Rework UpgradeActorsNear -> ProximityExternalCondition.

2016-12-02 16:14:31 +00:00
parent 5eaaff45ad
commit 32f0d570bf
8 changed files with 48 additions and 29 deletions
--- a/mods/ra/maps/allies-03a/rules.yaml
+++ b/mods/ra/maps/allies-03a/rules.yaml
@@ -34,6 +34,8 @@ HACKE6:
 		CaptureTypes: building
 	Targetable:
 		RequiresCondition: !jail
+	ExternalConditions@JAIL:
+		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
 	RenderSprites:
@@ -42,6 +44,8 @@ HACKE6:
 MEDI:
 	Targetable:
 		RequiresCondition: !jail
+	ExternalConditions@JAIL:
+		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner

@@ -50,8 +54,8 @@ PRISON:
 		Type: CenterPosition
 	Immobile:
 		OccupiesSpace: false
-	UpgradeActorsNear:
-		Upgrades: jail
+	ProximityExternalCondition:
+		Condition: jail
 		Range: 1c0

 CAMERA:
--- a/mods/ra/maps/allies-03b/rules.yaml
+++ b/mods/ra/maps/allies-03b/rules.yaml
@@ -35,6 +35,8 @@ HACKE6:
 	WithInfantryBody:
 	Targetable:
 		RequiresCondition: !jail
+	ExternalConditions@JAIL:
+		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
 	RenderSprites:
@@ -43,6 +45,8 @@ HACKE6:
 MEDI:
 	Targetable:
 		RequiresCondition: !jail
+	ExternalConditions@JAIL:
+		Conditions: jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner

@@ -51,8 +55,8 @@ PRISON:
 		Type: CenterPosition
 	Immobile:
 		OccupiesSpace: false
-	UpgradeActorsNear:
-		Upgrades: jail
+	ProximityExternalCondition:
+		Condition: jail
 		Range: 1c0

 CAMERA:
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -1263,7 +1263,7 @@ GALITE:
 		Prerequisites: ~disabled
 	SelectionDecorations:
 		VisualBounds: 25, 35, 0, -12
-	-Cloak@CLOAKGENERATOR:
+	-Cloak@EXTERNALCLOAK:

 TSTLAMP:
 	Inherits: GALITE
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -94,7 +94,7 @@
 		RequiresCondition: !empdisable && !deployed && !loading

 ^Cloakable:
-	Cloak@CLOAKGENERATOR:
+	Cloak@EXTERNALCLOAK:
 		RequiresCondition: cloakgenerator || crate-cloak
 		InitialDelay: 0
 		CloakDelay: 90
@@ -102,6 +102,8 @@
 		CloakSound: cloak5.aud
 		UncloakSound: cloak5.aud
 		UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
+	ExternalConditions@EXTERNALCLOAK:
+		Conditions: cloakgenerator, crate-cloak

 ^BasicBuilding:
 	Inherits@1: ^ExistsInWorld
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -396,8 +396,8 @@ NASTLH:
 		PowerupSpeech: EnablePower
 		PowerdownSpeech: DisablePower
 		IndicatorPalette: mouse
-	UpgradeActorsNear:
-		Upgrades: cloakgenerator
+	ProximityExternalCondition:
+		Condition: cloakgenerator
 		Range: 12c0
 		EnableSound: cloak5.aud
 		DisableSound: cloak5.aud