Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Name & Def Updates 09/03/2024 #862

Merged
merged 2 commits into from
Mar 10, 2024
Merged

Name & Def Updates 09/03/2024 #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f5d89
defs
Philiquaz Mar 9, 2024
fe209bd
CullingHeightBehavior
Philiquaz Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PartsParam.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,9 +1295,9 @@ public class UnkStruct10
public int Unk10 { get; set; }

/// <summary>
/// Unknown.
/// Unknown culling behaviour field for extreme height differences. Values 0000 - 10000.
/// </summary>
public int Unk14 { get; set; }
public int CullingHeightBehavior { get; set; }

/// <summary>
/// Creates an UnkStruct7 with default values.
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -1957,9 +1957,9 @@ public enum HitFilterType : byte
public float UnkT14 { get; set; }

/// <summary>
/// Unknown.
/// ID of location text to display when stepping onto this collision.
/// </summary>
public int UnkT18 { get; set; }
public int LocationTextID { get; set; }

/// <summary>
/// Unknown.
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions src/Andre/SoulsFormats/SoulsFormats/Formats/MSB/MSBE/PointParam.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,9 @@ public abstract class Region : Entry, IMsbRegion
public Vector3 Rotation { get; set; }

/// <summary>
/// Unknown.
/// Presumed ID for regions. Unique per map / incremented per region.
/// </summary>
public int Unk2C { get; set; }
public int RegionID { get; set; }

/// <summary>
/// Unknown.
Expand Down Expand Up @@ -579,7 +579,7 @@ private protected Region(BinaryReaderEx br)
MSB.ShapeType shapeType = br.ReadEnum32<MSB.ShapeType>();
Position = br.ReadVector3();
Rotation = br.ReadVector3();
Unk2C = br.ReadInt32();
RegionID = br.ReadInt32();
long baseDataOffset1 = br.ReadInt64();
long baseDataOffset2 = br.ReadInt64();
Unk40 = br.ReadInt32();
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/StudioCore/Assets/Paramdex/DS2S/Defs/CHR_PARAM.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<Field Def="s32 common_param_id" />
<Field Def="s32 move_param_id" />
<Field Def="s32 npc_player_status_param_id" />
<Field Def="u8 Unk00_1" />
<Field Def="u8 prevent_resting_related" />
<Field Def="u8 Unk00_2" />
<Field Def="u16 Unk01" />
<Field Def="s32 Unk02" />
<Field Def="s32 body_hit_sfx1" />
<Field Def="s32 chr_phantom_param_id" />
<Field Def="u8 Unk04" />
<Field Def="u8 spawn_limit" />
<Field Def="u8 Unk05" />
<Field Def="u8 can_revive_related" />
<Field Def="u8 Unk06" />
<Field Def="s32 stat_hp" />
<Field Def="f32 stat_stamina" />
Expand Down
8 changes: 7 additions & 1 deletion src/StudioCore/Assets/Paramdex/ER/Names/SpEffectParam.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 -
Expand Down
Loading