add variable for accessing the propellant resource name

FirstPersonKSP · Aug 11, 2024 · f126146 · f126146
1 parent f15bd46
commit f126146
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/RasterPropMonitor/Core/RPMCEvaluators.cs b/RasterPropMonitor/Core/RPMCEvaluators.cs
@@ -113,6 +113,14 @@ internal VariableEvaluator GetEvaluator(string input, out VariableUpdateType upd
                             return null;
                         }
 
+                    case "PROPELLANTR":
+                        if (tokens[2] == "NAME")
+                        {
+                            ushort propellantIndex = Convert.ToUInt16(tokens[1]);
+                            return (RPMVesselComputer comp) => comp.resources.GetPropellantResourceName(propellantIndex);
+                        }
+                        return null;
+
                     case "CREWLOCAL":
                         int crewSeatID = Convert.ToInt32(tokens[1]);
                         return (RPMVesselComputer comp) =>
@@ -363,7 +371,7 @@ internal NumericVariableEvaluator GetNumericEvaluator(string input, out Variable
                                 return null;
                             }
                         }
-                    case "PROPLNTR":
+                    case "PROPELLANTR":
                         {
                             if (tokens.Length == 3 && uint.TryParse(tokens[1], out uint propellantIndex))
                             {

diff --git a/RasterPropMonitor/Core/ResourceDataStorage.cs b/RasterPropMonitor/Core/ResourceDataStorage.cs
@@ -243,7 +243,7 @@ public double ListElement(string resourceName, ResourceProperty valueType, bool
             }
         }
 
-        public double GetPropellantResourceValue(uint propellantIndex, ResourceProperty valueType, bool stage)
+        private ResourceData GetPropellantResource(uint propellantIndex)
         {
             uint currentPropellantIndex = 0;
 
@@ -255,7 +255,7 @@ public double GetPropellantResourceValue(uint propellantIndex, ResourceProperty
                     {
                         if (currentPropellantIndex == propellantIndex)
                         {
-                            return (double)resource.GetProperty(valueType, stage);
+                            return resource;
                         }
                         else
                         {
@@ -265,7 +265,20 @@ public double GetPropellantResourceValue(uint propellantIndex, ResourceProperty
                 }
             }
 
-            return 0;
+            return null;
+        }
+
+        public double GetPropellantResourceValue(uint propellantIndex, ResourceProperty valueType, bool stage)
+        {
+            ResourceData rd = GetPropellantResource(propellantIndex);
+
+            return rd == null ? 0 : rd.GetProperty(valueType, stage);
+        }
+
+        public string GetPropellantResourceName(uint propellantIndex)
+        {
+            ResourceData rd = GetPropellantResource(propellantIndex);
+            return rd == null ? "" : rd.resourceDefinition.name;
         }
 
         private class ResourceData