diff --git a/CodeWalker.Core/GameFiles/MetaTypes/MetaNames.cs b/CodeWalker.Core/GameFiles/MetaTypes/MetaNames.cs index 5f24c0c..57f00c5 100644 --- a/CodeWalker.Core/GameFiles/MetaTypes/MetaNames.cs +++ b/CodeWalker.Core/GameFiles/MetaTypes/MetaNames.cs @@ -4030,6 +4030,16 @@ namespace CodeWalker.GameFiles propFlags = 1066841901, anchorId = 2731224028, 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, exclusionId = 3819522186, weaponSlot = 1912311826, diff --git a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs index 7e122cd..785cd28 100644 --- a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs +++ b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs @@ -447,11 +447,11 @@ namespace CodeWalker.GameFiles 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)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.CamDir, 64, MetaStructureEntryDataType.Float_XYZ, 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) ); //case MetaName.CStreamingRequestFrame: @@ -1057,17 +1057,17 @@ namespace CodeWalker.GameFiles ); case MetaName.CComponentInfo: return new MetaStructureInfo(MetaName.CComponentInfo, 3693847250, 512, 48, - new MetaStructureEntryInfo_s((MetaName)802196719, 0, MetaStructureEntryDataType.Hash, 0, 0, 0), - new MetaStructureEntryInfo_s((MetaName)4233133352, 4, MetaStructureEntryDataType.Hash, 0, 0, 0), + new MetaStructureEntryInfo_s(MetaName.pedXml_audioID, 0, 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)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.inclusions, 32, 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)2114993291, 42, MetaStructureEntryDataType.UnsignedShort, 0, 0, 0), - new MetaStructureEntryInfo_s((MetaName)3509540765, 44, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), - new MetaStructureEntryInfo_s((MetaName)4196345791, 45, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0) + new MetaStructureEntryInfo_s(MetaName.pedXml_vfxComps, 40, MetaStructureEntryDataType.ShortFlags, 0, 16, MetaName.ePedVarComp), + new MetaStructureEntryInfo_s(MetaName.pedXml_flags, 42, MetaStructureEntryDataType.UnsignedShort, 0, 0, 0), + new MetaStructureEntryInfo_s(MetaName.pedXml_compIdx, 44, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), + new MetaStructureEntryInfo_s(MetaName.pedXml_drawblIdx, 45, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0) ); case MetaName.CPedPropMetaData: return new MetaStructureInfo(MetaName.CPedPropMetaData, 2029738350, 768, 56, @@ -1081,7 +1081,7 @@ namespace CodeWalker.GameFiles new MetaStructureEntryInfo_s(MetaName.flags, 48, MetaStructureEntryDataType.UnsignedShort, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.anchorId, 50, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.propId, 51, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), - new MetaStructureEntryInfo_s((MetaName)2894625425, 52, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0) + new MetaStructureEntryInfo_s(MetaName.stickyness, 52, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0) ); case MetaName.CPedPropTexData: return new MetaStructureInfo(MetaName.CPedPropTexData, 2767296137, 512, 12, @@ -5899,12 +5899,12 @@ namespace CodeWalker.GameFiles { 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 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 float Unused0 { get; set; }//60 public Vector3 CamDir { get; set; } //64 64: Float_XYZ: 0: CamDir//210316193 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 Unused2 { get; set; }//100 public uint Unused3 { get; set; }//104 @@ -6391,9 +6391,9 @@ namespace CodeWalker.GameFiles [TC(typeof(EXP))] public struct CComponentInfo //48 bytes, Key:3693847250 //COMPONENT PEDS { - public MetaHash Unk_802196719 { get; set; } //0 0: Hash: 0: 802196719 - public MetaHash Unk_4233133352 { get; set; } //4 4: Hash: 0: 4233133352 - public ArrayOfBytes5 Unk_128864925 { get; set; } //8 8: ArrayOfBytes: 5: 128864925 + public MetaHash pedXml_audioID { get; set; } //0 0: Hash: 0: 802196719 + public MetaHash pedXml_audioID2 { get; set; } //4 4: Hash: 0: 4233133352 + public ArrayOfBytes5 pedXml_expressionMods { get; set; } //8 8: ArrayOfBytes: 5: 128864925 public byte Unused0 { get; set; }//13 public ushort Unused1 { get; set; }//14 public uint Unused2 { get; set; }//16 @@ -6402,10 +6402,10 @@ namespace CodeWalker.GameFiles public uint flags { get; set; } //28 28: UnsignedInt: 0: flags public int inclusions { get; set; } //32 32: IntFlags2: 0: inclusions//2172318933 public int exclusions { get; set; } //36 36: IntFlags2: 0: exclusions - public ePedVarComp Unk_1613922652 { get; set; } //40 40: ShortFlags: ePedVarComp: 1613922652 - public ushort Unk_2114993291 { get; set; } //42 42: UnsignedShort: 0: 2114993291 - public byte Unk_3509540765 { get; set; } //44 44: UnsignedByte: 0: 3509540765 - public byte Unk_4196345791 { get; set; } //45 45: UnsignedByte: 0: 4196345791 + public ePedVarComp pedXml_vfxComps { get; set; } //40 40: ShortFlags: ePedVarComp: 1613922652 + public ushort pedXml_flags { get; set; } //42 42: UnsignedShort: 0: 2114993291 + public byte pedXml_compIdx { get; set; } //44 44: UnsignedByte: 0: 3509540765 + public byte pedXml_drawblIdx { get; set; } //45 45: UnsignedByte: 0: 4196345791 public ushort Unused5 { get; set; }//46 } [TC(typeof(EXP))] public class MCComponentInfo : MetaWrapper @@ -6416,8 +6416,8 @@ namespace CodeWalker.GameFiles public CComponentInfo Data { get { return _Data; } } - public int ComponentType { get { return _Data.Unk_3509540765; } } - public int ComponentIndex { get { return _Data.Unk_4196345791; } } + public int ComponentType { get { return _Data.pedXml_compIdx; } } + public int ComponentIndex { get { return _Data.pedXml_drawblIdx; } } public MCComponentInfo() { } public MCComponentInfo(Meta meta, CComponentInfo data, MCPedVariationInfo owner) @@ -6524,7 +6524,7 @@ namespace CodeWalker.GameFiles public ushort flags { get; set; } //48 48: UnsignedShort: 0: flags public byte anchorId { get; set; } //50 50: UnsignedByte: 0: anchorId public byte propId { get; set; } //51 51: UnsignedByte: 0: propId - public byte Unk_2894625425 { get; set; } //52 52: UnsignedByte: 0: 2894625425 + public byte stickyness { get; set; } //52 52: UnsignedByte: 0: 2894625425 public byte Unused5 { get; set; }//53 public ushort Unused6 { get; set; }//54 } diff --git a/CodeWalker/Project/Panels/EditYmapCarGenPanel.Designer.cs b/CodeWalker/Project/Panels/EditYmapCarGenPanel.Designer.cs index 5b19265..76abf58 100644 --- a/CodeWalker/Project/Panels/EditYmapCarGenPanel.Designer.cs +++ b/CodeWalker/Project/Panels/EditYmapCarGenPanel.Designer.cs @@ -68,38 +68,19 @@ this.CarFlagsCheckedListBox.CheckOnClick = true; this.CarFlagsCheckedListBox.FormattingEnabled = true; this.CarFlagsCheckedListBox.Items.AddRange(new object[] { - "1 - High priority", - "2 - Unk02", + "1 - Force Spawn", + "2 - Ignore Density", "4 - Police", "8 - Firetruck", "16 - Ambulance", - "32 - Unk06", - "64 - Unk07", - "128 - Unk08", - "256 - Unk09", - "512 - SP Enable", - "1024 - MP Enable", + "32 - During Day", + "64 - At Night", + "128 - Align Left", + "256 - Align Right", + "512 - Single Player", + "1024 - Network Player", "2048 - Low Priority", - "4096 - Unk13", - "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"}); + "4096 - Prevent Entry"}); this.CarFlagsCheckedListBox.Location = new System.Drawing.Point(345, 112); this.CarFlagsCheckedListBox.Name = "CarFlagsCheckedListBox"; this.CarFlagsCheckedListBox.Size = new System.Drawing.Size(201, 289); diff --git a/CodeWalker/Project/Panels/EditYmapEntityPanel.Designer.cs b/CodeWalker/Project/Panels/EditYmapEntityPanel.Designer.cs index d68aa4a..2851b9e 100644 --- a/CodeWalker/Project/Panels/EditYmapEntityPanel.Designer.cs +++ b/CodeWalker/Project/Panels/EditYmapEntityPanel.Designer.cs @@ -188,15 +188,15 @@ this.EntityFlagsCheckedListBox.FormattingEnabled = true; this.EntityFlagsCheckedListBox.Items.AddRange(new object[] { "1 - Allow full rotation", - "2 - Unk02", + "2 - Stream Low Priority", "4 - Disable embedded collisions", "8 - LOD in parent ymap", - "16 - Unk05", + "16 - LOD Adopt Me", "32 - Static entity", "64 - Object isn\'t dark at night", "128 - Unk08", "256 - Unk09", - "512 - Disable YDR lights", + "512 - Ignore Day Night Light Settings", "1024 - Unk11", "2048 - Unk12", "4096 - Unk13", @@ -205,18 +205,18 @@ "32768 - Unk16", "65536 - Unk17", "131072 - Unk18", - "262144 - Disable archetype extensions", + "262144 - Dont Spawn Peds", "524288 - Unk20", "1048576 - Unk21", "2097152 - Unk22", - "4194304 - Don\'t cast shadows", - "8388608 - Only cast shadows", - "16777216 - Disable reflections", - "33554432 - Interior proxy", - "67108864 - Disable water reflections", - "134217728 - Reflection proxy", - "268435456 - Unk29", - "536870912 - Mirror proxy", + "4194304 - Dont Render Shadows", + "8388608 - Only Render Shadows", + "16777216 - Dont Render Reflections", + "33554432 - Only Render Reflections", + "67108864 - Dont Render Water Reflections", + "134217728 - Only Render Water Reflections", + "268435456 - Dont Render Mirror Reflections", + "536870912 - Only Render Mirror Reflections", "1073741824 - Unk31", "2147483648 - Unk32"}); this.EntityFlagsCheckedListBox.Location = new System.Drawing.Point(348, 113); diff --git a/CodeWalker/Project/Panels/EditYtypArchetypePanel.Designer.cs b/CodeWalker/Project/Panels/EditYtypArchetypePanel.Designer.cs index cbbbea6..36ae27d 100644 --- a/CodeWalker/Project/Panels/EditYtypArchetypePanel.Designer.cs +++ b/CodeWalker/Project/Panels/EditYtypArchetypePanel.Designer.cs @@ -64,11 +64,11 @@ this.label1 = new System.Windows.Forms.Label(); this.TabControl = new System.Windows.Forms.TabControl(); this.MloArchetypeTabPage = new System.Windows.Forms.TabPage(); + this.MloUpdatePortalCountsButton = new System.Windows.Forms.Button(); this.TimeArchetypeTabPage = new System.Windows.Forms.TabPage(); this.TimeFlagsTextBox = new System.Windows.Forms.TextBox(); this.TimeFlagsCheckedListBox = new System.Windows.Forms.CheckedListBox(); this.label15 = new System.Windows.Forms.Label(); - this.MloUpdatePortalCountsButton = new System.Windows.Forms.Button(); this.BaseArchetypeTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.SpecialAttributeNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.HDTextureDistNumericUpDown)).BeginInit(); @@ -297,38 +297,38 @@ this.EntityFlagsCheckedListBox.CheckOnClick = true; this.EntityFlagsCheckedListBox.FormattingEnabled = true; this.EntityFlagsCheckedListBox.Items.AddRange(new object[] { - "1 - Unk01", - "2 - Unk02", - "4 - Unk03", - "8 - Unk04", - "16 - Unk05", + "1 - Wet Road Reflection", + "2 - Dont Fade", + "4 - Draw Last", + "8 - Climbable By AI", + "16 - Suppress HD TXDs", "32 - Static", "64 - Disable alpha sorting", - "128 - Instance", - "256 - Unk09", - "512 - Bone anims (YCD)", + "128 - Tough For Bullets", + "256 - Is Generic", + "512 - Has Anim (YCD)", "1024 - UV anims (YCD)", - "2048 - Unk12", - "4096 - Unk13", - "8192 - Object won\'t cast shadow", - "16384 - Unk15", - "32768 - Unk16", + "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 - 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"}); + "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); @@ -507,6 +507,16 @@ this.MloArchetypeTabPage.Text = "Mlo Archetype Def"; this.MloArchetypeTabPage.UseVisualStyleBackColor = true; // + // 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 // this.TimeArchetypeTabPage.Controls.Add(this.TimeFlagsTextBox); @@ -581,16 +591,6 @@ this.label15.TabIndex = 68; this.label15.Text = "Time Flags:"; // - // 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); - // // EditYtypArchetypePanel // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/CodeWalker/Project/Panels/EditYtypMloPortalPanel.Designer.cs b/CodeWalker/Project/Panels/EditYtypMloPortalPanel.Designer.cs index 7220c8a..99f7f93 100644 --- a/CodeWalker/Project/Panels/EditYtypMloPortalPanel.Designer.cs +++ b/CodeWalker/Project/Panels/EditYtypMloPortalPanel.Designer.cs @@ -181,16 +181,16 @@ "2 - Link Interiors together", "4 - Mirror", "8 - Disable Timecycle Modifier", - "16 - Unused?", - "32 - Use exterior LOD", + "16 - Mirror Using Expensive Shaders", + "32 - Low LOD Only", "64 - Hide when door closed", - "128 - Mirror Directional Light", - "256 - Mirror exterior portals", - "512 - Mirror Portal Traversal", - "1024 - Mirror Floor", - "2048 - Mirror Floor (Water)", - "4096 - Light Bleeding", - "8192 - Water extent to horizon"}); + "128 - Mirror Can See Directional", + "256 - Mirror Using Portal Traversal", + "512 - Mirror Floor", + "1024 - Mirror Can See Exterior View", + "2048 - Water Surface", + "4096 - Water Surface Extend To Horizon", + "8192 - Use Light Bleed"}); this.FlagsCheckedListBox.Location = new System.Drawing.Point(318, 15); this.FlagsCheckedListBox.Name = "FlagsCheckedListBox"; this.FlagsCheckedListBox.Size = new System.Drawing.Size(184, 214); diff --git a/CodeWalker/Project/Panels/EditYtypMloRoomPanel.Designer.cs b/CodeWalker/Project/Panels/EditYtypMloRoomPanel.Designer.cs index b46f11c..37725d1 100644 --- a/CodeWalker/Project/Panels/EditYtypMloRoomPanel.Designer.cs +++ b/CodeWalker/Project/Panels/EditYtypMloRoomPanel.Designer.cs @@ -117,16 +117,16 @@ this.FlagsCheckedListBox.CheckOnClick = true; this.FlagsCheckedListBox.FormattingEnabled = true; this.FlagsCheckedListBox.Items.AddRange(new object[] { - "1 - Unk01", - "2 - Disables wanted level", - "4 - Disable exterior shadows", - "8 - Unk04", - "16 - Unk05", - "32 - Reduces vehicle population", - "64 - Reduces ped population", - "128 - Unk08", - "256 - Disable limbo portals", - "512 - Unk10"}); + "1 - Freeze Vehicles", + "2 - Freeze Peds", + "4 - No Directional Light", + "8 - No Exterior Lights", + "16 - Force Freeze", + "32 - Reduce Cars", + "64 - Reduce Peds", + "128 - Force Directional Light On", + "256 - Dont Render Exterior", + "512 - Mirror Potentially Visible"}); this.FlagsCheckedListBox.Location = new System.Drawing.Point(352, 41); this.FlagsCheckedListBox.Name = "FlagsCheckedListBox"; this.FlagsCheckedListBox.Size = new System.Drawing.Size(201, 154);