Missions, and experiments

cheese3660 · cheese3660 · commit a196d2ad5463 · 2023-12-21T15:27:05.000-05:00
diff --git a/src/PatchManager.Missions/MissionsTypes.cs b/src/PatchManager.Missions/MissionsTypes.cs
@@ -20,7 +20,7 @@ static MissionsTypes()
                 Conditions.Add(type.Name,type);
             }
 
-            if (type.IsSubclassOf(typeof(IMissionAction)))
+            if (typeof(IMissionAction).IsAssignableFrom(type))
             {
                 Actions.Add(type.Name, type);
             }
diff --git a/src/PatchManager.Missions/Rulesets/MissionRuleset.cs b/src/PatchManager.Missions/Rulesets/MissionRuleset.cs
@@ -20,7 +20,7 @@ public INewAsset CreateNew(List<DataValue> dataValues)
     {
         var missionDataObject = new MissionData
         {
-            name = dataValues[0].String
+            ID = dataValues[0].String
         };
 
         return new NewGenericAsset("missions", dataValues[0].String,
diff --git a/src/PatchManager.Missions/Selectables/ActionsSelectable.cs b/src/PatchManager.Missions/Selectables/ActionsSelectable.cs
@@ -62,17 +62,26 @@ public override bool MatchesClass(string @class, out DataValue classValue)
         return false;
     }
 
-    public override bool IsSameAs(ISelectable other) => throw new NotImplementedException();
+    public override bool IsSameAs(ISelectable other) =>
+        other is ActionsSelectable actionsSelectable && actionsSelectable.Actions == Actions;
 
     public override IModifiable OpenModification() => new JTokenModifiable(Actions, Selectable.SetModified);
 
     public override ISelectable AddElement(string elementType)
     {
         var actualType = MissionsTypes.Actions[elementType];
-        var elementObject = JObject.FromObject(Activator.CreateInstance(actualType));
+        var elementObject = new JObject()
+        {
+            ["$type"] = actualType.AssemblyQualifiedName
+        };
+        foreach (var (key, value) in JObject.FromObject(Activator.CreateInstance(actualType)))
+        {
+            elementObject[key] = value;
+        }
         var selectable = new JTokenSelectable(Selectable.SetModified, elementObject, token => TrimTypeName(((JObject)token)!.Value<string>()!), elementType);
         Children.Add(selectable);
         Classes.Add(elementType);
+        Actions.Add(elementObject);
         return selectable;
     }
 
diff --git a/src/PatchManager.Missions/Selectables/ConditionSetSelectable.cs b/src/PatchManager.Missions/Selectables/ConditionSetSelectable.cs
@@ -65,8 +65,14 @@ public override bool IsSameAs(ISelectable other) => other is ConditionSetSelecta
     public override ISelectable AddElement(string elementType)
     {
         var conditionType = MissionsTypes.Conditions[elementType];
-        var conditionObject = JObject.FromObject(Activator.CreateInstance(conditionType));
-        conditionObject["$type"] = conditionType.AssemblyQualifiedName;
+        var conditionObject = new JObject()
+        {
+            ["$type"] = conditionType.AssemblyQualifiedName
+        };
+        foreach (var (key, value) in JObject.FromObject(Activator.CreateInstance(conditionType)))
+        {
+            conditionObject[key] = value;
+        }
         _children.Add(conditionObject);
         if (conditionType == typeof(ConditionSet))
         {
diff --git a/src/PatchManager.Missions/Selectables/ContentBranchesSelectable.cs b/src/PatchManager.Missions/Selectables/ContentBranchesSelectable.cs
@@ -61,6 +61,7 @@ public override ISelectable AddElement(string elementType)
         var selectable = new ContentBranchSelectable(Selectable, obj);
         Children.Add(selectable);
         Classes.Add(elementType);
+        ContentBranches.Add(obj);
         return selectable;
     }
 
diff --git a/src/PatchManager.Missions/Selectables/MissionRewardSelectable.cs b/src/PatchManager.Missions/Selectables/MissionRewardSelectable.cs
@@ -1,6 +1,7 @@
 ﻿using Newtonsoft.Json.Linq;
 using PatchManager.SassyPatching;
 using PatchManager.SassyPatching.Interfaces;
+using PatchManager.SassyPatching.Modifiables;
 using PatchManager.SassyPatching.Selectables;
 
 namespace PatchManager.Missions.Selectables;
@@ -47,9 +48,11 @@ public override bool MatchesClass(string @class, out DataValue classValue)
         return false;
     }
 
-    public override bool IsSameAs(ISelectable other) => throw new NotImplementedException();
+    public override bool IsSameAs(ISelectable other) => other is MissionRewardSelectable missionRewardSelectable &&
+                                                        missionRewardSelectable.MissionReward == MissionReward;
 
-    public override IModifiable OpenModification() => throw new NotImplementedException();
+    public override IModifiable OpenModification() =>
+        new JTokenModifiable(MissionReward, MissionSelectable.SetModified);
 
     public override ISelectable AddElement(string elementType)
     {
diff --git a/src/PatchManager.Missions/Selectables/MissionSelectable.cs b/src/PatchManager.Missions/Selectables/MissionSelectable.cs
@@ -46,7 +46,11 @@ public MissionSelectable(JObject missionObject)
 
         var stages = (JArray)MissionObject["missionStages"]!;
         Children.Add(new StagesSelectable(this, stages));
-        var branches = (JArray)MissionObject["ContentBranches"]!;
+        if (missionObject.ContainsKey("ContentBranches"))
+        {
+            var branches = (JArray)MissionObject["ContentBranches"]!;
+            Children.Add(new ContentBranchesSelectable(this, branches));
+        }
     }
     
     public JObject MissionObject;
diff --git a/src/PatchManager.Missions/Selectables/StageSelectable.cs b/src/PatchManager.Missions/Selectables/StageSelectable.cs
@@ -2,6 +2,7 @@
 using Newtonsoft.Json.Linq;
 using PatchManager.SassyPatching;
 using PatchManager.SassyPatching.Interfaces;
+using PatchManager.SassyPatching.Modifiables;
 using PatchManager.SassyPatching.Selectables;
 
 namespace PatchManager.Missions.Selectables;
@@ -12,7 +13,7 @@ public sealed class StageSelectable : BaseSelectable
 
     public JObject StageObject;
 
-    private int ConditionIndex = 0;
+    private int ConditionIndex = -1;
     
     public StageSelectable(MissionSelectable missionSelectable, JObject stageObject)
     {
@@ -29,42 +30,90 @@ public StageSelectable(MissionSelectable missionSelectable, JObject stageObject)
             }
         }
 
-        ConditionIndex = Children.Count;
-        if (((JObject)stageObject["scriptableCondition"]!)["ConditionType"]!.Value<string>() == "ConditionSet")
+        if (stageObject["scriptableCondition"].Type == JTokenType.Object)
         {
-            Children.Add(new ConditionSetSelectable(missionSelectable,(JObject)stageObject["scriptableCondition"]!));
+            if (((JObject)stageObject["scriptableCondition"]!)["ConditionType"]!.Value<string>() == "ConditionSet")
+            {
+
+                ConditionIndex = Children.Count;
+                Children.Add(
+                    new ConditionSetSelectable(missionSelectable, (JObject)stageObject["scriptableCondition"]!));
+            }
+            else
+            {
+
+                ConditionIndex = Children.Count;
+                Children.Add(new JTokenSelectable(MissionSelectable.SetModified, stageObject["scriptableCondition"],
+                    "scriptableCondition", "scriptableCondition"));
+            }
         }
-        else
+
+        if (stageObject.TryGetValue("MissionReward", out var value))
         {
-            Children.Add(new JTokenSelectable(MissionSelectable.SetModified, stageObject["scriptableCondition"],
-                "scriptableCondition", "scriptableCondition"));
+            Children.Add(new MissionRewardSelectable(MissionSelectable, (JObject)value!));
         }
-        Children.Add(new MissionRewardSelectable(MissionSelectable,(JObject)stageObject["MissionReward"]!));
+
         Children.Add(new ActionsSelectable(MissionSelectable,(JArray)stageObject["actions"]!));
     }
 
     public override List<ISelectable> Children { get; }
     public override string Name => $"_{StageObject["StageID"]!.Value<long>()}";
     public override List<string> Classes { get; }
-    public override bool MatchesClass(string @class, out DataValue classValue) => throw new NotImplementedException();
 
-    public override bool IsSameAs(ISelectable other) => throw new NotImplementedException();
+    public override bool MatchesClass(string @class, out DataValue classValue)
+    {
+        if (StageObject.TryGetValue(@class, out var jToken))
+        {
+            classValue = DataValue.FromJToken(jToken);
+            return true;
+        }
+        classValue = DataValue.Null;
+        return false;
+    }
+
+    public override bool IsSameAs(ISelectable other) =>
+        other is StageSelectable stageSelectable && stageSelectable.StageObject == StageObject;
 
-    public override IModifiable OpenModification() => throw new NotImplementedException();
+    public override IModifiable OpenModification() => new JTokenModifiable(StageObject,MissionSelectable.SetModified);
 
     public override ISelectable AddElement(string elementType)
     {
         var conditionType = MissionsTypes.Conditions[elementType];
-        var conditionObject = JObject.FromObject(Activator.CreateInstance(conditionType));
-        conditionObject["$type"] = conditionType.AssemblyQualifiedName;
+        // var conditionObject = JObject.FromObject(Activator.CreateInstance(conditionType));
+        var conditionObject = new JObject();
+        foreach (var (key, value) in JObject.FromObject(Activator.CreateInstance(conditionType)))
+        {
+            conditionObject[key] = value;
+        }
+        StageObject["scriptableCondition"] = conditionObject;
         if (conditionType == typeof(ConditionSet))
         {
-            return Children[ConditionIndex] = new ConditionSetSelectable(MissionSelectable, conditionObject);
+            var selectable = new ConditionSetSelectable(MissionSelectable, conditionObject);
+            if (ConditionIndex > 0)
+            {
+                return Children[ConditionIndex] = selectable;
+            }
+
+            ConditionIndex = Children.Count;
+            Children.Add(selectable);
+            return selectable;
+        }
+        else
+        {
+            
+            var selectable = new JTokenSelectable(MissionSelectable.SetModified, conditionObject,
+                "scriptableCondition", "scriptableCondition");
+            
+            if (ConditionIndex > 0)
+            {
+                return Children[ConditionIndex] = selectable;
+            }
+
+            ConditionIndex = Children.Count;
+            Children.Add(selectable);
+            return selectable;
         }
 
-        StageObject["scriptableCondition"] = conditionObject;
-        return Children[ConditionIndex] = new JTokenSelectable(MissionSelectable.SetModified, conditionObject,
-            "scriptableCondition", "scriptableCondition");
     }
 
     public override string Serialize() => StageObject.ToString();
diff --git a/src/PatchManager.Missions/Selectables/StagesSelectable.cs b/src/PatchManager.Missions/Selectables/StagesSelectable.cs
@@ -61,6 +61,7 @@ public override ISelectable AddElement(string elementType)
         Classes.Add(elementType);
         var selectable = new StageSelectable(MissionSelectable, stage);
         Children.Add(selectable);
+        Stages.Add(stage);
         return selectable;
     }
 
diff --git a/src/PatchManager.SassyPatching/Execution/SassyTextPatcher.cs b/src/PatchManager.SassyPatching/Execution/SassyTextPatcher.cs
@@ -42,6 +42,7 @@ internal SassyTextPatcher(Environment environmentSnapshot, SelectionBlock rootSe
         //     Priority = global.Universe.AllStages[stageName];
         // }
         var global = environmentSnapshot.GlobalEnvironment;
+        OriginalGuid = environmentSnapshot.GlobalEnvironment.ModGuid;
         var universe = global.Universe;
         PriorityString =
             rootSelectionBlock.Attributes.OfType<RunAtStageAttribute>().FirstOrDefault() is { } runAtStageAttribute
@@ -50,8 +51,8 @@ internal SassyTextPatcher(Environment environmentSnapshot, SelectionBlock rootSe
         
     }
 
-    public string OriginalGuid { get; internal set; }
-    public string PriorityString { get; internal set; }
+    public string OriginalGuid { get; }
+    public string PriorityString { get; }
 
     /// <inheritdoc />
     public ulong Priority { get; set; }
diff --git a/src/PatchManager.SassyPatching/Nodes/Statements/Conditional.cs b/src/PatchManager.SassyPatching/Nodes/Statements/Conditional.cs
@@ -43,7 +43,7 @@ public override void ExecuteIn(Environment environment)
         }
         else
         {
-            Else.ExecuteIn(environment);
+            Else?.ExecuteIn(environment);
         }
     }
 
diff --git a/src/PatchManager.SassyPatching/Selectables/JTokenSelectable.cs b/src/PatchManager.SassyPatching/Selectables/JTokenSelectable.cs
@@ -104,16 +104,19 @@ public override IModifiable OpenModification()
     public override ISelectable AddElement(string elementType)
     {
         var obj = new JObject();
-        if (Token is JArray jArray)
+        var token = Token;
+        while (token is JProperty prop)
+            token = prop.Value;
+        switch (token)
         {
-            jArray[elementType] = obj;
-        } else if (Token is JObject jObject)
-        {
-            jObject[elementType] = obj;
-        }
-        else
-        {
-            throw new InvalidOperationException();
+            case JArray jArray:
+                jArray.Add(obj);
+                break;
+            case JObject jObject:
+                jObject[elementType] = obj;
+                break;
+            default:
+                throw new InvalidOperationException();
         }
         var n = new JTokenSelectable(_markDirty, obj, elementType);
         Children.Add(n);
diff --git a/src/PatchManager.SassyPatching/Transformer.cs b/src/PatchManager.SassyPatching/Transformer.cs
@@ -272,7 +272,7 @@ public override Node VisitName(sassy_parser.NameContext context)
 
     /// <inheritdoc />
     public override Node VisitAdd_element(sassy_parser.Add_elementContext context)
-        => new ElementAdditionSelector(context.GetCoordinate(), context.ELEMENT().GetText().TrimFirst());
+        => new ElementAdditionSelector(context.GetCoordinate(), context.ELEMENT().GetText());
 
     /// <inheritdoc />
     public override Node VisitEverything(sassy_parser.EverythingContext context)
diff --git a/src/PatchManager.Science/Modifiables/ExperimentModifiable.cs b/src/PatchManager.Science/Modifiables/ExperimentModifiable.cs
@@ -0,0 +1,24 @@
+﻿using PatchManager.SassyPatching;
+using PatchManager.SassyPatching.Modifiables;
+using PatchManager.Science.Selectables;
+
+namespace PatchManager.Science.Modifiables;
+
+public class ExperimentModifiable : JTokenModifiable
+{
+    private ExperimentSelectable _experimentSelectable;
+
+    public ExperimentModifiable(ExperimentSelectable selectable) : base(selectable.DataObject, selectable.SetModified)
+    {
+        _experimentSelectable = selectable;
+    }
+
+    public override void Set(DataValue dataValue)
+    {
+        if (dataValue.IsDeletion)
+        {
+            _experimentSelectable.SetDeleted();
+        }
+        base.Set(dataValue);
+    }
+}
diff --git a/src/PatchManager.Science/PatchManager.Science.csproj b/src/PatchManager.Science/PatchManager.Science.csproj
@@ -9,4 +9,8 @@
       <ProjectReference Include="..\PatchManager.SassyPatching\PatchManager.SassyPatching.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.2.0" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/PatchManager.Science/Rulesets/ExperimentRuleset.cs b/src/PatchManager.Science/Rulesets/ExperimentRuleset.cs
@@ -0,0 +1,32 @@
+﻿using JetBrains.Annotations;
+using KSP.Game.Science;
+using Newtonsoft.Json.Linq;
+using PatchManager.SassyPatching;
+using PatchManager.SassyPatching.Attributes;
+using PatchManager.SassyPatching.Interfaces;
+using PatchManager.SassyPatching.NewAssets;
+using PatchManager.Science.Selectables;
+
+namespace PatchManager.Science.Rulesets;
+
+[PatcherRuleset("experiments","scienceExperiment"),UsedImplicitly]
+public class ExperimentRuleset : IPatcherRuleSet
+{
+    public bool Matches(string label) => label == "scienceExperiment";
+
+    public ISelectable ConvertToSelectable(string type, string name, string jsonData) =>
+        new ExperimentSelectable(JObject.Parse(jsonData));
+
+    public INewAsset CreateNew(List<DataValue> dataValues)
+    {
+        var core = new ExperimentCore
+        {
+            data = new ExperimentDefinition
+            {
+                ExperimentID = dataValues[0].String
+            }
+        };
+        return new NewGenericAsset("scienceExperiment", dataValues[0].String,
+            new ExperimentSelectable(JObject.FromObject(core)));
+    }
+}
diff --git a/src/PatchManager.Science/Selectables/ExperimentSelectable.cs b/src/PatchManager.Science/Selectables/ExperimentSelectable.cs

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static MissionsTypes()`
`20`	`20`	`Conditions.Add(type.Name,type);`
`21`	`21`	`}`
`22`	`22`
`23`		`- if (type.IsSubclassOf(typeof(IMissionAction)))`
	`23`	`+ if (typeof(IMissionAction).IsAssignableFrom(type))`
`24`	`24`	`{`
`25`	`25`	`Actions.Add(type.Name, type);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public INewAsset CreateNew(List<DataValue> dataValues)`
`20`	`20`	`{`
`21`	`21`	`var missionDataObject = new MissionData`
`22`	`22`	`{`
`23`		`- name = dataValues[0].String`
	`23`	`+ ID = dataValues[0].String`
`24`	`24`	`};`
`25`	`25`
`26`	`26`	`return new NewGenericAsset("missions", dataValues[0].String,`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public override ISelectable AddElement(string elementType)`
`61`	`61`	`var selectable = new ContentBranchSelectable(Selectable, obj);`
`62`	`62`	`Children.Add(selectable);`
`63`	`63`	`Classes.Add(elementType);`
	`64`	`+ ContentBranches.Add(obj);`
`64`	`65`	`return selectable;`
`65`	`66`	`}`
`66`	`67`