From 25f38707c4920211894f27d908c25eaa86cbe944 Mon Sep 17 00:00:00 2001 From: dexyfex Date: Sun, 8 Oct 2017 21:47:41 +1100 Subject: [PATCH] Scenario default chain unk 1 value, uAvailableInMpSp name update --- GameFiles/MetaTypes/MetaNames.cs | 1 + GameFiles/MetaTypes/MetaTypes.cs | 6 +++--- ProjectForm.cs | 13 +++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/GameFiles/MetaTypes/MetaNames.cs b/GameFiles/MetaTypes/MetaNames.cs index 7462760..01511af 100644 --- a/GameFiles/MetaTypes/MetaNames.cs +++ b/GameFiles/MetaTypes/MetaNames.cs @@ -3358,6 +3358,7 @@ namespace CodeWalker.GameFiles iInterior = 1975994103, iRequiredIMapId = 1229525587, iTimeTillPedLeaves = 2296188475, + uAvailableInMpSp = 717991212, CPopGroupList = 738910261, diff --git a/GameFiles/MetaTypes/MetaTypes.cs b/GameFiles/MetaTypes/MetaTypes.cs index 3af1ccb..097b335 100644 --- a/GameFiles/MetaTypes/MetaTypes.cs +++ b/GameFiles/MetaTypes/MetaTypes.cs @@ -536,7 +536,7 @@ namespace CodeWalker.GameFiles new MetaStructureEntryInfo_s(MetaName.iInterior, 23, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.iRequiredIMapId, 24, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.iProbability, 25, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), - new MetaStructureEntryInfo_s((MetaName)717991212, 26, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), + new MetaStructureEntryInfo_s(MetaName.uAvailableInMpSp, 26, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.iTimeStartOverride, 27, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.iTimeEndOverride, 28, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), new MetaStructureEntryInfo_s(MetaName.iRadius, 29, MetaStructureEntryDataType.UnsignedByte, 0, 0, 0), @@ -3753,7 +3753,7 @@ namespace CodeWalker.GameFiles public byte iInterior { get; set; } //23 23: UnsignedByte: 0: 1975994103 public byte iRequiredIMapId { get; set; } //24 24: UnsignedByte: 0: iRequiredIMapId//1229525587 public byte iProbability { get; set; } //25 25: UnsignedByte: 0: iProbability//2974610960 - public byte Unk_717991212_SpOnly { get; set; } //26 26: UnsignedByte: 0: 717991212 // animal point, or a ped with a pet? + public byte uAvailableInMpSp { get; set; } //26 26: UnsignedByte: 0: uAvailableInMpSp//717991212 public byte iTimeStartOverride { get; set; } //27 27: UnsignedByte: 0: 591476992 public byte iTimeEndOverride { get; set; } //28 28: UnsignedByte: 0: 2688038523 public byte iRadius { get; set; } //29 29: UnsignedByte: 0: iRadius @@ -3812,7 +3812,7 @@ namespace CodeWalker.GameFiles public byte TimeStart { get { return _Data.iTimeStartOverride; } set { _Data.iTimeStartOverride = value; } } public byte TimeEnd { get { return _Data.iTimeEndOverride; } set { _Data.iTimeEndOverride = value; } } public byte Probability { get { return _Data.iProbability; } set { _Data.iProbability = value; } } - public byte SpOnlyFlag { get { return _Data.Unk_717991212_SpOnly; } set { _Data.Unk_717991212_SpOnly = value; } } + public byte AvailableMpSp { get { return _Data.uAvailableInMpSp; } set { _Data.uAvailableInMpSp = value; } } public byte Radius { get { return _Data.iRadius; } set { _Data.iRadius = value; } } public byte WaitTime { get { return _Data.iTimeTillPedLeaves; } set { _Data.iTimeTillPedLeaves = value; } } public Unk_700327466 Flags { get { return _Data.Flags; } set { _Data.Flags = value; } } diff --git a/ProjectForm.cs b/ProjectForm.cs index 8192f44..ce77bc2 100644 --- a/ProjectForm.cs +++ b/ProjectForm.cs @@ -4269,7 +4269,7 @@ namespace CodeWalker ScenarioPointTimeStartUpDown.Value = p.TimeStart; ScenarioPointTimeEndUpDown.Value = p.TimeEnd; ScenarioPointProbabilityUpDown.Value = p.Probability; - ScenarioPointSpOnlyFlagUpDown.Value = p.SpOnlyFlag; + ScenarioPointSpOnlyFlagUpDown.Value = p.AvailableMpSp; ScenarioPointRadiusUpDown.Value = p.Radius; ScenarioPointWaitTimeUpDown.Value = p.WaitTime; var iflags = (int)p.Flags; @@ -4614,7 +4614,7 @@ namespace CodeWalker ScenarioClusterPointTimeStartUpDown.Value = p.TimeStart; ScenarioClusterPointTimeEndUpDown.Value = p.TimeEnd; ScenarioClusterPointProbabilityUpDown.Value = p.Probability; - ScenarioClusterPointAnimalFlagUpDown.Value = p.SpOnlyFlag; + ScenarioClusterPointAnimalFlagUpDown.Value = p.AvailableMpSp; ScenarioClusterPointRadiusUpDown.Value = p.Radius; ScenarioClusterPointWaitTimeUpDown.Value = p.WaitTime; var iflags = (int)p.Flags; @@ -4737,6 +4737,7 @@ namespace CodeWalker var copycl = CurrentScenarioNode?.Cluster; MCScenarioChain chain = new MCScenarioChain(); + chain.Unk1 = 1; //default value if (copy != null) { chain.Data = copy.Data; @@ -9270,9 +9271,9 @@ namespace CodeWalker byte v = (byte)ScenarioPointSpOnlyFlagUpDown.Value; lock (scenariosyncroot) { - if (CurrentScenarioNode.MyPoint.SpOnlyFlag != v) + if (CurrentScenarioNode.MyPoint.AvailableMpSp != v) { - CurrentScenarioNode.MyPoint.SpOnlyFlag = v; + CurrentScenarioNode.MyPoint.AvailableMpSp = v; SetScenarioHasChanged(true); } } @@ -10592,9 +10593,9 @@ namespace CodeWalker byte v = (byte)ScenarioClusterPointAnimalFlagUpDown.Value; lock (scenariosyncroot) { - if (CurrentScenarioNode.ClusterMyPoint.SpOnlyFlag != v) + if (CurrentScenarioNode.ClusterMyPoint.AvailableMpSp != v) { - CurrentScenarioNode.ClusterMyPoint.SpOnlyFlag = v; + CurrentScenarioNode.ClusterMyPoint.AvailableMpSp = v; SetScenarioHasChanged(true); } }