diff --git a/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PartsParam.cs b/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PartsParam.cs index 8b88733e7..45d76a2e4 100644 --- a/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PartsParam.cs +++ b/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PartsParam.cs @@ -1295,9 +1295,9 @@ public class UnkStruct10 public int Unk10 { get; set; } /// - /// Unknown. + /// Unknown culling behaviour field for extreme height differences. Values 0000 - 10000. /// - public int Unk14 { get; set; } + public int CullingHeightBehavior { get; set; } /// /// Creates an UnkStruct7 with default values. @@ -1324,7 +1324,7 @@ internal UnkStruct10(BinaryReaderEx br) br.AssertInt32(0); Unk0C = br.ReadInt32(); Unk10 = br.AssertInt32([0, 1]); - Unk14 = br.ReadInt32(); + CullingHeightBehavior = br.ReadInt32(); br.AssertInt32(0); br.AssertInt32(0); } @@ -1336,7 +1336,7 @@ internal void Write(BinaryWriterEx bw) bw.WriteInt32(0); bw.WriteInt32(Unk0C); bw.WriteInt32(Unk10); - bw.WriteInt32(Unk14); + bw.WriteInt32(CullingHeightBehavior); bw.WriteInt32(0); bw.WriteInt32(0); } @@ -1957,9 +1957,9 @@ public enum HitFilterType : byte public float UnkT14 { get; set; } /// - /// Unknown. + /// ID of location text to display when stepping onto this collision. /// - public int UnkT18 { get; set; } + public int LocationTextID { get; set; } /// /// Unknown. @@ -2071,7 +2071,7 @@ private protected override void ReadTypeData(BinaryReaderEx br) br.AssertInt32(0); br.AssertInt32(0); UnkT14 = br.ReadSingle(); - UnkT18 = br.ReadInt32(); + LocationTextID = br.ReadInt32(); UnkT1C = br.ReadInt32(); PlayRegionID = br.ReadInt32(); UnkT24 = br.ReadInt16(); @@ -2112,7 +2112,7 @@ private protected override void WriteTypeData(BinaryWriterEx bw) bw.WriteInt32(0); bw.WriteInt32(0); bw.WriteSingle(UnkT14); - bw.WriteInt32(UnkT18); + bw.WriteInt32(LocationTextID); bw.WriteInt32(UnkT1C); bw.WriteInt32(PlayRegionID); bw.WriteInt16(UnkT24); diff --git a/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PointParam.cs b/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PointParam.cs index 3f9c89484..f53288892 100644 --- a/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PointParam.cs +++ b/src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PointParam.cs @@ -488,9 +488,9 @@ public abstract class Region : Entry, IMsbRegion public Vector3 Rotation { get; set; } /// - /// Unknown. + /// Presumed ID for regions. Unique per map / incremented per region. /// - public int Unk2C { get; set; } + public int RegionID { get; set; } /// /// Unknown. @@ -579,7 +579,7 @@ private protected Region(BinaryReaderEx br) MSB.ShapeType shapeType = br.ReadEnum32(); Position = br.ReadVector3(); Rotation = br.ReadVector3(); - Unk2C = br.ReadInt32(); + RegionID = br.ReadInt32(); long baseDataOffset1 = br.ReadInt64(); long baseDataOffset2 = br.ReadInt64(); Unk40 = br.ReadInt32(); @@ -662,7 +662,7 @@ internal override void Write(BinaryWriterEx bw, int id) bw.WriteUInt32((uint)Shape.Type); bw.WriteVector3(Position); bw.WriteVector3(Rotation); - bw.WriteInt32(Unk2C); + bw.WriteInt32(RegionID); bw.ReserveInt64("BaseDataOffset1"); bw.ReserveInt64("BaseDataOffset2"); bw.WriteInt32(Unk40); diff --git a/src/StudioCore/Assets/Paramdex/DS2S/Defs/CHR_PARAM.xml b/src/StudioCore/Assets/Paramdex/DS2S/Defs/CHR_PARAM.xml index 7f24655ee..e47f16fb5 100644 --- a/src/StudioCore/Assets/Paramdex/DS2S/Defs/CHR_PARAM.xml +++ b/src/StudioCore/Assets/Paramdex/DS2S/Defs/CHR_PARAM.xml @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/src/StudioCore/Assets/Paramdex/ER/Names/SpEffectParam.txt b/src/StudioCore/Assets/Paramdex/ER/Names/SpEffectParam.txt index e79a1a539..f665660ee 100644 --- a/src/StudioCore/Assets/Paramdex/ER/Names/SpEffectParam.txt +++ b/src/StudioCore/Assets/Paramdex/ER/Names/SpEffectParam.txt @@ -50,6 +50,7 @@ 175 HKS - Unk Guard Break & Block Animation Resist 176 HKS - Unk Guard Block Animation Resist 183 Spiritspring - In Range +184 Spirit Spring - Fall Immune (Torrent) 185 Spiritspring - Fall Immune 186 Spiritspring - Is Jumping 210 PLAN_SP_EFFECT_BUDDY_ORDER_GO @@ -793,6 +794,10 @@ 8970 PLAN_SP_EFFECT_STRAGGLER_DEACT 8971 PLAN_SP_EFFECT_STRAGGLER_ACT 8972 PLAN_SP_EFFECT_STRAGGLER_ACT_HOSTILE +9540 Spirit Summon Active +9560 Spirit Summon Disappeared +9630 Lipsync +9631 Lipsync (Subtle) 9820 Animation Offset - Unk 9821 Animation Offset - Unk 9822 Animation Offset - Unk @@ -2949,7 +2954,8 @@ 290208 Spirit Summon Adjustment - Mimic Tear +8 290209 Spirit Summon Adjustment - Mimic Tear +9 290210 Spirit Summon Adjustment - Mimic Tear +10 -295000 Phantom Color - Spirit Summon +295000 Spirit Summon - Color +295200 Spirit Summon - Color (Puppet) 295900 Spirit Summon - 295901 Spirit Summon - 295902 Spirit Summon -