Merge pull request #11294 from Mailaender/generic-demolition

Renamed C4Demolition to Demolition
2016-05-26 23:23:49 +02:00
parent b6afc765b4 6803de9539
commit 629f17b430
10 changed files with 42 additions and 29 deletions
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -38,7 +38,7 @@ MEDIC:
 	Voiced:
 		VoiceSet: Medic
 	RevealsShroud:
-		Range: 6c0		
+		Range: 6c0
 	Mobile:
 		Speed: 56
 	Health:
@@ -125,8 +125,8 @@ GHOST:
 		CrushSound: squishy2.aud
 	AttackFrontal:
 		Voice: Attack
-	C4Demolition:
-		C4Delay: 45
+	Demolition:
+		DetonationDelay: 45
 		Voice: Attack
 	WithInfantryBody:
 		AttackSequence: shoot
--- a/mods/ts/rules/nod-infantry.yaml
+++ b/mods/ts/rules/nod-infantry.yaml
@@ -113,7 +113,7 @@ MHIJACK:
 		Weapon: TiberiumHeal
 	Mobile:
 		Speed: 99
-	-Crushable:	
+	-Crushable:
 	Captures:
 		CaptureTypes: Vehicle
 	RevealsShroud:
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -149,7 +149,7 @@ NAWEAP:
 	Health:
 		HP: 1000
 	Armor:
-		Type: Heavy		
+		Type: Heavy
 	RevealsShroud:
 		Range: 4c0
 	RallyPoint:
@@ -428,7 +428,7 @@ NAWAST:
 		PipCount: 15
 		Capacity: 56
 	Power:
-		Amount: -40		
+		Amount: -40
 	FreeActor:
 		Actor: WEED
 		SpawnOffset: 3,1