Merge pull request #13217 from pchote/jumpjet-death

Fix jumpjet flying death animations
2017-05-05 13:11:17 +02:00
parent 4ec0089250 21a10f84a5
commit f5ddea305a
2 changed files with 13 additions and 0 deletions
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -165,6 +165,17 @@ JUMPJET.Husk:
 	AutoSelectionSize:
 	WithSpriteBody:
 		Sequence: die-falling
+	Health:
+	ConditionManager:
+	GrantConditionOnTerrain:
+		TerrainTypes: Water
+		Condition: water-death
+	WithDeathAnimation:
+		RequiresCondition: !water-death
+		FallbackSequence: die-flying
+	WithDeathAnimation@SPLASH:
+		RequiresCondition: water-death
+		FallbackSequence: die-splash

 GHOST:
 	Inherits: ^Soldier
--- a/mods/ts/sequences/infantry.yaml
+++ b/mods/ts/sequences/infantry.yaml
@@ -375,6 +375,8 @@ jumpjet:
 		Start: 445
 		Length: 6
 		ShadowStart: 896
+	die-splash: h2o_exp2
+		Length: *
 	die-exploding: s_bang34
 		Length: *
 	die-crushed: