From 21242cffff7171c9f6403cfbab2e4e23d66e02b8 Mon Sep 17 00:00:00 2001 From: ook3d <47336113+ook3D@users.noreply.github.com> Date: Mon, 20 May 2024 16:29:57 -0400 Subject: [PATCH] update scenario chain NavSpeed --- .../GameFiles/MetaTypes/MetaTypes.cs | 34 +++++++++---------- .../Project/Panels/EditScenarioNodePanel.cs | 34 +++++++++---------- CodeWalker/Project/ProjectForm.cs | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs index 785cd28..a264533 100644 --- a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs +++ b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs @@ -2156,7 +2156,7 @@ namespace CodeWalker.GameFiles : byte //Key:3326075799 { Move = 0, - Unk_7865678 = 1, + MoveIntoVehicleAsPassenger = 1, MoveFollowMaster = 2, } @@ -2171,22 +2171,22 @@ namespace CodeWalker.GameFiles public enum CScenarioChainingEdge__eNavSpeed //SCENARIO (Path) Edge nav speed : byte //Key:1112851290 { - Unk_00_3279574318 = 0, - Unk_01_2212923970 = 1, - Unk_02_4022799658 = 2, - Unk_03_1425672334 = 3, - Unk_04_957720931 = 4, - Unk_05_3795195414 = 5, - Unk_06_2834622009 = 6, - Unk_07_1876554076 = 7, - Unk_08_698543797 = 8, - Unk_09_1544199634 = 9, - Unk_10_2725613303 = 10, - Unk_11_4033265820 = 11, - Unk_12_3054809929 = 12, - Unk_13_3911005380 = 13, - Unk_14_3717649022 = 14, - Unk_15_3356026130 = 15, + kSpeed5Mph = 0, + kSpeed10Mph = 1, + kSpeed15Mph = 2, + kSpeed25Mph = 3, + kSpeed35Mph = 4, + kSpeed45Mph = 5, + kSpeed55Mph = 6, + kSpeed65Mph = 7, + kSpeed80Mph = 8, + kSpeed100Mph = 9, + kSpeed125Mph = 10, + kSpeed150Mph = 11, + kSpeed200Mph = 12, + kSpeedWalk = 13, + kSpeedRun = 14, + kSpeedSprint = 15, } public enum rage__fwArchetypeDef__eAssetType //archetype assetType diff --git a/CodeWalker/Project/Panels/EditScenarioNodePanel.cs b/CodeWalker/Project/Panels/EditScenarioNodePanel.cs index 3b47cbd..323153d 100644 --- a/CodeWalker/Project/Panels/EditScenarioNodePanel.cs +++ b/CodeWalker/Project/Panels/EditScenarioNodePanel.cs @@ -176,7 +176,7 @@ namespace CodeWalker.Project.Panels ScenarioChainEdgeActionComboBox.Items.Clear(); ScenarioChainEdgeActionComboBox.Items.Add(CScenarioChainingEdge__eAction.Move); - ScenarioChainEdgeActionComboBox.Items.Add(CScenarioChainingEdge__eAction.Unk_7865678); + ScenarioChainEdgeActionComboBox.Items.Add(CScenarioChainingEdge__eAction.MoveIntoVehicleAsPassenger); ScenarioChainEdgeActionComboBox.Items.Add(CScenarioChainingEdge__eAction.MoveFollowMaster); ScenarioChainEdgeNavModeComboBox.Items.Clear(); @@ -185,22 +185,22 @@ namespace CodeWalker.Project.Panels ScenarioChainEdgeNavModeComboBox.Items.Add(CScenarioChainingEdge__eNavMode.Roads); ScenarioChainEdgeNavSpeedComboBox.Items.Clear(); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_00_3279574318); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_01_2212923970); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_02_4022799658); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_03_1425672334); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_04_957720931); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_05_3795195414); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_06_2834622009); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_07_1876554076); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_08_698543797); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_09_1544199634); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_10_2725613303); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_11_4033265820); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_12_3054809929); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_13_3911005380); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_14_3717649022); - ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_15_3356026130); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed5Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed10Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed15Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed25Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed35Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed45Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed55Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed65Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed80Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed100Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed125Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed150Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeed200Mph); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeedWalk); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeedRun); + ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.kSpeedSprint); } diff --git a/CodeWalker/Project/ProjectForm.cs b/CodeWalker/Project/ProjectForm.cs index 5d1f1a6..77dd5cf 100644 --- a/CodeWalker/Project/ProjectForm.cs +++ b/CodeWalker/Project/ProjectForm.cs @@ -6134,7 +6134,7 @@ namespace CodeWalker.Project float dir = 0; var action = CScenarioChainingEdge__eAction.Move; var navMode = CScenarioChainingEdge__eNavMode.Direct; - var navSpeed = CScenarioChainingEdge__eNavSpeed.Unk_00_3279574318; + var navSpeed = CScenarioChainingEdge__eNavSpeed.kSpeed5Mph; var stype = defaulttype; var modelset = defaultmodelset; var flags = defaultflags;