Merge PoisonedByTiberium and DamagedWithoutFoundations

into DamagedByTerrain.
2016-02-22 10:47:31 +01:00
parent c3de3a0a90
commit 8df4e9e04c
19 changed files with 168 additions and 170 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -210,9 +210,11 @@
 	Passenger:
 		CargoType: Infantry
 	HiddenUnderFog:
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		UpgradeTypes: hazmatsuits
 		UpgradeMaxEnabledLevel: 0
+		Terrain: Tiberium, BlueTiberium
+		Weapon: Tiberium
 	GlobalUpgradable@BIO:
 		Upgrades: hazmatsuits
 		Prerequisites: bio
@@ -416,8 +418,9 @@
 	Guard:
 		Voice: Move
 	Guardable:
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: Heal
+		Terrain: Tiberium, BlueTiberium
 	Voiced:
 		VoiceSet: DinoVoice

--- a/mods/cnc/rules/infantry.yaml
+++ b/mods/cnc/rules/infantry.yaml
@@ -122,7 +122,7 @@ E5:
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	WithMuzzleOverlay:
-	-PoisonedByTiberium:
+	-DamagedByTerrain:
 	WithInfantryBody:
 		AttackSequence: shoot