From b84e27ef98bc7630dd466f95dbaf6e6afeeede23 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 5 Jun 2016 20:51:28 +0200
Subject: [PATCH] Remove TS Headshot DeathType

Also fixed a couple of mistakes compared to the original (some weapons still applied the wrong death type).
---
 mods/ts/rules/defaults.yaml        |  7 +++---
 mods/ts/sequences/infantry.yaml    | 40 ++++++++----------------------
 mods/ts/weapons/energyweapons.yaml | 10 ++++----
 mods/ts/weapons/smallguns.yaml     |  2 +-
 4 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index b2b1b20591..a4f50b12be 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -309,23 +309,22 @@
 		DeathTypes:
 			BulletDeath: 1
 			SmallExplosionDeath: 2
-			HeadshotDeath: 3
 	WithDeathAnimation@explosion:
 		DeathSequencePalette: effect
 		DeathPaletteIsPlayerPalette: False
 		DeathTypes:
-			ExplosionDeath: 4
+			ExplosionDeath: 3
 	WithDeathAnimation@energy:
 		DeathSequencePalette: ra
 		DeathPaletteIsPlayerPalette: False
 		DeathTypes:
-			EnergyDeath: 6
+			EnergyDeath: 5
 	WithDeathAnimation:
 		CrushedSequence: die-crushed
 		CrushedSequencePalette: player
 		CrushedPaletteIsPlayerPalette: true
 	DeathSounds@NORMAL:
-		DeathTypes: BulletDeath, SmallExplosionDeath, ExplosionDeath, HeadshotDeath
+		DeathTypes: BulletDeath, SmallExplosionDeath, ExplosionDeath
 	DeathSounds@BURNED:
 		Voice: Burned
 		DeathTypes: FireDeath
diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml
index fbff677e46..514170893a 100644
--- a/mods/ts/sequences/infantry.yaml
+++ b/mods/ts/sequences/infantry.yaml
@@ -35,11 +35,7 @@
 		Start: 149
 		Length: 15
 		ShadowStart: 441
-	die3:
-		Start: 149
-		Length: 15
-		ShadowStart: 441
-	die4: s_bang34
+	die3: s_bang34
 		Length: *
 	die-crushed:
 		Start: 159
@@ -52,7 +48,7 @@
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
-	die6: electro
+	die5: electro
 		Length: *
 
 ^BasicInfantryAttack:
@@ -308,11 +304,7 @@ medic:
 		Start: 149
 		Length: 15
 		ShadowStart: 455
-	die3:
-		Start: 149
-		Length: 15
-		ShadowStart: 455
-	die4: s_bang34
+	die3: s_bang34
 		Length: *
 	die-crushed:
 		Start: 159
@@ -329,7 +321,7 @@ medic:
 		Start: 292
 		Length: 14
 		ShadowStart: 599
-	die6: electro
+	die5: electro
 		Length: *
 	icon: mediicon
 
@@ -368,11 +360,7 @@ jumpjet:
 		Start: 445
 		Length: 6
 		ShadowStart: 896
-	die3: # TODO: animation for falling from sky starts at 436
-		Start: 445
-		Length: 6
-		ShadowStart: 896
-	die4: s_bang34
+	die3: s_bang34
 		Length: *
 	die-crushed:
 		Start: 450
@@ -394,7 +382,7 @@ jumpjet:
 		Length: 2
 		Facings: 8
 		ShadowStart: 711
-	die6: electro
+	die5: electro
 		Length: *
 	icon: jjeticon
 
@@ -453,14 +441,10 @@ weedguy:
 		Length: 11
 		ShadowStart: 368
 	die4:
-		Start: 197
-		Length: 5
-		ShadowStart: 399
-	die5:
 		Start: 177
 		Length: 20
 		ShadowStart: 379
-	die6: electro
+	die5: electro
 		Length: *
 	die-crushed:
 		Start: 174
@@ -503,11 +487,7 @@ doggie:
 		Start: 99
 		Length: 10
 		ShadowStart: 218
-	die3:
-		Start: 99
-		Length: 10
-		ShadowStart: 218
-	die4: s_bang34
+	die3: s_bang34
 		Length: *
 	die-crushed:
 		Start: 105
@@ -515,11 +495,11 @@ doggie:
 		ShadowStart: 224
 		Tick: 800
 		ZOffset: -511
-	die5:
+	die4:
 		Start: 109
 		Length: 10
 		ShadowStart: 228
-	die6:
+	die5:
 		Start: 109
 		Length: 10
 		ShadowStart: 228
diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml
index dddec8b897..e8dba50916 100644
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -23,7 +23,7 @@ LtRail:
 			Light: 150
 			Heavy: 110
 			Concrete: 5
-		DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath
+		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
 	Warhead@2Dam: SpreadDamage
 		Range: 0, 32
 		Falloff: 50, 50 # Only does half damage to friendly units
@@ -37,7 +37,7 @@ LtRail:
 			Light: 150
 			Heavy: 110
 			Concrete: 5
-		DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath
+		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
 
 MechRailgun:
 	ReloadDelay: 60
@@ -62,7 +62,7 @@ MechRailgun:
 			Light: 160
 			Heavy: 100
 			Concrete: 25
-		DamageTypes: Prone100Percent, TriggerProne, FireDeath
+		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
 
 SonicZap:
 	ReloadDelay: 180
@@ -87,7 +87,7 @@ SonicZap:
 		Versus:
 			Heavy: 80
 			Concrete: 60
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Dam: SpreadDamage
 		Range: 0, 32
 		Falloff: 50, 50
@@ -98,7 +98,7 @@ SonicZap:
 		Versus:
 			Heavy: 80
 			Concrete: 60
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 
 CyCannon:
 	ReloadDelay: 50
diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml
index c080e4b1c1..0abdff3594 100644
--- a/mods/ts/weapons/smallguns.yaml
+++ b/mods/ts/weapons/smallguns.yaml
@@ -274,4 +274,4 @@ Sniper:
 			Light: 5
 			Heavy: 5
 			Concrete: 5
-		DamageTypes: Prone100Percent, TriggerProne, HeadshotDeath
+		DamageTypes: Prone100Percent, TriggerProne, BulletDeath