ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-17 04:22:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #254 from ook3D/merge-8

Browse Source 
update scenario chain NavSpeed, Cluster point unknowns
This commit is contained in:
dexyfex 2024-07-16 08:06:31 +10:00 committed by GitHub
commit c7a943886a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2142,7 +2142,7 @@ namespace CodeWalker.GameFiles
: byte //Key:3326075799
{
Move = 0,
Unk_7865678 = 1,
MoveIntoVehicleAsPassenger = 1,
MoveFollowMaster = 2,
}
@ -2157,22 +2157,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
@ -5567,8 +5567,8 @@ namespace CodeWalker.GameFiles
{
public CScenarioPointContainer Points { get; set; } //0 0: Structure: CScenarioPointContainer//2380938603: Points//702683191
public rage__spdSphere ClusterSphere { get; set; } //48 48: Structure: 1062159465: ClusterSphere//352461053
public float Unk_1095875445 { get; set; } //64 64: Float: 0: 1095875445 //spawn chance? eg 5, 30
public byte Unk_3129415068 { get; set; } //68 68: Boolean: 0: 3129415068
public float NextSpawnAttemptDelay { get; set; } //64 64: Float: 0: 1095875445 //spawn chance? eg 5, 30
public byte AllPointsRequiredForSpawn { get; set; } //68 68: Boolean: 0: 3129415068
public uint Unused0 { get; set; }//72
public uint Unused1 { get; set; }//76
@ -5604,8 +5604,8 @@ namespace CodeWalker.GameFiles
_Data.ClusterSphere = new rage__spdSphere() { centerAndRadius = v4 };
}
}
public float Unk1 { get { return _Data.Unk_1095875445; } set { _Data.Unk_1095875445 = value; } }
public bool Unk2 { get { return _Data.Unk_3129415068==1; } set { _Data.Unk_3129415068 = (byte)(value?1:0); } }
public float NextSpawnAttemptDelay { get { return _Data.NextSpawnAttemptDelay; } set { _Data.NextSpawnAttemptDelay = value; } }
public bool AllPointsRequiredForSpawn { get { return _Data.AllPointsRequiredForSpawn==1; } set { _Data.AllPointsRequiredForSpawn = (byte)(value?1:0); } }
public MCScenarioPointCluster() { }
public MCScenarioPointCluster(MCScenarioPointRegion region) { Region = region; }

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

@ -2024,7 +2024,7 @@
//
this.ScenarioClusterRadiusTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ScenarioClusterRadiusTextBox.Location = new System.Drawing.Point(100, 29);
this.ScenarioClusterRadiusTextBox.Location = new System.Drawing.Point(146, 29);
this.ScenarioClusterRadiusTextBox.Name = "ScenarioClusterRadiusTextBox";
this.ScenarioClusterRadiusTextBox.Size = new System.Drawing.Size(204, 20);
this.ScenarioClusterRadiusTextBox.TabIndex = 9;
@ -2033,7 +2033,7 @@
// label157
//
this.label157.AutoSize = true;
this.label157.Location = new System.Drawing.Point(51, 32);
this.label157.Location = new System.Drawing.Point(97, 32);
this.label157.Name = "label157";
this.label157.Size = new System.Drawing.Size(43, 13);
this.label157.TabIndex = 8;
@ -2044,9 +2044,9 @@
this.ScenarioClusterUnk2CheckBox.AutoSize = true;
this.ScenarioClusterUnk2CheckBox.Location = new System.Drawing.Point(100, 81);
this.ScenarioClusterUnk2CheckBox.Name = "ScenarioClusterUnk2CheckBox";
this.ScenarioClusterUnk2CheckBox.Size = new System.Drawing.Size(55, 17);
this.ScenarioClusterUnk2CheckBox.Size = new System.Drawing.Size(169, 17);
this.ScenarioClusterUnk2CheckBox.TabIndex = 12;
this.ScenarioClusterUnk2CheckBox.Text = "Unk 2";
this.ScenarioClusterUnk2CheckBox.Text = "All Points Required For Spawn";
this.ScenarioClusterUnk2CheckBox.UseVisualStyleBackColor = true;
this.ScenarioClusterUnk2CheckBox.CheckedChanged += new System.EventHandler(this.ScenarioClusterUnk2CheckBox_CheckedChanged);
//
@ -2054,7 +2054,7 @@
//
this.ScenarioClusterUnk1TextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ScenarioClusterUnk1TextBox.Location = new System.Drawing.Point(100, 55);
this.ScenarioClusterUnk1TextBox.Location = new System.Drawing.Point(146, 55);
this.ScenarioClusterUnk1TextBox.Name = "ScenarioClusterUnk1TextBox";
this.ScenarioClusterUnk1TextBox.Size = new System.Drawing.Size(204, 20);
this.ScenarioClusterUnk1TextBox.TabIndex = 11;
@ -2065,14 +2065,14 @@
this.label140.AutoSize = true;
this.label140.Location = new System.Drawing.Point(4, 58);
this.label140.Name = "label140";
this.label140.Size = new System.Drawing.Size(90, 13);
this.label140.Size = new System.Drawing.Size(137, 13);
this.label140.TabIndex = 10;
this.label140.Text = "Probability Unk 1:";
this.label140.Text = "Next Spawn Attempt Delay:";
//
// ScenarioClusterGoToButton
//
this.ScenarioClusterGoToButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.ScenarioClusterGoToButton.Location = new System.Drawing.Point(382, 1);
this.ScenarioClusterGoToButton.Location = new System.Drawing.Point(428, 1);
this.ScenarioClusterGoToButton.Name = "ScenarioClusterGoToButton";
this.ScenarioClusterGoToButton.Size = new System.Drawing.Size(68, 23);
this.ScenarioClusterGoToButton.TabIndex = 7;
@ -2084,7 +2084,7 @@
//
this.ScenarioClusterCenterTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.ScenarioClusterCenterTextBox.Location = new System.Drawing.Point(100, 3);
this.ScenarioClusterCenterTextBox.Location = new System.Drawing.Point(146, 3);
this.ScenarioClusterCenterTextBox.Name = "ScenarioClusterCenterTextBox";
this.ScenarioClusterCenterTextBox.Size = new System.Drawing.Size(276, 20);
this.ScenarioClusterCenterTextBox.TabIndex = 6;
@ -2093,7 +2093,7 @@
// label139
//
this.label139.AutoSize = true;
this.label139.Location = new System.Drawing.Point(53, 6);
this.label139.Location = new System.Drawing.Point(99, 6);
this.label139.Name = "label139";
this.label139.Size = new System.Drawing.Size(41, 13);
this.label139.TabIndex = 5;

46
CodeWalker/Project/Panels/EditScenarioNodePanel.cs
View File

@ -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);
}
@ -516,8 +516,8 @@ namespace CodeWalker.Project.Panels
ScenarioClusterAddToProjectButton.Enabled = !ScenarioClusterDeleteButton.Enabled;
ScenarioClusterCenterTextBox.Text = FloatUtil.GetVector3String(c.Position);
ScenarioClusterRadiusTextBox.Text = FloatUtil.ToString(c.Radius);
ScenarioClusterUnk1TextBox.Text = FloatUtil.ToString(c.Unk1);
ScenarioClusterUnk2CheckBox.Checked = c.Unk2;
ScenarioClusterUnk1TextBox.Text = FloatUtil.ToString(c.NextSpawnAttemptDelay);
ScenarioClusterUnk2CheckBox.Checked = c.AllPointsRequiredForSpawn;
ScenarioClusterPointsListBox.Items.Clear();
ScenarioClusterAddPointButton.Enabled = true;
@ -2009,9 +2009,9 @@ namespace CodeWalker.Project.Panels
float v = FloatUtil.Parse(ScenarioClusterUnk1TextBox.Text);
lock (ProjectForm.ProjectSyncRoot)
{
if (CurrentScenarioNode.Cluster.Unk1 != v)
if (CurrentScenarioNode.Cluster.NextSpawnAttemptDelay != v)
{
CurrentScenarioNode.Cluster.Unk1 = v;
CurrentScenarioNode.Cluster.NextSpawnAttemptDelay = v;
ProjectForm.SetScenarioHasChanged(true);
}
}
@ -2025,9 +2025,9 @@ namespace CodeWalker.Project.Panels
bool v = ScenarioClusterUnk2CheckBox.Checked;
lock (ProjectForm.ProjectSyncRoot)
{
if (CurrentScenarioNode.Cluster.Unk2 != v)
if (CurrentScenarioNode.Cluster.AllPointsRequiredForSpawn != v)
{
CurrentScenarioNode.Cluster.Unk2 = v;
CurrentScenarioNode.Cluster.AllPointsRequiredForSpawn = v;
ProjectForm.SetScenarioHasChanged(true);
}
}

2
CodeWalker/Project/ProjectForm.cs
View File

@ -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;