Merge pull request #12796 from pchote/external-conditions-rework

Add support for per-source and total external condition caps.

mods/ra/maps/allies-03a/rules.yaml

@@ -34,20 +34,20 @@ HACKE6:
 		CaptureTypes: building
 	Targetable:
 		RequiresCondition: !jail
-	ExternalConditions@JAIL:
-		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
 	RenderSprites:
 		Image: E6
+	ExternalCondition@JAIL:
+		Condition: jail
 
 MEDI:
 	Targetable:
 		RequiresCondition: !jail
-	ExternalConditions@JAIL:
-		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
+	ExternalCondition@JAIL:
+		Condition: jail
 
 PRISON:
 	HiddenUnderShroud:

mods/ra/maps/allies-03b/rules.yaml

@@ -35,20 +35,20 @@ HACKE6:
 	WithInfantryBody:
 	Targetable:
 		RequiresCondition: !jail
-	ExternalConditions@JAIL:
-		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
 	RenderSprites:
 		Image: E6
+	ExternalCondition@JAIL:
+		Condition: jail
 
 MEDI:
 	Targetable:
 		RequiresCondition: !jail
-	ExternalConditions@JAIL:
-		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
+	ExternalCondition@JAIL:
+		Condition: jail
 
 PRISON:
 	HiddenUnderShroud:

mods/ra/maps/desert-shellmap/rules.yaml

@@ -22,8 +22,8 @@ World:
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
-	ExternalConditions:
-		Conditions: unkillable
+	ExternalCondition@UNKILLABLE:
+		Condition: unkillable
 
 ^Tank:
 	GivesBounty:
@@ -33,8 +33,8 @@ World:
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
-	ExternalConditions:
-		Conditions: unkillable
+	ExternalCondition@UNKILLABLE:
+		Condition: unkillable
 
 ^Infantry:
 	GivesBounty:
@@ -50,8 +50,8 @@ World:
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
-	ExternalConditions:
-		Conditions: unkillable
+	ExternalCondition@UNKILLABLE:
+		Condition: unkillable
 
 ^Ship:
 	GivesBounty:
@@ -61,8 +61,8 @@ World:
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
-	ExternalConditions:
-		Conditions: unkillable
+	ExternalCondition@UNKILLABLE:
+		Condition: unkillable
 
 ^Plane:
 	GivesBounty:
@@ -70,8 +70,8 @@ World:
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
-	ExternalConditions:
-		Conditions: unkillable
+	ExternalCondition@UNKILLABLE:
+		Condition: unkillable
 
 ^Building:
 	GivesBounty:
@@ -79,8 +79,8 @@ World:
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
-	ExternalConditions:
-		Conditions: unkillable
+	ExternalCondition@UNKILLABLE:
+		Condition: unkillable
 
 OILB:
 	CashTrickler:

mods/ra/maps/soviet-03/rules.yaml

@@ -59,8 +59,14 @@ V05:
 DOG:
 	# HACK: Disable experience without killing the linter
 	-GainsExperience:
-	ExternalConditions@EXPERIENCE:
-		Conditions: rank-veteran-1, rank-veteran-2, rank-veteran-3, rank-elite
+	ExternalCondition@RANK-VETERAN-1:
+		Condition: rank-veteran-1
+	ExternalCondition@RANK-VETERAN-2:
+		Condition: rank-veteran-2
+	ExternalCondition@RANK-VETERAN-3:
+		Condition: rank-veteran-3
+	ExternalCondition@RANK-ELITE:
+		Condition: rank-elite
 
 SPY:
 	Mobile: