ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-09-28 20:17:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:dexyfex/CodeWalker into update

Browse Source
This commit is contained in:
Niek Schoemaker 2024-01-06 19:56:59 +01:00
commit ed68bd59fd
No known key found for this signature in database
GPG Key ID: BDF9404CFECB0006
10 changed files with 757 additions and 889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CodeWalker.Core/GameFiles/FileTypes/RelFile.cs
View File

@ -6881,8 +6881,12 @@ namespace CodeWalker.GameFiles
public ushort Unk16 { get; set; } public ushort Unk16 { get; set; }
public MetaHash Alarm { get; set; } public MetaHash Alarm { get; set; }
public MetaHash Unk18 { get; set; } public MetaHash Unk18 { get; set; }
public FlagsUint Unk19 { get; set; }//very flaggy values, 0x00000003, 0x000A1403, etc public uint MaxPathDepth { get; set; }
public FlagsUint Unk20 { get; set; }//0x05A00000 public uint SmallReverbSend { get; set; }
public uint MediumReverbSend { get; set; }
public uint LargeReverbSend { get; set; }
public ushort MinTimeMinutes { get; set; }
public ushort MaxTimeMinutes { get; set; }
public float Unk21 { get; set; } public float Unk21 { get; set; }
public float Unk22 { get; set; } public float Unk22 { get; set; }
@ -6911,8 +6915,12 @@ namespace CodeWalker.GameFiles
Unk16 = br.ReadUInt16(); Unk16 = br.ReadUInt16();
Alarm = br.ReadUInt32(); Alarm = br.ReadUInt32();
Unk18 = br.ReadUInt32(); Unk18 = br.ReadUInt32();
Unk19 = br.ReadUInt32(); MaxPathDepth = br.ReadByte();
Unk20 = br.ReadUInt32();//0x05A00000 SmallReverbSend = br.ReadByte();
MediumReverbSend = br.ReadByte();
LargeReverbSend = br.ReadByte();
MinTimeMinutes = br.ReadUInt16();
MaxTimeMinutes = br.ReadUInt16();
Unk21 = br.ReadSingle(); Unk21 = br.ReadSingle();
Unk22 = br.ReadSingle(); Unk22 = br.ReadSingle();
} }
@ -6939,8 +6947,12 @@ namespace CodeWalker.GameFiles
bw.Write(Unk16); bw.Write(Unk16);
bw.Write(Alarm); bw.Write(Alarm);
bw.Write(Unk18); bw.Write(Unk18);
bw.Write(Unk19); bw.Write(MaxPathDepth);
bw.Write(Unk20);//0x05A00000 bw.Write(SmallReverbSend);
bw.Write(MediumReverbSend);
bw.Write(LargeReverbSend);
bw.Write(MinTimeMinutes);
bw.Write(MaxTimeMinutes);
bw.Write(Unk21); bw.Write(Unk21);
bw.Write(Unk22); bw.Write(Unk22);
} }
@ -6964,8 +6976,12 @@ namespace CodeWalker.GameFiles
RelXml.ValueTag(sb, indent, "Unk16", Unk16.ToString()); RelXml.ValueTag(sb, indent, "Unk16", Unk16.ToString());
RelXml.StringTag(sb, indent, "Alarm", RelXml.HashString(Alarm)); RelXml.StringTag(sb, indent, "Alarm", RelXml.HashString(Alarm));
RelXml.StringTag(sb, indent, "Unk18", RelXml.HashString(Unk18)); RelXml.StringTag(sb, indent, "Unk18", RelXml.HashString(Unk18));
RelXml.ValueTag(sb, indent, "Unk19", "0x" + Unk19.Hex); RelXml.ValueTag(sb, indent, "MaxPathDepth", MaxPathDepth.ToString());
RelXml.ValueTag(sb, indent, "Unk20", "0x" + Unk20.Hex); RelXml.ValueTag(sb, indent, "SmallReverbSend", SmallReverbSend.ToString());
RelXml.ValueTag(sb, indent, "MediumReverbSend", MediumReverbSend.ToString());
RelXml.ValueTag(sb, indent, "LargeReverbSend", LargeReverbSend.ToString());
RelXml.ValueTag(sb, indent, "MinTimeMinutes", MinTimeMinutes.ToString());
RelXml.ValueTag(sb, indent, "MaxTimeMinutes", MaxTimeMinutes.ToString());
RelXml.ValueTag(sb, indent, "Unk21", FloatUtil.ToString(Unk21)); RelXml.ValueTag(sb, indent, "Unk21", FloatUtil.ToString(Unk21));
RelXml.ValueTag(sb, indent, "Unk22", FloatUtil.ToString(Unk22)); RelXml.ValueTag(sb, indent, "Unk22", FloatUtil.ToString(Unk22));
} }
@ -6989,8 +7005,12 @@ namespace CodeWalker.GameFiles
Unk16 = (ushort)Xml.GetChildUIntAttribute(node, "Unk16", "value"); Unk16 = (ushort)Xml.GetChildUIntAttribute(node, "Unk16", "value");
Alarm = XmlRel.GetHash(Xml.GetChildInnerText(node, "Alarm")); Alarm = XmlRel.GetHash(Xml.GetChildInnerText(node, "Alarm"));
Unk18 = XmlRel.GetHash(Xml.GetChildInnerText(node, "Unk18")); Unk18 = XmlRel.GetHash(Xml.GetChildInnerText(node, "Unk18"));
Unk19 = Xml.GetChildUIntAttribute(node, "Unk19", "value"); MaxPathDepth = Xml.GetChildUIntAttribute(node, "MaxPathDepth", "value");
Unk20 = Xml.GetChildUIntAttribute(node, "Unk20", "value"); SmallReverbSend = Xml.GetChildUIntAttribute(node, "SmallReverbSend", "value");
MediumReverbSend = Xml.GetChildUIntAttribute(node, "MediumReverbSend", "value");
LargeReverbSend = Xml.GetChildUIntAttribute(node, "LargeReverbSend", "value");
MinTimeMinutes = (ushort)Xml.GetChildUIntAttribute(node, "MinTimeMinutes", "value");
MaxTimeMinutes = (ushort)Xml.GetChildUIntAttribute(node, "MaxTimeMinutes", "value");
Unk21 = Xml.GetChildFloatAttribute(node, "Unk21", "value"); Unk21 = Xml.GetChildFloatAttribute(node, "Unk21", "value");
Unk22 = Xml.GetChildFloatAttribute(node, "Unk22", "value"); Unk22 = Xml.GetChildFloatAttribute(node, "Unk22", "value");
} }

10
CodeWalker.Core/GameFiles/MetaTypes/MetaNames.cs
View File

@ -4065,6 +4065,16 @@ namespace CodeWalker.GameFiles
propFlags = 1066841901, propFlags = 1066841901,
anchorId = 2731224028, anchorId = 2731224028,
propId = 3817142252, propId = 3817142252,
stickyness = 2894625425,
pedXml_flags = 2114993291,
pedXml_vfxComps = 1613922652,
pedXml_expressionMods = 128864925,
pedXml_audioID2 = 4233133352,
pedXml_audioID = 802196719,
PromoteToHDList = 896120921,
CommonAddSets = 1762439591,
pedXml_compIdx = 3509540765,
pedXml_drawblIdx = 4196345791,
inclusionId = 1938349561, inclusionId = 1938349561,
exclusionId = 3819522186, exclusionId = 3819522186,
weaponSlot = 1912311826, weaponSlot = 1912311826,

100
CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs
View File

@ -445,17 +445,17 @@ namespace CodeWalker.GameFiles
new MetaStructureEntryInfo_s(MetaName.NewStyle, 32, MetaStructureEntryDataType.Boolean, 0, 0, 0) new MetaStructureEntryInfo_s(MetaName.NewStyle, 32, MetaStructureEntryDataType.Boolean, 0, 0, 0)
), ),
MetaName.CStreamingRequestFrame => new MetaStructureInfo(MetaName.CStreamingRequestFrame, 1112444512, 1024, 112, MetaName.CStreamingRequestFrame => new MetaStructureInfo(MetaName.CStreamingRequestFrame, 1112444512, 1024, 112,
new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Hash, 0, 0, 0), new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Hash, 0, 0, 0),
new MetaStructureEntryInfo_s(MetaName.AddList, 0, MetaStructureEntryDataType.Array, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.AddList, 0, MetaStructureEntryDataType.Array, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Hash, 0, 0, 0), new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Hash, 0, 0, 0),
new MetaStructureEntryInfo_s(MetaName.RemoveList, 16, MetaStructureEntryDataType.Array, 0, 2, 0), new MetaStructureEntryInfo_s(MetaName.RemoveList, 16, MetaStructureEntryDataType.Array, 0, 2, 0),
new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Hash, 0, 0, 0), new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Hash, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)896120921, 32, MetaStructureEntryDataType.Array, 0, 4, 0), new MetaStructureEntryInfo_s(MetaName.PromoteToHDList, 32, MetaStructureEntryDataType.Array, 0, 4, 0),
new MetaStructureEntryInfo_s(MetaName.CamPos, 48, MetaStructureEntryDataType.Float_XYZ, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.CamPos, 48, MetaStructureEntryDataType.Float_XYZ, 0, 0, 0),
new MetaStructureEntryInfo_s(MetaName.CamDir, 64, MetaStructureEntryDataType.Float_XYZ, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.CamDir, 64, MetaStructureEntryDataType.Float_XYZ, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)1762439591, 80, MetaStructureEntryDataType.Array, 0, 8, 0), new MetaStructureEntryInfo_s(MetaName.CommonAddSets, 80, MetaStructureEntryDataType.Array, 0, 8, 0),
new MetaStructureEntryInfo_s(MetaName.Flags, 96, MetaStructureEntryDataType.UnsignedInt, 0, 0, 0) new MetaStructureEntryInfo_s(MetaName.Flags, 96, MetaStructureEntryDataType.UnsignedInt, 0, 0, 0)
), ),
//case MetaName.CStreamingRequestFrame: //case MetaName.CStreamingRequestFrame:
// return new MetaStructureInfo(MetaName.CStreamingRequestFrame, 3672937465, 1024, 96, // return new MetaStructureInfo(MetaName.CStreamingRequestFrame, 3672937465, 1024, 96,
@ -1017,17 +1017,17 @@ namespace CodeWalker.GameFiles
new MetaStructureEntryInfo_s(MetaName.distribution, 1, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0) new MetaStructureEntryInfo_s(MetaName.distribution, 1, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0)
), ),
MetaName.CComponentInfo => new MetaStructureInfo(MetaName.CComponentInfo, 3693847250, 512, 48, MetaName.CComponentInfo => new MetaStructureInfo(MetaName.CComponentInfo, 3693847250, 512, 48,
new MetaStructureEntryInfo_s((MetaName)802196719, 0, MetaStructureEntryDataType.Hash, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.pedXml_audioID, 0, MetaStructureEntryDataType.Hash, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)4233133352, 4, MetaStructureEntryDataType.Hash, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.pedXml_audioID2, 4, MetaStructureEntryDataType.Hash, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Float, 0, 0, 0), new MetaStructureEntryInfo_s((MetaName)MetaTypeName.ARRAYINFO, 0, MetaStructureEntryDataType.Float, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)128864925, 8, MetaStructureEntryDataType.ArrayOfBytes, 0, 2, (MetaName)5), new MetaStructureEntryInfo_s(MetaName.pedXml_expressionMods, 8, MetaStructureEntryDataType.ArrayOfBytes, 0, 2, (MetaName)5),
new MetaStructureEntryInfo_s(MetaName.flags, 28, MetaStructureEntryDataType.UnsignedInt, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.flags, 28, MetaStructureEntryDataType.UnsignedInt, 0, 0, 0),
new MetaStructureEntryInfo_s(MetaName.inclusions, 32, MetaStructureEntryDataType.IntFlags2, 0, 32, 0), new MetaStructureEntryInfo_s(MetaName.inclusions, 32, MetaStructureEntryDataType.IntFlags2, 0, 32, 0),
new MetaStructureEntryInfo_s(MetaName.exclusions, 36, MetaStructureEntryDataType.IntFlags2, 0, 32, 0), new MetaStructureEntryInfo_s(MetaName.exclusions, 36, MetaStructureEntryDataType.IntFlags2, 0, 32, 0),
new MetaStructureEntryInfo_s((MetaName)1613922652, 40, MetaStructureEntryDataType.ShortFlags, 0, 16, MetaName.ePedVarComp), new MetaStructureEntryInfo_s(MetaName.pedXml_vfxComps, 40, MetaStructureEntryDataType.ShortFlags, 0, 16, MetaName.ePedVarComp),
new MetaStructureEntryInfo_s((MetaName)2114993291, 42, MetaStructureEntryDataType.UnsignedShort, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.pedXml_flags, 42, MetaStructureEntryDataType.UnsignedShort, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)3509540765, 44, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.pedXml_compIdx, 44, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0),
new MetaStructureEntryInfo_s((MetaName)4196345791, 45, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0) new MetaStructureEntryInfo_s(MetaName.pedXml_drawblIdx, 45, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0)
), ),
MetaName.CPedPropMetaData => new MetaStructureInfo(MetaName.CPedPropMetaData, 2029738350, 768, 56, MetaName.CPedPropMetaData => new MetaStructureInfo(MetaName.CPedPropMetaData, 2029738350, 768, 56,
new MetaStructureEntryInfo_s(MetaName.audioId, 0, MetaStructureEntryDataType.Hash, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.audioId, 0, MetaStructureEntryDataType.Hash, 0, 0, 0),
@ -5865,12 +5865,12 @@ namespace CodeWalker.GameFiles
{ {
public Array_uint AddList { get; set; } //0 0: Array: 0: AddList//327274266 {0: Hash: 0: 256} public Array_uint AddList { get; set; } //0 0: Array: 0: AddList//327274266 {0: Hash: 0: 256}
public Array_uint RemoveList { get; set; } //16 16: Array: 0: RemoveList//3372321331 {0: Hash: 0: 256} public Array_uint RemoveList { get; set; } //16 16: Array: 0: RemoveList//3372321331 {0: Hash: 0: 256}
public Array_uint Unk_896120921 { get; set; } //32 32: Array: 0: 896120921 {0: Hash: 0: 256} public Array_uint PromoteToHDList { get; set; } //32 32: Array: 0: 896120921 {0: Hash: 0: 256}
public Vector3 CamPos { get; set; } //48 48: Float_XYZ: 0: CamPos//357008256 public Vector3 CamPos { get; set; } //48 48: Float_XYZ: 0: CamPos//357008256
public float Unused0 { get; set; }//60 public float Unused0 { get; set; }//60
public Vector3 CamDir { get; set; } //64 64: Float_XYZ: 0: CamDir//210316193 public Vector3 CamDir { get; set; } //64 64: Float_XYZ: 0: CamDir//210316193
public float Unused1 { get; set; }//76 public float Unused1 { get; set; }//76
public Array_byte Unk_1762439591 { get; set; } //80 80: Array: 0: 1762439591 {0: UnsignedByte: 0: 256} public Array_byte CommonAddSets { get; set; } //80 80: Array: 0: 1762439591 {0: UnsignedByte: 0: 256}
public uint Flags { get; set; } //96 96: UnsignedInt: 0: Flags public uint Flags { get; set; } //96 96: UnsignedInt: 0: Flags
public uint Unused2 { get; set; }//100 public uint Unused2 { get; set; }//100
public uint Unused3 { get; set; }//104 public uint Unused3 { get; set; }//104
@ -6379,9 +6379,9 @@ namespace CodeWalker.GameFiles
[TC(typeof(EXP))] [TC(typeof(EXP))]
public readonly struct CComponentInfo //48 bytes, Key:3693847250 //COMPONENT PEDS public readonly struct CComponentInfo //48 bytes, Key:3693847250 //COMPONENT PEDS
{ {
public MetaHash Unk_802196719 { get; init; } //0 0: Hash: 0: 802196719 public MetaHash pedXml_audioID { get; init; } //0 0: Hash: 0: 802196719
public MetaHash Unk_4233133352 { get; init; } //4 4: Hash: 0: 4233133352 public MetaHash pedXml_audioID2 { get; init; } //4 4: Hash: 0: 4233133352
public ArrayOfBytes5 Unk_128864925 { get; init; } //8 8: ArrayOfBytes: 5: 128864925 public ArrayOfBytes5 pedXml_expressionMods { get; init; } //8 8: ArrayOfBytes: 5: 128864925
public byte Unused0 { get; init; }//13 public byte Unused0 { get; init; }//13
public ushort Unused1 { get; init; }//14 public ushort Unused1 { get; init; }//14
public uint Unused2 { get; init; }//16 public uint Unused2 { get; init; }//16
@ -6390,10 +6390,10 @@ namespace CodeWalker.GameFiles
public uint flags { get; init; } //28 28: UnsignedInt: 0: flags public uint flags { get; init; } //28 28: UnsignedInt: 0: flags
public int inclusions { get; init; } //32 32: IntFlags2: 0: inclusions//2172318933 public int inclusions { get; init; } //32 32: IntFlags2: 0: inclusions//2172318933
public int exclusions { get; init; } //36 36: IntFlags2: 0: exclusions public int exclusions { get; init; } //36 36: IntFlags2: 0: exclusions
public ePedVarComp Unk_1613922652 { get; init; } //40 40: ShortFlags: ePedVarComp: 1613922652 public ePedVarComp pedXml_vfxComps { get; init; } //40 40: ShortFlags: ePedVarComp: 1613922652
public ushort Unk_2114993291 { get; init; } //42 42: UnsignedShort: 0: 2114993291 public ushort pedXml_flags { get; init; } //42 42: UnsignedShort: 0: 2114993291
public byte Unk_3509540765 { get; init; } //44 44: UnsignedByte: 0: 3509540765 public byte pedXml_compIdx { get; init; } //44 44: UnsignedByte: 0: 3509540765
public byte Unk_4196345791 { get; init; } //45 45: UnsignedByte: 0: 4196345791 public byte pedXml_drawblIdx { get; init; } //45 45: UnsignedByte: 0: 4196345791
public ushort Unused5 { get; init; }//46 public ushort Unused5 { get; init; }//46
} }
[TC(typeof(EXP))] [TC(typeof(EXP))]
@ -6405,8 +6405,8 @@ namespace CodeWalker.GameFiles
public CComponentInfo Data => _Data; public CComponentInfo Data => _Data;
public int ComponentType => _Data.Unk_3509540765; public int ComponentType => _Data.pedXml_compIdx;
public int ComponentIndex => _Data.Unk_4196345791; public int ComponentIndex => _Data.pedXml_drawblIdx;
public MCComponentInfo() { } public MCComponentInfo() { }
public MCComponentInfo(Meta meta, in CComponentInfo data, MCPedVariationInfo owner) public MCComponentInfo(Meta meta, in CComponentInfo data, MCPedVariationInfo owner)
@ -6501,22 +6501,22 @@ namespace CodeWalker.GameFiles
[TC(typeof(EXP))] [TC(typeof(EXP))]
public struct CPedPropMetaData //56 bytes, Key:2029738350 //COMPONENT PEDS public struct CPedPropMetaData //56 bytes, Key:2029738350 //COMPONENT PEDS
{ {
public MetaHash audioId { get; init; } //0 0: Hash: 0: audioId public MetaHash audioId { get; set; } //0 0: Hash: 0: audioId
public readonly ArrayOfBytes5 expressionMods; //4 4: ArrayOfBytes: 5: expressionMods//942761829 public ArrayOfBytes5 expressionMods { get; set; } //4 4: ArrayOfBytes: 5: expressionMods//942761829
public byte Unused0 { get; init; }//9 public byte Unused0 { get; set; }//9
public ushort Unused1 { get; init; }//10 public ushort Unused1 { get; set; }//10
public uint Unused2 { get; init; }//12 public uint Unused2 { get; set; }//12
public uint Unused3 { get; init; }//16 public uint Unused3 { get; set; }//16
public uint Unused4 { get; init; }//20 public uint Unused4 { get; set; }//20
public readonly Array_Structure texData;//24 24: Array: 0: texData {0: Structure: CPedPropTexData: 256} public Array_Structure texData { get; set; } //24 24: Array: 0: texData {0: Structure: CPedPropTexData: 256}
public ePropRenderFlags renderFlags { get; init; } //40 40: IntFlags1: ePropRenderFlags: renderFlags public ePropRenderFlags renderFlags { get; set; } //40 40: IntFlags1: ePropRenderFlags: renderFlags
public uint propFlags { get; init; } //44 44: UnsignedInt: 0: propFlags public uint propFlags { get; set; } //44 44: UnsignedInt: 0: propFlags
public ushort flags { get; init; } //48 48: UnsignedShort: 0: flags public ushort flags { get; set; } //48 48: UnsignedShort: 0: flags
public byte anchorId { get; init; } //50 50: UnsignedByte: 0: anchorId public byte anchorId { get; set; } //50 50: UnsignedByte: 0: anchorId
public byte propId { get; init; } //51 51: UnsignedByte: 0: propId public byte propId { get; set; } //51 51: UnsignedByte: 0: propId
public byte Unk_2894625425 { get; init; } //52 52: UnsignedByte: 0: 2894625425 public byte stickyness { get; set; } //52 52: UnsignedByte: 0: 2894625425
public byte Unused5 { get; init; }//53 public byte Unused5 { get; set; }//53
public ushort Unused6 { get; init; }//54 public ushort Unused6 { get; set; }//54
} }
[TC(typeof(EXP))] public class MCPedPropMetaData : MetaWrapper [TC(typeof(EXP))] public class MCPedPropMetaData : MetaWrapper
{ {
@ -6532,7 +6532,7 @@ namespace CodeWalker.GameFiles
_Data = data; _Data = data;
Owner = owner; Owner = owner;
TexData = MetaTypes.ConvertDataArray<CPedPropTexData>(meta, MetaName.CPedPropTexData, in _Data.texData); TexData = MetaTypes.ConvertDataArray<CPedPropTexData>(meta, MetaName.CPedPropTexData, _Data.texData);
} }
public override void Load(Meta meta, in MetaPOINTER ptr) public override void Load(Meta meta, in MetaPOINTER ptr)

1316
CodeWalker.Core/GameFiles/Resources/Expression.cs
View File

File diff suppressed because it is too large Load Diff

37
CodeWalker/Project/Panels/EditYmapCarGenPanel.Designer.cs generated
View File

@ -68,38 +68,19 @@
this.CarFlagsCheckedListBox.CheckOnClick = true; this.CarFlagsCheckedListBox.CheckOnClick = true;
this.CarFlagsCheckedListBox.FormattingEnabled = true; this.CarFlagsCheckedListBox.FormattingEnabled = true;
this.CarFlagsCheckedListBox.Items.AddRange(new object[] { this.CarFlagsCheckedListBox.Items.AddRange(new object[] {
"1 - High priority", "1 - Force Spawn",
"2 - Unk02", "2 - Ignore Density",
"4 - Police", "4 - Police",
"8 - Firetruck", "8 - Firetruck",
"16 - Ambulance", "16 - Ambulance",
"32 - Unk06", "32 - During Day",
"64 - Unk07", "64 - At Night",
"128 - Unk08", "128 - Align Left",
"256 - Unk09", "256 - Align Right",
"512 - SP Enable", "512 - Single Player",
"1024 - MP Enable", "1024 - Network Player",
"2048 - Low Priority", "2048 - Low Priority",
"4096 - Unk13", "4096 - Prevent Entry"});
"8192 - Unk14",
"16384 - Unk15",
"32768 - Unk16",
"65536 - Unk17",
"131072 - Unk18",
"262144 - Unk19",
"524288 - Unk20",
"1048576 - Unk21",
"2097152 - Unk22",
"4194304 - Unk23",
"8388608 - Unk24",
"16777216 - Unk25",
"33554432 - Unk26",
"67108864 - Unk27",
"134217728 - Unk28",
"268435456 - Unk29",
"536870912 - Unk30",
"1073741824 - Unk31",
"2147483648 - Unk32"});
this.CarFlagsCheckedListBox.Location = new System.Drawing.Point(345, 112); this.CarFlagsCheckedListBox.Location = new System.Drawing.Point(345, 112);
this.CarFlagsCheckedListBox.Name = "CarFlagsCheckedListBox"; this.CarFlagsCheckedListBox.Name = "CarFlagsCheckedListBox";
this.CarFlagsCheckedListBox.Size = new System.Drawing.Size(201, 289); this.CarFlagsCheckedListBox.Size = new System.Drawing.Size(201, 289);

24
CodeWalker/Project/Panels/EditYmapEntityPanel.Designer.cs generated
View File

@ -188,15 +188,15 @@
this.EntityFlagsCheckedListBox.FormattingEnabled = true; this.EntityFlagsCheckedListBox.FormattingEnabled = true;
this.EntityFlagsCheckedListBox.Items.AddRange(new object[] { this.EntityFlagsCheckedListBox.Items.AddRange(new object[] {
"1 - Allow full rotation", "1 - Allow full rotation",
"2 - Unk02", "2 - Stream Low Priority",
"4 - Disable embedded collisions", "4 - Disable embedded collisions",
"8 - LOD in parent ymap", "8 - LOD in parent ymap",
"16 - Unk05", "16 - LOD Adopt Me",
"32 - Static entity", "32 - Static entity",
"64 - Object isn\'t dark at night", "64 - Object isn\'t dark at night",
"128 - Unk08", "128 - Unk08",
"256 - Unk09", "256 - Unk09",
"512 - Disable YDR lights", "512 - Ignore Day Night Light Settings",
"1024 - Unk11", "1024 - Unk11",
"2048 - Unk12", "2048 - Unk12",
"4096 - Unk13", "4096 - Unk13",
@ -205,18 +205,18 @@
"32768 - Unk16", "32768 - Unk16",
"65536 - Unk17", "65536 - Unk17",
"131072 - Unk18", "131072 - Unk18",
"262144 - Disable archetype extensions", "262144 - Dont Spawn Peds",
"524288 - Unk20", "524288 - Unk20",
"1048576 - Unk21", "1048576 - Unk21",
"2097152 - Unk22", "2097152 - Unk22",
"4194304 - Don\'t cast shadows", "4194304 - Dont Render Shadows",
"8388608 - Only cast shadows", "8388608 - Only Render Shadows",
"16777216 - Disable reflections", "16777216 - Dont Render Reflections",
"33554432 - Interior proxy", "33554432 - Only Render Reflections",
"67108864 - Disable water reflections", "67108864 - Dont Render Water Reflections",
"134217728 - Reflection proxy", "134217728 - Only Render Water Reflections",
"268435456 - Unk29", "268435456 - Dont Render Mirror Reflections",
"536870912 - Mirror proxy", "536870912 - Only Render Mirror Reflections",
"1073741824 - Unk31", "1073741824 - Unk31",
"2147483648 - Unk32"}); "2147483648 - Unk32"});
this.EntityFlagsCheckedListBox.Location = new System.Drawing.Point(348, 113); this.EntityFlagsCheckedListBox.Location = new System.Drawing.Point(348, 113);

75
CodeWalker/Project/Panels/EditYtypArchetypePanel.Designer.cs generated
View File

@ -301,16 +301,48 @@
// //
// EntityFlagsCheckedListBox // EntityFlagsCheckedListBox
// //
EntityFlagsCheckedListBox.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; this.EntityFlagsCheckedListBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
EntityFlagsCheckedListBox.CheckOnClick = true; | System.Windows.Forms.AnchorStyles.Right)));
EntityFlagsCheckedListBox.FormattingEnabled = true; this.EntityFlagsCheckedListBox.CheckOnClick = true;
EntityFlagsCheckedListBox.Items.AddRange(new object[] { "1 - Unk01", "2 - Unk02", "4 - Unk03", "8 - Unk04", "16 - Unk05", "32 - Static", "64 - Disable alpha sorting", "128 - Instance", "256 - Unk09", "512 - Bone anims (YCD)", "1024 - UV anims (YCD)", "2048 - Unk12", "4096 - Unk13", "8192 - Object won't cast shadow", "16384 - Unk15", "32768 - Unk16", "65536 - Double-sided rendering", "131072 - Dynamic", "262144 - Unk19", "524288 - Dynamic anims (YCD)", "1048576 - Unk21", "2097152 - Unk22", "4194304 - Unk23", "8388608 - Unk24", "16777216 - Unk25", "33554432 - Unk26", "67108864 - Enables special atribute for door archetypes", "134217728 - Unk28", "268435456 - Disable red vertex channel", "536870912 - Disable green vertex channel", "1073741824 - Disable blue vertex channel", "2147483648 - Disable alpha vertex channel" }); this.EntityFlagsCheckedListBox.FormattingEnabled = true;
EntityFlagsCheckedListBox.Location = new System.Drawing.Point(514, 44); this.EntityFlagsCheckedListBox.Items.AddRange(new object[] {
EntityFlagsCheckedListBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); "1 - Wet Road Reflection",
EntityFlagsCheckedListBox.Name = "EntityFlagsCheckedListBox"; "2 - Dont Fade",
EntityFlagsCheckedListBox.Size = new System.Drawing.Size(212, 310); "4 - Draw Last",
EntityFlagsCheckedListBox.TabIndex = 67; "8 - Climbable By AI",
EntityFlagsCheckedListBox.ItemCheck += ArchetypeFlagsCheckedListBox_ItemCheck; "16 - Suppress HD TXDs",
"32 - Static",
"64 - Disable alpha sorting",
"128 - Tough For Bullets",
"256 - Is Generic",
"512 - Has Anim (YCD)",
"1024 - UV anims (YCD)",
"2048 - Shadow Only",
"4096 - Damage Model",
"8192 - Dont Cast Shadows",
"16384 - Cast Texture Shadows",
"32768 - Dont Collide With Flyer",
"65536 - Double-sided rendering",
"131072 - Dynamic",
"262144 - Override Physics Bounds",
"524288 - Auto Start Anim",
"1048576 - Pre Reflected Water Proxy",
"2097152 - Proxy For Water Reflections",
"4194304 - No AI Cover",
"8388608 - No Player Cover",
"16777216 - Is Ladder Deprecated",
"33554432 - Has Cloth",
"67108864 - Enable Door Physics",
"134217728 - Is Fixed For Navigation",
"268435456 - Dont Avoid By Peds",
"536870912 - Use Ambient Scale",
"1073741824 - Is Debug",
"2147483648 - Has Alpha Shadow"});
this.EntityFlagsCheckedListBox.Location = new System.Drawing.Point(441, 38);
this.EntityFlagsCheckedListBox.Name = "EntityFlagsCheckedListBox";
this.EntityFlagsCheckedListBox.Size = new System.Drawing.Size(182, 274);
this.EntityFlagsCheckedListBox.TabIndex = 67;
this.EntityFlagsCheckedListBox.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.ArchetypeFlagsCheckedListBox_ItemCheck);
// //
// label14 // label14
// //
@ -495,6 +527,16 @@
MloUpdatePortalCountsButton.UseVisualStyleBackColor = true; MloUpdatePortalCountsButton.UseVisualStyleBackColor = true;
MloUpdatePortalCountsButton.Click += MloUpdatePortalCountsButton_Click; MloUpdatePortalCountsButton.Click += MloUpdatePortalCountsButton_Click;
// //
// MloUpdatePortalCountsButton
//
this.MloUpdatePortalCountsButton.Location = new System.Drawing.Point(49, 35);
this.MloUpdatePortalCountsButton.Name = "MloUpdatePortalCountsButton";
this.MloUpdatePortalCountsButton.Size = new System.Drawing.Size(153, 23);
this.MloUpdatePortalCountsButton.TabIndex = 0;
this.MloUpdatePortalCountsButton.Text = "Update Portal Counts";
this.MloUpdatePortalCountsButton.UseVisualStyleBackColor = true;
this.MloUpdatePortalCountsButton.Click += new System.EventHandler(this.MloUpdatePortalCountsButton_Click);
//
// TimeArchetypeTabPage // TimeArchetypeTabPage
// //
TimeArchetypeTabPage.Controls.Add(TimeFlagsTextBox); TimeArchetypeTabPage.Controls.Add(TimeFlagsTextBox);
@ -532,13 +574,12 @@
// //
// label15 // label15
// //
label15.AutoSize = true; this.label15.AutoSize = true;
label15.Location = new System.Drawing.Point(6, 10); this.label15.Location = new System.Drawing.Point(5, 9);
label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15";
label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(61, 13);
label15.Size = new System.Drawing.Size(66, 15); this.label15.TabIndex = 68;
label15.TabIndex = 68; this.label15.Text = "Time Flags:";
label15.Text = "Time Flags:";
// //
// EditYtypArchetypePanel // EditYtypArchetypePanel
// //

18
CodeWalker/Project/Panels/EditYtypMloPortalPanel.Designer.cs generated
View File

@ -181,16 +181,16 @@
"2 - Link Interiors together", "2 - Link Interiors together",
"4 - Mirror", "4 - Mirror",
"8 - Disable Timecycle Modifier", "8 - Disable Timecycle Modifier",
"16 - Unused?", "16 - Mirror Using Expensive Shaders",
"32 - Use exterior LOD", "32 - Low LOD Only",
"64 - Hide when door closed", "64 - Hide when door closed",
"128 - Mirror Directional Light", "128 - Mirror Can See Directional",
"256 - Mirror exterior portals", "256 - Mirror Using Portal Traversal",
"512 - Mirror Portal Traversal", "512 - Mirror Floor",
"1024 - Mirror Floor", "1024 - Mirror Can See Exterior View",
"2048 - Mirror Floor (Water)", "2048 - Water Surface",
"4096 - Light Bleeding", "4096 - Water Surface Extend To Horizon",
"8192 - Water extent to horizon"}); "8192 - Use Light Bleed"});
this.FlagsCheckedListBox.Location = new System.Drawing.Point(318, 15); this.FlagsCheckedListBox.Location = new System.Drawing.Point(318, 15);
this.FlagsCheckedListBox.Name = "FlagsCheckedListBox"; this.FlagsCheckedListBox.Name = "FlagsCheckedListBox";
this.FlagsCheckedListBox.Size = new System.Drawing.Size(184, 214); this.FlagsCheckedListBox.Size = new System.Drawing.Size(184, 214);

20
CodeWalker/Project/Panels/EditYtypMloRoomPanel.Designer.cs generated
View File

@ -117,16 +117,16 @@
this.FlagsCheckedListBox.CheckOnClick = true; this.FlagsCheckedListBox.CheckOnClick = true;
this.FlagsCheckedListBox.FormattingEnabled = true; this.FlagsCheckedListBox.FormattingEnabled = true;
this.FlagsCheckedListBox.Items.AddRange(new object[] { this.FlagsCheckedListBox.Items.AddRange(new object[] {
"1 - Unk01", "1 - Freeze Vehicles",
"2 - Disables wanted level", "2 - Freeze Peds",
"4 - Disable exterior shadows", "4 - No Directional Light",
"8 - Unk04", "8 - No Exterior Lights",
"16 - Unk05", "16 - Force Freeze",
"32 - Reduces vehicle population", "32 - Reduce Cars",
"64 - Reduces ped population", "64 - Reduce Peds",
"128 - Unk08", "128 - Force Directional Light On",
"256 - Disable limbo portals", "256 - Dont Render Exterior",
"512 - Unk10"}); "512 - Mirror Potentially Visible"});
this.FlagsCheckedListBox.Location = new System.Drawing.Point(352, 41); this.FlagsCheckedListBox.Location = new System.Drawing.Point(352, 41);
this.FlagsCheckedListBox.Name = "FlagsCheckedListBox"; this.FlagsCheckedListBox.Name = "FlagsCheckedListBox";
this.FlagsCheckedListBox.Size = new System.Drawing.Size(201, 154); this.FlagsCheckedListBox.Size = new System.Drawing.Size(201, 154);

4
CodeWalker/Rendering/Renderable.cs
View File

@ -587,14 +587,14 @@ namespace CodeWalker.Rendering
if (Expression?.BoneTracksDict != null) if (Expression?.BoneTracksDict != null)
{ {
var exprbt = new ExpressionBoneTrack() { BoneTag = boneid, Track = track, Flags = boneiditem.Unk0 }; var exprbt = new ExpressionTrack() { BoneId = boneid, Track = track, Flags = boneiditem.Unk0 };
var exprbtmap = exprbt; var exprbtmap = exprbt;
if ((track == 24) || (track == 25) || (track == 26)) if ((track == 24) || (track == 25) || (track == 26))
{ {
if (Expression.BoneTracksDict.TryGetValue(exprbt, out exprbtmap)) if (Expression.BoneTracksDict.TryGetValue(exprbt, out exprbtmap))
{ {
boneid = exprbtmap.BoneTag; boneid = exprbtmap.BoneId;
} }
else else
{ } { }