Remove TS bombsandgrenades.yaml and move its weapons elsewhere

Grenade and RPGTower weapon to ballisticweapons.yaml, Bomb to otherweapons.yaml

mods/ts/mod.yaml

@@ -85,11 +85,10 @@ Rules:
 	ts|rules/bridges.yaml
 
 Weapons:
-	ts|weapons/bombsandgrenades.yaml
+	ts|weapons/ballisticweapons.yaml
 	ts|weapons/energyweapons.yaml
 	ts|weapons/explosions.yaml
 	ts|weapons/healweapons.yaml
-	ts|weapons/ballisticweapons.yaml
 	ts|weapons/missiles.yaml
 	ts|weapons/otherweapons.yaml
 	ts|weapons/smallguns.yaml

mods/ts/weapons/ballisticweapons.yaml

@@ -130,3 +130,71 @@
 	Warhead@4Smu: LeaveSmudge
 		SmudgeType: MediumCrater
 		InvalidTargets: Vehicle, Building, Wall
+
+Grenade:
+	ReloadDelay: 60
+	Range: 4c512
+	Projectile: Bullet
+		Speed: 160
+		Blockable: true
+		Shadow: true
+		LaunchAngle: 60
+		Inaccuracy: 0
+		Image: DISCUS
+		BounceCount: 2
+	Warhead@1Dam: SpreadDamage
+		Spread: 192
+		Damage: 40
+		Versus:
+			None: 100
+			Wood: 85
+			Light: 70
+			Heavy: 35
+			Concrete: 28
+		DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: large_grey_explosion
+		ImpactSounds: expnew13.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosions: small_watersplash
+		ExplosionPalette: player
+		ImpactSounds: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+		InvalidTargets: Vehicle, Building, Wall
+
+RPGTower:
+	ReloadDelay: 80
+	Range: 8c0
+	Report: glnch4.aud
+	Projectile: Bullet
+		Speed: 384
+		Blockable: false
+		Shadow: true
+		LaunchAngle: 62
+		Image: canister
+		Palette: player
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 110
+		Versus:
+			None: 30
+			Wood: 75
+			Light: 90
+			Heavy: 100
+			Concrete: 70
+		DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: large_clsn
+		ImpactSounds: expnew14.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosions: small_watersplash
+		ExplosionPalette: player
+		ImpactSounds: ssplash2.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+		InvalidTargets: Vehicle, Building, Wall

mods/ts/weapons/bombsandgrenades.yaml

@@ -1,101 +0,0 @@
-Grenade:
-	ReloadDelay: 60
-	Range: 4c512
-	Projectile: Bullet
-		Speed: 160
-		Blockable: true
-		Shadow: true
-		LaunchAngle: 60
-		Inaccuracy: 0
-		Image: DISCUS
-		BounceCount: 2
-	Warhead@1Dam: SpreadDamage
-		Spread: 192
-		Damage: 40
-		Versus:
-			None: 100
-			Wood: 85
-			Light: 70
-			Heavy: 35
-			Concrete: 28
-		DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: large_grey_explosion
-		ImpactSounds: expnew13.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: small_watersplash
-		ExplosionPalette: player
-		ImpactSounds: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-		InvalidTargets: Vehicle, Building, Wall
-
-Bomb:
-	ReloadDelay: 60
-	Burst: 5
-	BurstDelay: 5
-	Range: 2c0
-	Projectile: GravityBomb
-		Speed: 170
-		Image: 120mm
-		Shadow: true
-		Palette: ra
-	Warhead@1Dam: SpreadDamage
-		Spread: 298
-		Damage: 160
-		Versus:
-			None: 200
-			Wood: 90
-			Light: 75
-			Heavy: 32
-			Concrete: 100
-		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: large_explosion
-		ExplosionPalette: effectalpha75
-		ImpactSounds: expnew09.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: small_watersplash
-		ExplosionPalette: player
-		ImpactSounds: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-		InvalidTargets: Vehicle, Building, Wall
-
-RPGTower:
-	ReloadDelay: 80
-	Range: 8c0
-	Report: glnch4.aud
-	Projectile: Bullet
-		Speed: 384
-		Blockable: false
-		Shadow: true
-		LaunchAngle: 62
-		Image: canister
-		Palette: player
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 110
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 90
-			Heavy: 100
-			Concrete: 70
-		DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: large_clsn
-		ImpactSounds: expnew14.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: small_watersplash
-		ExplosionPalette: player
-		ImpactSounds: ssplash2.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumCrater
-		InvalidTargets: Vehicle, Building, Wall

mods/ts/weapons/otherweapons.yaml

@@ -22,6 +22,40 @@ FireballLauncher:
 		SmudgeType: SmallScorch
 		InvalidTargets: Vehicle, Building, Wall
 
+Bomb:
+	ReloadDelay: 60
+	Burst: 5
+	BurstDelay: 5
+	Range: 2c0
+	Projectile: GravityBomb
+		Speed: 170
+		Image: 120mm
+		Shadow: true
+		Palette: ra
+	Warhead@1Dam: SpreadDamage
+		Spread: 298
+		Damage: 160
+		Versus:
+			None: 200
+			Wood: 90
+			Light: 75
+			Heavy: 32
+			Concrete: 100
+		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: large_explosion
+		ExplosionPalette: effectalpha75
+		ImpactSounds: expnew09.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosions: small_watersplash
+		ExplosionPalette: player
+		ImpactSounds: ssplash3.aud
+		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+		InvalidTargets: Vehicle, Building, Wall
+
 FiendShard:
 	ReloadDelay: 30
 	Burst: 3