Merge pull request #11499 from Mailaender/damaged-by-terrain

Merged PoisonedByTiberium and DamagedWithoutFoundations into DamagedByTerrain
2016-07-10 22:22:29 +02:00
parent 203310ae4c 8df4e9e04c
commit 6342b40bfd
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

--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -125,7 +125,7 @@ sietch:
 		Type: wood
 	RevealsShroud:
 		Range: 10c0
-	-DamagedWithoutFoundation:
+	-DamagedByTerrain:
 	-GivesBuildableArea:
 	-Sellable:
 	-Capturable:
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -277,7 +277,11 @@
 		Range: 3c0
 	WithCrumbleOverlay:
 	Demolishable:
-	DamagedWithoutFoundation:
+	DamagedByTerrain:
+		Weapon: weathering
+		Terrain: Rock
+		DamageThreshold: 50
+		StartOnThreshold: true
 	ThrowsShrapnel:
 		Weapons: Debris, Debris2, Debris3, Debris4
 		Pieces: 2, 5
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -43,7 +43,7 @@ concreteb:

 construction_yard:
 	Inherits: ^Building
-	-DamagedWithoutFoundation:
+	-DamagedByTerrain:
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 3,2
--- a/mods/ts/rules/civilian-infantry.yaml
+++ b/mods/ts/rules/civilian-infantry.yaml
@@ -35,8 +35,9 @@ UMAGON:
 		Speed: 71
 	Health:
 		HP: 150
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Passenger:
 	RevealsShroud:
 		Range: 7c0
@@ -90,8 +91,9 @@ MUTANT:
 		VoiceSet: Mutant
 	Health:
 		HP: 50
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Mobile:
 		Speed: 56
 	RevealsShroud:
@@ -115,8 +117,9 @@ MWMN:
 		VoiceSet: CivilianFemale
 	Health:
 		HP: 50
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Mobile:
 		Speed: 56
 	RevealsShroud:
@@ -140,8 +143,9 @@ MUTANT3:
 		VoiceSet: Mutant
 	Health:
 		HP: 50
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Mobile:
 		Speed: 56
 	RevealsShroud:
@@ -165,8 +169,9 @@ TRATOS:
 		VoiceSet: Tratos
 	Health:
 		HP: 200
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Mobile:
 		Speed: 71
 	RevealsShroud:
@@ -220,8 +225,9 @@ DOGGIE:
 		HP: 250
 		Shape: Circle
 			Radius: 213
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Valued:
 		Cost: 100
 	Armor:
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -284,7 +284,9 @@
 		Voice: Move
 	HiddenUnderFog:
 	ActorLostNotification:
-	PoisonedByTiberium:
+	DamagedByTerrain:
+		Terrain: Tiberium, BlueTiberium
+		Weapon: Tiberium
 	Guard:
 		Voice: Move
 	Guardable:
@@ -383,8 +385,9 @@
 	RevealsShroud:
 		Range: 4c0
 	MustBeDestroyed:
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	WithPermanentInjury:
 	WithInfantryBody:
 		AttackSequence: attack
@@ -465,9 +468,9 @@
 		Weapons: SmallDebris
 		Pieces: 3, 7
 		Range: 2c0, 5c0
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: Veins
-		Resources: Veins
+		Terrain: Veins
 	UpgradeOnDamage@DAMAGED:
 		Upgrades: damagedspeed
 		ValidDamageStates: Heavy
@@ -633,8 +636,9 @@
 		TargetTypes: Ground, Creep
 	AttackMove:
 	HiddenUnderFog:
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Guardable:
 	WithSpriteBody:

--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -113,8 +113,9 @@ GHOST:
 		Speed: 56
 	Health:
 		HP: 200
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Passenger:
 	RevealsShroud:
 		Range: 6c0
--- a/mods/ts/rules/gdi-vehicles.yaml
+++ b/mods/ts/rules/gdi-vehicles.yaml
@@ -93,7 +93,7 @@ HVR:
 		TrailWhileStationary: True
 		StationaryInterval: 18
 		MovingInterval: 6
-	-PoisonedByTiberium:
+	-DamagedByTerrain:

 SMECH:
 	Inherits: ^Vehicle
@@ -132,7 +132,7 @@ SMECH:
 		MoveSequence: run
 	Selectable:
 		Bounds: 20, 32, 0, -8
-	-PoisonedByTiberium:
+	-DamagedByTerrain:

 MMCH:
 	Inherits: ^Tank
--- a/mods/ts/rules/nod-infantry.yaml
+++ b/mods/ts/rules/nod-infantry.yaml
@@ -109,8 +109,9 @@ MHIJACK:
 		VoiceSet: Hijacker
 	Health:
 		HP: 300
-	PoisonedByTiberium:
+	DamagedByTerrain:
 		Weapon: TiberiumHeal
+		Terrain: Tiberium, BlueTiberium
 	Mobile:
 		Speed: 99
 	-Crushable:
--- a/mods/ts/rules/nod-vehicles.yaml
+++ b/mods/ts/rules/nod-vehicles.yaml
@@ -27,7 +27,7 @@ BGGY:
 		Voice: Attack
 	AutoTarget:
 	WithMuzzleOverlay:
-	-PoisonedByTiberium:
+	-DamagedByTerrain:

 BIKE:
 	Inherits: ^VoxelVehicle
@@ -257,7 +257,7 @@ WEED:
 	-WithVoxelBody:
 	WithVoxelUnloadBody:
 	-GainsExperience:
-	-PoisonedByTiberium:
+	-DamagedByTerrain:

 SAPC:
 	Inherits: ^VoxelTank
--- a/mods/ts/rules/shared-vehicles.yaml
+++ b/mods/ts/rules/shared-vehicles.yaml
@@ -96,7 +96,7 @@ HARV:
 		FactionImages:
 			gdi: harv.gdi
 			nod: harv.nod
-	-PoisonedByTiberium:
+	-DamagedByTerrain:

 LPST:
 	Inherits: ^VoxelTank