Allow for missions to multiple asset names because KSP2 is Inconsistent inconsistent here, and I want to be able to use the optimizations

cheese3660 · cheese3660 · commit ea6fe7290256 · 2025-07-11T07:55:09.000-04:00
diff --git a/Runtime/Generic/SassyPatching/Rulesets/JsonRuleset.cs b/Runtime/Generic/SassyPatching/Rulesets/JsonRuleset.cs
@@ -32,7 +32,7 @@ public ISelectable ConvertToSelectable(string type, string name, string jsonData
 
         public bool CanGetAssetNameFromSelectableName => true;
 
-        public string SelectableNameToAssetName(string selectableName) => selectableName;
+        public string[] SelectableNameToAssetName(string selectableName) => new [] {selectableName};
 
         /// <inheritdoc />
         public INewAsset CreateNew(List<DataValue> dataValues)
diff --git a/Runtime/Missions/Rulesets/MissionRuleset.cs b/Runtime/Missions/Rulesets/MissionRuleset.cs
@@ -30,7 +30,14 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Mission
         // TODO: Validate
         public bool CanGetAssetNameFromSelectableName => true;
 
-        public string SelectableNameToAssetName(string selectableName) => selectableName;
+        public string[] SelectableNameToAssetName(string selectableName) => new[]
+        {
+            selectableName,
+            // For the main KSP2 missions
+            $"KSP2Mission_{selectableName}",
+            // For the tutorial missions
+            selectableName.Replace(' ','_')
+        };
 
         /// <inheritdoc/>
         public INewAsset CreateNew(List<DataValue> dataValues)
diff --git a/Runtime/Parts/Rulesets/PartsRuleset.cs b/Runtime/Parts/Rulesets/PartsRuleset.cs
@@ -43,7 +43,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is PartSel
 
         public bool CanGetAssetNameFromSelectableName => true;
 
-        public string SelectableNameToAssetName(string selectableName) => selectableName;
+        public string[] SelectableNameToAssetName(string selectableName) => new[] {selectableName};
 
         /// <inheritdoc />
         /// <summary>
diff --git a/Runtime/PatchManager.Resources/Rulesets/ResourceRuleset.cs b/Runtime/PatchManager.Resources/Rulesets/ResourceRuleset.cs
@@ -39,7 +39,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is RecipeS
         // TODO: Validate
         public bool CanGetAssetNameFromSelectableName => false;
 
-        public string SelectableNameToAssetName(string selectableName)
+        public string[] SelectableNameToAssetName(string selectableName)
         {
             throw new System.NotImplementedException();
         }
diff --git a/Runtime/PatchManager.Resources/Rulesets/ResourceUnitRuleset.cs b/Runtime/PatchManager.Resources/Rulesets/ResourceUnitRuleset.cs
@@ -27,7 +27,7 @@ public class ResourceUnitRuleset : IPatcherRuleSet
 
         private static int _globallyIncrementingId = 0;
 
-        public string SelectableNameToAssetName(string selectableName)
+        public string[] SelectableNameToAssetName(string selectableName)
         {
             throw new System.NotImplementedException();
         }
diff --git a/Runtime/Planets/Rulesets/AtmosphereOverrideRuleset.cs b/Runtime/Planets/Rulesets/AtmosphereOverrideRuleset.cs
@@ -24,7 +24,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Atmosph
 
         public bool CanGetAssetNameFromSelectableName => true;
 
-        public string SelectableNameToAssetName(string selectableName) => $"atmosphere_override_{selectableName.ToLowerInvariant()}";
+        public string[] SelectableNameToAssetName(string selectableName) => new [] { $"atmosphere_override_{selectableName.ToLowerInvariant()}" };
 
         public INewAsset CreateNew(List<DataValue> dataValues)
         {
diff --git a/Runtime/Planets/Rulesets/CelestialBodyRuleset.cs b/Runtime/Planets/Rulesets/CelestialBodyRuleset.cs
@@ -9,7 +9,7 @@
 
 namespace PatchManager.Planets.Rulesets
 {
-    [PatcherRuleset("body","celestial_bodies")]
+    [PatcherRuleset("body", "celestial_bodies")]
     public class CelestialBodyRuleset : IPatcherRuleSet
     {
         public string[] Labels => new[] { "celestial_bodies" };
@@ -24,7 +24,8 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Celesti
 
         public bool CanGetAssetNameFromSelectableName => true;
 
-        public string SelectableNameToAssetName(string selectableName) => selectableName;
+        public string[] SelectableNameToAssetName(string selectableName) => new[]
+            { selectableName };
 
         public INewAsset CreateNew(List<DataValue> dataValues)
         {
diff --git a/Runtime/Planets/Rulesets/GalaxyRuleset.cs b/Runtime/Planets/Rulesets/GalaxyRuleset.cs
@@ -34,7 +34,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is GalaxyS
         
         public bool CanGetAssetNameFromSelectableName => false;
 
-        public string SelectableNameToAssetName(string selectableName) => $"GalaxyDefinition_{selectableName}";
+        public string[] SelectableNameToAssetName(string selectableName) => new [] {$"GalaxyDefinition_{selectableName}"};
 
         /// <inheritdoc />
         public INewAsset CreateNew(List<DataValue> dataValues)
diff --git a/Runtime/Planets/Rulesets/VolumeCloudOverrideRuleset.cs b/Runtime/Planets/Rulesets/VolumeCloudOverrideRuleset.cs
@@ -22,7 +22,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is VolumeC
 
         public bool CanGetAssetNameFromSelectableName => true;
 
-        public string SelectableNameToAssetName(string selectableName) => $"volume_cloud_override_{selectableName.ToLowerInvariant()}";
+        public string[] SelectableNameToAssetName(string selectableName) => new [] {$"volume_cloud_override_{selectableName.ToLowerInvariant()}"};
 
         public INewAsset CreateNew(List<DataValue> dataValues)
         {
diff --git a/Runtime/SassyPatching/Execution/SassyTextPatcher.cs b/Runtime/SassyPatching/Execution/SassyTextPatcher.cs
@@ -24,7 +24,7 @@ public class SassyTextPatcher
         private Environment _environmentSnapshot;
         private SelectionBlock _rootSelectionBlock;
         public IPatcherRuleSet RuleSet;
-        [CanBeNull] public string AssetName;
+        [CanBeNull] public string[] AssetName;
         [CanBeNull] public string AssetType; // We have one overload for asset types
         internal SassyTextPatcher(Environment environmentSnapshot, SelectionBlock rootSelectionBlock)
         {
diff --git a/Runtime/SassyPatching/Execution/Universe.cs b/Runtime/SassyPatching/Execution/Universe.cs
@@ -582,36 +582,43 @@ private void RegisterPatcher(SassyTextPatcher patcher)
                 }
             } else if (patcher.RuleSet.Labels == null && patcher.AssetName != null)
             {
-                if (NamePatches.TryGetValue(patcher.AssetName, out var patchers))
+                foreach (var name in patcher.AssetName)
                 {
-                    AddSorted(patchers, patcher);
-                }
-                else
-                {
-                    NamePatches[patcher.AssetName] = new List<SassyTextPatcher> { patcher };
+                    if (NamePatches.TryGetValue(name, out var patchers))
+                    {
+                        AddSorted(patchers, patcher);
+                    }
+                    else
+                    {
+                        NamePatches[name] = new List<SassyTextPatcher> { patcher };
+                    }
                 }
             } else if (patcher.RuleSet.Labels != null && patcher.AssetName != null)
             {
                 foreach (var label in patcher.RuleSet.Labels)
                 {
-                    if (LabelNamePatches.TryGetValue(label, out var namePatchers))
+                    foreach (var name in patcher.AssetName)
                     {
-                        if (namePatchers.TryGetValue(patcher.AssetName, out var patchers))
+                        
+                        if (LabelNamePatches.TryGetValue(label, out var namePatchers))
                         {
-                            AddSorted(patchers, patcher);
+                            if (namePatchers.TryGetValue(name, out var patchers))
+                            {
+                                AddSorted(patchers, patcher);
+                            }
+                            else
+                            {
+                                namePatchers[name] = new List<SassyTextPatcher> { patcher };
+                            }
                         }
                         else
                         {
-                            namePatchers[patcher.AssetName] = new List<SassyTextPatcher> { patcher };
+                            LabelNamePatches[label] = new Dictionary<string, List<SassyTextPatcher>>
+                            {
+                                [name] = new() { patcher }
+                            };
                         }
                     }
-                    else
-                    {
-                        LabelNamePatches[label] = new Dictionary<string, List<SassyTextPatcher>>
-                        {
-                            [patcher.AssetName] = new() { patcher }
-                        };
-                    }
                 }
             }
         }
diff --git a/Runtime/SassyPatching/Interfaces/IPatcherRuleSet.cs b/Runtime/SassyPatching/Interfaces/IPatcherRuleSet.cs
@@ -34,7 +34,7 @@ public interface IPatcherRuleSet
         
         public bool CanGetAssetNameFromSelectableName { get; }
 
-        public string SelectableNameToAssetName(string selectableName);
+        public string[] SelectableNameToAssetName(string selectableName);
         
         /// <summary>
         /// Creates a new asset for the patcher
diff --git a/Runtime/Science/Rulesets/DiscoverablesRuleset.cs b/Runtime/Science/Rulesets/DiscoverablesRuleset.cs
@@ -30,7 +30,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Discove
 
         // TODO: Evaluate whether or not this is the case
         public bool CanGetAssetNameFromSelectableName => false;
-        public string SelectableNameToAssetName(string selectableName)
+        public string[] SelectableNameToAssetName(string selectableName)
         {
             throw new System.NotImplementedException();
         }
diff --git a/Runtime/Science/Rulesets/ExperimentRuleset.cs b/Runtime/Science/Rulesets/ExperimentRuleset.cs
@@ -29,7 +29,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Experim
         
         // TODO: Evaluate whether or not this is the case
         public bool CanGetAssetNameFromSelectableName => true;
-        public string SelectableNameToAssetName(string selectableName) => selectableName;
+        public string[] SelectableNameToAssetName(string selectableName) => new [] { selectableName };
 
         /// <inheritdoc />
         public INewAsset CreateNew(List<DataValue> dataValues)
diff --git a/Runtime/Science/Rulesets/RegionsRuleset.cs b/Runtime/Science/Rulesets/RegionsRuleset.cs
@@ -29,7 +29,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Regions
 
         // TODO: Evaluate whether or not this is the case
         public bool CanGetAssetNameFromSelectableName => false;
-        public string SelectableNameToAssetName(string selectableName)
+        public string[] SelectableNameToAssetName(string selectableName)
         {
             throw new System.NotImplementedException();
         }
diff --git a/Runtime/Science/Rulesets/ScienceRuleset.cs b/Runtime/Science/Rulesets/ScienceRuleset.cs
@@ -28,7 +28,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Science
         
         // TODO: Evaluate whether or not this is the case
         public bool CanGetAssetNameFromSelectableName => false;
-        public string SelectableNameToAssetName(string selectableName)
+        public string[] SelectableNameToAssetName(string selectableName)
         {
             throw new System.NotImplementedException();
         }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is RecipeS`
`39`	`39`	`// TODO: Validate`
`40`	`40`	`public bool CanGetAssetNameFromSelectableName => false;`
`41`	`41`
`42`		`- public string SelectableNameToAssetName(string selectableName)`
	`42`	`+ public string[] SelectableNameToAssetName(string selectableName)`
`43`	`43`	`{`
`44`	`44`	`throw new System.NotImplementedException();`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class ResourceUnitRuleset : IPatcherRuleSet`
`27`	`27`
`28`	`28`	`private static int _globallyIncrementingId = 0;`
`29`	`29`
`30`		`- public string SelectableNameToAssetName(string selectableName)`
	`30`	`+ public string[] SelectableNameToAssetName(string selectableName)`
`31`	`31`	`{`
`32`	`32`	`throw new System.NotImplementedException();`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Atmosph`
`24`	`24`
`25`	`25`	`public bool CanGetAssetNameFromSelectableName => true;`
`26`	`26`
`27`		`- public string SelectableNameToAssetName(string selectableName) => $"atmosphere_override_{selectableName.ToLowerInvariant()}";`
	`27`	`+ public string[] SelectableNameToAssetName(string selectableName) => new [] { $"atmosphere_override_{selectableName.ToLowerInvariant()}" };`
`28`	`28`
`29`	`29`	`public INewAsset CreateNew(List<DataValue> dataValues)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace PatchManager.Planets.Rulesets`
`11`	`11`	`{`
`12`		`- [PatcherRuleset("body","celestial_bodies")]`
	`12`	`+ [PatcherRuleset("body", "celestial_bodies")]`
`13`	`13`	`public class CelestialBodyRuleset : IPatcherRuleSet`
`14`	`14`	`{`
`15`	`15`	`public string[] Labels => new[] { "celestial_bodies" };`
`@@ -24,7 +24,8 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is Celesti`
`24`	`24`
`25`	`25`	`public bool CanGetAssetNameFromSelectableName => true;`
`26`	`26`
`27`		`- public string SelectableNameToAssetName(string selectableName) => selectableName;`
	`27`	`+ public string[] SelectableNameToAssetName(string selectableName) => new[]`
	`28`	`+ { selectableName };`
`28`	`29`
`29`	`30`	`public INewAsset CreateNew(List<DataValue> dataValues)`
`30`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public bool CanIngestSelectable(ISelectable selectable) => selectable is VolumeC`
`22`	`22`
`23`	`23`	`public bool CanGetAssetNameFromSelectableName => true;`
`24`	`24`
`25`		`- public string SelectableNameToAssetName(string selectableName) => $"volume_cloud_override_{selectableName.ToLowerInvariant()}";`
	`25`	`+ public string[] SelectableNameToAssetName(string selectableName) => new [] {$"volume_cloud_override_{selectableName.ToLowerInvariant()}"};`
`26`	`26`
`27`	`27`	`public INewAsset CreateNew(List<DataValue> dataValues)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class SassyTextPatcher`
`24`	`24`	`private Environment _environmentSnapshot;`
`25`	`25`	`private SelectionBlock _rootSelectionBlock;`
`26`	`26`	`public IPatcherRuleSet RuleSet;`
`27`		`- [CanBeNull] public string AssetName;`
	`27`	`+ [CanBeNull] public string[] AssetName;`
`28`	`28`	`[CanBeNull] public string AssetType; // We have one overload for asset types`
`29`	`29`	`internal SassyTextPatcher(Environment environmentSnapshot, SelectionBlock rootSelectionBlock)`
`30`	`30`	`{`