Skip to content

Commit

Permalink
new info from seil
Browse files Browse the repository at this point in the history
  • Loading branch information
@igorseabra4
igorseabra4 committed Feb 17, 2019
1 parent 01d3e7e commit e26ac30
Show file tree
Hide file tree
Showing 41 changed files with 931 additions and 696 deletions.
12 changes: 6 additions & 6 deletions IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetEditing.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,15 +752,15 @@ public void ApplyScale(Vector3 factor)

if (a is AssetMVPT MVPT)
{
if (MVPT.MovementRadius != -1)
MVPT.MovementRadius *= singleFactor;
if (MVPT.DistanceICanSeeYou != -1)
MVPT.DistanceICanSeeYou *= singleFactor;
if (MVPT.ZoneRadius != -1)
MVPT.ZoneRadius *= singleFactor;
if (MVPT.ArenaRadius != -1)
MVPT.ArenaRadius *= singleFactor;
}
else if (a is AssetSFX SFX)
{
SFX.RadiusMax *= singleFactor;
SFX.RadiusMin *= singleFactor;
SFX.OuterRadius *= singleFactor;
SFX.InnerRadius *= singleFactor;
}
else if (a is PlaceableAsset placeable && !(a is AssetPLYR || a is AssetPKUP || a is AssetUI || a is AssetUIFT || a is AssetVIL || (a is AssetDYNA DYNA && DYNA.Type == DynaType.game_object__Teleport)))
{
Expand Down
261 changes: 132 additions & 129 deletions IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetTemplates.cs
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions IndustrialPark/ArchiveEditor/Other/AssetTemplate.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public enum AssetTemplate
Camera,
Destructible_Generic,
ElectricArc_Generic,
Pendulum_Generic,
Platform_Generic,
Player_Generic,
SIMP_Generic,
Expand Down
2 changes: 1 addition & 1 deletion IndustrialPark/Assets/ObjectAssets/AssetCNTR.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public short Count
}

[Category("Counter")]
public short Unknown
public short Padding
{
get => ReadShort(0xA);
set => Write(0xA, value);
Expand Down
4 changes: 2 additions & 2 deletions IndustrialPark/Assets/ObjectAssets/AssetCSNM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public AssetID CSN_AssetID
}

[Category("Cutscene Manager")]
public int UnknownInt0C
public int CsnmFlags
{
get => ReadInt(0xC);
set => Write(0xC, value);
}

[Category("Cutscene Manager")]
public int UnknownInt10
public int InterpSpeed
{
get => ReadInt(0x10);
set => Write(0x10, value);
Expand Down
64 changes: 37 additions & 27 deletions IndustrialPark/Assets/ObjectAssets/AssetENV.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,120 +12,130 @@ public AssetENV(Section_AHDR AHDR) : base(AHDR) { }

public override bool HasReference(uint assetID)
{
if (JSP_AssetID == assetID)
if (BSP_AssetID == assetID)
return true;
if (CAM_AssetID == assetID)
if (StartCameraAssetID == assetID)
return true;
if (LKIT_AssetID_0 == assetID)
if (BSP_LKIT_AssetID == assetID)
return true;
if (LKIT_AssetID_1 == assetID)
if (Object_LKIT_AssetID == assetID)
return true;
if (MAPR_AssetID == assetID)
if (BSP_Collision_AssetID == assetID)
return true;
if (BSP_FX_AssetID == assetID)
return true;
if (BSP_Camera_AssetID == assetID)
return true;
if (BSP_MAPR_AssetID == assetID)
return true;
if (BSP_MAPR_Collision_AssetID == assetID)
return true;
if (BSP_MAPR_FX_AssetID == assetID)
return true;

return base.HasReference(assetID);
}

[Category("Environment")]
public AssetID JSP_AssetID
public AssetID BSP_AssetID
{
get => ReadUInt(0x8);
set => Write(0x8, value);
}

[Category("Environment")]
public AssetID CAM_AssetID
public AssetID StartCameraAssetID
{
get => ReadUInt(0xC);
set => Write(0xC, value);
}

[Category("Environment")]
public int UnknownInt10
public int ClimateFlags
{
get => ReadInt(0x10);
set => Write(0x10, value);
}

[Category("Environment"), TypeConverter(typeof(FloatTypeConverter))]
public float UnknownFloat14
public float ClimateStrengthMin
{
get => ReadFloat(0x14);
set => Write(0x14, value);
}

[Category("Environment"), TypeConverter(typeof(FloatTypeConverter))]
public float UnknownFloat18
public float ClimateStrengthMax
{
get => ReadFloat(0x18);
set => Write(0x18, value);
}

[Category("Environment")]
public AssetID LKIT_AssetID_0
public AssetID BSP_LKIT_AssetID
{
get => ReadUInt(0x1C);
set => Write(0x1C, value);
}

[Category("Environment")]
public AssetID LKIT_AssetID_1
public AssetID Object_LKIT_AssetID
{
get => ReadUInt(0x20);
set => Write(0x20, value);
}

[Category("Environment")]
public int UnknownInt24
public int Padding24
{
get => ReadInt(0x24);
set => Write(0x24, value);
}

[Category("Environment")]
public int UnknownInt28
public AssetID BSP_Collision_AssetID
{
get => ReadInt(0x28);
get => ReadUInt(0x28);
set => Write(0x28, value);
}

}
[Category("Environment")]
public int UnknownInt2C
public AssetID BSP_FX_AssetID
{
get => ReadInt(0x2C);
get => ReadUInt(0x2C);
set => Write(0x2C, value);
}

[Category("Environment")]
public int UnknownInt30
public AssetID BSP_Camera_AssetID
{
get => ReadInt(0x30);
get => ReadUInt(0x30);
set => Write(0x30, value);
}

[Category("Environment")]
public AssetID MAPR_AssetID
public AssetID BSP_MAPR_AssetID
{
get => ReadUInt(0x34);
set => Write(0x34, value);
}

[Category("Environment")]
public int UnknownInt38
public AssetID BSP_MAPR_Collision_AssetID
{
get => ReadInt(0x38);
get => ReadUInt(0x38);
set => Write(0x38, value);
}

[Category("Environment")]
public int UnknownInt3C
public AssetID BSP_MAPR_FX_AssetID
{
get => ReadInt(0x3C);
get => ReadUInt(0x3C);
set => Write(0x3C, value);
}

[Category("Environment"), TypeConverter(typeof(FloatTypeConverter))]
public float UnknownFloat40
public float LoldHeight
{
get => BitConverter.ToSingle(AHDR.data, 0x40);
set
Expand Down
43 changes: 32 additions & 11 deletions IndustrialPark/Assets/ObjectAssets/AssetFOG.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,55 +14,55 @@ public AssetFOG(Section_AHDR AHDR) : base(AHDR) { }
protected override int EventStartOffset => 0x24;

[Category("Fog"), Editor(typeof(MyColorEditor), typeof(UITypeEditor)), DisplayName("End Color (R, G, B)")]
public MyColor Color1
public MyColor BackgroundColor
{
get
{
byte[] abgr = BitConverter.GetBytes(ReadInt(0x8));
return new MyColor(abgr[3], abgr[2], abgr[1], abgr[0]);
}

set => Write(0x8, BitConverter.ToInt32(new byte[] { Color1Alpha, value.B, value.G, value.R }, 0));
set => Write(0x8, BitConverter.ToInt32(new byte[] { BackgroundColorAlpha, value.B, value.G, value.R }, 0));
}

[Category("Fog"), DisplayName("End Color Alpha (0 - 255)")]
public byte Color1Alpha
public byte BackgroundColorAlpha
{
get
{
byte[] abgr = BitConverter.GetBytes(ReadInt(0x8));
return abgr[0];
}

set => Write(0x8, BitConverter.ToInt32(new byte[] { value, Color1.B, Color1.G, Color1.R }, 0));
set => Write(0x8, BitConverter.ToInt32(new byte[] { value, BackgroundColor.B, BackgroundColor.G, BackgroundColor.R }, 0));
}

[Category("Fog"), Editor(typeof(MyColorEditor), typeof(UITypeEditor)), DisplayName("Start Color (R, G, B)")]
public MyColor Color2
public MyColor FogColor
{
get
{
byte[] abgr = BitConverter.GetBytes(ReadInt(0xC));
return new MyColor(abgr[3], abgr[2], abgr[1], abgr[0]);
}

set => Write(0xC, BitConverter.ToInt32(new byte[] { Color2Alpha, value.B, value.G, value.R }, 0));
set => Write(0xC, BitConverter.ToInt32(new byte[] { FogColorAlpha, value.B, value.G, value.R }, 0));
}

[Category("Fog"), DisplayName("Start Color Alpha (0 - 255)")]
public byte Color2Alpha
public byte FogColorAlpha
{
get
{
byte[] abgr = BitConverter.GetBytes(ReadInt(0xC));
return abgr[0];
}

set => Write(0xC, BitConverter.ToInt32(new byte[] { value, Color2.B, Color2.G, Color2.R }, 0));
set => Write(0xC, BitConverter.ToInt32(new byte[] { value, FogColor.B, FogColor.G, FogColor.R }, 0));
}

[Category("Fog"), TypeConverter(typeof(FloatTypeConverter))]
public float UnknownFloat10
public float FogDensity
{
get => ReadFloat(0x10);
set => Write(0x10, value);
Expand Down Expand Up @@ -90,10 +90,31 @@ public float TransitionTime
}

[Category("Fog")]
public int UnknownInt20
public byte FogType
{
get => ReadInt(0x20);
get => ReadByte(0x20);
set => Write(0x20, value);
}

[Category("Fog")]
public byte Padding21
{
get => ReadByte(0x21);
set => Write(0x21, value);
}

[Category("Fog")]
public byte Padding22
{
get => ReadByte(0x22);
set => Write(0x22, value);
}

[Category("Fog")]
public byte Padding23
{
get => ReadByte(0x23);
set => Write(0x23, value);
}
}
}
Loading

0 comments on commit e26ac30

Please sign in to comment.