Merge pull request #12640 from reaperrr/ts-weapon-inherit2

Slim & tweak TS weapons - part 2
2017-02-04 14:40:27 +01:00
parent 484dd20f28 2ee47ff5cf
commit 226e2f7fa4
5 changed files with 156 additions and 400 deletions
--- a/mods/ts/weapons/ballisticweapons.yaml
+++ b/mods/ts/weapons/ballisticweapons.yaml
@@ -1,4 +1,4 @@
-90mm:
+^Cannon:
 	ReloadDelay: 50
 	Range: 6c768
 	Report: 120mmf.aud
@@ -9,7 +9,8 @@
 		LaunchAngle: 75
 		Palette: ra
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
+		Spread: 108
+		Falloff: 100, 50, 25, 12, 6, 3, 0
 		Damage: 36
 		Versus:
 			None: 25
@@ -19,7 +20,8 @@
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosions: small_clsn
+		Explosions: medium_clsn
+		ExplosionPalette: effectalpha75
 		ImpactSounds: expnew14.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
@@ -27,89 +29,63 @@
 		ExplosionPalette: player
 		ImpactSounds: ssplash3.aud
 		ValidImpactTypes: Water
+	Warhead@4Smu: LeaveSmudge
+		SmudgeType: MediumCrater
+		InvalidTargets: Vehicle, Building, Wall
+
+90mm:
+	Inherits: ^Cannon
+	Warhead@2Eff: CreateEffect
+		Explosions: small_clsn
 	Warhead@4Smu: LeaveSmudge
 		SmudgeType: SmallCrater
-		InvalidTargets: Vehicle, Building, Wall

 120mm:
+	Inherits: ^Cannon
 	ReloadDelay: 80
-	Range: 6c768
-	Report: 120mmf.aud
 	Projectile: Bullet
 		Speed: 1c512
+		Blockable: false
+		LaunchAngle: 0
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 70
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: medium_clsn
-		ImpactSounds: expnew14.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

 120mmx:
+	Inherits: ^Cannon
 	ReloadDelay: 80
-	Range: 6c768
-	Report: 120mmf.aud
 	Burst: 2
 	BurstDelay: 5
-	Projectile: Bullet
-		Speed: 682
-		Image: 120mm
-		Shadow: true
-		LaunchAngle: 62
-		Palette: ra
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 50
-		Versus:
-			None: 25
-			Wood: 65
-			Light: 75
-			Heavy: 100
-			Concrete: 60
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: medium_clsn
-		ImpactSounds: expnew14.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

-155mm:
-	ReloadDelay: 110
-	Range: 18c0
-	Report: 120mmf.aud
+RPGTower:
+	Inherits: ^Cannon
+	ReloadDelay: 80
+	Range: 8c0
+	Report: glnch4.aud
 	Projectile: Bullet
-		Speed: 170
-		Image: 120mm
-		LaunchAngle: 165
-		Shadow: true
+		Speed: 384
 		Blockable: false
-		Palette: ra
-	MinRange: 5c0
+		Image: canister
+		Palette: player
 	Warhead@1Dam: SpreadDamage
-		Spread: 298
-		Damage: 150
+		Damage: 110
+		Versus:
+			None: 30
+			Wood: 75
+			Light: 90
+			Heavy: 100
+			Concrete: 70
+		DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: large_clsn
+
+^ArtilleryWeapon:
+	Inherits: ^Cannon
+	Projectile: Bullet
+		Blockable: false
+	Warhead@1Dam: SpreadDamage
+		Spread: 216
 		Versus:
 			None: 100
 			Wood: 85
@@ -117,21 +93,23 @@
 			Heavy: 35
 			Concrete: 35
 		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
+
+155mm:
+	Inherits: ^ArtilleryWeapon
+	ReloadDelay: 110
+	Range: 18c0
+	Projectile: Bullet
+		Speed: 384
+		LaunchAngle: 165
+	MinRange: 5c0
+	Warhead@1Dam: SpreadDamage
+		Damage: 150
 	Warhead@2Eff: CreateEffect
 		Explosions: large_explosion
-		ExplosionPalette: effectalpha75
 		ImpactSounds: expnew06.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

 Grenade:
+	Inherits: ^ArtilleryWeapon
 	ReloadDelay: 60
 	Range: 4c512
 	Projectile: Bullet
@@ -143,58 +121,12 @@ Grenade:
 		Image: DISCUS
 		BounceCount: 2
 	Warhead@1Dam: SpreadDamage
-		Spread: 192
+		Spread: 154
 		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
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -1,4 +1,4 @@
-LtRail:
+^Railgun:
 	ReloadDelay: 60
 	Range: 6c0
 	Report: bigggun1.aud
@@ -14,9 +14,7 @@ LtRail:
 		Range: 0, 32
 		Falloff: 100, 100
 		Damage: 150
-		InfDeath: 6
 		AffectsParent: false
-		ValidStances: Neutral, Enemy
 		Versus:
 			None: 100
 			Wood: 130
@@ -24,6 +22,11 @@ LtRail:
 			Heavy: 110
 			Concrete: 5
 		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
+
+LtRail:
+	Inherits: ^Railgun
+	Warhead@1Dam: SpreadDamage
+		ValidStances: Neutral, Enemy
 	Warhead@2Dam: SpreadDamage
 		Range: 0, 32
 		Falloff: 50, 50 # Only does half damage to friendly units
@@ -40,21 +43,14 @@ LtRail:
 		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath

 MechRailgun:
-	ReloadDelay: 60
+	Inherits: ^Railgun
 	Range: 8c0
 	Burst: 2 # for alternating muzzle offsets, dmg/s identical to original
 	BurstDelay: 60
 	Report: railuse5.aud
 	Projectile: AreaBeam
-		Speed: 20c0
-		Duration: 3
-		DamageInterval: 2
-		Width: 80
-		BeyondTargetRange: 0c64
-		Blockable: true
 		Color: 00FFFFC8
 	Warhead@1Dam: SpreadDamage
-		Spread: 42
 		Damage: 200
 		Versus:
 			None: 200
@@ -62,7 +58,6 @@ MechRailgun:
 			Light: 160
 			Heavy: 100
 			Concrete: 25
-		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath

 SonicZap:
 	ReloadDelay: 180
@@ -101,30 +96,13 @@ SonicZap:
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath

-CyCannon:
+^EnergyBlast:
 	ReloadDelay: 50
 	Range: 7c0
 	Report: scrin5b.aud
 	ValidTargets: Ground
-	Projectile: Missile
-		MaximumLaunchSpeed: 192
-		Blockable: false
-		HorizontalRateOfTurn: 2
-		Shadow: true
-		Image: TORPEDO
-		MinimumLaunchSpeed: 75
-		Speed: 384
 	Warhead@1Dam: SpreadDamage
-		Spread: 43
-		Damage: 120
 		ValidTargets: Ground
-		Versus:
-			None: 350
-			Wood: 260
-			Light: 205
-			Heavy: 150
-			Concrete: 80
-		DamageTypes: Prone350Percent, TriggerProne, EnergyDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: large_explosion
 		ExplosionPalette: effectalpha75
@@ -139,24 +117,42 @@ CyCannon:
 		SmudgeType: SmallScorch
 		InvalidTargets: Vehicle, Building, Wall

+CyCannon:
+	Inherits: ^EnergyBlast
+	Projectile: Missile
+		MaximumLaunchSpeed: 192
+		Blockable: false
+		HorizontalRateOfTurn: 2
+		Shadow: true
+		Image: TORPEDO
+		MinimumLaunchSpeed: 75
+		Speed: 384
+		RangeLimit: 8c0
+	Warhead@1Dam: SpreadDamage
+		Spread: 43
+		Damage: 120
+		Versus:
+			None: 350
+			Wood: 260
+			Light: 205
+			Heavy: 150
+			Concrete: 80
+		DamageTypes: Prone350Percent, TriggerProne, EnergyDeath
+
 Proton:
-	ReloadDelay: 50
+	Inherits: ^EnergyBlast
 	Range: 5c0
-	Report: scrin5b.aud
 	Burst: 5
 	BurstDelay: 3
-	ValidTargets: Ground
 	Projectile: Bullet
 		Speed: 341
 		Blockable: false
 		Shadow: true
 		Inaccuracy: 128
 		Image: TORPEDO
-		RangeLimit: 35
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 20
-		ValidTargets: Ground
 		Versus:
 			None: 25
 			Wood: 65
@@ -166,21 +162,8 @@ Proton:
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: small_bang
-		ImpactSounds: expnew12.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: small_watersplash
-		ExplosionPalette: player
-		ImpactSounds: ssplash3.aud
-		ValidImpactTypes: Water
-	Warhead@4Smu: LeaveSmudge
-		SmudgeType: MediumScorch
-		InvalidTargets: Vehicle, Building, Wall

-ObeliskLaserFire:
-	ReloadDelay: 1
-	Range: 10c512
-	Report: obelray1.aud
+^Laser:
 	Projectile: LaserZap
 		Width: 72
 		Duration: 15
@@ -195,20 +178,23 @@ ObeliskLaserFire:
 		Damage: 250
 		DamageTypes: Prone60Percent, TriggerProne, EnergyDeath

+ObeliskLaserFire:
+	Inherits: ^Laser
+	ReloadDelay: 1
+	Range: 10c512
+	Report: obelray1.aud
+	Warhead@1Dam: SpreadDamage
+		Damage: 250
+
 TurretLaserFire:
+	Inherits: ^Laser
 	ReloadDelay: 40
 	Range: 5c512
 	Report: lastur1.aud
 	Projectile: LaserZap
 		Width: 36
 		Duration: 8
-		ZOffset: 2047
-		Color: FF000080
-		SecondaryBeam: true
 		SecondaryBeamWidth: 144
-		SecondaryBeamZOffset: 2047
 		SecondaryBeamColor: FF000030
 	Warhead@1Dam: SpreadDamage
-		Spread: 42
 		Damage: 30
-		DamageTypes: Prone60Percent, TriggerProne, EnergyDeath
--- a/mods/ts/weapons/explosions.yaml
+++ b/mods/ts/weapons/explosions.yaml
@@ -1,8 +1,8 @@
-UnitExplode:
+^DamagingExplosion:
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
+		Spread: 192
+		Falloff: 100, 50, 25, 12, 6, 3, 0
 		Damage: 50
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Versus:
 			None: 90
 			Wood: 75
@@ -17,16 +17,13 @@ UnitExplode:
 		SmudgeType: MediumCrater
 		InvalidTargets: Building, Wall

+UnitExplode:
+	Inherits: ^DamagingExplosion
+
 UnitExplodeSmall:
+	Inherits: ^DamagingExplosion
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
 		Damage: 40
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: medium_brnl
 		ImpactSounds: expnew13.aud
@@ -47,27 +44,21 @@ CyborgExplode:
 		ImpactSounds: expnew10.aud

 TiberiumExplosion:
+	Inherits: ^DamagingExplosion
 	Warhead@1Dam: SpreadDamage
 		Spread: 9
 		Damage: 10
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Res: CreateResource
+	Warhead@Res: CreateResource
 		AddsResourceType: Tiberium
 		Size: 1,1
-	Warhead@3Eff: CreateEffect
+	Warhead@2Eff: CreateEffect
 		Explosions: large_explosion
-		ExplosionPalette: effectalpha75
-		ImpactSounds: expnew09.aud
+	-Warhead@4Smu: LeaveSmudge

 SmallDebris:
 	ReloadDelay: 60
 	Range: 4c0
-	Report:
 	Projectile: Bullet
 		Speed: 50, 125
 		LaunchAngle: 45, 135
@@ -76,15 +67,9 @@ SmallDebris:
 		Shadow: true

 LargeDebris:
-	ReloadDelay: 60
-	Range: 4c0
-	Report:
+	Inherits: SmallDebris
 	Projectile: Bullet
-		Speed: 50, 125
-		LaunchAngle: 45, 135
 		Image: dbrislg
-		Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-		Shadow: true

 Demolish:
 	Warhead@1Dam: SpreadDamage
--- a/mods/ts/weapons/missiles.yaml
+++ b/mods/ts/weapons/missiles.yaml
@@ -22,7 +22,8 @@
 		CruiseAltitude: 1c512
 		AllowSnapping: true
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
+		Spread: 108
+		Falloff: 100, 50, 25, 12, 6, 3, 0
 		Damage: 25
 		ValidTargets: Ground, Air
 		Versus:
@@ -70,7 +71,7 @@ MammothTusk:
 		HorizontalRateOfTurn: 10
 		RangeLimit: 9c0
 	Warhead@1Dam: SpreadDamage
-		Spread: 171
+		Spread: 144
 		Damage: 40
 		ValidTargets: Air
 		Versus:
@@ -92,7 +93,7 @@ MammothTusk:

 BikeMissile:
 	Inherits: ^DefaultMissile
-	Burst: 2 # to make bike alternate between left and right launcher, change in dmg/s compared to original TS
+	Burst: 2 # to make bike alternate between left and right launcher, no change in dmg/s compared to original TS
 	BurstDelay: 60
 	Range: 5c0
 	Report: misl1.aud
@@ -118,7 +119,7 @@ Hellfire:
 	Burst: 2
 	ValidTargets: Ground
 	Warhead@1Dam: SpreadDamage
-		Spread: 85
+		Spread: 72
 		Damage: 30
 		ValidTargets: Ground, Air
 		Versus:
--- a/mods/ts/weapons/smallguns.yaml
+++ b/mods/ts/weapons/smallguns.yaml
@@ -1,82 +1,11 @@
-Minigun:
-	ReloadDelay: 21
-	Range: 4c0
-	Report: infgun3.aud, gostgun1.aud, slvkgun1.aud
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 8
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water
-
-M1Carbine:
+^MG:
 	ReloadDelay: 20
 	Range: 4c0
-	Report: infgun3.aud
-	Projectile: Bullet
-		Speed: 1c682
+	Projectile: InstantHit
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
+		Spread: 108
+		Falloff: 100, 50, 25, 12, 6, 3, 0
 		Damage: 15
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water
-
-Vulcan:
-	ReloadDelay: 60
-	Range: 4c0
-	Report: chaingn1.aud
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 20
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water
-
-Vulcan2:
-	ReloadDelay: 50
-	Burst: 3
-	Range: 6c0
-	Report: tsgun4.aud
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 50
 		Versus:
 			None: 100
 			Wood: 60
@@ -92,186 +21,109 @@ Vulcan2:
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

+Minigun:
+	Inherits: ^MG
+	ReloadDelay: 21
+	Report: infgun3.aud, gostgun1.aud, slvkgun1.aud
+	Warhead@1Dam: SpreadDamage
+		Damage: 8
+
+M1Carbine:
+	Inherits: ^MG
+	Report: infgun3.aud
+
+Vulcan:
+	Inherits: ^MG
+	Report: chaingn1.aud
+	Warhead@1Dam: SpreadDamage
+		Damage: 20
+
+Vulcan2:
+	Inherits: ^MG
+	ReloadDelay: 50
+	Burst: 3
+	Range: 6c0
+	Report: tsgun4.aud
+	Warhead@1Dam: SpreadDamage
+		Damage: 50
+
 Vulcan3:
+	Inherits: ^MG
 	ReloadDelay: 30
 	Burst: 3
-	Range: 4c0
 	Report: cygun1.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 10
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water

 VulcanTower:
+	Inherits: ^MG
 	ReloadDelay: 26
 	Range: 6c0
 	Report: chaingn1.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 18
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water

 JumpCannon:
+	Inherits: ^MG
 	ReloadDelay: 40
 	Burst: 2
 	Range: 5c0
 	Report: jumpjet1.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 15
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water

 AssaultCannon:
+	Inherits: ^MG
 	ReloadDelay: 50
 	Range: 5c0
 	Report: tsgun4.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 40
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water

 RaiderCannon:
+	Inherits: ^MG
 	ReloadDelay: 55
 	Range: 4c0
 	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
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 40
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water

 HarpyClaw:
+	Inherits: ^MG
 	ReloadDelay: 36
 	Range: 5c0
 	Report: cygun1.aud
-	Projectile: Bullet
-		Speed: 1c682
-	ValidTargets: Ground, Air
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 60
-		ValidTargets: Ground, Air
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ExplosionPalette: ra
-		ValidImpactTypes: Water

 Pistola:
-	ReloadDelay: 20
+	Inherits: ^MG
 	Range: 3c0
 	Report: gun18.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 2
-		Versus:
-			Wood: 60
-			Light: 40
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: piff
-		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
 		Explosions: water_piff
-		ExplosionPalette: ra
-		ValidImpactTypes: Water

 Sniper:
+	Inherits: ^MG
 	ReloadDelay: 60
 	Range: 6c768
 	Report: silencer.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 42
+		Spread: 36
 		Damage: 150
 		Versus:
-			None: 100
 			Wood: 5
 			Light: 5
 			Heavy: 5
 			Concrete: 5
 		DamageTypes: Prone100Percent, TriggerProne, BulletDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: piff
+	Warhead@3EffWater: CreateEffect
+		Explosions: water_piff