label batching is now opt-in, and allow batching labels that differ in color if they're not linked to a variable

Author: JonnyOThan

GameData/JSI/RasterPropMonitor/PropBatching.cfg

@@ -347,4 +347,42 @@ PROP_BATCH
 		modelPath = ASET/ASET_Props/Control/SwitchRotary/model/Switch_Rotary_Dimmer_Mark
 		transformName = swRotaryCircleMarkObj
 	}
-}
+}
+
+@PROP:HAS[@MODULE[JSILabel]:HAS[#transformName[Legend_Center]]]
+{
+	@MODULE[JSILabel]:HAS[#transformName[Legend_Center]]
+	{
+		canBatch = false
+	}
+}
+@PROP:HAS[@MODULE[JSILabel]:HAS[#transformName[Legend_Upper]]]
+{
+	@MODULE[JSILabel]:HAS[#transformName[Legend_Upper]]
+	{
+		canBatch = false
+	}
+}
+@PROP:HAS[@MODULE[JSILabel]:HAS[#transformName[Legend_Lower]]]
+{
+	@MODULE[JSILabel]:HAS[#transformName[Legend_Lower]]
+	{
+		canBatch = false
+	}
+}
+
+@PROP:HAS[@MODULE[JSILabel]:HAS[#variableName[CUSTOM_ALCOR_BACKLIGHT_ON]&~canBatch]]
+{
+	@MODULE[JSILabel]:HAS[#variableName[CUSTOM_ALCOR_BACKLIGHT_ON]&~canBatch]
+	{
+		canBatch = true
+	}
+}
+
+@PROP:HAS[@MODULE[JSILabel]:HAS[~variableName&~canBatch]]
+{
+	@MODULE[JSILabel]:HAS[~variableName&~canBatch]
+	{
+		canBatch = true
+	}
+}

RasterPropMonitor/Auxiliary modules/JSILabel.cs

@@ -62,12 +62,15 @@ void ReadColor(ConfigNode node, string key, RasterPropMonitorComputer rpmComp, r
 
             public override bool Equals(object obj)
             {
+                // TODO: technically we don't need to differentiate labels by color even if they are connected to a variable, but we do need to store the colors per-label...
                 return obj is TextBatchInfo info &&
                        variableName == info.variableName &&
                        font == info.font &&
-                       EqualityComparer<Color32>.Default.Equals(zeroColor, info.zeroColor) &&
-                       EqualityComparer<Color32>.Default.Equals(positiveColor, info.positiveColor) &&
-                       EqualityComparer<Color32>.Default.Equals(negativeColor, info.negativeColor) &&
+                       (variableName == null || 
+                           (EqualityComparer<Color32>.Default.Equals(zeroColor, info.zeroColor) &&
+                           EqualityComparer<Color32>.Default.Equals(positiveColor, info.positiveColor) &&
+                           EqualityComparer<Color32>.Default.Equals(negativeColor, info.negativeColor))
+                       ) &&
                        flashRate == info.flashRate;
             }
 
@@ -76,9 +79,14 @@ public override int GetHashCode()
                 var hashCode = -1112470117;
                 hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(variableName);
                 hashCode = hashCode * -1521134295 + font.GetHashCode();
-                hashCode = hashCode * -1521134295 + zeroColor.GetHashCode();
-                hashCode = hashCode * -1521134295 + positiveColor.GetHashCode();
-                hashCode = hashCode * -1521134295 + negativeColor.GetHashCode();
+
+                if (variableName != null)
+                {
+                    hashCode = hashCode * -1521134295 + zeroColor.GetHashCode();
+                    hashCode = hashCode * -1521134295 + positiveColor.GetHashCode();
+                    hashCode = hashCode * -1521134295 + negativeColor.GetHashCode();
+                }
+
                 hashCode = hashCode * -1521134295 + flashRate.GetHashCode();
                 return hashCode;
             }
@@ -132,6 +140,8 @@ public enum EmissiveMode
         public int refreshRate = 10;
         [KSPField]
         public bool oneshot;
+        [KSPField]
+        public bool canBatch;
 
         private bool variablePositive = false;
         private bool flashOn = true;
@@ -214,10 +224,11 @@ public void Start()
 
                     if (oneshot)
                     {
+                        textObj.text = labels[0].Get();
+
                         var propBatcher = internalModel.GetComponentInChildren<PropBatcher>();
-                        if (propBatcher != null)
+                        if (propBatcher != null && canBatch)
                         {
-                            textObj.text = labels[0].Get();
                             propBatcher.AddStaticLabel(this);
                             return;
                         }