Merge pull request #213 from ook3D/master

tweak(); updated Particle Unknowns to correct names
This commit is contained in:
dexyfex 2023-08-21 14:48:04 +10:00 committed by GitHub
commit 3bfd6ac9f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2071,14 +2071,14 @@ namespace CodeWalker.GameFiles
public uint Unknown_6Ch { get; set; } = 0x7f800001; // 0x7f800001 public uint Unknown_6Ch { get; set; } = 0x7f800001; // 0x7f800001
public float Unknown_70h { get; set; } public float Unknown_70h { get; set; }
public float Unknown_74h { get; set; } // 0, 0.1f, 0.25f, 1.0f public float Unknown_74h { get; set; } // 0, 0.1f, 0.25f, 1.0f
public float Unknown_78h { get; set; } public float PlaybackDelay { get; set; }
public float Unknown_7Ch { get; set; } public float Unknown_7Ch { get; set; }
public float Unknown_80h { get; set; } public float PlaybackSpeedScale { get; set; }
public float Unknown_84h { get; set; } public float PlaybackSpeedScaleModifier { get; set; }
public uint Unknown_88h { get; set; } // eg. 0x01010105 public uint Unknown_88h { get; set; } // eg. 0x01010105
public uint Unknown_8Ch { get; set; } // eg. 0x01010002 public uint Unknown_8Ch { get; set; } // eg. 0x01010002
public float Unknown_90h { get; set; } public float CullRadius { get; set; }
public float Unknown_94h { get; set; } public float CullDistance { get; set; }
public float Unknown_98h { get; set; } public float Unknown_98h { get; set; }
public uint Unknown_9Ch { get; set; } = 0x7f800001;// 0x7f800001 public uint Unknown_9Ch { get; set; } = 0x7f800001;// 0x7f800001
public float Unknown_A0h { get; set; } public float Unknown_A0h { get; set; }
@ -2141,14 +2141,14 @@ namespace CodeWalker.GameFiles
this.Unknown_6Ch = reader.ReadUInt32(); this.Unknown_6Ch = reader.ReadUInt32();
this.Unknown_70h = reader.ReadSingle(); this.Unknown_70h = reader.ReadSingle();
this.Unknown_74h = reader.ReadSingle(); this.Unknown_74h = reader.ReadSingle();
this.Unknown_78h = reader.ReadSingle(); this.PlaybackDelay = reader.ReadSingle();
this.Unknown_7Ch = reader.ReadSingle(); this.Unknown_7Ch = reader.ReadSingle();
this.Unknown_80h = reader.ReadSingle(); this.PlaybackSpeedScale = reader.ReadSingle();
this.Unknown_84h = reader.ReadSingle(); this.PlaybackSpeedScaleModifier = reader.ReadSingle();
this.Unknown_88h = reader.ReadUInt32(); this.Unknown_88h = reader.ReadUInt32();
this.Unknown_8Ch = reader.ReadUInt32(); this.Unknown_8Ch = reader.ReadUInt32();
this.Unknown_90h = reader.ReadSingle(); this.CullRadius = reader.ReadSingle();
this.Unknown_94h = reader.ReadSingle(); this.CullDistance = reader.ReadSingle();
this.Unknown_98h = reader.ReadSingle(); this.Unknown_98h = reader.ReadSingle();
this.Unknown_9Ch = reader.ReadUInt32(); this.Unknown_9Ch = reader.ReadUInt32();
this.Unknown_A0h = reader.ReadSingle(); this.Unknown_A0h = reader.ReadSingle();
@ -2531,14 +2531,14 @@ namespace CodeWalker.GameFiles
writer.Write(this.Unknown_6Ch); writer.Write(this.Unknown_6Ch);
writer.Write(this.Unknown_70h); writer.Write(this.Unknown_70h);
writer.Write(this.Unknown_74h); writer.Write(this.Unknown_74h);
writer.Write(this.Unknown_78h); writer.Write(this.PlaybackDelay);
writer.Write(this.Unknown_7Ch); writer.Write(this.Unknown_7Ch);
writer.Write(this.Unknown_80h); writer.Write(this.PlaybackSpeedScale);
writer.Write(this.Unknown_84h); writer.Write(this.PlaybackSpeedScaleModifier);
writer.Write(this.Unknown_88h); writer.Write(this.Unknown_88h);
writer.Write(this.Unknown_8Ch); writer.Write(this.Unknown_8Ch);
writer.Write(this.Unknown_90h); writer.Write(this.CullRadius);
writer.Write(this.Unknown_94h); writer.Write(this.CullDistance);
writer.Write(this.Unknown_98h); writer.Write(this.Unknown_98h);
writer.Write(this.Unknown_9Ch); writer.Write(this.Unknown_9Ch);
writer.Write(this.Unknown_A0h); writer.Write(this.Unknown_A0h);
@ -2572,14 +2572,14 @@ namespace CodeWalker.GameFiles
YptXml.ValueTag(sb, indent, "Unknown54", YptXml.UintString(Unknown_54h)); YptXml.ValueTag(sb, indent, "Unknown54", YptXml.UintString(Unknown_54h));
YptXml.ValueTag(sb, indent, "Unknown70", FloatUtil.ToString(Unknown_70h)); YptXml.ValueTag(sb, indent, "Unknown70", FloatUtil.ToString(Unknown_70h));
YptXml.ValueTag(sb, indent, "Unknown74", FloatUtil.ToString(Unknown_74h)); YptXml.ValueTag(sb, indent, "Unknown74", FloatUtil.ToString(Unknown_74h));
YptXml.ValueTag(sb, indent, "Unknown78", FloatUtil.ToString(Unknown_78h)); YptXml.ValueTag(sb, indent, "PlaybackDelay", FloatUtil.ToString(PlaybackDelay));
YptXml.ValueTag(sb, indent, "Unknown7C", FloatUtil.ToString(Unknown_7Ch)); YptXml.ValueTag(sb, indent, "Unknown7C", FloatUtil.ToString(Unknown_7Ch));
YptXml.ValueTag(sb, indent, "Unknown80", FloatUtil.ToString(Unknown_80h)); YptXml.ValueTag(sb, indent, "PlaybackSpeedScale", FloatUtil.ToString(PlaybackSpeedScale));
YptXml.ValueTag(sb, indent, "Unknown84", FloatUtil.ToString(Unknown_84h)); YptXml.ValueTag(sb, indent, "PlaybackSpeedScaleModifier", FloatUtil.ToString(PlaybackSpeedScaleModifier));
YptXml.ValueTag(sb, indent, "Unknown88", YptXml.UintString(Unknown_88h)); YptXml.ValueTag(sb, indent, "Unknown88", YptXml.UintString(Unknown_88h));
YptXml.ValueTag(sb, indent, "Unknown8C", YptXml.UintString(Unknown_8Ch)); YptXml.ValueTag(sb, indent, "Unknown8C", YptXml.UintString(Unknown_8Ch));
YptXml.ValueTag(sb, indent, "Unknown90", FloatUtil.ToString(Unknown_90h)); YptXml.ValueTag(sb, indent, "CullRadius", FloatUtil.ToString(CullRadius));
YptXml.ValueTag(sb, indent, "Unknown94", FloatUtil.ToString(Unknown_94h)); YptXml.ValueTag(sb, indent, "CullDistance", FloatUtil.ToString(CullDistance));
YptXml.ValueTag(sb, indent, "Unknown98", FloatUtil.ToString(Unknown_98h)); YptXml.ValueTag(sb, indent, "Unknown98", FloatUtil.ToString(Unknown_98h));
YptXml.ValueTag(sb, indent, "UnknownA0", FloatUtil.ToString(Unknown_A0h)); YptXml.ValueTag(sb, indent, "UnknownA0", FloatUtil.ToString(Unknown_A0h));
YptXml.ValueTag(sb, indent, "UnknownA4", FloatUtil.ToString(Unknown_A4h)); YptXml.ValueTag(sb, indent, "UnknownA4", FloatUtil.ToString(Unknown_A4h));
@ -2617,14 +2617,14 @@ namespace CodeWalker.GameFiles
Unknown_54h = Xml.GetChildUIntAttribute(node, "Unknown54"); Unknown_54h = Xml.GetChildUIntAttribute(node, "Unknown54");
Unknown_70h = Xml.GetChildFloatAttribute(node, "Unknown70"); Unknown_70h = Xml.GetChildFloatAttribute(node, "Unknown70");
Unknown_74h = Xml.GetChildFloatAttribute(node, "Unknown74"); Unknown_74h = Xml.GetChildFloatAttribute(node, "Unknown74");
Unknown_78h = Xml.GetChildFloatAttribute(node, "Unknown78"); PlaybackDelay = Xml.GetChildFloatAttribute(node, "PlaybackDelay");
Unknown_7Ch = Xml.GetChildFloatAttribute(node, "Unknown7C"); Unknown_7Ch = Xml.GetChildFloatAttribute(node, "Unknown7C");
Unknown_80h = Xml.GetChildFloatAttribute(node, "Unknown80"); PlaybackSpeedScale = Xml.GetChildFloatAttribute(node, "PlaybackSpeedScale");
Unknown_84h = Xml.GetChildFloatAttribute(node, "Unknown84"); PlaybackSpeedScaleModifier = Xml.GetChildFloatAttribute(node, "PlaybackSpeedScaleModifier");
Unknown_88h = Xml.GetChildUIntAttribute(node, "Unknown88"); Unknown_88h = Xml.GetChildUIntAttribute(node, "Unknown88");
Unknown_8Ch = Xml.GetChildUIntAttribute(node, "Unknown8C"); Unknown_8Ch = Xml.GetChildUIntAttribute(node, "Unknown8C");
Unknown_90h = Xml.GetChildFloatAttribute(node, "Unknown90"); CullRadius = Xml.GetChildFloatAttribute(node, "CullRadius");
Unknown_94h = Xml.GetChildFloatAttribute(node, "Unknown94"); CullDistance = Xml.GetChildFloatAttribute(node, "CullDistance");
Unknown_98h = Xml.GetChildFloatAttribute(node, "Unknown98"); Unknown_98h = Xml.GetChildFloatAttribute(node, "Unknown98");
Unknown_A0h = Xml.GetChildFloatAttribute(node, "UnknownA0"); Unknown_A0h = Xml.GetChildFloatAttribute(node, "UnknownA0");
Unknown_A4h = Xml.GetChildFloatAttribute(node, "UnknownA4"); Unknown_A4h = Xml.GetChildFloatAttribute(node, "UnknownA4");
@ -2724,10 +2724,10 @@ namespace CodeWalker.GameFiles
public ulong ParticleRuleNamePointer { get; set; } public ulong ParticleRuleNamePointer { get; set; }
public ulong EmitterRulePointer { get; set; } public ulong EmitterRulePointer { get; set; }
public ulong ParticleRulePointer { get; set; } public ulong ParticleRulePointer { get; set; }
public float Unknown_50h { get; set; } public float MoveSpeedScale { get; set; }
public float Unknown_54h { get; set; } public float MoveSpeedScaleModifier { get; set; }
public float Unknown_58h { get; set; } public float ParticleScale { get; set; }
public float Unknown_5Ch { get; set; } public float ParticleScaleModifier { get; set; }
public uint Colour1 { get; set; } // eg. 0xfffafafa - colour? public uint Colour1 { get; set; } // eg. 0xfffafafa - colour?
public uint Colour2 { get; set; } // eg. 0x5affffff - colour? public uint Colour2 { get; set; } // eg. 0x5affffff - colour?
public ulong Unknown_68h; // 0x0000000000000000 public ulong Unknown_68h; // 0x0000000000000000
@ -2756,10 +2756,10 @@ namespace CodeWalker.GameFiles
this.ParticleRuleNamePointer = reader.ReadUInt64(); this.ParticleRuleNamePointer = reader.ReadUInt64();
this.EmitterRulePointer = reader.ReadUInt64(); this.EmitterRulePointer = reader.ReadUInt64();
this.ParticleRulePointer = reader.ReadUInt64(); this.ParticleRulePointer = reader.ReadUInt64();
this.Unknown_50h = reader.ReadSingle(); this.MoveSpeedScale = reader.ReadSingle();
this.Unknown_54h = reader.ReadSingle(); this.MoveSpeedScaleModifier = reader.ReadSingle();
this.Unknown_58h = reader.ReadSingle(); this.ParticleScale = reader.ReadSingle();
this.Unknown_5Ch = reader.ReadSingle(); this.ParticleScaleModifier = reader.ReadSingle();
this.Colour1 = reader.ReadUInt32(); this.Colour1 = reader.ReadUInt32();
this.Colour2 = reader.ReadUInt32(); this.Colour2 = reader.ReadUInt32();
this.Unknown_68h = reader.ReadUInt64(); this.Unknown_68h = reader.ReadUInt64();
@ -2829,7 +2829,7 @@ namespace CodeWalker.GameFiles
//{ }//no hit //{ }//no hit
//if (Unknown_28h != 0) //if (Unknown_28h != 0)
//{ }//no hit //{ }//no hit
switch (Unknown_50h) switch (MoveSpeedScale)
{ {
case 1.0f: case 1.0f:
case 2.0f: case 2.0f:
@ -2839,7 +2839,7 @@ namespace CodeWalker.GameFiles
default: default:
break;//more break;//more
} }
switch (Unknown_54h) switch (MoveSpeedScaleModifier)
{ {
case 1.0f: case 1.0f:
case 2.0f: case 2.0f:
@ -2849,7 +2849,7 @@ namespace CodeWalker.GameFiles
default: default:
break;//and more break;//and more
} }
switch (Unknown_58h) switch (ParticleScale)
{ {
case 1.0f: case 1.0f:
case 0.5f: case 0.5f:
@ -2860,7 +2860,7 @@ namespace CodeWalker.GameFiles
default: default:
break;//more break;//more
} }
switch (Unknown_5Ch) switch (ParticleScaleModifier)
{ {
case 1.0f: case 1.0f:
case 1.2f: case 1.2f:
@ -2929,10 +2929,10 @@ namespace CodeWalker.GameFiles
writer.Write(this.ParticleRuleNamePointer); writer.Write(this.ParticleRuleNamePointer);
writer.Write(this.EmitterRulePointer); writer.Write(this.EmitterRulePointer);
writer.Write(this.ParticleRulePointer); writer.Write(this.ParticleRulePointer);
writer.Write(this.Unknown_50h); writer.Write(this.MoveSpeedScale);
writer.Write(this.Unknown_54h); writer.Write(this.MoveSpeedScaleModifier);
writer.Write(this.Unknown_58h); writer.Write(this.ParticleScale);
writer.Write(this.Unknown_5Ch); writer.Write(this.ParticleScaleModifier);
writer.Write(this.Colour1); writer.Write(this.Colour1);
writer.Write(this.Colour2); writer.Write(this.Colour2);
writer.Write(this.Unknown_68h); writer.Write(this.Unknown_68h);
@ -2943,10 +2943,10 @@ namespace CodeWalker.GameFiles
YptXml.StringTag(sb, indent, "ParticleRule", YptXml.XmlEscape(ParticleRuleName?.Value ?? "")); YptXml.StringTag(sb, indent, "ParticleRule", YptXml.XmlEscape(ParticleRuleName?.Value ?? ""));
YptXml.ValueTag(sb, indent, "Unknown10", FloatUtil.ToString(Unknown_10h)); YptXml.ValueTag(sb, indent, "Unknown10", FloatUtil.ToString(Unknown_10h));
YptXml.ValueTag(sb, indent, "Unknown14", FloatUtil.ToString(Unknown_14h)); YptXml.ValueTag(sb, indent, "Unknown14", FloatUtil.ToString(Unknown_14h));
YptXml.ValueTag(sb, indent, "Unknown50", FloatUtil.ToString(Unknown_50h)); YptXml.ValueTag(sb, indent, "MoveSpeedScale", FloatUtil.ToString(MoveSpeedScale));
YptXml.ValueTag(sb, indent, "Unknown54", FloatUtil.ToString(Unknown_54h)); YptXml.ValueTag(sb, indent, "MoveSpeedScaleModifier", FloatUtil.ToString(MoveSpeedScaleModifier));
YptXml.ValueTag(sb, indent, "Unknown58", FloatUtil.ToString(Unknown_58h)); YptXml.ValueTag(sb, indent, "ParticleScale", FloatUtil.ToString(ParticleScale));
YptXml.ValueTag(sb, indent, "Unknown5C", FloatUtil.ToString(Unknown_5Ch)); YptXml.ValueTag(sb, indent, "ParticleScaleModifier", FloatUtil.ToString(ParticleScaleModifier));
YptXml.ValueTag(sb, indent, "Colour1", YptXml.UintString(Colour1)); YptXml.ValueTag(sb, indent, "Colour1", YptXml.UintString(Colour1));
YptXml.ValueTag(sb, indent, "Colour2", YptXml.UintString(Colour2)); YptXml.ValueTag(sb, indent, "Colour2", YptXml.UintString(Colour2));
if (UnknownData != null) if (UnknownData != null)
@ -2962,10 +2962,10 @@ namespace CodeWalker.GameFiles
ParticleRuleName = (string_r)Xml.GetChildInnerText(node, "ParticleRule"); if (ParticleRuleName.Value == null) ParticleRuleName = null; ParticleRuleName = (string_r)Xml.GetChildInnerText(node, "ParticleRule"); if (ParticleRuleName.Value == null) ParticleRuleName = null;
Unknown_10h = Xml.GetChildFloatAttribute(node, "Unknown10"); Unknown_10h = Xml.GetChildFloatAttribute(node, "Unknown10");
Unknown_14h = Xml.GetChildFloatAttribute(node, "Unknown14"); Unknown_14h = Xml.GetChildFloatAttribute(node, "Unknown14");
Unknown_50h = Xml.GetChildFloatAttribute(node, "Unknown50"); MoveSpeedScale = Xml.GetChildFloatAttribute(node, "MoveSpeedScale");
Unknown_54h = Xml.GetChildFloatAttribute(node, "Unknown54"); MoveSpeedScaleModifier = Xml.GetChildFloatAttribute(node, "MoveSpeedScaleModifier");
Unknown_58h = Xml.GetChildFloatAttribute(node, "Unknown58"); ParticleScale = Xml.GetChildFloatAttribute(node, "ParticleScale");
Unknown_5Ch = Xml.GetChildFloatAttribute(node, "Unknown5C"); ParticleScaleModifier = Xml.GetChildFloatAttribute(node, "ParticleScaleModifier");
Colour1 = Xml.GetChildUIntAttribute(node, "Colour1"); Colour1 = Xml.GetChildUIntAttribute(node, "Colour1");
Colour2 = Xml.GetChildUIntAttribute(node, "Colour2"); Colour2 = Xml.GetChildUIntAttribute(node, "Colour2");
var udnode = node.SelectSingleNode("UnknownData"); var udnode = node.SelectSingleNode("UnknownData");