From ca674073589c0bfe6dabf67cec9c199cfdf5a9fd Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 29 Mar 2015 21:52:17 +0200
Subject: [PATCH 1/5] Split TS weapons.yaml into several categorized yamls

---
 mods/ts/mod.yaml                      |   14 +-
 mods/ts/weapons.yaml                  | 1269 -------------------------
 mods/ts/weapons/bombsandgrenades.yaml |   94 ++
 mods/ts/weapons/energyweapons.yaml    |  152 +++
 mods/ts/weapons/explosions.yaml       |   45 +
 mods/ts/weapons/healweapons.yaml      |   42 +
 mods/ts/weapons/largeguns.yaml        |  124 +++
 mods/ts/weapons/missiles.yaml         |  269 ++++++
 mods/ts/weapons/otherweapons.yaml     |   74 ++
 mods/ts/weapons/smallguns.yaml        |  277 ++++++
 mods/ts/weapons/superweapons.yaml     |  183 ++++
 11 files changed, 1271 insertions(+), 1272 deletions(-)
 delete mode 100644 mods/ts/weapons.yaml
 create mode 100644 mods/ts/weapons/bombsandgrenades.yaml
 create mode 100644 mods/ts/weapons/energyweapons.yaml
 create mode 100644 mods/ts/weapons/explosions.yaml
 create mode 100644 mods/ts/weapons/healweapons.yaml
 create mode 100644 mods/ts/weapons/largeguns.yaml
 create mode 100644 mods/ts/weapons/missiles.yaml
 create mode 100644 mods/ts/weapons/otherweapons.yaml
 create mode 100644 mods/ts/weapons/smallguns.yaml
 create mode 100644 mods/ts/weapons/superweapons.yaml

diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index ed9054fd86..82dd4a9d24 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -74,6 +74,17 @@ Rules:
 	./mods/ts/rules/vehicles.yaml
 	./mods/ts/rules/trees.yaml
 
+Weapons:
+	./mods/ts/weapons/bombsandgrenades.yaml
+	./mods/ts/weapons/energyweapons.yaml
+	./mods/ts/weapons/explosions.yaml
+	./mods/ts/weapons/healweapons.yaml
+	./mods/ts/weapons/largeguns.yaml
+	./mods/ts/weapons/missiles.yaml
+	./mods/ts/weapons/otherweapons.yaml
+	./mods/ts/weapons/smallguns.yaml
+	./mods/ts/weapons/superweapons.yaml
+
 Sequences:
 	./mods/ts/sequences/aircraft.yaml
 	./mods/ts/sequences/infantry.yaml
@@ -146,9 +157,6 @@ ChromeLayout:
 	./mods/ra/chrome/missionbrowser.yaml
 	./mods/ra/chrome/confirmation-dialogs.yaml
 
-Weapons:
-	./mods/ts/weapons.yaml
-
 Voices:
 	./mods/ts/audio/voices.yaml
 
diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml
deleted file mode 100644
index 99595c9091..0000000000
--- a/mods/ts/weapons.yaml
+++ /dev/null
@@ -1,1269 +0,0 @@
-UnitExplode:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 50
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 2
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: large_twlt
-		ImpactSound: expnew09.aud
-
-UnitExplodeSmall:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 40
-		DeathType: 2
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: medium_brnl
-		ImpactSound: expnew13.aud
-
-Minigun:
-	ReloadDelay: 21
-	Range: 4c0
-	Report: INFGUN3.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 12
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-Grenade:
-	ReloadDelay: 60
-	Range: 4c512
-	Projectile: Bullet
-		Speed: 85
-		Blockable: false
-		Shadow: true
-		Angle: 62
-		Inaccuracy: 554
-		Image: DISCUS
-	Warhead@1Dam: SpreadDamage
-		Spread: 171
-		Damage: 40
-		DeathType: 3
-		ProneModifier: 70
-		Versus:
-			None: 100
-			Wood: 85
-			Light: 70
-			Heavy: 35
-			Concrete: 28
-	Warhead@2Eff: CreateEffect
-		Explosion: large_grey_explosion
-		ImpactSound: expnew13.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-
-Bazooka:
-	ReloadDelay: 60
-	Range: 6c0
-	MinRange: 0c512
-	Report: RKETINF1.AUD
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Speed: 213
-		Arm: 3
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 8
-		RangeLimit: 50
-		CloseEnough: 256
-		LockOnProbability: 80
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 35
-		DeathType: 2
-		ValidTargets: Ground, Air
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water, Air, AirHit
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4EffAir: CreateEffect
-		Explosion: small_twlt
-		ImpactSound: expnew12.aud
-		ValidImpactTypes: Air, AirHit
-	Warhead@5Smu: LeaveSmudge
-		SmudgeType: SmallCrater
-
-MultiCluster:
-	ReloadDelay: 80
-	Range: 6c0
-	Report: MISL1.AUD
-	ValidTargets: Ground
-	Projectile: Missile
-		Speed: 170
-		Arm: 2
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 8
-		RangeLimit: 35
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 65
-		DeathType: 3
-		ValidTargets: Ground
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
-		ImpactSound: expnew09.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash2.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-
-Heal:
-	ReloadDelay: 80
-	Range: 2c849
-	Report: HEALER1.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: -50
-		DeathType: 1
-		ProneModifier: 100
-		Versus:
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
-
-Sniper:
-	ReloadDelay: 60
-	Range: 6c768
-	Report: SILENCER.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 150
-		DeathType: 1
-		ProneModifier: 100
-		Versus:
-			None: 100
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
-
-M1Carbine:
-	ReloadDelay: 20
-	Range: 4c0
-	Report: INFGUN3.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-LtRail:
-	ReloadDelay: 60
-	Range: 6c0
-	Report: BIGGGUN1.AUD
-	Projectile: LaserZap
-		Speed: 1c682
-		BeamWidth: 1
-		BeamDuration: 10
-		Color: 200,0,128,255
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 150
-		DeathType: 2
-		ProneModifier: 100
-		Versus:
-			None: 100
-			Wood: 130
-			Light: 150
-			Heavy: 110
-			Concrete: 5
-
-CyCannon:
-	ReloadDelay: 50
-	Range: 7c0
-	Report: SCRIN5B.AUD
-	ValidTargets: Ground
-	Projectile: Bullet
-		Speed: 192
-		Blockable: false
-		Shadow: true
-		Image: TORPEDO
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 120
-		DeathType: 6
-		ProneModifier: 100
-		ValidTargets: Ground
-		Versus:
-			None: 100
-			Wood: 65
-			Light: 75
-			Heavy: 50
-			Concrete: 40
-	Warhead@2Eff: CreateEffect
-		Explosion: large_bang
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: SmallScorch
-
-Vulcan3:
-	ReloadDelay: 30
-	Burst: 3
-	Range: 4c0
-	Report: CYGUN1.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 10
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-Vulcan2:
-	ReloadDelay: 50
-	Burst: 3
-	Range: 6c0
-	Report: TSGUN4.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 50
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			None: 100
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-Vulcan:
-	ReloadDelay: 60
-	Range: 4c0
-	Report: CHAINGN1.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 20
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-FiendShard:
-	ReloadDelay: 30
-	Burst: 3
-	Range: 5c0
-	Report: FIEND2.AUD
-	Projectile: Bullet
-		Speed: 213
-		Image: CRYSTAL4
-		Inaccuracy: 512
-		Shadow: true
-		Angle: 88
-		Palette: greentiberium
-	Warhead@1Dam: SpreadDamage
-		Damage: 35
-		DeathType: 1
-		ProneModifier: 100
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-
-JumpCannon:
-	ReloadDelay: 40
-	Burst: 2
-	Range: 5c0
-	Report: JUMPJET1.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-HoverMissile:
-	ReloadDelay: 68
-	Burst: 2
-	Range: 8c0
-	Report: HOVRMIS1.AUD
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Speed: 213
-		Arm: 2
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 8
-		RangeLimit: 35
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
-		DeathType: 2
-		ValidTargets: Ground, Air
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water, Air, AirHit
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4EffAir: CreateEffect
-		Explosion: small_twlt
-		ImpactSound: expnew12.aud
-		ValidImpactTypes: Air, AirHit
-	Warhead@5: LeaveSmudge
-		SmudgeType: SmallCrater
-
-120mmx:
-	ReloadDelay: 80
-	Range: 6c768
-	Report: 120MMF.AUD
-	Burst: 2
-	BurstDelay: 5
-	Projectile: Bullet
-		Speed: 682
-		Image: 120mm
-		Shadow: true
-		Angle: 62
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 50
-		DeathType: 2
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: medium_clsn
-		ImpactSound: expnew14.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-
-MammothTusk:
-	ReloadDelay: 80
-	Range: 6c0
-	Report: MISL1.AUD
-	ValidTargets: Air
-	Burst: 2
-	Projectile: Missile
-		Arm: 0
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 10
-		Speed: 170
-		RangeLimit: 35
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 171
-		Damage: 40
-		DeathType: 3
-		ProneModifier: 70
-		ValidTargets: Air
-		Versus:
-			None: 100
-			Wood: 85
-			Light: 70
-			Heavy: 35
-			Concrete: 28
-	Warhead@2Eff: CreateEffect
-		Explosion: medium_bang
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-
-Repair:
-	ReloadDelay: 80
-	Range: 1c819
-	Report: REPAIR11.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: -50
-		DeathType: 1
-		ProneModifier: 100
-		Versus:
-			None: 0
-			Wood: 0
-			Light: 100
-			Heavy: 100
-			Concrete: 0
-
-SlimeAttack:
-	ReloadDelay: 80
-	Burst: 3
-	Range: 5c0
-	Report: VICER1.AUD
-	Projectile: Bullet
-		Speed: 426
-	Warhead@1Dam: SpreadDamage
-		Damage: 100
-		DeathType: 2
-		ProneModifier: 100
-		Versus:
-			Wood: 25
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-
-SuicideBomb:
-	ReloadDelay: 1
-	Range: 0c512
-	Report: HUNTER2.AUD
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 110
-		Falloff: 10000, 3680, 1350, 500, 180, 70, 0
-		DeathType: 5
-		Versus:
-			None: 90
-			Light: 60
-			Heavy: 25
-			Concrete: 50
-	Warhead@2Res: DestroyResource
-
-120mm:
-	ReloadDelay: 80
-	Range: 6c768
-	Report: 120MMF.AUD
-	Projectile: Bullet
-		Speed: 1c512
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 70
-		DeathType: 2
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: large_clsn
-		ImpactSound: expnew14.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-
-MechRailgun:
-	ReloadDelay: 60
-	Range: 8c0
-	Burst: 2
-	BurstDelay: 10
-	Report: RAILUSE5.AUD
-	Projectile: LaserZap
-		Color: 200,0,255,255
-		BeamWidth: 3
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 200
-		DeathType: 5
-		ProneModifier: 100
-		Versus:
-			None: 200
-			Wood: 175
-			Light: 160
-			Heavy: 100
-			Concrete: 25
-
-AssaultCannon:
-	ReloadDelay: 50
-	Range: 5c0
-	Report: TSGUN4.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-BikeMissile:
-	ReloadDelay: 60
-	Burst: 2
-	BurstDelay: 60
-	Range: 5c0
-	Report: MISL1.AUD
-	ValidTargets: Ground
-	Projectile: Missile
-		Arm: 2
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 8
-		Speed: 213
-		RangeLimit: 35
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 40
-		DeathType: 2
-		ValidTargets: Ground
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: SmallCrater
-
-RaiderCannon:
-	ReloadDelay: 55
-	Range: 4c0
-	Burst: 2
-	BurstDelay: 55
-	Report: CHAINGN1.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-FireballLauncher:
-	ReloadDelay: 50
-	Range: 4c256
-	Report: FLAMTNK1.AUD
-	Projectile: Bullet
-		Speed: 64
-		Image: FLAMEALL
-		Inaccuracy: 384
-	Burst: 5
-	BurstDelay: 5
-	Warhead@1Dam: SpreadDamage
-		Spread: 341
-		Damage: 25
-		DeathType: 5
-		ProneModifier: 100
-		Versus:
-			None: 600
-			Wood: 148
-			Light: 59
-			Heavy: 6
-			Concrete: 2
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: SmallScorch
-
-SonicZap:
-	ReloadDelay: 120
-	Range: 6c0
-	Charges: yes
-	Report: SONIC4.AUD
-	Projectile: LaserZap
-		Color: 200,0,255,255
-		BeamWidth: 12
-		BeamDuration: 50
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 100
-		DeathType: 5
-		Versus:
-			Heavy: 80
-			Concrete: 60
-
-Dragon:
-	ReloadDelay: 50
-	Range: 6c0
-	Burst: 2
-	Report: MISL1.AUD
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Speed: 213
-		Arm: 2
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 8
-		RangeLimit: 35
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
-		DeathType: 2
-		ValidTargets: Ground, Air
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water, Air, AirHit
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4EffAir: CreateEffect
-		Explosion: small_twlt
-		ImpactSound: expnew12.aud
-		ValidImpactTypes: Air, AirHit
-	Warhead@5Smu: LeaveSmudge
-		SmudgeType: SmallCrater
-
-90mm:
-	ReloadDelay: 50
-	Range: 6c768
-	Report: 120MMF.AUD
-	Projectile: Bullet
-		Speed: 682
-		Image: 120mm
-		Shadow: true
-		Angle: 62
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 36
-		DeathType: 2
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: medium_clsn
-		ImpactSound: expnew14.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: SmallCrater
-
-155mm:
-	ReloadDelay: 110
-	Range: 18c0
-	Report: 120MMF.AUD
-	Projectile: Bullet
-		Speed: 170
-		Image: 120mm
-		Angle: 165
-		Shadow: true
-		Blockable: false
-		Palette: ra
-	MinRange: 5c0
-	Warhead@1Dam: SpreadDamage
-		Spread: 298
-		Damage: 150
-		DeathType: 3
-		ProneModifier: 100
-		Versus:
-			None: 100
-			Wood: 85
-			Light: 68
-			Heavy: 35
-			Concrete: 35
-	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
-		ImpactSound: expnew06.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash2.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-
-Hellfire:
-	ReloadDelay: 50
-	Range: 6c0
-	Report: ORCAMIS1.AUD
-	Burst: 2
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Speed: 256
-		Arm: 2
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 8
-		RangeLimit: 35
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 85
-		Damage: 30
-		DeathType: 2
-		ValidTargets: Ground, Air
-		Versus:
-			None: 30
-			Wood: 65
-			Light: 150
-			Heavy: 100
-			Concrete: 30
-	Warhead@2Eff: CreateEffect
-		Explosion: small_bang
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water, Air, AirHit
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4EffAir: CreateEffect
-		Explosion: small_twlt
-		ImpactSound: expnew12.aud
-		ValidImpactTypes: Air, AirHit
-	Warhead@5Smu: LeaveSmudge
-		SmudgeType: SmallCrater
-
-Bomb:
-	ReloadDelay: 10
-	Range: 5c0
-	Projectile: Bullet
-		Speed: 170
-		Image: canister
-		Shadow: true
-		Palette: player
-	Warhead@1Dam: SpreadDamage
-		Spread: 298
-		Damage: 160
-		DeathType: 3
-		ProneModifier: 100
-		Versus:
-			None: 200
-			Wood: 90
-			Light: 75
-			Heavy: 32
-			Concrete: 100
-	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
-		ImpactSound: expnew09.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-
-Proton:
-	ReloadDelay: 3
-	Range: 5c0
-	Report: SCRIN5B.AUD
-	Burst: 2
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Speed: 256
-		Arm: 2
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: TORPEDO
-		RateOfTurn: 1
-		RangeLimit: 35
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 20
-		DeathType: 3
-		ValidTargets: Ground, Air
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-	Warhead@2Eff: CreateEffect
-		Explosion: small_bang
-		ImpactSound: expnew12.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash3.aud
-		ValidImpactTypes: Water
-
-HarpyClaw:
-	ReloadDelay: 36
-	Range: 5c0
-	Report: CYGUN1.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	ValidTargets: Ground, Air
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 60
-		DeathType: 1
-		ProneModifier: 70
-		ValidTargets: Ground, Air
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-Pistola:
-	ReloadDelay: 20
-	Range: 3c0
-	Report: GUN18.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 2
-		DeathType: 1
-		ProneModifier: 70
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piff
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piff
-		ValidImpactTypes: Water
-
-Tiberium:
-	ReloadDelay: 16
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 2
-		DeathType: 6
-		PreventProne: yes
-
-TiberiumHeal:
-	ReloadDelay: 16
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: -2
-		DeathType: 6
-		PreventProne: yes
-
-IonCannon:
-	ValidTargets: Ground, Air
-	Warhead@1Dam_impact: SpreadDamage
-		Spread: 1c0
-		Damage: 100
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		ProneModifier: 100
-		ValidTargets: Ground, Air
-	Warhead@2Eff_impact: CreateEffect
-		Explosion: ionring
-		ImpactSound: ion1.aud
-	Warhead@3Dam_area: SpreadDamage
-		Spread: 1c0
-		Damage: 250
-		Falloff: 100, 50, 25, 0
-		DeathType: 5
-		Delay: 3
-		ValidTargets: Ground, Air
-	Warhead@4Smu_area: LeaveSmudge
-		SmudgeType: SmallScorch
-		Size: 2,1
-		Delay: 3
-
-VulcanTower:
-	ReloadDelay: 26
-	Range: 6c0
-	Report: CHAINGN1.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 18
-		DeathType: 1
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
-		ValidImpactTypes: Water
-
-RPGTower:
-	ReloadDelay: 80
-	Range: 8c0
-	Report: GLNCH4.AUD
-	Projectile: Bullet
-		Speed: 384
-		Blockable: false
-		Shadow: true
-		Angle: 62
-		Image: canister
-		Palette: player
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 110
-		DeathType: 2
-		ProneModifier: 70
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 90
-			Heavy: 100
-			Concrete: 70
-	Warhead@2Eff: CreateEffect
-		Explosion: large_clsn
-		ImpactSound: expnew14.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
-		ImpactSound: ssplash2.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-
-SAMTower:
-	ReloadDelay: 55
-	Range: 15c0
-	Report: SAMSHOT1.AUD
-	ValidTargets: Air
-	Projectile: Missile
-		Speed: 298
-		Arm: 2
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 128
-		Image: DRAGON
-		RateOfTurn: 5
-		RangeLimit: 60
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 33
-		DeathType: 2
-		ValidTargets: Air
-	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
-		ImpactSound: expnew12.aud
-
-ObeliskLaser:
-	ReloadDelay: 120
-	Range: 10c512
-	Charges: true
-	Report: OBELRAY1.AUD
-	Projectile: LaserZap
-		BeamWidth: 4
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 250
-		DeathType: 5
-		ProneModifier: 60
-
-TurretLaser:
-	ReloadDelay: 40
-	Range: 5c512
-	Report: LASTUR1.AUD
-	Projectile: LaserZap
-		BeamWidth: 2
-		BeamDuration: 5
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 30
-		DeathType: 5
-		ProneModifier: 60
-
-EMPulseCannon:
-	ReloadDelay: 100
-	Range: 10c0
-	Report: PLSECAN2.AUD
-	Projectile: Bullet
-		Speed: 425
-		Blockable: false
-		Shadow: true
-		Angle: 62
-		Image: pulsball
-	Warhead@2Eff: CreateEffect
-		Explosion: pulse_explosion
-# Dummy warhead to allow targeting
-	Warhead@target: SpreadDamage
-		Spread: 0
-		Damage: 0
-		PreventProne: true
-		ValidTargets: Vehicle
-	Warhead@emp: GrantUpgrade
-		Range: 3c0
-		Duration: 250
-		Upgrades: empdisable
-		ValidTargets: Vehicle
-
-TiberiumExplosion:
-	Warhead@1Dam: SpreadDamage
-		Spread: 9
-		Damage: 10
-		DeathType: 3
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Res: CreateResource
-		AddsResourceType: Tiberium
-		Size: 1,1
-	Warhead@3Eff: CreateEffect
-		Explosion: large_explosion
-		ImpactSound: expnew09.aud
-
-ClusterMissile:
-	ValidTargets: Ground, Water, Air
-	Warhead@ImpactDamage0: SpreadDamage
-		Spread: 1c0
-		Damage: 150
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		ValidTargets: Ground, Water, Air
-		Versus:
-			Concrete: 25
-	Warhead@SoundEffect0: CreateEffect
-		Explosion: large_explosion
-		ImpactSound: expnew19.aud
-	Warhead@ResourceDestruction0: DestroyResource
-		Size: 1
-	Warhead@ClusterSmudges0: LeaveSmudge
-		SmudgeType: LargeCrater
-		Size: 1
-	Warhead@ClusterDamage1: SpreadDamage
-		Spread: 2c0
-		Damage: 60
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Delay: 5
-		ValidTargets: Ground, Water, Air
-		Versus:
-			Concrete: 25
-	Warhead@ResourceDestruction1: DestroyResource
-		Size: 2
-		Delay: 5
-	Warhead@ClusterSmudges1: LeaveSmudge
-		SmudgeType: LargeScorch
-		Size: 2
-		Delay: 5
-	Warhead@ClusterDamage2: SpreadDamage
-		Spread: 3c0
-		Damage: 60
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Delay: 10
-		ValidTargets: Ground, Water, Air
-		Versus:
-			Concrete: 25
-	Warhead@ResourceDestruction2: DestroyResource
-		Size: 3
-		Delay: 10
-	Warhead@ClusterSmudges2: LeaveSmudge
-		SmudgeType: LargeScorch
-		Size: 3
-		Delay: 10
-	Warhead@ClusterDamage3: SpreadDamage
-		Spread: 4c0
-		Damage: 60
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Delay: 15
-		ValidTargets: Ground, Water, Air
-		Versus:
-			Concrete: 25
-	Warhead@ResourceDestruction3: DestroyResource
-		Size: 4
-		Delay: 15
-	Warhead@ClusterSmudges3: LeaveSmudge
-		SmudgeType: MediumScorch
-		Size: 4
-		Delay: 15
-	Warhead@ClusterDamage4: SpreadDamage
-		Spread: 5c0
-		Damage: 60
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Delay: 20
-		ValidTargets: Ground, Water, Air
-		Versus:
-			Concrete: 25
-	Warhead@ResourceDestruction4: DestroyResource
-		Size: 5
-		Delay: 20
-	Warhead@ClusterSmudges4: LeaveSmudge
-		SmudgeType: SmallScorch
-		Size: 5
-		Delay: 20
-
diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml
new file mode 100644
index 0000000000..b1ffca1a87
--- /dev/null
+++ b/mods/ts/weapons/bombsandgrenades.yaml
@@ -0,0 +1,94 @@
+Grenade:
+	ReloadDelay: 60
+	Range: 4c512
+	Projectile: Bullet
+		Speed: 85
+		Blockable: false
+		Shadow: true
+		Angle: 62
+		Inaccuracy: 554
+		Image: DISCUS
+	Warhead@1Dam: SpreadDamage
+		Spread: 171
+		Damage: 40
+		DeathType: 3
+		ProneModifier: 70
+		Versus:
+			None: 100
+			Wood: 85
+			Light: 70
+			Heavy: 35
+			Concrete: 28
+	Warhead@2Eff: CreateEffect
+		Explosion: large_grey_explosion
+		ImpactSound: expnew13.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+
+Bomb:
+	ReloadDelay: 10
+	Range: 5c0
+	Projectile: Bullet
+		Speed: 170
+		Image: canister
+		Shadow: true
+		Palette: player
+	Warhead@1Dam: SpreadDamage
+		Spread: 298
+		Damage: 160
+		DeathType: 3
+		ProneModifier: 100
+		Versus:
+			None: 200
+			Wood: 90
+			Light: 75
+			Heavy: 32
+			Concrete: 100
+	Warhead@2Eff: CreateEffect
+		Explosion: large_explosion
+		ImpactSound: expnew09.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+
+RPGTower:
+	ReloadDelay: 80
+	Range: 8c0
+	Report: GLNCH4.AUD
+	Projectile: Bullet
+		Speed: 384
+		Blockable: false
+		Shadow: true
+		Angle: 62
+		Image: canister
+		Palette: player
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 110
+		DeathType: 2
+		ProneModifier: 70
+		Versus:
+			None: 30
+			Wood: 75
+			Light: 90
+			Heavy: 100
+			Concrete: 70
+	Warhead@2Eff: CreateEffect
+		Explosion: large_clsn
+		ImpactSound: expnew14.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash2.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml
new file mode 100644
index 0000000000..617891a7db
--- /dev/null
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -0,0 +1,152 @@
+LtRail:
+	ReloadDelay: 60
+	Range: 6c0
+	Report: BIGGGUN1.AUD
+	Projectile: LaserZap
+		Speed: 1c682
+		BeamWidth: 1
+		BeamDuration: 10
+		Color: 200,0,128,255
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 150
+		DeathType: 2
+		ProneModifier: 100
+		Versus:
+			None: 100
+			Wood: 130
+			Light: 150
+			Heavy: 110
+			Concrete: 5
+
+MechRailgun:
+	ReloadDelay: 60
+	Range: 8c0
+	Burst: 2
+	BurstDelay: 10
+	Report: RAILUSE5.AUD
+	Projectile: LaserZap
+		Color: 200,0,255,255
+		BeamWidth: 3
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 200
+		DeathType: 5
+		ProneModifier: 100
+		Versus:
+			None: 200
+			Wood: 175
+			Light: 160
+			Heavy: 100
+			Concrete: 25
+
+SonicZap:
+	ReloadDelay: 120
+	Range: 6c0
+	Charges: yes
+	Report: SONIC4.AUD
+	Projectile: LaserZap
+		Color: 200,0,255,255
+		BeamWidth: 12
+		BeamDuration: 50
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 100
+		DeathType: 5
+		Versus:
+			Heavy: 80
+			Concrete: 60
+
+CyCannon:
+	ReloadDelay: 50
+	Range: 7c0
+	Report: SCRIN5B.AUD
+	ValidTargets: Ground
+	Projectile: Bullet
+		Speed: 192
+		Blockable: false
+		Shadow: true
+		Image: TORPEDO
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 120
+		DeathType: 6
+		ProneModifier: 100
+		ValidTargets: Ground
+		Versus:
+			None: 100
+			Wood: 65
+			Light: 75
+			Heavy: 50
+			Concrete: 40
+	Warhead@2Eff: CreateEffect
+		Explosion: large_bang
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: SmallScorch
+
+Proton:
+	ReloadDelay: 3
+	Range: 5c0
+	Report: SCRIN5B.AUD
+	Burst: 2
+	ValidTargets: Ground, Air
+	Projectile: Missile
+		Speed: 256
+		Arm: 2
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: TORPEDO
+		RateOfTurn: 1
+		RangeLimit: 35
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 20
+		DeathType: 3
+		ValidTargets: Ground, Air
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: small_bang
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+
+ObeliskLaser:
+	ReloadDelay: 120
+	Range: 10c512
+	Charges: true
+	Report: OBELRAY1.AUD
+	Projectile: LaserZap
+		BeamWidth: 4
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 250
+		DeathType: 5
+		ProneModifier: 60
+
+TurretLaser:
+	ReloadDelay: 40
+	Range: 5c512
+	Report: LASTUR1.AUD
+	Projectile: LaserZap
+		BeamWidth: 2
+		BeamDuration: 5
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 30
+		DeathType: 5
+		ProneModifier: 60
diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml
new file mode 100644
index 0000000000..94f421a8b1
--- /dev/null
+++ b/mods/ts/weapons/explosions.yaml
@@ -0,0 +1,45 @@
+UnitExplode:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 50
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 2
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: large_twlt
+		ImpactSound: expnew09.aud
+
+UnitExplodeSmall:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 40
+		DeathType: 2
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: medium_brnl
+		ImpactSound: expnew13.aud
+
+TiberiumExplosion:
+	Warhead@1Dam: SpreadDamage
+		Spread: 9
+		Damage: 10
+		DeathType: 3
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Res: CreateResource
+		AddsResourceType: Tiberium
+		Size: 1,1
+	Warhead@3Eff: CreateEffect
+		Explosion: large_explosion
+		ImpactSound: expnew09.aud
diff --git a/mods/ts/weapons/healweapons.yaml b/mods/ts/weapons/healweapons.yaml
new file mode 100644
index 0000000000..f72928ecbc
--- /dev/null
+++ b/mods/ts/weapons/healweapons.yaml
@@ -0,0 +1,42 @@
+Heal:
+	ReloadDelay: 80
+	Range: 2c849
+	Report: HEALER1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: -50
+		DeathType: 1
+		ProneModifier: 100
+		Versus:
+			Wood: 0
+			Light: 0
+			Heavy: 0
+			Concrete: 0
+
+Repair:
+	ReloadDelay: 80
+	Range: 1c819
+	Report: REPAIR11.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: -50
+		DeathType: 1
+		ProneModifier: 100
+		Versus:
+			None: 0
+			Wood: 0
+			Light: 100
+			Heavy: 100
+			Concrete: 0
+
+TiberiumHeal:
+	ReloadDelay: 16
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: -2
+		DeathType: 6
+		PreventProne: yes
diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml
new file mode 100644
index 0000000000..3a19922800
--- /dev/null
+++ b/mods/ts/weapons/largeguns.yaml
@@ -0,0 +1,124 @@
+90mm:
+	ReloadDelay: 50
+	Range: 6c768
+	Report: 120MMF.AUD
+	Projectile: Bullet
+		Speed: 682
+		Image: 120mm
+		Shadow: true
+		Angle: 62
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 36
+		DeathType: 2
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: medium_clsn
+		ImpactSound: expnew14.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: SmallCrater
+
+120mm:
+	ReloadDelay: 80
+	Range: 6c768
+	Report: 120MMF.AUD
+	Projectile: Bullet
+		Speed: 1c512
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 70
+		DeathType: 2
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: large_clsn
+		ImpactSound: expnew14.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+
+120mmx:
+	ReloadDelay: 80
+	Range: 6c768
+	Report: 120MMF.AUD
+	Burst: 2
+	BurstDelay: 5
+	Projectile: Bullet
+		Speed: 682
+		Image: 120mm
+		Shadow: true
+		Angle: 62
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 50
+		DeathType: 2
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: medium_clsn
+		ImpactSound: expnew14.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+
+155mm:
+	ReloadDelay: 110
+	Range: 18c0
+	Report: 120MMF.AUD
+	Projectile: Bullet
+		Speed: 170
+		Image: 120mm
+		Angle: 165
+		Shadow: true
+		Blockable: false
+		Palette: ra
+	MinRange: 5c0
+	Warhead@1Dam: SpreadDamage
+		Spread: 298
+		Damage: 150
+		DeathType: 3
+		ProneModifier: 100
+		Versus:
+			None: 100
+			Wood: 85
+			Light: 68
+			Heavy: 35
+			Concrete: 35
+	Warhead@2Eff: CreateEffect
+		Explosion: large_explosion
+		ImpactSound: expnew06.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash2.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml
new file mode 100644
index 0000000000..caf5dd906e
--- /dev/null
+++ b/mods/ts/weapons/missiles.yaml
@@ -0,0 +1,269 @@
+Bazooka:
+	ReloadDelay: 60
+	Range: 6c0
+	MinRange: 0c512
+	Report: RKETINF1.AUD
+	ValidTargets: Ground, Air
+	Projectile: Missile
+		Speed: 213
+		Arm: 3
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 8
+		RangeLimit: 50
+		CloseEnough: 256
+		LockOnProbability: 80
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 35
+		DeathType: 2
+		ValidTargets: Ground, Air
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: small_clsn
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water, Air, AirHit
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4EffAir: CreateEffect
+		Explosion: small_twlt
+		ImpactSound: expnew12.aud
+		ValidImpactTypes: Air, AirHit
+	Warhead@5Smu: LeaveSmudge
+		SmudgeType: SmallCrater
+
+HoverMissile:
+	ReloadDelay: 68
+	Burst: 2
+	Range: 8c0
+	Report: HOVRMIS1.AUD
+	ValidTargets: Ground, Air
+	Projectile: Missile
+		Speed: 213
+		Arm: 2
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 8
+		RangeLimit: 35
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 30
+		DeathType: 2
+		ValidTargets: Ground, Air
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: small_clsn
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water, Air, AirHit
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4EffAir: CreateEffect
+		Explosion: small_twlt
+		ImpactSound: expnew12.aud
+		ValidImpactTypes: Air, AirHit
+	Warhead@5: LeaveSmudge
+		SmudgeType: SmallCrater
+
+MammothTusk:
+	ReloadDelay: 80
+	Range: 6c0
+	Report: MISL1.AUD
+	ValidTargets: Air
+	Burst: 2
+	Projectile: Missile
+		Arm: 0
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 10
+		Speed: 170
+		RangeLimit: 35
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 171
+		Damage: 40
+		DeathType: 3
+		ProneModifier: 70
+		ValidTargets: Air
+		Versus:
+			None: 100
+			Wood: 85
+			Light: 70
+			Heavy: 35
+			Concrete: 28
+	Warhead@2Eff: CreateEffect
+		Explosion: medium_bang
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+
+BikeMissile:
+	ReloadDelay: 60
+	Burst: 2
+	BurstDelay: 60
+	Range: 5c0
+	Report: MISL1.AUD
+	ValidTargets: Ground
+	Projectile: Missile
+		Arm: 2
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 8
+		Speed: 213
+		RangeLimit: 35
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 40
+		DeathType: 2
+		ValidTargets: Ground
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: small_clsn
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: SmallCrater
+
+Dragon:
+	ReloadDelay: 50
+	Range: 6c0
+	Burst: 2
+	Report: MISL1.AUD
+	ValidTargets: Ground, Air
+	Projectile: Missile
+		Speed: 213
+		Arm: 2
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 8
+		RangeLimit: 35
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 30
+		DeathType: 2
+		ValidTargets: Ground, Air
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: small_clsn
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water, Air, AirHit
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4EffAir: CreateEffect
+		Explosion: small_twlt
+		ImpactSound: expnew12.aud
+		ValidImpactTypes: Air, AirHit
+	Warhead@5Smu: LeaveSmudge
+		SmudgeType: SmallCrater
+
+Hellfire:
+	ReloadDelay: 50
+	Range: 6c0
+	Report: ORCAMIS1.AUD
+	Burst: 2
+	ValidTargets: Ground, Air
+	Projectile: Missile
+		Speed: 256
+		Arm: 2
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 8
+		RangeLimit: 35
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 85
+		Damage: 30
+		DeathType: 2
+		ValidTargets: Ground, Air
+		Versus:
+			None: 30
+			Wood: 65
+			Light: 150
+			Heavy: 100
+			Concrete: 30
+	Warhead@2Eff: CreateEffect
+		Explosion: small_bang
+		ImpactSound: expnew12.aud
+		InvalidImpactTypes: Water, Air, AirHit
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4EffAir: CreateEffect
+		Explosion: small_twlt
+		ImpactSound: expnew12.aud
+		ValidImpactTypes: Air, AirHit
+	Warhead@5Smu: LeaveSmudge
+		SmudgeType: SmallCrater
+
+SAMTower:
+	ReloadDelay: 55
+	Range: 15c0
+	Report: SAMSHOT1.AUD
+	ValidTargets: Air
+	Projectile: Missile
+		Speed: 298
+		Arm: 2
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 5
+		RangeLimit: 60
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 33
+		DeathType: 2
+		ValidTargets: Air
+	Warhead@2Eff: CreateEffect
+		Explosion: small_clsn
+		ImpactSound: expnew12.aud
diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml
new file mode 100644
index 0000000000..2b3e5adae8
--- /dev/null
+++ b/mods/ts/weapons/otherweapons.yaml
@@ -0,0 +1,74 @@
+FireballLauncher:
+	ReloadDelay: 50
+	Range: 4c256
+	Report: FLAMTNK1.AUD
+	Projectile: Bullet
+		Speed: 64
+		Image: FLAMEALL
+		Inaccuracy: 384
+	Burst: 5
+	BurstDelay: 5
+	Warhead@1Dam: SpreadDamage
+		Spread: 341
+		Damage: 25
+		DeathType: 5
+		ProneModifier: 100
+		Versus:
+			None: 600
+			Wood: 148
+			Light: 59
+			Heavy: 6
+			Concrete: 2
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SmallScorch
+
+FiendShard:
+	ReloadDelay: 30
+	Burst: 3
+	Range: 5c0
+	Report: FIEND2.AUD
+	Projectile: Bullet
+		Speed: 213
+		Image: CRYSTAL4
+		Inaccuracy: 512
+		Shadow: true
+		Angle: 88
+		Palette: greentiberium
+	Warhead@1Dam: SpreadDamage
+		Damage: 35
+		DeathType: 1
+		ProneModifier: 100
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash3.aud
+		ValidImpactTypes: Water
+
+SlimeAttack:
+	ReloadDelay: 80
+	Burst: 3
+	Range: 5c0
+	Report: VICER1.AUD
+	Projectile: Bullet
+		Speed: 426
+	Warhead@1Dam: SpreadDamage
+		Damage: 100
+		DeathType: 2
+		ProneModifier: 100
+		Versus:
+			Wood: 25
+			Light: 30
+			Heavy: 10
+			Concrete: 10
+
+Tiberium:
+	ReloadDelay: 16
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 2
+		DeathType: 6
+		PreventProne: yes
diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml
new file mode 100644
index 0000000000..6d0b9773ac
--- /dev/null
+++ b/mods/ts/weapons/smallguns.yaml
@@ -0,0 +1,277 @@
+Minigun:
+	ReloadDelay: 21
+	Range: 4c0
+	Report: INFGUN3.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 12
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+M1Carbine:
+	ReloadDelay: 20
+	Range: 4c0
+	Report: INFGUN3.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 15
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+Vulcan:
+	ReloadDelay: 60
+	Range: 4c0
+	Report: CHAINGN1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 20
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+Vulcan2:
+	ReloadDelay: 50
+	Burst: 3
+	Range: 6c0
+	Report: TSGUN4.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 50
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			None: 100
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+Vulcan3:
+	ReloadDelay: 30
+	Burst: 3
+	Range: 4c0
+	Report: CYGUN1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 10
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+VulcanTower:
+	ReloadDelay: 26
+	Range: 6c0
+	Report: CHAINGN1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 18
+		DeathType: 1
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+JumpCannon:
+	ReloadDelay: 40
+	Burst: 2
+	Range: 5c0
+	Report: JUMPJET1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 15
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+AssaultCannon:
+	ReloadDelay: 50
+	Range: 5c0
+	Report: TSGUN4.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 40
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+RaiderCannon:
+	ReloadDelay: 55
+	Range: 4c0
+	Burst: 2
+	BurstDelay: 55
+	Report: CHAINGN1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 40
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+HarpyClaw:
+	ReloadDelay: 36
+	Range: 5c0
+	Report: CYGUN1.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	ValidTargets: Ground, Air
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 60
+		DeathType: 1
+		ProneModifier: 70
+		ValidTargets: Ground, Air
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piffs
+		ValidImpactTypes: Water
+
+Pistola:
+	ReloadDelay: 20
+	Range: 3c0
+	Report: GUN18.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 2
+		DeathType: 1
+		ProneModifier: 70
+		Versus:
+			Wood: 60
+			Light: 40
+			Heavy: 25
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piff
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: water_piff
+		ValidImpactTypes: Water
+
+Sniper:
+	ReloadDelay: 60
+	Range: 6c768
+	Report: SILENCER.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 150
+		DeathType: 1
+		ProneModifier: 100
+		Versus:
+			None: 100
+			Wood: 0
+			Light: 0
+			Heavy: 0
+			Concrete: 0
diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml
new file mode 100644
index 0000000000..0db742c280
--- /dev/null
+++ b/mods/ts/weapons/superweapons.yaml
@@ -0,0 +1,183 @@
+MultiCluster:
+	ReloadDelay: 80
+	Range: 6c0
+	Report: MISL1.AUD
+	ValidTargets: Ground
+	Projectile: Missile
+		Speed: 170
+		Arm: 2
+		Blockable: false
+		Shadow: true
+		Inaccuracy: 128
+		Image: DRAGON
+		RateOfTurn: 8
+		RangeLimit: 35
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 65
+		DeathType: 3
+		ValidTargets: Ground
+		Versus:
+			None: 25
+			Wood: 65
+			Light: 75
+			Heavy: 100
+			Concrete: 60
+	Warhead@2Eff: CreateEffect
+		Explosion: large_explosion
+		ImpactSound: expnew09.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: small_watersplash
+		ImpactSound: ssplash2.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+
+SuicideBomb:
+	ReloadDelay: 1
+	Range: 0c512
+	Report: HUNTER2.AUD
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 110
+		Falloff: 10000, 3680, 1350, 500, 180, 70, 0
+		DeathType: 5
+		Versus:
+			None: 90
+			Light: 60
+			Heavy: 25
+			Concrete: 50
+	Warhead@2Res: DestroyResource
+
+IonCannon:
+	ValidTargets: Ground, Air
+	Warhead@1Dam_impact: SpreadDamage
+		Spread: 1c0
+		Damage: 100
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		ProneModifier: 100
+		ValidTargets: Ground, Air
+	Warhead@2Eff_impact: CreateEffect
+		Explosion: ionring
+		ImpactSound: ion1.aud
+	Warhead@3Dam_area: SpreadDamage
+		Spread: 1c0
+		Damage: 250
+		Falloff: 100, 50, 25, 0
+		DeathType: 5
+		Delay: 3
+		ValidTargets: Ground, Air
+	Warhead@4Smu_area: LeaveSmudge
+		SmudgeType: SmallScorch
+		Size: 2,1
+		Delay: 3
+
+EMPulseCannon:
+	ReloadDelay: 100
+	Range: 10c0
+	Report: PLSECAN2.AUD
+	Projectile: Bullet
+		Speed: 425
+		Blockable: false
+		Shadow: true
+		Angle: 62
+		Image: pulsball
+	Warhead@2Eff: CreateEffect
+		Explosion: pulse_explosion
+# Dummy warhead to allow targeting
+	Warhead@target: SpreadDamage
+		Spread: 0
+		Damage: 0
+		PreventProne: true
+		ValidTargets: Vehicle
+	Warhead@emp: GrantUpgrade
+		Range: 3c0
+		Duration: 250
+		Upgrades: empdisable
+		ValidTargets: Vehicle
+
+ClusterMissile:
+	ValidTargets: Ground, Water, Air
+	Warhead@ImpactDamage0: SpreadDamage
+		Spread: 1c0
+		Damage: 150
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		ValidTargets: Ground, Water, Air
+		Versus:
+			Concrete: 25
+	Warhead@SoundEffect0: CreateEffect
+		Explosion: large_explosion
+		ImpactSound: expnew19.aud
+	Warhead@ResourceDestruction0: DestroyResource
+		Size: 1
+	Warhead@ClusterSmudges0: LeaveSmudge
+		SmudgeType: LargeCrater
+		Size: 1
+	Warhead@ClusterDamage1: SpreadDamage
+		Spread: 2c0
+		Damage: 60
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Delay: 5
+		ValidTargets: Ground, Water, Air
+		Versus:
+			Concrete: 25
+	Warhead@ResourceDestruction1: DestroyResource
+		Size: 2
+		Delay: 5
+	Warhead@ClusterSmudges1: LeaveSmudge
+		SmudgeType: LargeScorch
+		Size: 2
+		Delay: 5
+	Warhead@ClusterDamage2: SpreadDamage
+		Spread: 3c0
+		Damage: 60
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Delay: 10
+		ValidTargets: Ground, Water, Air
+		Versus:
+			Concrete: 25
+	Warhead@ResourceDestruction2: DestroyResource
+		Size: 3
+		Delay: 10
+	Warhead@ClusterSmudges2: LeaveSmudge
+		SmudgeType: LargeScorch
+		Size: 3
+		Delay: 10
+	Warhead@ClusterDamage3: SpreadDamage
+		Spread: 4c0
+		Damage: 60
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Delay: 15
+		ValidTargets: Ground, Water, Air
+		Versus:
+			Concrete: 25
+	Warhead@ResourceDestruction3: DestroyResource
+		Size: 4
+		Delay: 15
+	Warhead@ClusterSmudges3: LeaveSmudge
+		SmudgeType: MediumScorch
+		Size: 4
+		Delay: 15
+	Warhead@ClusterDamage4: SpreadDamage
+		Spread: 5c0
+		Damage: 60
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Delay: 20
+		ValidTargets: Ground, Water, Air
+		Versus:
+			Concrete: 25
+	Warhead@ResourceDestruction4: DestroyResource
+		Size: 5
+		Delay: 20
+	Warhead@ClusterSmudges4: LeaveSmudge
+		SmudgeType: SmallScorch
+		Size: 5
+		Delay: 20

From fbfc38fe1b3caabbc921ac9963fdb84f3ac2e1e3 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 29 Mar 2015 22:50:08 +0200
Subject: [PATCH 2/5] Fix TS weapon names to match the original

---
 mods/ts/rules/structures.yaml      | 8 ++++----
 mods/ts/weapons/energyweapons.yaml | 6 ++++--
 mods/ts/weapons/missiles.yaml      | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index bdef1e6814..5cc1e17c29 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -1026,7 +1026,7 @@ GACTWR:
 	Armament@SAM:
 		UpgradeTypes: tower.sam
 		UpgradeMinEnabledLevel: 1
-		Weapon: SAMTower
+		Weapon: RedEye2
 		LocalOffset: 512,0,512
 	WithMuzzleFlash:
 		UpgradeTypes: tower.vulcan
@@ -1139,7 +1139,7 @@ NASAM:
 	WithTurret:
 		Recoils: no
 	Armament:
-		Weapon: SAMTower
+		Weapon: RedEye2
 		LocalOffset: 512,0,512
 	Power:
 		Amount: -30
@@ -1177,7 +1177,7 @@ NALASR:
 		Offset: 298,-171,0
 	AttackTurreted:
 	Armament:
-		Weapon: TurretLaser
+		Weapon: LaserFire2
 	RenderVoxels:
 	WithVoxelTurret:
 	AutoTarget:
@@ -1212,7 +1212,7 @@ NAOBEL:
 	RenderBuildingCharge:
 		ChargeAudio: obelpowr.aud
 	Armament:
-		Weapon: ObeliskLaser
+		Weapon: LaserFire
 		LocalOffset: 0,0,725
 	AttackCharge:
 		ReloadTime: 50
diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml
index 617891a7db..2cab2d240f 100644
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -125,7 +125,8 @@ Proton:
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
 
-ObeliskLaser:
+# Obelisk laser
+LaserFire:
 	ReloadDelay: 120
 	Range: 10c512
 	Charges: true
@@ -138,7 +139,8 @@ ObeliskLaser:
 		DeathType: 5
 		ProneModifier: 60
 
-TurretLaser:
+# Laser turret
+LaserFire2:
 	ReloadDelay: 40
 	Range: 5c512
 	Report: LASTUR1.AUD
diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml
index caf5dd906e..3b1247f07b 100644
--- a/mods/ts/weapons/missiles.yaml
+++ b/mods/ts/weapons/missiles.yaml
@@ -244,13 +244,13 @@ Hellfire:
 	Warhead@5Smu: LeaveSmudge
 		SmudgeType: SmallCrater
 
-SAMTower:
+RedEye2:
 	ReloadDelay: 55
 	Range: 15c0
 	Report: SAMSHOT1.AUD
 	ValidTargets: Air
 	Projectile: Missile
-		Speed: 298
+		Speed: 384
 		Arm: 2
 		Blockable: false
 		Shadow: true

From 0efce0e94ac218809071250de8be2f4cedcf3972 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 30 Mar 2015 17:42:37 +0200
Subject: [PATCH 3/5] Brings TS weapons more in line with the original's rules

Adds trails to missiles.
---
 mods/ts/sequences/misc.yaml           |  8 ++++++
 mods/ts/weapons/bombsandgrenades.yaml | 18 ++++++++------
 mods/ts/weapons/energyweapons.yaml    | 36 +++++++++++++--------------
 mods/ts/weapons/missiles.yaml         | 31 ++++++++++++-----------
 mods/ts/weapons/otherweapons.yaml     | 17 ++++++-------
 mods/ts/weapons/smallguns.yaml        | 12 ++++-----
 6 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index fad83cdc02..69202d1ffc 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -187,6 +187,14 @@ smallsmoke:
 	idle: sgrysmk1
 		Length: *
 
+large_smoke_trail:
+	idle: smokey
+		Length: *
+
+small_smoke_trail:
+	idle: smokey2
+		Length: *
+
 largefire:
 	idle: fire1
 		Length: *
diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml
index b1ffca1a87..70526c76b5 100644
--- a/mods/ts/weapons/bombsandgrenades.yaml
+++ b/mods/ts/weapons/bombsandgrenades.yaml
@@ -1,12 +1,12 @@
 Grenade:
 	ReloadDelay: 60
 	Range: 4c512
-	Projectile: Bullet
+	Projectile: Bullet # TODO: Add bounce effect
 		Speed: 85
 		Blockable: false
 		Shadow: true
-		Angle: 62
-		Inaccuracy: 554
+		Angle: 45
+		Inaccuracy: 384
 		Image: DISCUS
 	Warhead@1Dam: SpreadDamage
 		Spread: 171
@@ -31,13 +31,15 @@ Grenade:
 		SmudgeType: MediumCrater
 
 Bomb:
-	ReloadDelay: 10
-	Range: 5c0
-	Projectile: Bullet
+	ReloadDelay: 60
+	Burst: 5
+	BurstDelay: 5
+	Range: 2c0
+	Projectile: GravityBomb
 		Speed: 170
-		Image: canister
+		Image: 120mm
 		Shadow: true
-		Palette: player
+		Palette: ra
 	Warhead@1Dam: SpreadDamage
 		Spread: 298
 		Damage: 160
diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml
index 2cab2d240f..76c4d5e5fc 100644
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -22,8 +22,8 @@ LtRail:
 MechRailgun:
 	ReloadDelay: 60
 	Range: 8c0
-	Burst: 2
-	BurstDelay: 10
+	Burst: 2 # for alternating muzzle offsets, dmg/s identical to original
+	BurstDelay: 60
 	Report: RAILUSE5.AUD
 	Projectile: LaserZap
 		Color: 200,0,255,255
@@ -62,23 +62,24 @@ CyCannon:
 	Range: 7c0
 	Report: SCRIN5B.AUD
 	ValidTargets: Ground
-	Projectile: Bullet
+	Projectile: Missile
 		Speed: 192
 		Blockable: false
+		RateOfTurn: 2
 		Shadow: true
 		Image: TORPEDO
 	Warhead@1Dam: SpreadDamage
-		Spread: 256
+		Spread: 43
 		Damage: 120
 		DeathType: 6
-		ProneModifier: 100
+		ProneModifier: 350
 		ValidTargets: Ground
 		Versus:
-			None: 100
-			Wood: 65
-			Light: 75
-			Heavy: 50
-			Concrete: 40
+			None: 350
+			Wood: 260
+			Light: 205
+			Heavy: 150
+			Concrete: 80
 	Warhead@2Eff: CreateEffect
 		Explosion: large_bang
 		ImpactSound: expnew12.aud
@@ -91,25 +92,24 @@ CyCannon:
 		SmudgeType: SmallScorch
 
 Proton:
-	ReloadDelay: 3
+	ReloadDelay: 50
 	Range: 5c0
 	Report: SCRIN5B.AUD
-	Burst: 2
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Speed: 256
-		Arm: 2
+	Burst: 5
+	BurstDelay: 3
+	ValidTargets: Ground
+	Projectile: Bullet
+		Speed: 341
 		Blockable: false
 		Shadow: true
 		Inaccuracy: 128
 		Image: TORPEDO
-		RateOfTurn: 1
 		RangeLimit: 35
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 20
 		DeathType: 3
-		ValidTargets: Ground, Air
+		ValidTargets: Ground
 		Versus:
 			None: 25
 			Wood: 65
diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml
index 3b1247f07b..2f0301990e 100644
--- a/mods/ts/weapons/missiles.yaml
+++ b/mods/ts/weapons/missiles.yaml
@@ -6,19 +6,17 @@ Bazooka:
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Speed: 213
-		Arm: 3
 		Blockable: false
 		Shadow: true
 		Inaccuracy: 128
 		Image: DRAGON
+		Trail: small_smoke_trail
 		RateOfTurn: 8
 		RangeLimit: 50
-		CloseEnough: 256
-		LockOnProbability: 80
 		Palette: ra
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
-		Damage: 35
+		Damage: 25
 		DeathType: 2
 		ValidTargets: Ground, Air
 		Versus:
@@ -55,6 +53,7 @@ HoverMissile:
 		Shadow: true
 		Inaccuracy: 128
 		Image: DRAGON
+		Trail: small_smoke_trail
 		RateOfTurn: 8
 		RangeLimit: 35
 		Palette: ra
@@ -91,14 +90,14 @@ MammothTusk:
 	ValidTargets: Air
 	Burst: 2
 	Projectile: Missile
-		Arm: 0
 		Blockable: false
 		Shadow: true
 		Inaccuracy: 128
 		Image: DRAGON
+		Trail: small_smoke_trail
 		RateOfTurn: 10
-		Speed: 170
-		RangeLimit: 35
+		Speed: 213
+		RangeLimit: 50
 		Palette: ra
 	Warhead@1Dam: SpreadDamage
 		Spread: 171
@@ -123,7 +122,7 @@ MammothTusk:
 
 BikeMissile:
 	ReloadDelay: 60
-	Burst: 2
+	Burst: 2 # to make bike alternate between left and right launcher, change in dmg/s compared to original TS
 	BurstDelay: 60
 	Range: 5c0
 	Report: MISL1.AUD
@@ -134,9 +133,10 @@ BikeMissile:
 		Shadow: true
 		Inaccuracy: 128
 		Image: DRAGON
+		Trail: small_smoke_trail
 		RateOfTurn: 8
 		Speed: 213
-		RangeLimit: 35
+		RangeLimit: 50
 		Palette: ra
 	Warhead@1Dam: SpreadDamage
 		Spread: 256
@@ -167,14 +167,15 @@ Dragon:
 	Report: MISL1.AUD
 	ValidTargets: Ground, Air
 	Projectile: Missile
-		Speed: 213
+		Speed: 171
 		Arm: 2
 		Blockable: false
 		Shadow: true
 		Inaccuracy: 128
 		Image: DRAGON
+		Trail: small_smoke_trail
 		RateOfTurn: 8
-		RangeLimit: 35
+		RangeLimit: 50
 		Palette: ra
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
@@ -207,7 +208,7 @@ Hellfire:
 	Range: 6c0
 	Report: ORCAMIS1.AUD
 	Burst: 2
-	ValidTargets: Ground, Air
+	ValidTargets: Ground
 	Projectile: Missile
 		Speed: 256
 		Arm: 2
@@ -215,6 +216,7 @@ Hellfire:
 		Shadow: true
 		Inaccuracy: 128
 		Image: DRAGON
+		Trail: small_smoke_trail
 		RateOfTurn: 8
 		RangeLimit: 35
 		Palette: ra
@@ -222,7 +224,7 @@ Hellfire:
 		Spread: 85
 		Damage: 30
 		DeathType: 2
-		ValidTargets: Ground, Air
+		ValidTargets: Ground
 		Versus:
 			None: 30
 			Wood: 65
@@ -256,8 +258,9 @@ RedEye2:
 		Shadow: true
 		Inaccuracy: 128
 		Image: DRAGON
+		Trail: small_smoke_trail
 		RateOfTurn: 5
-		RangeLimit: 60
+		RangeLimit: 100
 		Palette: ra
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml
index 2b3e5adae8..7d7b6b3b2a 100644
--- a/mods/ts/weapons/otherweapons.yaml
+++ b/mods/ts/weapons/otherweapons.yaml
@@ -32,17 +32,16 @@ FiendShard:
 		Image: CRYSTAL4
 		Inaccuracy: 512
 		Shadow: true
-		Angle: 88
+		Angle: 60
 		Palette: greentiberium
 	Warhead@1Dam: SpreadDamage
 		Damage: 35
 		DeathType: 1
 		ProneModifier: 100
 		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
+			Light: 60
+			Heavy: 40
+			Concrete: 20
 	Warhead@3EffWater: CreateEffect
 		Explosion: small_watersplash
 		ImpactSound: ssplash3.aud
@@ -50,7 +49,6 @@ FiendShard:
 
 SlimeAttack:
 	ReloadDelay: 80
-	Burst: 3
 	Range: 5c0
 	Report: VICER1.AUD
 	Projectile: Bullet
@@ -60,10 +58,9 @@ SlimeAttack:
 		DeathType: 2
 		ProneModifier: 100
 		Versus:
-			Wood: 25
-			Light: 30
-			Heavy: 10
-			Concrete: 10
+			Light: 60
+			Heavy: 40
+			Concrete: 20
 
 Tiberium:
 	ReloadDelay: 16
diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml
index 6d0b9773ac..8259084128 100644
--- a/mods/ts/weapons/smallguns.yaml
+++ b/mods/ts/weapons/smallguns.yaml
@@ -6,7 +6,7 @@ Minigun:
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
-		Damage: 12
+		Damage: 8
 		DeathType: 1
 		ProneModifier: 70
 		Versus:
@@ -188,7 +188,7 @@ AssaultCannon:
 RaiderCannon:
 	ReloadDelay: 55
 	Range: 4c0
-	Burst: 2
+	Burst: 2 # this + BurstDelay just makes the buggy alternate between barrels (for muzzle flash), no actual difference to original TS
 	BurstDelay: 55
 	Report: CHAINGN1.AUD
 	Projectile: Bullet
@@ -271,7 +271,7 @@ Sniper:
 		ProneModifier: 100
 		Versus:
 			None: 100
-			Wood: 0
-			Light: 0
-			Heavy: 0
-			Concrete: 0
+			Wood: 5
+			Light: 5
+			Heavy: 5
+			Concrete: 5

From 32bed06df5a38428c6c7fb50d4cb0467ad52e856 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 30 Mar 2015 17:43:31 +0200
Subject: [PATCH 4/5] Fix Orca Bomber and Banshee Fighter flight behavior and
 reloading

---
 mods/ts/rules/aircraft.yaml | 27 ++++++++++++++++-----------
 mods/ts/rules/defaults.yaml | 13 +++++++++++--
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index 8b00e87e04..04d0cd12da 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -99,7 +99,7 @@ ORCA:
 	Hovers:
 
 ORCAB:
-	Inherits: ^Helicopter
+	Inherits: ^Plane
 	Valued:
 		Cost: 1600
 	Tooltip:
@@ -110,10 +110,12 @@ ORCAB:
 		Prerequisites: ~gahpad, gatech
 	Selectable:
 		Bounds: 30,24
-	Helicopter:
+	Plane:
+		CruiseAltitude: 3072
+		MaximumPitch: 120
 		RearmBuildings: gahpad
-		ROT: 5
-		Speed: 112
+		ROT: 3
+		Speed: 96
 	Health:
 		HP: 260
 	Armor:
@@ -122,11 +124,13 @@ ORCAB:
 		Range: 2c0
 	Armament:
 		Weapon: Bomb
-	AttackHeli:
+	AttackPlane:
 		FacingTolerance: 20
 	AmmoPool:
-		Ammo: 2
+		Ammo: 10
 		PipCount: 2
+		ReloadCount: 5
+		ReloadTicks: 200
 		PipType: Ammo
 		PipTypeEmpty: AmmoEmpty
 	AutoTarget:
@@ -190,7 +194,7 @@ TRNSPORT:
 	Hovers:
 
 SCRIN:
-	Inherits: ^Helicopter
+	Inherits: ^Plane
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -202,7 +206,8 @@ SCRIN:
 	Selectable:
 		Bounds: 30,24
 		Voice: Scrin
-	Helicopter:
+	Plane:
+		MaximumPitch: 90
 		RearmBuildings: nahpad
 		ROT: 3
 		Speed: 168
@@ -214,11 +219,12 @@ SCRIN:
 		Range: 2c0
 	Armament:
 		Weapon: Proton
-	AttackHeli:
+	AttackPlane:
 		FacingTolerance: 20
 	AmmoPool:
-		Ammo: 3
+		Ammo: 15
 		PipCount: 3
+		ReloadCount: 5
 		PipType: Ammo
 		PipTypeEmpty: AmmoEmpty
 	AutoTarget:
@@ -264,4 +270,3 @@ APACHE:
 	RenderVoxels:
 	WithVoxelBody:
 	Hovers:
-
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index b0e98a2e10..1b0cfdac4a 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -438,8 +438,7 @@
 		RepairBuildings:
 		RearmBuildings:
 		LandWhenIdle: no
-	Buildable:
-		Queue: Aircraft
+		CruiseAltitude: 2048
 	HiddenUnderFog:
 	AttackMove:
 	GainsExperience:
@@ -472,6 +471,16 @@
 	UpgradeManager:
 	MustBeDestroyed:
 
+^Plane:	
+	Inherits: ^Helicopter
+	-Helicopter:
+	Plane:
+		RepairBuildings:
+		RearmBuildings: gahpad, nahpad
+		LandWhenIdle: no
+		CruiseAltitude: 2560
+	ReturnOnIdle:
+
 ^BlossomTree:
 	Tooltip:
 		Name: Blossom Tree

From 6dc577ed6f154fafb2c910486180eff15c1c1d1a Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Wed, 1 Apr 2015 23:10:41 +0200
Subject: [PATCH 5/5] Make all aircraft repairable on GDI repair bay, make all
 armed aircraft rearmable on both helipads

---
 mods/ts/rules/aircraft.yaml | 6 ++----
 mods/ts/rules/defaults.yaml | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index 04d0cd12da..734cc39d63 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -74,7 +74,7 @@ ORCA:
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
-		RearmBuildings: gahpad
+		RearmBuildings: gahpad, nahpad
 		ROT: 5
 		Speed: 186
 	Health:
@@ -113,7 +113,6 @@ ORCAB:
 	Plane:
 		CruiseAltitude: 3072
 		MaximumPitch: 120
-		RearmBuildings: gahpad
 		ROT: 3
 		Speed: 96
 	Health:
@@ -208,7 +207,6 @@ SCRIN:
 		Voice: Scrin
 	Plane:
 		MaximumPitch: 90
-		RearmBuildings: nahpad
 		ROT: 3
 		Speed: 168
 	Health:
@@ -245,7 +243,7 @@ APACHE:
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
-		RearmBuildings: nahpad
+		RearmBuildings: gahpad, nahpad
 		ROT: 5
 		Speed: 130
 	Health:
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 1b0cfdac4a..cc47de8b8e 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -435,7 +435,7 @@
 	Selectable:
 		Voice: Heli
 	Helicopter:
-		RepairBuildings:
+		RepairBuildings: gadept
 		RearmBuildings:
 		LandWhenIdle: no
 		CruiseAltitude: 2048
@@ -475,7 +475,7 @@
 	Inherits: ^Helicopter
 	-Helicopter:
 	Plane:
-		RepairBuildings:
+		RepairBuildings: gadept
 		RearmBuildings: gahpad, nahpad
 		LandWhenIdle: no
 		CruiseAltitude: 2560