From e4b37c1b5d02bd4984c090d6cab38619ddd99f56 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 21:36:24 +0200
Subject: [PATCH 01/14] Reduce speed penalty for vehicles on certain terrain
 types.

The old one were a bit harsh.
---
 mods/ts/rules/defaults.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 389c6f9c59..2ec88c177c 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -177,10 +177,10 @@
 		Crushes: crate
 		TerrainSpeeds:
 			Clear: 80
-			Rough: 40
+			Rough: 60
 			Road: 100
-			Beach: 40
-			Tiberium: 40
+			Beach: 60
+			Tiberium: 60
 		ROT: 5
 	SelectionDecorations:
 		Palette: pips

From 077efb5884ba2474dfc1113032a70ba958bb9e82 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 21:46:11 +0200
Subject: [PATCH 02/14] Fixes two music track titles

---
 mods/ts/music.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/ts/music.yaml b/mods/ts/music.yaml
index e12b51ffdb..248342f338 100644
--- a/mods/ts/music.yaml
+++ b/mods/ts/music.yaml
@@ -1,6 +1,6 @@
 #Tiberian Sun
 intro: Intro
-maps: Maps
+maps: Map Selection
 approach: Approach
 defense: The Defense
 duskhour: Dusk Hour
@@ -27,7 +27,7 @@ hacker: Hacker
 infiltra: Infiltration
 kmachine: Killing Machine
 linkup: Link Up
-rainnite: Rain in the Night 2
+rainnite: Rain In The Night 2
 slavesys: Slave To The System
 #Bonus tracks
 stomp: Stomp

From 3fcd77eb41b164280efc980d1ee3c0461ba48f05 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 21:50:05 +0200
Subject: [PATCH 03/14] Adds various crate effect sequences, removes levelup ra
 backfall.

---
 mods/ts/bits/levelup.shp    | Bin 345 -> 0 bytes
 mods/ts/sequences/misc.yaml |  27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 delete mode 100644 mods/ts/bits/levelup.shp

diff --git a/mods/ts/bits/levelup.shp b/mods/ts/bits/levelup.shp
deleted file mode 100644
index eec8a7f72c5cd0757cb0b22008897cfd4af77d92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 345
zcmZQ&009Lc1OYb&h6WH_3#GR}>DN$Ni4h_n$p}(~0RP$<85-w1unTZ7umEYM02u`d
z1#Sl>2EhOY0iKg>i~%wMCJHiVmouK6&KTfw<2B>ITR@}!xdXM$gKC?Hq0J4ZEuHaX
zI7r)S#(z>wKyB<mZF8a8=3;1LgK1M|JSh&+md*Gt3Z(5g14H8+sJ1y6+Kw?m9r>K$
o<aGw1Hf_d#vq0L~f!g??+W0ZFwZXJ4XE-?>r0q4szgs|U05C^T00000

diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index d09e628123..966161fc69 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -54,10 +54,33 @@ beacon:
 		BlendMode: Additive
 
 crate-effects:
-	levelup: levelup
+	dollar: money
+		Start: 0
+		Length: *
+	reveal-map: reveal
+		Start: 0
+		Length: *
+	hide-map: shroudx
+		Start: 0
+		Length: *
+	fpower: firepowr
+		Start: 0
+		Length: *
+	armor: armor
+		Start: 0
+		Length: *
+	stealth: cloak
+		Start: 0
+		Length: *
+	heal: healall
+		Start: 0
+		Length: *
+	nuke: mltimisl
+		Start: 0
+		Length: *
+	levelup: veteran
 		Start: 0
 		Length: *
-		Tick: 200
 
 rank:
 	rank: pips

From dc143d09670307576aacfdd6556ab90a4fb9d35b Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:07:59 +0200
Subject: [PATCH 04/14] Adds sequences for flameall, scorch and crater marks,
 and smoke placeholder

---
 mods/ts/sequences/misc.yaml | 47 +++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index 966161fc69..59e152eadd 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -258,13 +258,11 @@ discus:
 		Start: 0
 		Length: *
 
-# TODO: needs unit*.pal
 canister:
 	idle:
 		Start: 0
 		Length: *
 
-# TODO: needs unit*.pal + ShadowIndex: 4
 dragon:
 	idle:
 		Start: 0
@@ -285,6 +283,19 @@ torpedo:
 		Start: 0
 		Length: *
 
+flameall:
+	idle:
+		Start: 0
+		Length: 19
+		Facings: -8
+		Tick: 160
+
+#TODO: placeholder to fix crashes related to smoke
+smoke_m:
+	idle: fire3
+		Start: 0
+		Length: *
+
 moveflsh:
 	idle: ring
 		Start: 0
@@ -374,5 +385,33 @@ resources:
 		ShadowStart: 12
 
 shroud:
-	shroud: shadow
-		Length: *
\ No newline at end of file
+	shroud: shadow #TODO: use shroud.shp
+		Length: *
+
+scorches: #TODO: make use of 07-12 as well
+	sc1: burnt01
+		Length: *
+	sc2: burnt02
+		Length: *
+	sc3: burnt03
+		Length: *
+	sc4: burnt04
+		Length: *
+	sc5: burnt05
+		Length: *
+	sc6: burnt06
+		Length: *
+
+craters: #TODO: make use of 07-12 as well
+	cr1: crater01
+		Length: *
+	cr2: crater02
+		Length: *
+	cr3: crater03
+		Length: *
+	cr4: crater04
+		Length: *
+	cr5: crater05
+		Length: *
+	cr6: crater06
+		Length: *

From 887ec938cc9a4b3aa212405bb3db614dde3c332a Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:24:38 +0200
Subject: [PATCH 05/14] adds muzzle sequences for vehicles

---
 mods/ts/sequences/vehicles.yaml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/mods/ts/sequences/vehicles.yaml b/mods/ts/sequences/vehicles.yaml
index 00ce6acd8c..5e643d3f4c 100644
--- a/mods/ts/sequences/vehicles.yaml
+++ b/mods/ts/sequences/vehicles.yaml
@@ -15,6 +15,9 @@ hvr:
 		Start: 0
 
 4tnk:
+	muzzle: gunfire
+		Start: 0
+		Length: *
 	icon: xxicon
 		Start: 0
 
@@ -67,6 +70,30 @@ bike:
 		Start: 0
 
 bggy:
+	muzzle0: mgun-n
+		Start: 0
+		Length: *
+	muzzle1: mgun-nw
+		Start: 0
+		Length: *
+	muzzle2: mgun-w
+		Start: 0
+		Length: *
+	muzzle3: mgun-sw
+		Start: 0
+		Length: *
+	muzzle4: mgun-s
+		Start: 0
+		Length: *
+	muzzle5: mgun-se
+		Start: 0
+		Length: *
+	muzzle6: mgun-e
+		Start: 0
+		Length: *
+	muzzle7: mgun-ne
+		Start: 0
+		Length: *
 	icon: bggyicon
 		Start: 0
 
@@ -83,6 +110,9 @@ sonic:
 		Start: 0
 
 ttnk:
+	muzzle: gunfire
+		Start: 0
+		Length: *
 	icon: tickicon
 		Start: 0
 
@@ -104,6 +134,9 @@ mmch:
 	turret:
 		Start: 120
 		Facings: -32
+	muzzle: gunfire
+		Start: 0
+		Length: *
 	icon: mmchicon
 		Start: 0
 

From 9d5228d14144ec8723deaed728bb04894b25497f Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 21:51:21 +0200
Subject: [PATCH 06/14] Set Tick value for various TS infantry sequences to 80

---
 mods/ts/sequences/infantry.yaml | 225 +++++++++++++++++++++++++++++---
 1 file changed, 205 insertions(+), 20 deletions(-)

diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml
index 06e3f218d8..f9cce3fd00 100644
--- a/mods/ts/sequences/infantry.yaml
+++ b/mods/ts/sequences/infantry.yaml
@@ -35,35 +35,43 @@ e1:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: infdie
 		Start: 0
 		Length: *
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: e1icon
 		Start: 0
 
@@ -104,35 +112,43 @@ e2:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: infdie
 		Start: 0
 		Length: *
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: e2icon
 		Start: 0
 
@@ -173,35 +189,43 @@ e3:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: infdie
 		Start: 0
 		Length: *
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: e4icon
 		Start: 0
 
@@ -220,14 +244,17 @@ weedguy:
 		Start: 56
 		Length: 1
 		Facings: 8
+		Tick: 80
 	prone-shoot: weed
 		Start: 212
 		Length: 6
 		Facings: 8
+		Tick: 80
 	standup-0: weed
 		Start: 260
 		Length: 2
 		Facings: 8
+		Tick: 80
 	prone-run: weed
 		Start: 86
 		Length: 6
@@ -244,25 +271,31 @@ weedguy:
 		Start: 160
 		Length: 6
 		ShadowStart: 362
+		Tick: 80
 	die1: weed
 		Start: 149
 		Length: 11
 		ShadowStart: 351
+		Tick: 80
 	die3: weed
 		Start: 166
 		Length: 10
 		ShadowStart: 368
+		Tick: 80
 	die4: weed
 		Start: 197
 		Length: 5
 		ShadowStart: 399
+		Tick: 80
 	die5: weed
 		Start: 177
 		Length: 19
 		ShadowStart: 379
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: weaticon
 		Start: 0
 
@@ -303,37 +336,46 @@ medic:
 		Start: 134
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 455
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 455
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 567
+		Tick: 80
 	heal:
 		Start: 292
 		Length: 14
 		ShadowStart: 599
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mediicon
 		Start: 0
 
@@ -374,26 +416,32 @@ engineer:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: engnicon
 		Start: 0
 
@@ -434,36 +482,44 @@ umagon:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: umagicon
 		Start: 0
 
@@ -504,36 +560,44 @@ ghost: # TODO unused GUNFIRE.SHP
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: gosticon
 		Start: 0
 
@@ -572,36 +636,44 @@ jumpjet: # TODO: ShadowStart:
 		Start: 134
 		Length: 15
 		ShadowStart: 585
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 600
+		Tick: 80
 	die3: #TODO: animation doesn't fit this InfDeath
 		Start: 436
 		Length: 15
 		ShadowStart: 887
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 615
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 663
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 711
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: jjeticon
 		Start: 0
 
@@ -642,36 +714,44 @@ mhijack:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mutcicon
 		Start: 0
 
@@ -712,36 +792,44 @@ chamspy:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: chamicon
 		Start: 0
 
@@ -782,35 +870,43 @@ cyc2:
 		Start: 182
 		Length: 15
 		ShadowStart: 490
+		Tick: 80
 	die2:
 		Start: 197
 		Length: 15
 		ShadowStart: 505
+		Tick: 80
 	die3: infexpl
 		Start: 0
 		Length: *
+		Tick: 80
 	shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 520
+		Tick: 80
 	prone-shoot:
 		Start: 260
 		Length: 6
 		Facings: 8
 		ShadowStart: 568
+		Tick: 80
 	standup-0: # TODO: N/A as they only crawl when severly damaged
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 568
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: cybcicon
 		Start: 0
 
@@ -823,7 +919,7 @@ cyborg:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 378
 	idle1:
 		Start: 56
@@ -839,7 +935,7 @@ cyborg:
 		Start: 86
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 456
 	prone-stand:
 		Start: 86
@@ -851,36 +947,44 @@ cyborg:
 		Start: 134
 		Length: 15
 		ShadowStart: 504
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 519
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 534
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 582
+		Tick: 80
 	standup-0: # TODO: N/A as they don't do that
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 630
+		Tick: 80
 	die5: # TODO: unused running frame 322 and following
 		Start: 292
 		Length: 14
 		ShadowStart: 662
+		Tick: 80
 	die3:
 		Start: 307
 		Length: 14
 		ShadowStart: 677
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: cybiicon
 		Start: 0
 
@@ -893,7 +997,7 @@ mutant:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 300
 	idle1:
 		Start: 56
@@ -909,7 +1013,7 @@ mutant:
 		Start: 86
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 378
 	prone-stand:
 		Start: 86
@@ -921,36 +1025,44 @@ mutant:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mutcicon
 		Start: 0
 
@@ -963,7 +1075,7 @@ mwmn:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 300
 	idle1:
 		Start: 56
@@ -979,7 +1091,7 @@ mwmn:
 		Start: 86
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 378
 	prone-stand:
 		Start: 86
@@ -991,36 +1103,44 @@ mwmn:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mutcicon
 		Start: 0
 
@@ -1033,7 +1153,7 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 300
 	idle1:
 		Start: 56
@@ -1049,7 +1169,7 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-
 		Start: 86
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 378
 	prone-stand:
 		Start: 86
@@ -1061,36 +1181,44 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mutcicon
 		Start: 0
 
@@ -1103,7 +1231,7 @@ tratos:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 300
 	idle1:
 		Start: 56
@@ -1119,7 +1247,7 @@ tratos:
 		Start: 86
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 378
 	prone-stand:
 		Start: 86
@@ -1131,36 +1259,44 @@ tratos:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mutcicon
 		Start: 0
 
@@ -1173,7 +1309,7 @@ oxanna:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 300
 	idle1:
 		Start: 56
@@ -1189,7 +1325,7 @@ oxanna:
 		Start: 86
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 378
 	prone-stand:
 		Start: 86
@@ -1201,36 +1337,44 @@ oxanna:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mutcicon
 		Start: 0
 
@@ -1243,7 +1387,7 @@ slav:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 300
 	idle1:
 		Start: 56
@@ -1259,7 +1403,7 @@ slav:
 		Start: 86
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 378
 	prone-stand:
 		Start: 86
@@ -1271,36 +1415,44 @@ slav:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 456
+		Tick: 80
 	prone-shoot:
 		Start: 212
 		Length: 6
 		Facings: 8
 		ShadowStart: 504
+		Tick: 80
 	standup-0:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: mutcicon
 		Start: 0
 
@@ -1313,33 +1465,39 @@ doggie: # TODO: not sure what frame 88 and following is
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 100
+		Tick: 80
 		ShadowStart: 127
 	die1:
 		Start: 99
 		Length: 10
 		ShadowStart: 218
+		Tick: 80
 	die2:
 		Start: 99
 		Length: 10
 		ShadowStart: 218
+		Tick: 80
 	die3:
 		Start: 99
 		Length: 10
 		ShadowStart: 218
+		Tick: 80
 	shoot:
 		Start: 56
 		Length: 4
 		Facings: 8
 		ShadowStart: 175
+		Tick: 80
 	die5:
 		Start: 109
 		Length: 10
 		ShadowStart: 228
+		Tick: 80
 	die6:
 		Start: 109
 		Length: 10
 		ShadowStart: 228
+		Tick: 80
 	icon: xxicon
 		Start: 0
 
@@ -1374,40 +1532,49 @@ civ1:
 		Length: 6
 		Facings: 8
 		ShadowStart: 300
+		Tick: 80
 	panic-stand:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	panic-run:
 		Start: 86
 		Length: 6
 		Facings: 8
 		ShadowStart: 378
+		Tick: 80
 	shoot:
 		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 457
+		Tick: 80
 	die1:
 		Start: 134
 		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: xxicon
 		Start: 0
 
@@ -1421,40 +1588,49 @@ civ2:
 		Length: 6
 		Facings: 8
 		ShadowStart: 300
+		Tick: 80
 	panic-stand:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	panic-run:
 		Start: 86
 		Length: 6
 		Facings: 8
 		ShadowStart: 378
+		Tick: 80
 	shoot:
-		Start: 165
+		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 457
+		Tick: 80
 	die1:
 		Start: 134
-		Length: 14
+		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: xxicon
 		Start: 0
 
@@ -1468,39 +1644,48 @@ civ3:
 		Length: 6
 		Facings: 8
 		ShadowStart: 300
+		Tick: 80
 	panic-stand:
 		Start: 260
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
+		Tick: 80
 	panic-run:
 		Start: 86
 		Length: 6
 		Facings: 8
 		ShadowStart: 378
+		Tick: 80
 	shoot:
-		Start: 165
+		Start: 164
 		Length: 6
 		Facings: 8
 		ShadowStart: 457
+		Tick: 80
 	die1:
 		Start: 134
-		Length: 14
+		Length: 15
 		ShadowStart: 426
+		Tick: 80
 	die2:
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die3: # TODO: copy-paste of die2
 		Start: 149
 		Length: 15
 		ShadowStart: 441
+		Tick: 80
 	die5: flameguy # TODO: walking animation unused
 		Start: 42
 		Length: 104
 		ShadowStart: 190
+		Tick: 80
 	die6: electro
 		Start: 0
 		Length: *
+		Tick: 80
 	icon: xxicon
-		Start: 0
\ No newline at end of file
+		Start: 0

From 425d02e86bf7ae5f8f50fc654ca72022a1ef8812 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:01:13 +0200
Subject: [PATCH 07/14] Adds several previously missing weapons, resets Versus
 values to original TS values

Fixes flameall.shp to cover 8 directions instead of only 4
---
 mods/ts/bits/flameall.shp   | Bin 0 -> 35494 bytes
 mods/ts/rules/defaults.yaml |   3 +
 mods/ts/weapons.yaml        | 364 ++++++++++++++++++++++++++----------
 3 files changed, 273 insertions(+), 94 deletions(-)
 create mode 100644 mods/ts/bits/flameall.shp

diff --git a/mods/ts/bits/flameall.shp b/mods/ts/bits/flameall.shp
new file mode 100644
index 0000000000000000000000000000000000000000..ffa4df5ffd7541aab0a86968c518f2213a38242c
GIT binary patch
literal 35494
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
E6)Gk&`v3p{

literal 0
HcmV?d00001

diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 2ec88c177c..5c65dcfac7 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -215,6 +215,9 @@
 	Huntable:
 	LuaScriptEvents:
 	ScriptTriggers:
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 
 ^Helicopter:
 	AppearsOnRadar:
diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml
index 427ab893db..23260ac305 100644
--- a/mods/ts/weapons.yaml
+++ b/mods/ts/weapons.yaml
@@ -1,3 +1,29 @@
+UnitExplode:
+	Warhead:
+		Damage: 500
+		Spread: 426
+		Versus:
+			None: 90%
+			Wood: 75%
+			Light: 60%
+			Heavy: 25%
+		Explosion: large_twlt
+		InfDeath: 2
+		ImpactSound: expnew09.aud
+
+UnitExplodeSmall:
+	Warhead:
+		Damage: 40
+		Spread: 426
+		Versus:
+			None: 90%
+			Wood: 75%
+			Light: 60%
+			Heavy: 25%
+		Explosion: medium_brnl
+		InfDeath: 2
+		ImpactSound: expnew13.aud
+
 Minigun:
 	ROF: 21
 	Range: 4c0
@@ -7,13 +33,13 @@ Minigun:
 	Warhead:
 		Spread: 128
 		Versus:
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
-		Damage: 15
+		Damage: 12
 
 Grenade:
 	ROF: 60
@@ -26,12 +52,13 @@ Grenade:
 		Inaccuracy: 554
 		Image: DISCUS
 	Warhead:
-		Spread: 256
+		Spread: 171
 		Versus:
-			None: 50%
-			Wood: 100%
-			Light: 25%
-			Heavy: 5%
+			None: 100%
+			Wood: 85%
+			Light: 70%
+			Heavy: 35%
+			Concrete: 28%
 		InfDeath: 3
 		Damage: 40
 		Explosion: large_grey_explosion
@@ -55,10 +82,11 @@ Bazooka:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 10%
-			Wood: 75%
-			Light: 35%
-			Concrete: 20%
+			None: 25%
+			Wood: 65%
+			Light: 75%
+			Heavy: 100%
+			Concrete: 60%
 		InfDeath: 2
 		Damage: 25
 		Explosion: small_clsn
@@ -82,10 +110,11 @@ MultiCluster:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 10%
-			Wood: 75%
-			Light: 35%
-			Concrete: 20%
+			None: 25%
+			Wood: 65%
+			Light: 75%
+			Heavy: 100%
+			Concrete: 60%
 		InfDeath: 3
 		Damage: 65
 		Explosion: large_explosion
@@ -118,9 +147,10 @@ Sniper:
 		Spread: 42
 		Versus:
 			None: 100%
-			Wood: 5%
-			Light: 5%
-			Heavy: 5%
+			Wood: 0%
+			Light: 0%
+			Heavy: 0%
+			Concrete: 0%
 		InfDeath: 1
 
 M1Carbine:
@@ -132,10 +162,10 @@ M1Carbine:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 100%
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
+			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
 		Damage: 15
@@ -144,18 +174,45 @@ LtRail:
 	ROF: 60
 	Range: 6c0
 	Report: BIGGGUN1.AUD
-	Projectile: Bullet
+	Projectile: LaserZap
 		Speed: 1c682
+		BeamWidth: 1
+		BeamDuration: 10
+		Color: 200,0,128,255
 	Warhead:
 		Damage: 150
 		Spread: 42
 		Versus:
 			None: 100%
-			Wood: 5%
-			Light: 5%
-			Heavy: 5%
+			Wood: 130%
+			Light: 150%
+			Heavy: 110%
+			Concrete: 5%
 		InfDeath: 2
 
+CyCannon:
+	ROF: 50
+	Range: 7c0
+	Report: SCRIN5B.AUD
+	ValidTargets: Ground
+	Projectile: Bullet
+		Speed: 192
+		High: yes
+		Shadow: yes
+		Image: TORPEDO
+	Warhead:
+		Spread: 256
+		Versus:
+			None: 100%
+			Wood: 65%
+			Light: 75%
+			Heavy: 50%
+			Concrete: 40%
+		InfDeath: 6
+		Damage: 120
+		Explosion: large_bang
+		ImpactSound: expnew12.aud
+
 Vulcan3:
 	ROF: 30
 	Burst: 3
@@ -166,9 +223,9 @@ Vulcan3:
 	Warhead:
 		Spread: 128
 		Versus:
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
@@ -200,10 +257,11 @@ Vulcan:
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead:
+		Spread: 128
 		Versus:
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
@@ -221,9 +279,9 @@ FiendShard:
 		Angle: 88
 	Warhead:
 		Versus:
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		InfDeath: 1
 		Damage: 35
@@ -236,10 +294,11 @@ JumpCannon:
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead:
+		Spread: 128
 		Versus:
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
@@ -264,10 +323,11 @@ HoverMissile:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 10%
-			Wood: 75%
-			Light: 35%
-			Concrete: 20%
+			None: 25%
+			Wood: 65%
+			Light: 75%
+			Heavy: 100%
+			Concrete: 60%
 		InfDeath: 2
 		Damage: 30
 		Explosion: small_clsn
@@ -288,11 +348,11 @@ HoverMissile:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 30%
-			Wood: 75%
-			Light: 100%
+			None: 25%
+			Wood: 65%
+			Light: 75%
 			Heavy: 100%
-			Concrete: 100%
+			Concrete: 60%
 		InfDeath: 2
 		Damage: 50
 		Explosion: medium_clsn
@@ -315,12 +375,13 @@ MammothTusk:
 		Speed: 170
 		RangeLimit: 35
 	Warhead:
-		Spread: 256
+		Spread: 171
 		Versus:
-			None: 40%
-			Wood: 75%
-			Light: 75%
-			Heavy: 50%
+			None: 100%
+			Wood: 85%
+			Light: 70%
+			Heavy: 35%
+			Concrete: 28%
 		InfDeath: 3
 		Damage: 40
 		Explosion: medium_bang
@@ -383,11 +444,11 @@ SuicideBomb:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 30%
-			Wood: 75%
-			Light: 100%
+			None: 25%
+			Wood: 65%
+			Light: 75%
 			Heavy: 100%
-			Concrete: 100%
+			Concrete: 60%
 		InfDeath: 2
 		Damage: 70
 		Explosion: large_clsn
@@ -398,13 +459,18 @@ MechRailgun:
 	Range: 8c0
 	Burst: 2
 	BurstDelay: 10
-	Charges: yes
 	Report: RAILUSE5.AUD
 	Projectile: LaserZap
 		Color: 200,0,255,255
-		BeamWidth: 2
+		BeamWidth: 3
 	Warhead:
 		Spread: 42
+		Versus:
+			None: 200%
+			Wood: 175%
+			Light: 160%
+			Heavy: 100%
+			Concrete: 25%
 		InfDeath: 5
 		Damage: 200
 
@@ -417,9 +483,9 @@ AssaultCannon:
 	Warhead:
 		Spread: 128
 		Versus:
-			Wood: 100%
-			Light: 60%
-			Heavy: 40%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
@@ -445,10 +511,11 @@ BikeMissile:
 	Warhead:
 		Spread: 256
 		Versus:
-			None: 40%
-			Wood: 75%
+			None: 25%
+			Wood: 65%
 			Light: 75%
-			Heavy: 50%
+			Heavy: 100%
+			Concrete: 60%
 		InfDeath: 2
 		Damage: 40
 		Explosion: small_clsn
@@ -457,15 +524,17 @@ BikeMissile:
 RaiderCannon:
 	ROF: 55
 	Range: 4c0
+	Burst: 2	#purely cosmetical, for alternate muzzle position
+	BurstDelay: 55
 	Report: CHAINGN1.AUD
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead:
 		Spread: 128
 		Versus:
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
@@ -476,32 +545,36 @@ FireballLauncher:
 	Range: 4c256
 	Report: FLAMTNK1.AUD
 	Projectile: Bullet
-		Speed: 341
-	Burst: 2
-	BurstDelay: 25
+		Speed: 64
+		Image: FLAMEALL
+		Inacuracy: 384
+	Burst: 5
+	BurstDelay: 5
 	Warhead:
 		Spread: 341
 		Versus:
-			None: 100%
-			Wood: 100%
-			Light: 50%
-			Heavy: 25%
-			Concrete: 20%
+			None: 600%
+			Wood: 148%
+			Light: 59%
+			Heavy: 6%
+			Concrete: 2%
 		InfDeath: 5
-		Damage: 90
+		Damage: 25
 
 SonicZap:
 	ROF: 120
 	Range: 6c0
-	Burst: 2
-	BurstDelay: 10
 	Charges: yes
 	Report: SONIC4.AUD
 	Projectile: LaserZap
 		Color: 200,0,255,255
-		BeamWidth: 10
+		BeamWidth: 12
+		BeamDuration: 50
 	Warhead:
 		Spread: 42
+		Versus:
+			Heavy: 80%
+			Concrete: 60%
 		InfDeath: 5
 		Damage: 100
 
@@ -524,10 +597,11 @@ Dragon:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 10%
-			Wood: 75%
-			Light: 35%
-			Concrete: 20%
+			None: 25%
+			Wood: 65%
+			Light: 75%
+			Heavy: 100%
+			Concrete: 60%
 		InfDeath: 2
 		Damage: 30
 		Explosion: small_clsn
@@ -546,11 +620,11 @@ Dragon:
 	Warhead:
 		Spread: 128
 		Versus:
-			None: 30%
-			Wood: 75%
-			Light: 100%
+			None: 25%
+			Wood: 65%
+			Light: 75%
 			Heavy: 100%
-			Concrete: 100%
+			Concrete: 60%
 		InfDeath: 2
 		Damage: 36
 		Explosion: medium_clsn
@@ -668,9 +742,9 @@ HarpyClaw:
 	Warhead:
 		Spread: 128
 		Versus:
-			Wood: 25%
-			Light: 30%
-			Heavy: 10%
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
 			Concrete: 10%
 		Explosion: piffpiff
 		InfDeath: 1
@@ -685,10 +759,10 @@ Pistola:
 	Warhead:
 		Spread: 128
 		Versus:
-			Wood: 50%
-			Light: 60%
+			Wood: 60%
+			Light: 40%
 			Heavy: 25%
-			Concrete: 25%
+			Concrete: 10%
 		Explosion: piff
 		InfDeath: 1
 		Damage: 2
@@ -701,3 +775,105 @@ Tiberium:
 		Damage: 2
 		PreventProne: yes
 
+IonCannon:
+	ValidTargets: Ground, Air
+	Warhead@impact:
+		Damage: 1000
+		Spread: 1c0
+		InfDeath: 5
+		Explosion: ring1
+	Warhead@area:
+		DamageModel: PerCell
+		Damage: 250
+		SmudgeType: Scorch
+		Size: 2,1
+		Delay: 3
+		InfDeath: 5
+
+VulcanTower:
+	ROF: 26
+	Range: 6c0
+	Report: CHAINGN1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead:
+		Spread: 128
+		Versus:
+			Wood: 60%
+			Light: 40%
+			Heavy: 25%
+			Concrete: 10%
+		Explosion: piffpiff
+		InfDeath: 1
+		Damage: 18
+
+RPGTower:
+	ROF: 80
+	Range: 8c0
+	Report: GLNCH4.AUD
+	Palette: player
+	Projectile: Bullet
+		Speed: 384
+		Image: canister
+		Shadow: yes
+		Angle: 62
+	Warhead:
+		Spread: 128
+		Versus:
+			None: 30%
+			Wood: 75%
+			Light: 90%
+			Heavy: 100%
+			Concrete: 70%
+		InfDeath: 2
+		Damage: 110
+		Explosion: large_clsn
+		ImpactSound: expnew14.aud
+
+SAMTower:
+	ROF: 55
+	Range: 15c0
+	Report: SAMSHOT1.AUD
+	ValidTargets: Air
+	Palette: ra
+	Projectile: Missile
+		Speed: 298
+		Arm: 2
+		High: yes
+		Shadow: yes
+		Inaccuracy: 128
+		Image: DRAGON
+		ROT: 5
+		RangeLimit: 60
+	Warhead:
+		Spread: 128
+		InfDeath: 2
+		Damage: 33
+		Explosion: small_clsn
+		ImpactSound: expnew12.aud
+
+ObeliskLaser:
+	ROF: 120
+	Range: 10c512
+	Charges: true
+	Report: OBELRAY1.AUD
+	Projectile: LaserZap
+		BeamWidth: 4
+	Warhead:
+		Spread: 42
+		InfDeath: 5
+		SmudgeType: Scorch
+		Damage: 250
+
+TurretLaser:
+	ROF: 40
+	Range: 5c512
+	Report: LASTUR1.AUD
+	Projectile: LaserZap
+		BeamWidth: 2
+		BeamDuration: 5
+	Warhead:
+		Spread: 42
+		InfDeath: 5
+		SmudgeType: Scorch
+		Damage: 30

From 21625f56508bf3d7a8f918ff42fe71c9f8573bea Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:02:38 +0200
Subject: [PATCH 08/14] Fixes bounds, offsets, FireDelays and weapons for some
 infantry

---
 mods/ts/rules/infantry.yaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mods/ts/rules/infantry.yaml b/mods/ts/rules/infantry.yaml
index cab87f39e2..7a7dbe3f34 100644
--- a/mods/ts/rules/infantry.yaml
+++ b/mods/ts/rules/infantry.yaml
@@ -45,7 +45,7 @@ E2:
 	Armament:
 		Weapon: Grenade
 		LocalOffset: 0,0,555
-		FireDelay: 15
+		FireDelay: 5
 	AttackFrontal:
 	TakeCover:
 	-RenderInfantry:
@@ -73,7 +73,7 @@ E3:
 		Speed: 42
 	Armament@PRIMARY:
 		Weapon: Bazooka
-		LocalOffset: 0,0,555
+		LocalOffset: 128,0,640
 	AttackFrontal:
 	TakeCover:
 	-RenderInfantry:
@@ -101,9 +101,8 @@ WEEDGUY:
 	CrushableInfantry:
 		CrushSound: squish2.aud
 	Armament:
-		Weapon: MultiCluster
+		Weapon: FireballLauncher
 		LocalOffset: 85,0,384
-		FireDelay: 3
 	AttackFrontal:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -224,6 +223,7 @@ GHOST:
 		Range: 6c0
 	Armament:
 		Weapon: LtRail
+		LocalOffset: 85,0,384
 	CrushableInfantry:
 		CrushSound: squish2.aud
 	AttackFrontal:
@@ -311,7 +311,7 @@ CYBORG:
 	-CrushableInfantry:
 		CrushSound: squish2.aud
 	Selectable:
-		Bounds: 12,17,0,-6
+		Bounds: 14,30,0,-7
 		Voice: Cyborg
 	Mobile:
 		Speed: 56
@@ -344,7 +344,7 @@ CYC2:
 	-CrushableInfantry:
 		CrushSound: squish2.aud
 	Selectable:
-		Bounds: 12,17,0,-6
+		Bounds: 14,30,0,-7
 		Voice: CyborgCommando
 	Mobile:
 		Speed: 56
@@ -354,7 +354,8 @@ CYC2:
 	RevealsShroud:
 		Range: 7c0
 	Armament:
-		Weapon: Sniper
+		Weapon: CyCannon
+		LocalOffset: 170,85,683
 	AttackFrontal:
 	TakeCover:
 	-RenderInfantry:

From 06fc2a31d672073b5b4aff5b7da44caa85727293 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:05:31 +0200
Subject: [PATCH 09/14] Fixes offsets, adds muzzles and Turret ROT values for
 several vehicles.

Adds cloak sound to stealth tank.
---
 mods/ts/rules/vehicles.yaml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml
index 9025464ca8..a95a8a52c0 100644
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -118,6 +118,7 @@ HVR:
 		Weapon: HoverMissile
 	Turreted:
 		ROT: 7
+		Offset: -128,0,0
 	AttackTurreted:
 	AutoTarget:
 	RenderSprites:
@@ -149,8 +150,11 @@ HVR:
 		ROT: 3
 	Armament@PRIMARY:
 		Weapon: 120mmx
+		LocalOffset: 640,85,384, 640,-85,384
+		MuzzleSequence: muzzle
 	Armament@SECONDARY:
 		Weapon: MammothTusk
+		LocalOffset: 0,256,426, 0,-256,426
 	AttackTurreted:
 	AutoTarget:
 	SelfHealing:
@@ -162,6 +166,7 @@ HVR:
 	WithVoxelBody:
 	WithVoxelTurret:
 	WithVoxelBarrel:
+	WithMuzzleFlash:
 
 TRUCKB:
 	Inherits: ^Vehicle
@@ -482,6 +487,7 @@ MMCH:
 	RenderInfantry:
 		SpawnsCorpse: false
 	Turreted:
+		ROT: 5
 	AttackTurreted:
 	WithTurret:
 		Recoils: no
@@ -491,7 +497,7 @@ MMCH:
 		RecoilRecovery: 26
 	RenderVoxels:
 	WithVoxelBarrel:
-		LocalOffset: -128, 128, 213
+		LocalOffset: -128, 85, 256
 	AutoTarget:
 
 HMEC:
@@ -606,11 +612,15 @@ BGGY:
 		Range: 6c0
 	Armament:
 		Weapon: RaiderCannon
+		LocalOffset: 0,-43,384, 0,43,384
+		MuzzleSequence: muzzle
+		MuzzleSplitFacings: 8
 	AttackFrontal:
 	AutoTarget:
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody:
+	WithMuzzleFlash:
 
 SAPC:
 	Inherits: ^Vehicle
@@ -691,6 +701,8 @@ SONIC:
 		Weapon: SonicZap
 	AttackTurreted:
 	Turreted:
+		ROT: 5
+		Offset: -170,0,0
 	AutoTarget:
 	RenderSprites:
 	RenderVoxels:
@@ -749,8 +761,8 @@ STNK:
 	Cloak:
 		InitialDelay: 90
 		CloakDelay: 90
-		CloakSound:
-		UncloakSound:
+		CloakSound: cloak5.aud
+		UncloakSound: cloak5.aud
 	Armament:
 		Weapon: Dragon
 		LocalOffset: 213,43,128, 213,-43,128

From 467d1b613715989e479decbda30239d5f5b7f90d Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:09:19 +0200
Subject: [PATCH 10/14] Adds Scorch and Crater marks to world, adds Heavy start
 unit support for testing purposes

---
 mods/ts/rules/world.yaml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml
index dcac7c751a..6fd8631aa1 100644
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -104,12 +104,26 @@ World:
 		AllowedTerrainTypes: Clear
 		AllowUnderActors: false
 		TerrainType: Tiberium
+	SmudgeLayer@SCORCH:
+		Type: Scorch
+		Sequence: scorches
+		SmokePercentage: 50
+	SmudgeLayer@CRATER:
+		Type: Crater
+		Sequence: craters
 	PathfinderDebugOverlay:
 	SpawnMapActors:
 	CreateMPPlayers:
-	MPStartUnits:
+	MPStartUnits@MCV:
 		Races: gdi, nod
 		BaseActor: mcv
+	MPStartUnits@TEST:
+		Class: heavy
+		Races: gdi,nod
+		BaseActor: mcv
+		SupportActors: e1,e2,e3,cyborg,cyc2,jumpjet,umagon,ghost,mmch,smech,hmec,bggy,bike,art2,ttnk,hvr,sonic,subtank,repair,4tnk
+		InnerSupportRadius: 3
+		OuterSupportRadius: 5
 	MPStartLocations:
 	SpawnMPUnits:
 	PathFinder:

From 37f831ca9c52e30566409bed34b1f5dcfe531a6c Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:23:43 +0200
Subject: [PATCH 11/14] Adds defenses and advanced Nod power plant, fixes GDI
 radar dish animation

Additionally tweaks offsets for deployed artillery and tick tank.
---
 mods/ts/rules/structures.yaml     | 306 +++++++++++++++++++++++++++++-
 mods/ts/sequences/structures.yaml | 257 +++++++++++++++++++++++--
 mods/ts/sequences/voxels.yaml     |   8 +-
 3 files changed, 550 insertions(+), 21 deletions(-)

diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index b7df463bf1..2ad1f4e5dc 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -212,6 +212,34 @@ NAPOWR:
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
 
+NAAPWR:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 5
+		Prerequisites: factory
+		Owner: nod
+		Hotkey: p
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: Advanced Power Plant
+		Description: Provides more power for structures
+	ProvidesCustomPrerequisite:
+		Prerequisite: anypower
+	Building:
+		Power: 200
+		Footprint: xxx xxx
+		Dimensions: 2,3
+	Health:
+		HP: 900
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 4c0
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+
 NAHAND:
 	Inherits: ^Building
 	Buildable:
@@ -380,23 +408,29 @@ GATICK:
 	Turreted:
 		ROT: 6
 		InitialFacing: 128
+		Offset: 170,0,213
 	Armament:
 		Weapon: 90mm
+		LocalOffset: 384,0,128
+		MuzzleSequence: muzzle
 	AttackTurreted:
+	BodyOrientation:
+		QuantizedFacings: 32
 	AutoTarget:
 	RenderRangeCircle:
 	DrawLineToTarget:
 	RenderBuilding:
 	RenderVoxels:
-		Image: ttnk
 	WithVoxelBarrel:
+		LocalOffset: 170,0,0
 	WithVoxelTurret:
 	Transforms:
 		IntoActor: ttnk
 		Offset: 1,1
 		Facing: 96
-		TransformSounds:
+		TransformSounds: place2.aud
 		NoTransformSounds:
+	WithMuzzleFlash:
 
 GAICBM:
 	Inherits: ^Building
@@ -419,7 +453,7 @@ GAICBM:
 		IntoActor: icbm
 		Offset: 1,1
 		Facing: 96
-		TransformSounds:
+		TransformSounds: place2.aud
 		NoTransformSounds:
 
 GADPSA:
@@ -443,7 +477,7 @@ GADPSA:
 		IntoActor: lpst
 		Offset: 1,1
 		Facing: 96
-		TransformSounds:
+		TransformSounds: place2.aud
 		NoTransformSounds:
 	RenderDetectionCircle:
 	DetectCloaked:
@@ -471,23 +505,29 @@ GAARTY:
 	Turreted:
 		ROT: 5
 		InitialFacing: 128
+		Offset: 0,0,171
 	Armament:
 		Weapon: 155mm
+		LocalOffset: 811,0,0
+		MuzzleSequence: muzzle
 	AttackTurreted:
+	BodyOrientation:
+		QuantizedFacings: 32
 	AutoTarget:
 	RenderRangeCircle:
 	DrawLineToTarget:
 	RenderBuilding:
 	RenderVoxels:
-		Image: art2
 	WithVoxelBarrel:
+		LocalOffset: 0,0,-512
 	WithVoxelTurret:
 	Transforms:
 		IntoActor: art2
 		Offset: 1,1
 		Facing: 96
-		TransformSounds:
+		TransformSounds: place2.aud
 		NoTransformSounds:
+	WithMuzzleFlash:
 
 GASPOT:
 	Inherits: ^Building
@@ -769,6 +809,260 @@ GADEPT:
 	WithRepairOverlay@PLATFORM:
 		Sequence: platform
 
+GAVULC:
+	Inherits: ^Building
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: Vulcan Tower
+		Description: Basic base defense. \nRequires no power to operate.\n  Strong vs infantry and light armor\n  Cannot target Aircraft
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 30
+		Owner: gdi
+	Building:
+		Power: -20
+	DisabledOverlay:
+	-GivesBuildableArea:
+	Health:
+		HP: 500
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 6c0
+	BodyOrientation:
+		QuantizedFacings: 32
+	RenderRangeCircle:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 5
+	AutoTarget:
+	Turreted:
+		ROT: 10
+		InitialFacing: 50
+	AttackTurreted:
+	WithTurret:
+		Recoils: no
+	Armament@PRIMARY:
+		Weapon: VulcanTower
+		LocalOffset: 768,85,512
+		Recoil: 0
+		MuzzleSequence: muzzle
+		MuzzleSplitFacings: 8
+	Armament@SECONDARY:
+		Name: secondary
+		Weapon: VulcanTower
+		LocalOffset: 768,-85,512
+		Recoil: 0
+		MuzzleSequence: muzzle
+		MuzzleSplitFacings: 8
+	WithMuzzleFlash:
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+
+GAROCK:
+	Inherits: ^Building
+	Valued:
+		Cost: 1000
+	Tooltip:
+		Name: RPG Tower
+		Description: GDI Advanced base defense.\nRequires power to operate.\n  Strong vs armored ground units\n  Cannot target Aircraft
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 40
+		Owner: gdi
+	Building:
+		Power: -50
+	RequiresPower:
+	DisabledOverlay:
+	-GivesBuildableArea:
+	Health:
+		HP: 500
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 6c0
+	BodyOrientation:
+		QuantizedFacings: 32
+	RenderRangeCircle:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 5
+	AutoTarget:
+	Turreted:
+		ROT: 10
+		InitialFacing: 50
+	AttackTurreted:
+	WithTurret:
+		Recoils: no
+	Armament:
+		Weapon: RPGTower
+		LocalOffset: 512,-128,512
+		Recoil: 0
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+
+GACSAM:
+	Inherits: ^Building
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: S.A.M. Tower
+		Description: GDI Anti-Air base defense. \nRequires power to operate.\n  Strong vs all Aircraft\n  Cannot target ground units
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 60
+		Owner: gdi
+	Building:
+		Power: -30
+	RequiresPower:
+	DisabledOverlay:
+	-GivesBuildableArea:
+	Health:
+		HP: 500
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 6c0
+	BodyOrientation:
+		QuantizedFacings: 32
+	RenderRangeCircle:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 5
+	AutoTarget:
+	Turreted:
+		ROT: 10
+		InitialFacing: 50
+	AttackTurreted:
+	WithTurret:
+		Recoils: no
+	Armament:
+		Weapon: SAMTower
+		LocalOffset: 512,0,512
+		Recoil: 0
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+
+NASAM:
+	Inherits: ^Building
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: S.A.M. Site
+		Description: Nod Anti-Air base defense. \nRequires power to operate.\n  Strong vs all Aircraft\n  Cannot target ground units
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 60
+		Owner: nod
+	Building:
+		Power: -30
+	RequiresPower:
+	DisabledOverlay:
+	-GivesBuildableArea:
+	Health:
+		HP: 500
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 6c0
+	BodyOrientation:
+		QuantizedFacings: 32
+	RenderRangeCircle:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 5
+	AutoTarget:
+	Turreted:
+		ROT: 10
+		InitialFacing: 50
+	AttackTurreted:
+	WithTurret:
+		Recoils: no
+	Armament:
+		Weapon: SAMTower
+		LocalOffset: 512,0,512
+		Recoil: 0
+
+NALASR:
+	Inherits: ^Building
+	Valued:
+		Cost: 500
+	Tooltip:
+		Name: Laser Turret
+		Description: Basic base defense. \nRequires power to operate.\n  Strong vs all ground units\n  Cannot target Aircraft
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 50
+		Owner: nod
+	Building:
+		Power: -40
+	RequiresPower:
+	DisabledOverlay:
+	-GivesBuildableArea:
+	Health:
+		HP: 400
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 5c0
+	RenderRangeCircle:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 3
+	Turreted:
+		ROT: 10
+		InitialFacing: 300
+		Offset: 298,-171,256
+	AttackTurreted:
+	Armament:
+		Weapon: TurretLaser
+	RenderVoxels:
+	WithVoxelTurret:
+	AutoTarget:
+
+NAOBEL:
+	Inherits: ^Building
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Obelisk of Light
+		Description: Advanced base defense. \nRequires power to operate.\n  Strong vs all ground units\n  Cannot target Aircraft
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 90
+		Prerequisites: tech
+		Owner: nod
+	Building:
+		Power: -150
+		Footprint: xx xx
+		Dimensions: 2,2
+	RequiresPower:
+	DisabledOverlay:
+	-GivesBuildableArea:
+	Health:
+		HP: 600
+	Armor:
+		Type: Heavy
+	RevealsShroud:
+		Range: 8c0
+	RenderBuildingCharge:
+		ChargeAudio: obelpowr.aud
+	Armament:
+		Weapon: ObeliskLaser
+		LocalOffset: 0,0,725
+	AttackCharge:
+		ReloadTime: 50
+		InitialChargeDelay: 50
+	AutoTarget:
+	-RenderBuilding:
+	RenderRangeCircle:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 5
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+
 ANYPOWER:
 	Tooltip:
 		Name: Power Plant
diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml
index c625534e26..e8ad196076 100644
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -222,6 +222,35 @@ napowr:
 	icon: npwricon
 		Start: 0
 
+naapwr:
+	idle: ntapwr
+		Start: 0
+		ShadowStart: 3
+	damaged-idle: ntapwr
+		Start: 1
+		ShadowStart: 4
+	critical-idle: ntapwr
+		Start: 2
+		ShadowStart: 5
+	idle-lights: ntapwr_a
+		Start: 0
+		Length: 9
+		Tick: 200
+	damaged-idle-lights: ntapwr_a
+		Start: 9
+		Length: 9
+		Tick: 200
+	critical-idle-lights: ntapwr_a
+		Start: 9
+		Length: 9
+		Tick: 200
+	make: ntapwrmk
+		Start: 0
+		Length: 19
+		ShadowStart: 19
+	icon: apwricon
+		Start: 0
+
 nahand:
 	idle: nthand
 		Start: 0
@@ -303,9 +332,9 @@ naradr:
 	damaged-idle: ntradr
 		Start: 1
 		ShadowStart: 4
-	critical-idle: ntradr
-		Start: 2
-		ShadowStart: 5
+#	critical-idle: ntradr	#shows a destroyed dish
+#		Start: 2
+#		ShadowStart: 5
 	idle-dish: ntradr_a
 		Start: 0
 		Length: 24
@@ -357,17 +386,17 @@ garadr:
 	damaged-idle: gtradr
 		Start: 1
 		ShadowStart: 4
-	critical-idle: gtradr
-		Start: 2
-		ShadowStart: 5
-	idle-dish: gtradr_a # TODO: needs to ping-pong
-		Start: 0
-		Length: 15
-		Tick: 120
-	damaged-idle-dish: gtradr_a # TODO: needs to ping-pong
-		Start: 15
-		Length: 15
-		Tick: 160
+#	critical-idle: gtradr	#shows a destroyed radar dish
+#		Start: 2
+#		ShadowStart: 5
+	idle-dish: gtradr_a
+		Frames: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
+		Length: 28
+		Tick: 200
+	damaged-idle-dish: gtradr_a
+		Frames: 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16
+		Length: 28
+		Tick: 240
 	make: gtradrmk
 		Start: 0
 		Length: 20
@@ -453,14 +482,20 @@ gatick:
 		Start: 0
 		Facings: 1
 		ShadowStart: 3
+		Offset: 0,-13
 	damaged-idle:
 		Start: 1
 		Facings: 1
 		ShadowStart: 4
+		Offset: 0,-13
+	muzzle: gunfire
+		Start: 0
+		Length: *
 	make: gatickmk
 		Start: 0
 		Length: 24
 		ShadowStart: 24
+		Offset: 0,-13
 
 gaicbm:
 	idle:
@@ -495,14 +530,207 @@ gaarty:
 		Start: 0
 		Facings: 1
 		ShadowStart: 3
+		Offset: 0,-12
 	damaged-idle:
 		Start: 1
 		Facings: 1
 		ShadowStart: 4
+		Offset: 0,-12
+	muzzle: gunfire
+		Start: 0
+		Length: *
 	make: gaartymk
 		Start: 0
 		Length: 16
 		ShadowStart: 16
+		Offset: 0,-12
+
+naobel:
+	idle: ntobel
+		Start: 0
+		ShadowStart: 3
+	damaged-idle: ntobel
+		Start: 1
+		ShadowStart: 4
+	critical-idle: ntobel
+		Start: 2
+		ShadowStart: 5
+	active: ntobel #placeholder until Charge supports overlays
+		Start: 0
+		Length: 1
+		ShadowStart: 3
+#	active: ntobel_b
+#		Start: 0
+#		Length: 12
+#		Tick: 240
+	idle-lights: ntobel_a
+		Start: 0
+		Length: 12
+		Tick: 80
+	make: ntobelmk
+		Start: 0
+		Length: 19
+		ShadowStart: 19
+	icon: obliicon
+		Start: 0
+
+nalasr:
+	idle: ntlasr
+		Start: 0
+		ShadowStart: 3
+	damaged-idle: ntlasr
+		Start: 1
+		ShadowStart: 4
+	critical-idle: ntlasr
+		Start: 2
+		ShadowStart: 5
+	make: ntlasrmk
+		Start: 0
+		Length: 21
+		ShadowStart: 21
+	icon: plticon
+		Start: 0
+
+nasam:
+	idle: ntsam
+		Start: 0
+		ShadowStart: 3
+	damaged-idle: ntsam
+		Start: 1
+		ShadowStart: 4
+	critical-idle: ntsam
+		Start: 2
+		ShadowStart: 5
+	turret: gtctwr_d
+		Start: 0
+		Facings: 32
+		Offset: 0,20
+	make: ntsammk
+		Start: 0
+		Length: 8
+		ShadowStart: 8
+	icon: samicon
+		Start: 0
+
+gavulc:
+	idle: gtctwr
+		Start: 0
+		ShadowStart: 3
+	damaged-idle: gtctwr
+		Start: 1
+		ShadowStart: 4
+	critical-idle: gtctwr
+		Start: 2
+		ShadowStart: 5
+	turret: gtctwr_b
+		Start: 0
+		Facings: 32
+	muzzle0: mgun-n
+		Start: 0
+		Length: *
+	muzzle1: mgun-nw
+		Start: 0
+		Length: *
+	muzzle2: mgun-w
+		Start: 0
+		Length: *
+	muzzle3: mgun-sw
+		Start: 0
+		Length: *
+	muzzle4: mgun-s
+		Start: 0
+		Length: *
+	muzzle5: mgun-se
+		Start: 0
+		Length: *
+	muzzle6: mgun-e
+		Start: 0
+		Length: *
+	muzzle7: mgun-ne
+		Start: 0
+		Length: *
+	idle-lights: gtctwr_a
+		Start: 0
+		Length: 6
+		Tick: 200
+	damaged-idle-lights: gtctwr_a
+		Start: 0
+		Length: 6
+		Tick: 200
+	critical-idle-lights: gtctwr_a
+		Start: 6
+		Length: 6
+		Tick: 200
+	make: gtctwrmk
+		Start: 0
+		Length: 11
+		ShadowStart: 11
+	icon: twr1icon
+		Start: 0
+
+garock:
+	idle: gtctwr
+		Start: 0
+		ShadowStart: 3
+	damaged-idle: gtctwr
+		Start: 1
+		ShadowStart: 4
+	critical-idle: gtctwr
+		Start: 2
+		ShadowStart: 5
+	turret: gtctwr_c
+		Start: 0
+		Facings: 32
+	idle-lights: gtctwr_a
+		Start: 0
+		Length: 6
+		Tick: 200
+	damaged-idle-lights: gtctwr_a
+		Start: 0
+		Length: 6
+		Tick: 200
+	critical-idle-lights: gtctwr_a
+		Start: 6
+		Length: 6
+		Tick: 200
+	make: gtctwrmk
+		Start: 0
+		Length: 11
+		ShadowStart: 11
+	icon: twr2icon
+		Start: 0
+
+gacsam:
+	idle: gtctwr
+		Start: 0
+		ShadowStart: 3
+	damaged-idle: gtctwr
+		Start: 1
+		ShadowStart: 4
+	critical-idle: gtctwr
+		Start: 2
+		ShadowStart: 5
+	turret: gtctwr_d
+		Start: 0
+		Facings: 32
+	idle-lights: gtctwr_a
+		Start: 0
+		Length: 6
+		Tick: 200
+	damaged-idle-lights: gtctwr_a
+		Start: 0
+		Length: 6
+		Tick: 200
+	critical-idle-lights: gtctwr_a
+		Start: 6
+		Length: 6
+		Tick: 200
+	make: gtctwrmk
+		Start: 0
+		Length: 11
+		ShadowStart: 11
+	icon: twr3icon
+		Start: 0
 
 gaspot:
 	idle:
@@ -660,6 +888,7 @@ galite:
 #		BlendMode: Alpha
 	icon: liteicon
 		Start: 0
+
 gadept:
 	idle:
 		Start: 0
diff --git a/mods/ts/sequences/voxels.yaml b/mods/ts/sequences/voxels.yaml
index 7db3f18756..4b8029bfbf 100644
--- a/mods/ts/sequences/voxels.yaml
+++ b/mods/ts/sequences/voxels.yaml
@@ -12,6 +12,8 @@ apc: # TODO apcw in water
 
 art2:
 	idle:
+
+gaarty:
 	turret: art2tur
 	barrel: art2barl
 
@@ -20,7 +22,9 @@ subtank:
 
 bggy:
 	idle:
-#	muzzle: # TODO: use MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW
+
+nalasr:
+	turret: laser
 
 sapc:
 	idle:
@@ -30,6 +34,8 @@ bike:
 
 ttnk:
 	idle:
+
+gatick:
 	turret: ttnktur
 	barrel: ttnkbarl
 

From ee77be25d6c1f2500931fb649136a8d7349ec526 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:25:38 +0200
Subject: [PATCH 12/14] adds disabled voxel sequences for various unused voxels
 for possible use later on

---
 mods/ts/sequences/voxels.yaml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/mods/ts/sequences/voxels.yaml b/mods/ts/sequences/voxels.yaml
index 4b8029bfbf..8caf4b2f24 100644
--- a/mods/ts/sequences/voxels.yaml
+++ b/mods/ts/sequences/voxels.yaml
@@ -121,6 +121,40 @@ sonic:
 #utnk: # TODO: unused alternative version of Devil's Tongue
 #	idle:
 
+#mrj: # TODO: unused
+#	idle:
+#	turret: mrjtur
+
+#m113: # TODO: unused
+#	idle:
+#	turret: m113tur
+
+#mlrs: # TODO: unused
+#	idle:
+#	turret: mlrstur
+
+#arty: # TODO: unused
+#	idle:
+#	barrel: artybarl
+
+#1tnk: # TODO: unused
+#	idle:
+#	turret: 1tnktur
+#	barrel: 1tnkbarl
+
+#2tnk: # TODO: unused
+#	idle:
+#	turret: 2tnktur
+#	barrel: 2tnkbarl
+
+#3tnk: # TODO: unused
+#	idle:
+#	turret: 3tnktur
+#	barrel: 3tnkbarl
+
+#ftnk: # TODO: unused
+#	idle:
+
 #tire: # TODO: unused debris
 #	idle:
 

From 4aafd4ecf4ed62be58365d49c2a2b547ce37c843 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:36:57 +0200
Subject: [PATCH 13/14] Adds TODO comments to GDI placeholder defenses

---
 mods/ts/rules/structures.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index 2ad1f4e5dc..77faa36515 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -809,6 +809,7 @@ GADEPT:
 	WithRepairOverlay@PLATFORM:
 		Sequence: platform
 
+#TODO: Placeholder, replace with Component Tower + Vulcan Upgrade
 GAVULC:
 	Inherits: ^Building
 	Valued:
@@ -860,6 +861,7 @@ GAVULC:
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
 
+#TODO: Placeholder, replace with Component Tower + RPG Upgrade
 GAROCK:
 	Inherits: ^Building
 	Valued:
@@ -902,6 +904,7 @@ GAROCK:
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
 
+#TODO: Placeholder, replace with Component Tower + SAM Upgrade
 GACSAM:
 	Inherits: ^Building
 	Valued:

From e1b78bc728a3974372ae361343159a0075b67d1a Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 22 May 2014 22:41:52 +0200
Subject: [PATCH 14/14] Tweaks Mammoth Mk.2 firing offsets

---
 mods/ts/rules/vehicles.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml
index a95a8a52c0..ff37c87327 100644
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -525,9 +525,10 @@ HMEC:
 	AutoTarget:
 	Armament@MISSILES:
 		Weapon: MammothTusk
+		LocalOffset: -128,-384,980, -128,384,980
 	Armament@RAILGUN:
 		Weapon: MechRailgun
-		LocalOffset: 640,-640,980, 640,640,980
+		LocalOffset: 640,-384,980, 640,384,980
 	RenderVoxels:
 	WithVoxelWalkerBody: