Merge pull request #12633 from reaperrr/slim-ra-weapons

Slim down RA weapon yamls via inheritance
2017-02-09 21:57:39 +01:00
parent 01357c4f59 fce404f6d9
commit ac9c8b93a2
7 changed files with 423 additions and 826 deletions
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -127,7 +127,7 @@ ChromeLayout:

 Weapons:
 	ra|weapons/explosions.yaml
-	ra|weapons/largecaliber.yaml
+	ra|weapons/ballistics.yaml
 	ra|weapons/missiles.yaml
 	ra|weapons/other.yaml
 	ra|weapons/smallcaliber.yaml
--- a/mods/ra/weapons/ballistics.yaml
+++ b/mods/ra/weapons/ballistics.yaml
@@ -0,0 +1,196 @@
+^Cannon:
+	ReloadDelay: 50
+	Range: 4c768
+	Report: cannon1.aud
+	Projectile: Bullet
+		Speed: 682
+		Image: 120MM
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 40
+		Versus:
+			None: 20
+			Wood: 75
+			Light: 75
+			Concrete: 50
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
+	Warhead@3Eff: CreateEffect
+		Explosions: small_explosion
+		ImpactSounds: kaboom12.aud
+		InvalidImpactTypes: Water
+	Warhead@4EffWater: CreateEffect
+		Explosions: small_splash
+		ImpactSounds: splash9.aud
+		ValidImpactTypes: Water
+
+25mm:
+	Inherits: ^Cannon
+	ReloadDelay: 13
+	Range: 4c0
+	Report: cannon2.aud
+	Projectile: Bullet
+		Speed: 853
+		Image: 50CAL
+	Warhead@1Dam: SpreadDamage
+		Damage: 16
+		Versus:
+			None: 30
+			Wood: 40
+			Light: 100
+			Heavy: 40
+			Concrete: 30
+	-Warhead@2Smu: LeaveSmudge
+	Warhead@3Eff: CreateEffect
+		ImpactSounds:
+	Warhead@4EffWater: CreateEffect
+		ImpactSounds:
+
+90mm:
+	Inherits: ^Cannon
+
+105mm:
+	Inherits: ^Cannon
+	ReloadDelay: 70
+	Burst: 2
+	BurstDelay: 4
+
+120mm:
+	Inherits: ^Cannon
+	ReloadDelay: 90
+	Burst: 2
+	InvalidTargets: Air, Infantry
+	Warhead@1Dam: SpreadDamage
+		Damage: 60
+		InvalidTargets: Air
+
+TurretGun:
+	Inherits: ^Cannon
+	ReloadDelay: 30
+	Range: 7c0
+	Report: turret1.aud
+	Warhead@1Dam: SpreadDamage
+		Damage: 60
+		Versus:
+			Wood: 50
+
+^Artillery:
+	Inherits: ^Cannon
+	ReloadDelay: 85
+	Range: 12c0
+	Projectile: Bullet
+		Speed: 204
+		Blockable: false
+		LaunchAngle: 62
+		Inaccuracy: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 220
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+			Concrete: 50
+		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
+	Warhead@3Eff: CreateEffect
+		Explosions: artillery_explosion
+		ImpactSounds: kaboom15.aud
+	Warhead@4EffWater: CreateEffect
+		Explosions: med_splash
+
+155mm:
+	Inherits: ^Artillery
+	MinRange: 3c0
+	Report: tank5.aud
+	Projectile: Bullet
+		ContrailLength: 30
+
+8Inch:
+	Inherits: ^Artillery
+	MinRange: 3c0
+	ReloadDelay: 250
+	Range: 16c0
+	Burst: 2
+	Report: turret1.aud
+	Projectile: Bullet
+		Inaccuracy: 2c938
+		ContrailLength: 30
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: 25
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		Versus:
+			None: 60
+			Wood: 75
+			Light: 60
+			Heavy: 25
+			Concrete: 100
+	Warhead@4EffWater: CreateEffect
+		Explosions: large_splash
+
+2Inch:
+	Inherits: ^Cannon
+	ReloadDelay: 60
+	Range: 5c512
+	Report: cannon2.aud
+	Projectile: Bullet
+		Speed: 426
+	Warhead@1Dam: SpreadDamage
+		Damage: 25
+		Versus:
+			None: 30
+
+Grenade:
+	Inherits: ^Artillery
+	ReloadDelay: 60
+	Range: 4c0
+	Report: grenade1.aud
+	Projectile: Bullet
+		Speed: 136
+		Inaccuracy: 554
+		Image: BOMB
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 60
+		Versus:
+			None: 50
+			Wood: 100
+			Light: 25
+			Heavy: 25
+			Concrete: 100
+	Warhead@3Eff: CreateEffect
+		Explosions: med_explosion
+		ImpactSounds: kaboom25.aud
+	Warhead@4EffWater: CreateEffect
+		Explosions: small_splash
+
+DepthCharge:
+	Inherits: ^Artillery
+	ReloadDelay: 60
+	Range: 5c0
+	ValidTargets: Underwater
+	Projectile: Bullet
+		Speed: 85
+		Image: BOMB
+		Inaccuracy: 128
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 80
+		ValidTargets: Underwater
+		Versus:
+			None: 30
+			Wood: 75
+			Light: 75
+			Heavy: 100
+			Concrete: 50
+		DamageTypes: ExplosionDeath
+	Warhead@4EffWater: CreateEffect
+		Explosions: large_splash
+		ImpactSounds: h2obomb2.aud
+	Warhead@3Eff: CreateEffect
+		Explosions: small_explosion
+		ImpactSounds: kaboom15.aud
+		ValidImpactTypes: WaterHit
--- a/mods/ra/weapons/explosions.yaml
+++ b/mods/ra/weapons/explosions.yaml
@@ -1,137 +1,92 @@
+^Explosion:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 50
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+			Concrete: 100
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Warhead@Smu: LeaveSmudge
+		SmudgeType: Crater
+		InvalidTargets: Structure, Wall, Trees
+	Warhead@2Eff: CreateEffect
+		Explosions: self_destruct
+		ImpactSounds: kaboom22.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosions: large_splash
+		ImpactSounds: splash9.aud
+		ValidImpactTypes: Water
+
 CrateNapalm:
+	Inherits: ^Explosion
 	ValidTargets: Ground, Trees
 	Warhead@1Dam: SpreadDamage
 		Spread: 170
 		Damage: 60
-		ValidTargets: Ground, Trees
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		ValidTargets: Ground, Trees
 		Versus:
-			None: 90
-			Light: 60
-			Heavy: 25
+			Wood: 100
 			Concrete: 50
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
 	Warhead@2Eff: CreateEffect
 		Explosions: napalm
 		ImpactSounds: firebl3.aud
+		InvalidImpactTypes: None
+	-Warhead@3EffWater: CreateEffect
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Structure, Wall, Trees

 CrateExplosion:
+	Inherits: ^Explosion
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 50
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
 		AffectsParent: true
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosions: self_destruct
-		ImpactSounds: kaboom15.aud
-	Warhead@Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Structure, Wall, Trees
+		InvalidImpactTypes: None
+	-Warhead@3EffWater: CreateEffect

 UnitExplode:
+	Inherits: ^Explosion
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 50
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: self_destruct
-		ImpactSounds: kaboom22.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: large_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-	Warhead@Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Structure, Wall, Trees

 UnitExplodeShip:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 50
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Inherits: ^Explosion
+	-Warhead@Smu: LeaveSmudge
 	Warhead@2Eff: CreateEffect
 		Explosions: building
 		ImpactSounds: kaboom25.aud
+		InvalidImpactTypes: None

 UnitExplodeSubmarine:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 50
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Inherits: ^Explosion
+	-Warhead@Smu: LeaveSmudge
 	Warhead@2Eff: CreateEffect
 		Explosions: large_splash
 		ImpactSounds: splash9.aud
+		InvalidImpactTypes: None

 UnitExplodeSmall:
+	Inherits: ^Explosion
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
 		Damage: 40
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: large_explosion
 		ImpactSounds: kaboom15.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: large_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-	Warhead@Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Structure, Wall, Trees

 ArtilleryExplode:
+	Inherits: ^Explosion
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
 		Damage: 150
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: self_destruct
 		ImpactSounds: kaboom22.aud
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: large_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-	Warhead@Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Structure, Wall, Trees

 V2Explode:
 	Inherits: SCUD
@@ -157,9 +112,8 @@ CivBuildingExplosion:
 		Delay: 1

 BarrelExplode:
+	Inherits: ^Explosion
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 50
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 5
 		ValidTargets: Ground, Trees
@@ -167,13 +121,14 @@ BarrelExplode:
 			None: 120
 			Wood: 200
 			Light: 50
-			Heavy: 25
 			Concrete: 10
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath, Incendiary
 	Warhead@2Eff: CreateEffect
 		Explosions: napalm
 		ImpactSounds: firebl3.aud
 		Delay: 5
+		InvalidImpactTypes: None
+	-Warhead@3EffWater: CreateEffect
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Scorch
 		Size: 2
@@ -193,17 +148,14 @@ ATMine:
 		InvalidTargets: Structure, Wall, Trees

 APMine:
+	Inherits: ATMine
 	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 400
-		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: napalm
 		ImpactSounds: mine1.aud
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Structure, Wall, Trees

 OreExplosion:
 	Warhead@1Dam: SpreadDamage
--- a/mods/ra/weapons/largecaliber.yaml
+++ b/mods/ra/weapons/largecaliber.yaml
@@ -1,295 +0,0 @@
-25mm:
-	ReloadDelay: 13
-	Range: 4c0
-	Report: cannon2.aud
-	Projectile: Bullet
-		Speed: 853
-		Image: 50CAL
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 16
-		Versus:
-			None: 30
-			Wood: 40
-			Heavy: 40
-			Concrete: 30
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@3EffGround: CreateEffect
-		Explosions: small_explosion
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ValidImpactTypes: Water
-
-90mm:
-	ReloadDelay: 50
-	Range: 4c768
-	Report: cannon1.aud
-	Projectile: Bullet
-		Speed: 682
-		Image: 120MM
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		Versus:
-			None: 20
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3EffGround: CreateEffect
-		Explosions: small_explosion
-		ImpactSounds: kaboom12.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-105mm:
-	ReloadDelay: 70
-	Range: 4c768
-	Report: cannon1.aud
-	Burst: 2
-	BurstDelay: 4
-	Projectile: Bullet
-		Speed: 682
-		Image: 120MM
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		Versus:
-			None: 20
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3EffGround: CreateEffect
-		Explosions: small_explosion
-		ImpactSounds: kaboom12.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-120mm:
-	ReloadDelay: 90
-	Range: 4c768
-	Report: cannon1.aud
-	Burst: 2
-	InvalidTargets: Air, Infantry
-	Projectile: Bullet
-		Speed: 682
-		Image: 120MM
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 60
-		InvalidTargets: Air
-		Versus:
-			None: 20
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3EffGround: CreateEffect
-		Explosions: small_explosion
-		ImpactSounds: kaboom12.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-TurretGun:
-	ReloadDelay: 30
-	Range: 7c0
-	Report: turret1.aud
-	Projectile: Bullet
-		Speed: 682
-		Image: 120MM
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 60
-		Versus:
-			None: 20
-			Wood: 50
-			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3EffGround: CreateEffect
-		Explosions: small_explosion
-		ImpactSounds: kaboom12.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-155mm:
-	ReloadDelay: 85
-	Range: 12c0
-	MinRange: 3c0
-	Report: tank5.aud
-	Projectile: Bullet
-		Speed: 204
-		Blockable: false
-		LaunchAngle: 62
-		Inaccuracy: 1c682
-		Image: 120MM
-		ContrailLength: 30
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 220
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: artillery_explosion
-		ImpactSounds: kaboom15.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-8Inch:
-	ReloadDelay: 250
-	Range: 16c0
-	Burst: 2
-	Report: turret1.aud
-	Projectile: Bullet
-		Speed: 204
-		Blockable: false
-		LaunchAngle: 62
-		Inaccuracy: 2c938
-		Image: 120MM
-		ContrailLength: 30
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 25
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		Versus:
-			None: 60
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: artillery_explosion
-		ImpactSounds: kaboom15.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: large_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-2Inch:
-	ReloadDelay: 60
-	Range: 5c512
-	Report: cannon2.aud
-	Projectile: Bullet
-		Speed: 426
-		Image: 120MM
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 25
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: small_explosion
-		ImpactSounds: kaboom12.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-Grenade:
-	ReloadDelay: 60
-	Range: 4c0
-	Report: grenade1.aud
-	Projectile: Bullet
-		Speed: 136
-		Blockable: false
-		LaunchAngle: 62
-		Inaccuracy: 554
-		Image: BOMB
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 60
-		Versus:
-			None: 50
-			Wood: 100
-			Light: 25
-			Heavy: 25
-			Concrete: 100
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
-		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-DepthCharge:
-	ReloadDelay: 60
-	Range: 5c0
-	ValidTargets: Underwater
-	Projectile: Bullet
-		Speed: 85
-		Image: BOMB
-		LaunchAngle: 62
-		Blockable: false
-		Inaccuracy: 128
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 80
-		ValidTargets: Underwater
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: ExplosionDeath
-	Warhead@3Eff: CreateEffect
-		Explosions: large_splash
-		ImpactSounds: h2obomb2.aud
-	Warhead@4EffHit: CreateEffect
-		Explosions: small_explosion
-		ImpactSounds: kaboom15.aud
-		ValidImpactTypes: WaterHit
--- a/mods/ra/weapons/missiles.yaml
+++ b/mods/ra/weapons/missiles.yaml
@@ -1,53 +1,12 @@
-Maverick:
-	ReloadDelay: 30
-	Range: 9c0
-	MinRange: 3c0
-	Report: missile7.aud
-	Burst: 2
-	BurstDelay: 7
-	ValidTargets: Ground, Water
-	Projectile: Missile
-		Speed: 256
-		Arm: 2
-		Blockable: false
-		ContrailLength: 10
-		Inaccuracy: 512
-		Image: DRAGON
-		HorizontalRateOfTurn: 5
-		CruiseAltitude: 2c0
-		RangeLimit: 14c410
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 70
-		ValidTargets: Ground, Water
-		Versus:
-			None: 30
-			Wood: 90
-			Light: 90
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
-		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-Dragon:
+^AntiGroundMissile:
 	ReloadDelay: 50
 	Range: 5c0
 	MinRange: 0c512
 	Report: missile6.aud
-	ValidTargets: Ground, Water
 	Projectile: Missile
 		Speed: 213
 		Arm: 2
 		Blockable: false
-		TrailImage: smokey
 		ContrailLength: 10
 		Inaccuracy: 128
 		Image: DRAGON
@@ -56,11 +15,12 @@ Dragon:
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 50
-		ValidTargets: Ground, Water
+		ValidTargets: Ground, Water, Air
 		Versus:
 			None: 10
 			Wood: 75
 			Light: 35
+			Heavy: 100
 			Concrete: 50
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Smu: LeaveSmudge
@@ -75,93 +35,81 @@ Dragon:
 		ImpactSounds: splash9.aud
 		ValidImpactTypes: Water

-HellfireAG:
-	ReloadDelay: 60
-	Range: 5c0
-	MinRange: 1c256
-	Report: missile6.aud
-	Burst: 4
-	BurstDelay: 14
-	ValidTargets: Ground, Water
+^AntiAirMissile:
+	Inherits: ^AntiGroundMissile
+	ValidTargets: Air
+
+Maverick:
+	Inherits: ^AntiGroundMissile
+	ReloadDelay: 30
+	Range: 9c0
+	MinRange: 3c0
+	Report: missile7.aud
+	Burst: 2
+	BurstDelay: 7
 	Projectile: Missile
 		Speed: 256
-		Arm: 2
-		Blockable: false
-		ContrailLength: 10
-		Inaccuracy: 128
-		Image: DRAGON
-		HorizontalRateOfTurn: 10
-		RangeLimit: 8c512
+		Inaccuracy: 512
+		CruiseAltitude: 2c0
+		RangeLimit: 14c410
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 60
-		ValidTargets: Ground, Water
+		Damage: 70
 		Versus:
 			None: 30
 			Wood: 90
 			Light: 90
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
-		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
+			Concrete: 100
+
+Dragon:
+	Inherits: ^AntiGroundMissile
+	Projectile: Missile
+		TrailImage: smokey
+
+HellfireAG:
+	Inherits: ^AntiGroundMissile
+	ReloadDelay: 60
+	MinRange: 1c256
+	Burst: 4
+	BurstDelay: 14
+	Projectile: Missile
+		Speed: 256
+		HorizontalRateOfTurn: 10
+		RangeLimit: 8c512
+	Warhead@1Dam: SpreadDamage
+		Damage: 60
+		Versus:
+			None: 30
+			Wood: 90
+			Light: 90
+			Concrete: 100

 HellfireAA:
+	Inherits: ^AntiAirMissile
 	ReloadDelay: 60
-	Range: 5c0
 	MinRange: 1c256
-	Report: missile6.aud
 	Burst: 2
 	BurstDelay: 10
-	ValidTargets: Air
 	Projectile: Missile
 		Speed: 384
-		Arm: 2
-		Blockable: false
-		ContrailLength: 10
 		Inaccuracy: 128
-		Image: DRAGON
 		HorizontalRateOfTurn: 10
 		RangeLimit: 7c0
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 40
 		ValidTargets: Air
 		Versus:
-			None: 30
-			Wood: 75
 			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@3Eff: CreateEffect
 		Explosions: med_explosion_air
-		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water

 MammothTusk:
+	Inherits: ^AntiGroundMissile
 	ReloadDelay: 60
 	Range: 8c0
-	Report: missile6.aud
 	Burst: 2
 	ValidTargets: Air, Infantry
 	Projectile: Missile
 		Speed: 341
-		Arm: 2
-		Blockable: false
-		ContrailLength: 10
-		Inaccuracy: 128
-		Image: DRAGON
 		HorizontalRateOfTurn: 15
 		RangeLimit: 9c614
 	Warhead@1Dam: SpreadDamage
@@ -170,196 +118,104 @@ MammothTusk:
 		ValidTargets: Air, Infantry
 		Versus:
 			None: 100
-			Wood: 75
 			Light: 60
 			Heavy: 25
+			Concrete: 50
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
 	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
 		ImpactSounds: kaboom12.aud
 		InvalidImpactTypes: Water, Air, AirHit
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
 	Warhead@5EffAir: CreateEffect
 		Explosions: med_explosion_air
 		ImpactSounds: kaboom25.aud
 		ValidImpactTypes: Air, AirHit

 Nike:
+	Inherits: ^AntiAirMissile
 	ReloadDelay: 15
 	Range: 7c512
 	Report: missile1.aud
-	ValidTargets: Air
 	Projectile: Missile
 		Arm: 3
-		Blockable: false
-		ContrailLength: 10
+		Inaccuracy: 0
 		Image: MISSILE
 		HorizontalRateOfTurn: 25
 		RangeLimit: 9c0
 		Speed: 341
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 50
 		ValidTargets: Air
 		Versus:
 			None: 90
 			Light: 90
 			Heavy: 50
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@3Eff: CreateEffect
 		Explosions: med_explosion_air
 		ImpactSounds: kaboom25.aud

 RedEye:
+	Inherits: Nike
 	ReloadDelay: 50
-	Range: 7c512
-	MinRange: 0c512
-	Report: missile1.aud
-	ValidTargets: Air
 	Projectile: Missile
-		Arm: 3
-		Blockable: false
-		ContrailLength: 10
-		Image: MISSILE
+		Inaccuracy: 0
 		HorizontalRateOfTurn: 20
-		RangeLimit: 9c0
 		Speed: 298
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 40
 		ValidTargets: Air
 		Versus:
-			None: 90
 			Wood: 75
 			Light: 60
 			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion_air
-		ImpactSounds: kaboom25.aud

 Stinger:
+	Inherits: ^AntiGroundMissile
 	ReloadDelay: 60
 	Range: 9c0
-	Report: missile6.aud
 	Burst: 2
 	BurstDelay: 0
-	ValidTargets: Ground, Water
 	Projectile: Missile
 		Arm: 3
-		Blockable: false
-		ContrailLength: 10
-		Image: DRAGON
+		Inaccuracy: 0
 		HorizontalRateOfTurn: 20
 		RangeLimit: 10c819
 		Speed: 170
 		CloseEnough: 149
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 30
-		ValidTargets: Air, Ground, Water
 		Versus:
 			None: 30
-			Wood: 75
 			Light: 75
 			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
 	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
-		ImpactSounds: kaboom25.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@5EffAir: CreateEffect
 		Explosions: med_explosion_air
 		ImpactSounds: kaboom25.aud
 		ValidImpactTypes: Air, AirHit
-	Warhead@4EffWater: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water

 StingerAA:
-	ReloadDelay: 60
-	Range: 9c0
-	Report: missile6.aud
-	Burst: 2
-	BurstDelay: 0
+	Inherits: Stinger
 	ValidTargets: Air
 	Projectile: Missile
-		Arm: 3
-		Blockable: false
-		ContrailLength: 10
-		Image: DRAGON
-		HorizontalRateOfTurn: 20
-		RangeLimit: 10c819
 		Speed: 255
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
-		ValidTargets: Air, Ground, Water
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
-		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: Water, Air, AirHit
-	Warhead@5EffAir: CreateEffect
-		Explosions: med_explosion_air
-		ImpactSounds: kaboom25.aud
-		ValidImpactTypes: Air, AirHit
-	Warhead@4EffWater: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
+		CloseEnough: 298

 APTusk:
+	Inherits: ^AntiGroundMissile
 	ReloadDelay: 60
 	Range: 6c0
-	Report: missile6.aud
-	ValidTargets: Ground, Water
 	Projectile: Missile
 		Speed: 298
-		Arm: 2
-		Blockable: false
 		TrailImage: smokey
-		ContrailLength: 10
-		Inaccuracy: 128
-		Image: DRAGON
 		HorizontalRateOfTurn: 10
 		RangeLimit: 7c204
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 30
-		ValidTargets: Ground, Water
 		Versus:
 			None: 25
-			Wood: 75
 			Light: 75
 			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
-		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water

 TorpTube:
 	ReloadDelay: 100
@@ -385,6 +241,7 @@ TorpTube:
 			None: 30
 			Wood: 75
 			Light: 75
+			Heavy: 100
 			Concrete: 500
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@3Eff: CreateEffect
@@ -400,16 +257,17 @@ TorpTube:
 		ImpactSounds: splash9.aud
 		ValidImpactTypes: Water

-SubMissile:
+^SubMissileDefault:
+	Inherits: ^AntiGroundMissile
 	ReloadDelay: 300
-	Range: 16c0
+	Range: 8c0
 	Burst: 2
-	Report: missile6.aud
-	Projectile: Bullet
-		Speed: 162
-		Blockable: false
+	Projectile: Missile
+		Speed: 234
+		Inaccuracy: 0c614
+		HorizontalRateOfTurn: 15
+		RangeLimit: 9c0
 		LaunchAngle: 120
-		Inaccuracy: 2c938
 		Image: MISSILE
 		TrailImage: smokey
 		ContrailLength: 30
@@ -419,12 +277,11 @@ SubMissile:
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Versus:
 			None: 40
+			Wood: 100
 			Light: 30
 			Heavy: 30
+			Concrete: 100
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
 	Warhead@3Eff: CreateEffect
 		Explosions: artillery_explosion
 		ImpactSounds: kaboom15.aud
@@ -434,24 +291,32 @@ SubMissile:
 		ImpactSounds: splash9.aud
 		ValidImpactTypes: Water

+SubMissile:
+	Inherits: ^SubMissileDefault
+	Range: 16c0
+	-Projectile:
+	Projectile: Bullet
+		Speed: 162
+		Blockable: false
+		LaunchAngle: 120
+		Inaccuracy: 2c938
+		Image: MISSILE
+		TrailImage: smokey
+		ContrailLength: 30
+
 SubMissileAA:
-	Inherits: SubMissile
-	Range: 8c0
+	Inherits: ^SubMissileDefault
 	ValidTargets: Air
-	Projectile: Missile
-		Speed: 234
-		Inaccuracy: 0c614
-		HorizontalRateOfTurn: 15
-		RangeLimit: 9c0
 	Warhead@1Dam: SpreadDamage
 		Damage: 15
-		ValidTargets: Air, Ground, Water

 SCUD:
+	Inherits: ^AntiGroundMissile
 	ReloadDelay: 240
 	Range: 10c0
 	MinRange: 3c0
 	Report: missile1.aud
+	-Projectile:
 	Projectile: Bullet
 		Speed: 170
 		Blockable: false
@@ -465,21 +330,15 @@ SCUD:
 		Spread: 341
 		Damage: 45
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		ValidTargets: Ground, Trees
+		ValidTargets: Ground, Water, Trees
 		Versus:
 			None: 90
-			Wood: 75
 			Light: 70
 			Heavy: 40
+			Concrete: 100
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath, Incendiary
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
 	Warhead@3Eff: CreateEffect
 		Explosions: napalm
 		ImpactSounds: firebl3.aud
-		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
 		Explosions: large_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
--- a/mods/ra/weapons/other.yaml
+++ b/mods/ra/weapons/other.yaml
@@ -1,13 +1,7 @@
-FireballLauncher:
+^FireWeapon:
 	ValidTargets: Ground, Water, Trees
 	ReloadDelay: 65
 	Range: 5c0
-	Burst: 2
-	BurstDelay: 20
-	Projectile: Bullet
-		Speed: 204
-		TrailImage: fb2
-		Image: FB1
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
 		Damage: 150
@@ -26,10 +20,18 @@ FireballLauncher:
 		Explosions: napalm
 		ImpactSounds: firebl3.aud

+FireballLauncher:
+	Inherits: ^FireWeapon
+	Burst: 2
+	BurstDelay: 20
+	Projectile: Bullet
+		Speed: 204
+		TrailImage: fb2
+		Image: FB1
+
 Flamer:
-	ValidTargets: Ground, Water, Trees
+	Inherits: ^FireWeapon
 	ReloadDelay: 50
-	Range: 5c0
 	Burst: 15
 	BurstDelay: 1
 	Projectile: Bullet
@@ -41,23 +43,13 @@ Flamer:
 	Warhead@1Dam: SpreadDamage
 		Spread: 341
 		Damage: 8
-		ValidTargets: Ground, Water, Trees
 		Versus:
-			None: 90
 			Wood: 100
-			Light: 60
-			Heavy: 25
-			Concrete: 20
-		DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		InvalidTargets: Structure, Wall
 	Warhead@3Eff: CreateEffect
 		Explosions: small_napalm
-		ImpactSounds: firebl3.aud

 Napalm:
-	ValidTargets: Ground, Water, Trees
+	Inherits: ^FireWeapon
 	ReloadDelay: 20
 	Range: 4c512
 	Projectile: Bullet
@@ -67,21 +59,11 @@ Napalm:
 	Warhead@1Dam: SpreadDamage
 		Spread: 170
 		Damage: 100
-		ValidTargets: Ground, Water, Trees
 		Versus:
-			None: 90
-			Light: 60
-			Heavy: 25
+			Wood: 100
 			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		InvalidTargets: Structure, Wall
-	Warhead@3Eff: CreateEffect
-		Explosions: napalm
-		ImpactSounds: firebl3.aud

-TeslaZap:
+^TeslaWeapon:
 	ReloadDelay: 3
 	Range: 8c512
 	Report: tesla1.aud
@@ -91,32 +73,25 @@ TeslaZap:
 		Damage: 100
 		Versus:
 			None: 1000
-			Wood: 60
 		DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath

+TeslaZap:
+	Inherits: ^TeslaWeapon
+	Warhead@1Dam: SpreadDamage
+		Versus:
+			Wood: 60
+
 PortaTesla:
+	Inherits: ^TeslaWeapon
 	ReloadDelay: 70
 	Range: 6c0
-	Report: tesla1.aud
-	Projectile: TeslaZap
 	Warhead@1Dam: SpreadDamage
-		Spread: 42
 		Damage: 45
-		Versus:
-			None: 1000
-		DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath

 TTankZap:
+	Inherits: ^TeslaWeapon
 	ReloadDelay: 120
 	Range: 7c0
-	Report: tesla1.aud
-	Projectile: TeslaZap
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 100
-		Versus:
-			None: 1000
-		DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath

 DogJaw:
 	ValidTargets: Infantry
@@ -145,18 +120,12 @@ Heal:
 		DebugOverlayColor: 00FF00

 Repair:
-	ReloadDelay: 80
-	Range: 4c0
+	Inherits: Heal
 	Report: fixit1.aud
 	ValidTargets: Repair
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		ValidStances: Ally
-		Spread: 213
 		Damage: -20
 		ValidTargets: Repair
-		DebugOverlayColor: 00FF00

 Crush:
 	Warhead@1Dam: SpreadDamage
@@ -189,20 +158,10 @@ Claw:
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath

 Mandible:
+	Inherits: Claw
 	ReloadDelay: 10
-	Range: 1c512
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 213
 		Damage: 60
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath

 MADTankThump:
 	InvalidTargets: MADTank, Infantry
--- a/mods/ra/weapons/smallcaliber.yaml
+++ b/mods/ra/weapons/smallcaliber.yaml
@@ -1,27 +1,4 @@
-ZSU-23:
-	Burst: 2
-	BurstDelay: 5
-	ReloadDelay: 0
-	Range: 10c0
-	Report: aacanon3.aud
-	ValidTargets: Air
-	Projectile: Bullet
-		Speed: 3c340
-		Blockable: false
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 12
-		ValidTargets: Air
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: small_explosion_air
-
-FLAK-23-AA:
+^AACannon:
 	ReloadDelay: 10
 	Range: 8c0
 	Report: aacanon3.aud
@@ -32,30 +9,7 @@ FLAK-23-AA:
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
 		Damage: 20
-		ValidTargets: Air, Ground, Water
-		Versus:
-			None: 40
-			Wood: 10
-			Light: 60
-			Heavy: 10
-			Concrete: 20
-		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
-	Warhead@2EffAir: CreateEffect
-		Explosions: small_explosion_air
-		ValidImpactTypes: Air, AirHit
-
-FLAK-23-AG:
-	ReloadDelay: 10
-	Range: 6c0
-	Report: aacanon3.aud
-	ValidTargets: Ground, Water
-	Projectile: Bullet
-		Speed: 1c682
-		Blockable: false
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 20
-		ValidTargets: Air, Ground, Water
+		ValidTargets: Air
 		Versus:
 			None: 40
 			Wood: 10
@@ -65,34 +19,81 @@ FLAK-23-AG:
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: small_explosion_air
-		InvalidImpactTypes: Air, AirHit
+
+ZSU-23:
+	Inherits: ^AACannon
+	Burst: 2
+	BurstDelay: 5
+	ReloadDelay: 0
+	Range: 10c0
+	Projectile: Bullet
+		Speed: 3c340
+	Warhead@1Dam: SpreadDamage
+		Damage: 12
+		Versus:
+			None: 30
+			Wood: 75
+			Light: 75
+			Heavy: 100
+			Concrete: 50
+
+FLAK-23-AA:
+	Inherits: ^AACannon
+	Warhead@1Dam: SpreadDamage
+		ValidTargets: Air, Ground, Water
+
+FLAK-23-AG:
+	Inherits: ^AACannon
+	Range: 6c0
+	ValidTargets: Ground, Water
+	Warhead@1Dam: SpreadDamage
+		ValidTargets: Air, Ground, Water
+	Warhead@2Eff: CreateEffect
+		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
 		Explosions: small_splash
 		ValidImpactTypes: Water

-Vulcan:
+^HeavyMG:
 	ReloadDelay: 30
 	Range: 6c0
 	Report: gun13.aud
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead@1Dam_1: SpreadDamage
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
-		Damage: 10
+		Damage: 30
 		Versus:
-			None: 200
+			None: 100
 			Wood: 50
 			Light: 60
 			Heavy: 25
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff_1: CreateEffect
+	Warhead@2Eff: CreateEffect
 		Explosions: piffs
 		InvalidImpactTypes: Water
-	Warhead@2Eff_1Water: CreateEffect
+	Warhead@3EffWater: CreateEffect
 		Explosions: water_piffs
 		ValidImpactTypes: Water
-	Warhead@3Dam_2: SpreadDamage
+
+^LightMG:
+	Inherits: ^HeavyMG
+	Warhead@1Dam: SpreadDamage
+		Damage: 15
+		Versus:
+			Wood: 10
+			Light: 30
+			Heavy: 10
+			Concrete: 10
+
+Vulcan:
+	Inherits: ^HeavyMG
+	Warhead@1Dam: SpreadDamage
+		Damage: 10
+		Versus:
+			None: 200
+	Warhead@4Dam_2: SpreadDamage
 		Spread: 128
 		Damage: 10
 		Delay: 2
@@ -189,134 +190,73 @@ Vulcan:
 		Delay: 10

 ChainGun:
+	Inherits: ^HeavyMG
 	ReloadDelay: 10
 	Range: 5c0
 	MinRange: 0c768
-	Report: gun13.aud
 	Projectile: Bullet
-		Speed: 1c682
 		Blockable: false
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
 		Versus:
 			None: 120
-			Wood: 50
-			Light: 60
-			Heavy: 25
-			Concrete: 25
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ValidImpactTypes: Water

 ChainGun.Yak:
+	Inherits: ^HeavyMG
 	ReloadDelay: 3
 	Range: 5c0
 	MinRange: 3c0
-	Report: gun13.aud
 	Projectile: Bullet
-		Speed: 1c682
 		Blockable: false
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 40
-		Versus:
-			Wood: 50
-			Light: 60
-			Heavy: 25
-			Concrete: 25
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ValidImpactTypes: Water

 Pistol:
+	Inherits: ^LightMG
 	ReloadDelay: 7
 	Range: 3c0
 	Report: gun27.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 1
-		Versus:
-			Wood: 50
-			Light: 60
-			Heavy: 25
-			Concrete: 25
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: piff
-		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
 		Explosions: water_piff
-		ValidImpactTypes: Water

 M1Carbine:
+	Inherits: ^LightMG
 	ReloadDelay: 20
 	Range: 5c0
 	Report: gun11.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
 		Versus:
 			Wood: 25
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ValidImpactTypes: Water

 M60mg:
+	Inherits: ^LightMG
 	ReloadDelay: 30
 	Range: 4c0
 	Report: pillbox1.aud
 	Burst: 5
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
-		Versus:
-			Wood: 10
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
-		InvalidImpactTypes: Water
-	Warhead@3EffWater: CreateEffect
-		Explosions: water_piffs
-		ValidImpactTypes: Water

-SilencedPPK:
+^SnipeWeapon:
 	ReloadDelay: 80
 	Range: 2c512
-	Report: silppk.aud
+	Report: gun5.aud
 	ValidTargets: Ground, Infantry
 	InvalidTargets: Vehicle, Tank, Water, Structure, Wall, Husk
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
+		Spread: 42
 		Damage: 150
-		ValidTargets: Infantry
+		ValidTargets: Barrel, Infantry
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
+
+SilencedPPK:
+	Inherits: ^SnipeWeapon
+	Report: silppk.aud
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
 	Warhead@2Eff: CreateEffect
 		Explosions: piffs
 		InvalidImpactTypes: Water
@@ -325,18 +265,11 @@ SilencedPPK:
 		ValidImpactTypes: Water

 Colt45:
+	Inherits: ^SnipeWeapon
 	ReloadDelay: 5
 	Range: 7c0
-	Report: gun5.aud
-	ValidTargets: Ground, Infantry
-	InvalidTargets: Vehicle, Tank, Water, Structure, Wall, Husk
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 42
 		Damage: 50
-		ValidTargets: Barrel, Infantry
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: piff
 		InvalidImpactTypes: Water
@@ -345,15 +278,8 @@ Colt45:
 		ValidImpactTypes: Water

 Sniper:
-	Report: gun5.aud
+	Inherits: ^SnipeWeapon
 	ReloadDelay: 70
 	Range: 10c0
-	ValidTargets: Ground, Infantry
-	InvalidTargets: Vehicle, Tank, Water, Structure, Wall, Husk
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 42
 		Damage: 140
-		ValidTargets: Infantry
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath