Merge pull request #12497 from pchote/condition-manager

Complete Upgrades -> Condition transition.
2016-12-24 13:43:15 +01:00
parent 8977a5651f 2322d40395
commit d21b805012
90 changed files with 363 additions and 406 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -5,7 +5,7 @@
 	GivesExperience:
 		PlayerExperienceModifier: 1
 	ScriptTriggers:
-	UpgradeManager:
+	ConditionManager:
 	RenderDebugState:

 ^SpriteActor:
@@ -605,7 +605,7 @@

 ^CivBuilding:
 	Inherits: ^Building
-	-UpgradeManager:
+	-ConditionManager:
 	Health:
 		HP: 400
 	Tooltip:
--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -106,7 +106,7 @@ sandworm:
 		TerrainTypes: Sand, Dune, SpiceSand, Spice
 		MovingInterval: 3
 		RequiresCondition: !attacking
-	UpgradeManager:
+	ConditionManager:
 	Buildable:
 		Description: Attracted by vibrations in the sand.\nWill eat units whole and has a large appetite.

--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -5,7 +5,7 @@
 	GivesExperience:
 		PlayerExperienceModifier: 1
 	ScriptTriggers:
-	UpgradeManager:
+	ConditionManager:
 	RenderDebugState:

 ^SpriteActor:
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -4,7 +4,7 @@
 	GivesExperience:
 		PlayerExperienceModifier: 1
 	ScriptTriggers:
-	UpgradeManager:
+	ConditionManager:
 	RenderDebugState:

 ^SpriteActor:
@@ -894,7 +894,7 @@
 		ShadowImage: parach-shadow
 		ShadowSequence: idle
 		RequiresCondition: parachute
-	UpgradeManager:
+	ConditionManager:

 ^Mine:
 	Inherits: ^SpriteActor
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -5,7 +5,7 @@
 	GivesExperience:
 		PlayerExperienceModifier: 1
 	ScriptTriggers:
-	UpgradeManager:
+	ConditionManager:
 	RenderDebugState:

 ^SpriteActor:
@@ -246,7 +246,7 @@
 		SellSounds: cashturn.aud
 	Demolishable:
 	ScriptTriggers:
-	UpgradeManager:
+	ConditionManager:
 	Health:
 		Shape: Rectangle
 			RotateToIsometry: true