From f808c095c168a80d281836d7b77f3da49fa9f4a2 Mon Sep 17 00:00:00 2001 From: dexy Date: Tue, 23 Nov 2021 12:46:16 +1100 Subject: [PATCH] Update all scenario flags names --- .../GameFiles/MetaTypes/MetaTypes.cs | 56 +++++----- .../Panels/EditScenarioNodePanel.Designer.cs | 104 +++++++++--------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs index e06c931..192bcb1 100644 --- a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs +++ b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs @@ -1250,33 +1250,33 @@ namespace CodeWalker.GameFiles new MetaEnumEntryInfo_s(MetaName.IgnoreMaxInRange, 0), new MetaEnumEntryInfo_s(MetaName.NoSpawn, 1), new MetaEnumEntryInfo_s(MetaName.StationaryReactions, 2), - new MetaEnumEntryInfo_s((MetaName)3257836369, 3), - new MetaEnumEntryInfo_s((MetaName)2165609255, 4), + new MetaEnumEntryInfo_s(MetaName.OnlySpawnInSameInterior, 3), + new MetaEnumEntryInfo_s(MetaName.SpawnedPedIsArrestable, 4), new MetaEnumEntryInfo_s(MetaName.ActivateVehicleSiren, 5), new MetaEnumEntryInfo_s(MetaName.AggressiveVehicleDriving, 6), - new MetaEnumEntryInfo_s((MetaName)2004780781, 7), - new MetaEnumEntryInfo_s((MetaName)536864854, 8), - new MetaEnumEntryInfo_s((MetaName)3441065168, 9), + new MetaEnumEntryInfo_s(MetaName.LandVehicleOnArrival, 7), + new MetaEnumEntryInfo_s(MetaName.IgnoreThreatsIfLosNotClear, 8), + new MetaEnumEntryInfo_s(MetaName.EventsInRadiusTriggerDisputes, 9), new MetaEnumEntryInfo_s(MetaName.AerialVehiclePoint, 10), new MetaEnumEntryInfo_s(MetaName.TerritorialScenario, 11), - new MetaEnumEntryInfo_s((MetaName)3690227693, 12), - new MetaEnumEntryInfo_s((MetaName)1601179199, 13), - new MetaEnumEntryInfo_s((MetaName)2583152330, 14), - new MetaEnumEntryInfo_s((MetaName)3490317520, 15), + new MetaEnumEntryInfo_s(MetaName.EndScenarioIfPlayerWithinRadius, 12), + new MetaEnumEntryInfo_s(MetaName.EventsInRadiusTriggerThreatResponse, 13), + new MetaEnumEntryInfo_s(MetaName.TaxiPlaneOnGround, 14), + new MetaEnumEntryInfo_s(MetaName.FlyOffToOblivion, 15), new MetaEnumEntryInfo_s(MetaName.InWater, 16), - new MetaEnumEntryInfo_s((MetaName)1269249358, 17), + new MetaEnumEntryInfo_s(MetaName.AllowInvestigation, 17), new MetaEnumEntryInfo_s(MetaName.OpenDoor, 18), new MetaEnumEntryInfo_s(MetaName.PreciseUseTime, 19), - new MetaEnumEntryInfo_s((MetaName)2247631388, 20), - new MetaEnumEntryInfo_s((MetaName)4100708934, 21), + new MetaEnumEntryInfo_s(MetaName.NoRespawnUntilStreamedOut, 20), + new MetaEnumEntryInfo_s(MetaName.NoVehicleSpawnMaxDistance, 21), new MetaEnumEntryInfo_s(MetaName.ExtendedRange, 22), new MetaEnumEntryInfo_s(MetaName.ShortRange, 23), new MetaEnumEntryInfo_s(MetaName.HighPriority, 24), new MetaEnumEntryInfo_s(MetaName.IgnoreLoitering, 25), new MetaEnumEntryInfo_s(MetaName.UseSearchlight, 26), new MetaEnumEntryInfo_s(MetaName.ResetNoCollisionOnCleanUp, 27), - new MetaEnumEntryInfo_s((MetaName)3304563391, 28), - new MetaEnumEntryInfo_s((MetaName)1111379709, 29), + new MetaEnumEntryInfo_s(MetaName.CheckCrossedArrivalPlane, 28), + new MetaEnumEntryInfo_s(MetaName.UseVehicleFrontForArrival, 29), new MetaEnumEntryInfo_s(MetaName.IgnoreWeatherRestrictions, 30) ); case MetaName.CSpawnPoint__AvailabilityMpSp: @@ -2099,33 +2099,33 @@ namespace CodeWalker.GameFiles IgnoreMaxInRange = 1,//0, NoSpawn = 2,//1, StationaryReactions = 4,//2, - Unk_3257836369 = 8,//3, - Unk_2165609255 = 16,//4, + OnlySpawnInSameInterior = 8,//3, + SpawnedPedIsArrestable = 16,//4, ActivateVehicleSiren = 32,//5, AggressiveVehicleDriving = 64,//6, - Unk_2004780781 = 128,//7, - Unk_536864854 = 256,//8, - Unk_3441065168 = 512,//9, + LandVehicleOnArrival = 128,//7, + IgnoreThreatsIfLosNotClear = 256,//8, + EventsInRadiusTriggerDisputes = 512,//9, AerialVehiclePoint = 1024,//10, TerritorialScenario = 2048,//11, - Unk_3690227693 = 4096,//12, - Unk_1601179199 = 8192,//13, - Unk_2583152330 = 16384,//14, - Unk_3490317520 = 32768,//15, + EndScenarioIfPlayerWithinRadius = 4096,//12, + EventsInRadiusTriggerThreatResponse = 8192,//13, + TaxiPlaneOnGround = 16384,//14, + FlyOffToOblivion = 32768,//15, InWater = 65536,//16, - Unk_1269249358 = 131072,//17, // AllowInvestigation ? + AllowInvestigation = 131072,//17, OpenDoor = 262144,//18, PreciseUseTime = 524288,//19, - Unk_2247631388 = 1048576,//20, - Unk_4100708934 = 2097152,//21, + NoRespawnUntilStreamedOut = 1048576,//20, + NoVehicleSpawnMaxDistance = 2097152,//21, ExtendedRange = 4194304,//22, ShortRange = 8388608,//23, HighPriority = 16777216,//24, IgnoreLoitering = 33554432,//25, UseSearchlight = 67108864,//26, ResetNoCollisionOnCleanUp = 134217728,//27, - Unk_3304563391 = 268435456,//28, - Unk_1111379709 = 536870912,//29, + CheckCrossedArrivalPlane = 268435456,//28, + UseVehicleFrontForArrival = 536870912,//29, IgnoreWeatherRestrictions = 1073741824,//30, } diff --git a/CodeWalker/Project/Panels/EditScenarioNodePanel.Designer.cs b/CodeWalker/Project/Panels/EditScenarioNodePanel.Designer.cs index 1227bc8..70fdca8 100644 --- a/CodeWalker/Project/Panels/EditScenarioNodePanel.Designer.cs +++ b/CodeWalker/Project/Panels/EditScenarioNodePanel.Designer.cs @@ -71,6 +71,8 @@ this.ScenarioEntityTabPage = new System.Windows.Forms.TabPage(); this.ScenarioEntityDeleteButton = new System.Windows.Forms.Button(); this.ScenarioEntityPanel = new System.Windows.Forms.Panel(); + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox = new System.Windows.Forms.CheckBox(); + this.ScenarioEntityMayNotAlwaysExistCheckBox = new System.Windows.Forms.CheckBox(); this.label160 = new System.Windows.Forms.Label(); this.ScenarioEntityAddPointButton = new System.Windows.Forms.Button(); this.label161 = new System.Windows.Forms.Label(); @@ -220,8 +222,6 @@ this.label154 = new System.Windows.Forms.Label(); this.ScenarioClusterPointTypeComboBox = new System.Windows.Forms.ComboBox(); this.label155 = new System.Windows.Forms.Label(); - this.ScenarioEntityMayNotAlwaysExistCheckBox = new System.Windows.Forms.CheckBox(); - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox = new System.Windows.Forms.CheckBox(); this.ScenarioTabControl.SuspendLayout(); this.ScenarioPointTabPage.SuspendLayout(); this.ScenarioPointOuterPanel.SuspendLayout(); @@ -452,33 +452,33 @@ "1 - IgnoreMaxInRange", "2 - NoSpawn", "4 - StationaryReactions", - "8 - Unk", - "16 - Unk", + "8 - OnlySpawnInSameInterior", + "16 - SpawnedPedIsArrestable", "32 - ActivateVehicleSiren", "64 - AggressiveVehicleDriving", - "128 - Unk", - "256 - Unk", - "512 - Unk", + "128 - LandVehicleOnArrival", + "256 - IgnoreThreatsIfLosNotClear", + "512 - EventsInRadiusTriggerDisputes", "1024 - AerialVehiclePoint", "2048 - TerritorialScenario", - "4096 - Unk", - "8192 - Unk", - "16384 - Unk", - "32768 - Unk", + "4096 - EndScenarioIfPlayerWithinRadius", + "8192 - EventsInRadiusTriggerThreatResponse", + "16384 - TaxiPlaneOnGround", + "32768 - FlyOffToOblivion", "65536 - InWater", - "131072 - Unk", + "131072 - AllowInvestigation", "262144 - OpenDoor", "524288 - PreciseUseTime", - "1048576 - Unk", - "2097152 - Unk", + "1048576 - NoRespawnUntilStreamedOut", + "2097152 - NoVehicleSpawnMaxDistance", "4194304 - ExtendedRange", "8388608 - ShortRange", "16777216 - HighPriority", "33554432 - IgnoreLoitering", "67108864 - UseSearchlight", "134217728 - ResetNoCollisionOnCleanUp", - "268435456 - Unk", - "536870912 - Unk", + "268435456 - CheckCrossedArrivalPlane", + "536870912 - UseVehicleFrontForArrival", "1073741824 - IgnoreWeatherRestrictions"}); this.ScenarioPointFlagsCheckedListBox.Location = new System.Drawing.Point(195, 167); this.ScenarioPointFlagsCheckedListBox.Name = "ScenarioPointFlagsCheckedListBox"; @@ -799,6 +799,28 @@ this.ScenarioEntityPanel.Size = new System.Drawing.Size(551, 385); this.ScenarioEntityPanel.TabIndex = 8; // + // ScenarioEntitySpecificallyPreventArtPointsCheckBox + // + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.AutoSize = true; + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Location = new System.Drawing.Point(91, 84); + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Name = "ScenarioEntitySpecificallyPreventArtPointsCheckBox"; + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Size = new System.Drawing.Size(167, 17); + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.TabIndex = 13; + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Text = "Specifically Prevent Art Points"; + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.UseVisualStyleBackColor = true; + this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.CheckedChanged += new System.EventHandler(this.ScenarioEntitySpecificallyPreventArtPointsCheckBox_CheckedChanged); + // + // ScenarioEntityMayNotAlwaysExistCheckBox + // + this.ScenarioEntityMayNotAlwaysExistCheckBox.AutoSize = true; + this.ScenarioEntityMayNotAlwaysExistCheckBox.Location = new System.Drawing.Point(91, 60); + this.ScenarioEntityMayNotAlwaysExistCheckBox.Name = "ScenarioEntityMayNotAlwaysExistCheckBox"; + this.ScenarioEntityMayNotAlwaysExistCheckBox.Size = new System.Drawing.Size(156, 17); + this.ScenarioEntityMayNotAlwaysExistCheckBox.TabIndex = 11; + this.ScenarioEntityMayNotAlwaysExistCheckBox.Text = "Entity May Not Always Exist"; + this.ScenarioEntityMayNotAlwaysExistCheckBox.UseVisualStyleBackColor = true; + this.ScenarioEntityMayNotAlwaysExistCheckBox.CheckedChanged += new System.EventHandler(this.ScenarioEntityMayNotAlwaysExistCheckBox_CheckedChanged); + // // label160 // this.label160.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1050,33 +1072,33 @@ "1 - IgnoreMaxInRange", "2 - NoSpawn", "4 - StationaryReactions", - "8 - Unk", - "16 - Unk", + "8 - OnlySpawnInSameInterior", + "16 - SpawnedPedIsArrestable", "32 - ActivateVehicleSiren", "64 - AggressiveVehicleDriving", - "128 - Unk", - "256 - Unk", - "512 - Unk", + "128 - LandVehicleOnArrival", + "256 - IgnoreThreatsIfLosNotClear", + "512 - EventsInRadiusTriggerDisputes", "1024 - AerialVehiclePoint", "2048 - TerritorialScenario", - "4096 - Unk", - "8192 - Unk", - "16384 - Unk", - "32768 - Unk", + "4096 - EndScenarioIfPlayerWithinRadius", + "8192 - EventsInRadiusTriggerThreatResponse", + "16384 - TaxiPlaneOnGround", + "32768 - FlyOffToOblivion", "65536 - InWater", - "131072 - Unk", + "131072 - AllowInvestigation", "262144 - OpenDoor", "524288 - PreciseUseTime", - "1048576 - Unk", - "2097152 - Unk", + "1048576 - NoRespawnUntilStreamedOut", + "2097152 - NoVehicleSpawnMaxDistance", "4194304 - ExtendedRange", "8388608 - ShortRange", "16777216 - HighPriority", "33554432 - IgnoreLoitering", "67108864 - UseSearchlight", "134217728 - ResetNoCollisionOnCleanUp", - "268435456 - Unk", - "536870912 - Unk", + "268435456 - CheckCrossedArrivalPlane", + "536870912 - UseVehicleFrontForArrival", "1073741824 - IgnoreWeatherRestrictions"}); this.ScenarioEntityPointFlagsCheckedListBox.Location = new System.Drawing.Point(269, 193); this.ScenarioEntityPointFlagsCheckedListBox.Name = "ScenarioEntityPointFlagsCheckedListBox"; @@ -2535,28 +2557,6 @@ this.label155.TabIndex = 10; this.label155.Text = "Type:"; // - // ScenarioEntityMayNotAlwaysExistCheckBox - // - this.ScenarioEntityMayNotAlwaysExistCheckBox.AutoSize = true; - this.ScenarioEntityMayNotAlwaysExistCheckBox.Location = new System.Drawing.Point(91, 60); - this.ScenarioEntityMayNotAlwaysExistCheckBox.Name = "ScenarioEntityMayNotAlwaysExistCheckBox"; - this.ScenarioEntityMayNotAlwaysExistCheckBox.Size = new System.Drawing.Size(156, 17); - this.ScenarioEntityMayNotAlwaysExistCheckBox.TabIndex = 11; - this.ScenarioEntityMayNotAlwaysExistCheckBox.Text = "Entity May Not Always Exist"; - this.ScenarioEntityMayNotAlwaysExistCheckBox.UseVisualStyleBackColor = true; - this.ScenarioEntityMayNotAlwaysExistCheckBox.CheckedChanged += new System.EventHandler(this.ScenarioEntityMayNotAlwaysExistCheckBox_CheckedChanged); - // - // ScenarioEntitySpecificallyPreventArtPointsCheckBox - // - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.AutoSize = true; - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Location = new System.Drawing.Point(91, 84); - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Name = "ScenarioEntitySpecificallyPreventArtPointsCheckBox"; - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Size = new System.Drawing.Size(167, 17); - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.TabIndex = 13; - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.Text = "Specifically Prevent Art Points"; - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.UseVisualStyleBackColor = true; - this.ScenarioEntitySpecificallyPreventArtPointsCheckBox.CheckedChanged += new System.EventHandler(this.ScenarioEntitySpecificallyPreventArtPointsCheckBox_CheckedChanged); - // // EditScenarioNodePanel // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);