Merge pull request #12405 from reaperrr/slim-cnc-weapon-yamls

Shrink TD weapon yamls by using inheritance
2016-12-18 19:08:24 +01:00
parent 74f7827187 1f626e239b
commit 19dbcc9886
5 changed files with 119 additions and 412 deletions
--- a/mods/cnc/weapons/explosions.yaml
+++ b/mods/cnc/weapons/explosions.yaml
@@ -1,4 +1,31 @@
+^DamagingExplosion:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 40
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 100
+			Heavy: 100
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: poof
+		ImpactSounds: xplos.aud
+	Warhead@3Smu: LeaveSmudge
+		SmudgeType: Crater
+		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
+
+^DamagingExplosionHE:
+	Inherits: ^DamagingExplosion
+	Warhead@1Dam: SpreadDamage
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+
 FlametankExplode:
+	Inherits: ^DamagingExplosion
 	Warhead@1Dam: SpreadDamage
 		Spread: 1c0
 		Damage: 115
@@ -10,16 +37,7 @@ FlametankExplode:
 		SmudgeType: Scorch

 HeliCrash:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 40
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: poof
-		ImpactSounds: xplos.aud
-	Warhead@3Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
+	Inherits: ^DamagingExplosion

 HeliExplode:
 	Warhead@1Dam: SpreadDamage
@@ -29,57 +47,34 @@ HeliExplode:
 		ImpactSounds: xplos.aud

 UnitExplode:
+	Inherits: ^DamagingExplosionHE
 	Warhead@1Dam: SpreadDamage
-		Spread: 426
 		Damage: 50
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosions: poof
 		ImpactSounds: xplobig6.aud
-	Warhead@3Smu: LeaveSmudge
-		SmudgeType: Crater

 UnitExplodeShip:
-	Inherits: UnitExplode
+	Inherits: ^DamagingExplosionHE
+	Warhead@1Dam: SpreadDamage
+		Damage: 50
 	Warhead@2Eff: CreateEffect
 		Explosions: building
+		ImpactSounds: xplobig6.aud

 UnitExplodeSmall:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 40
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Inherits: ^DamagingExplosionHE
 	Warhead@2Eff: CreateEffect
 		Explosions: big_frag
 		ImpactSounds: xplobig4.aud
-	Warhead@3Smu: LeaveSmudge
-		SmudgeType: Crater

 GrenadierExplode:
+	Inherits: ^DamagingExplosionHE
 	Warhead@1Dam: SpreadDamage
 		Spread: 256
 		Damage: 10
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosions: poof
 		ImpactSounds: xplosml2.aud
-	Warhead@3Smu: LeaveSmudge
-		SmudgeType: Crater

 BuildingExplode:
 	Warhead@1Eff: CreateEffect
@@ -90,19 +85,17 @@ BuildingExplode:
 		Delay: 1

 Napalm.Crate:
+	Inherits: ^DamagingExplosionHE
 	Warhead@1Dam: SpreadDamage
 		Spread: 170
 		Damage: 50
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Versus:
-			None: 90
 			Wood: 100
-			Light: 60
-			Heavy: 25
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Eff: CreateEffect
+	Warhead@2Eff: CreateEffect
 		Explosions: med_napalm
 		ImpactSounds: flamer2.aud
+	Warhead@3Smu: LeaveSmudge
+		SmudgeType: Scorch
--- a/mods/cnc/weapons/largecaliber.yaml
+++ b/mods/cnc/weapons/largecaliber.yaml
@@ -1,121 +1,64 @@
+^BallisticWeapon:
+	ReloadDelay: 40
+	Range: 4c768
+	Report: tnkfire6.aud
+	Projectile: Bullet
+		Image: 120MM
+		Speed: 682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 40
+		Versus:
+			None: 25
+			Wood: 100
+			Light: 100
+			Heavy: 100
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
+	Warhead@3Eff: CreateEffect
+		Explosions: small_frag
+		ImpactSounds: xplos.aud
+
 70mm:
+	Inherits: ^BallisticWeapon
 	ReloadDelay: 30
 	Range: 4c0
 	Report: tnkfire3.aud
 	Projectile: Bullet
-		Image: 120MM
 		Speed: 853
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 25
 		Versus:
 			None: 25
 			Wood: 75
 			Light: 100
 			Heavy: 90
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud
-
-105mm:
-	ReloadDelay: 50
-	Range: 4c768
-	Report: tnkfire4.aud
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 75
-			Heavy: 100
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud

 120mm:
-	ReloadDelay: 40
-	Range: 4c768
-	Report: tnkfire6.aud
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		Versus:
-			None: 25
-			Wood: 100
-			Light: 100
-			Heavy: 100
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud
+	Inherits: ^BallisticWeapon

 120mmDual:
-	ReloadDelay: 40
-	Range: 4c768
-	Report: tnkfire6.aud
+	Inherits: ^BallisticWeapon
 	Burst: 2
 	BurstDelay: 8
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		Versus:
-			None: 25
-			Wood: 100
-			Light: 100
-			Heavy: 100
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud

 TurretGun:
+	Inherits: ^BallisticWeapon
 	ReloadDelay: 20
 	Range: 6c0
-	Report: tnkfire6.aud
 	Projectile: Bullet
-		Image: 120MM
 		Speed: 853
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
 		Versus:
 			None: 20
 			Wood: 25
 			Light: 100
 			Heavy: 100
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud

 ArtilleryShell:
+	Inherits: ^BallisticWeapon
 	ReloadDelay: 65
 	Range: 11c0
 	MinRange: 2c896
@@ -126,7 +69,6 @@ ArtilleryShell:
 		LaunchAngle: 56
 		Inaccuracy: 1c256
 		ContrailLength: 30
-		Image: 120MM
 	Warhead@1Dam: SpreadDamage
 		Spread: 341
 		Damage: 150
@@ -136,9 +78,6 @@ ArtilleryShell:
 			Light: 75
 			Heavy: 50
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
 	Warhead@3Eff: CreateEffect
 		Explosions: poof
 		ImpactSounds: xplosml2.aud
--- a/mods/cnc/weapons/missiles.yaml
+++ b/mods/cnc/weapons/missiles.yaml
@@ -1,4 +1,4 @@
-Rockets:
+^MissileWeapon:
 	ReloadDelay: 50
 	Range: 6c0
 	MinRange: 0c512
@@ -31,60 +31,37 @@ Rockets:
 		Explosions: small_frag
 		ImpactSounds: xplos.aud

+Rockets:
+	Inherits: ^MissileWeapon
+
 BikeRockets:
-	ReloadDelay: 50
-	Range: 6c0
-	Report: bazook1.aud
-	ValidTargets: Ground, Air
+	Inherits: ^MissileWeapon
 	Burst: 2
 	BurstDelay: 10
 	Projectile: Missile
-		Arm: 0
-		Blockable: false
-		Inaccuracy: 128
-		Image: DRAGON
 		HorizontalRateOfTurn: 10
-		TrailImage: smokey
-		ContrailLength: 8
 		Speed: 213
-		RangeLimit: 7c204
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 30
-		ValidTargets: Ground, Air
 		Versus:
 			None: 25
 			Wood: 75
-			Light: 100
-			Heavy: 100
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud

 OrcaAGMissiles:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 12
 	Burst: 2
 	BurstDelay: 12
 	Range: 5c0
 	MinRange: 1c256
-	Report: bazook1.aud
 	ValidTargets: Ground
 	Projectile: Missile
 		Arm: 1
-		Blockable: false
-		Inaccuracy: 128
-		Image: DRAGON
 		HorizontalRateOfTurn: 20
-		TrailImage: smokey
-		ContrailLength: 8
 		Speed: 256
 		RangeLimit: 6c0
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 25
 		ValidTargets: Ground
 		Versus:
@@ -92,74 +69,39 @@ OrcaAGMissiles:
 			Wood: 100
 			Light: 100
 			Heavy: 75
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud

 OrcaAAMissiles:
-	ReloadDelay: 12
-	Burst: 2
-	BurstDelay: 12
-	Range: 5c0
-	MinRange: 1c256
-	Report: bazook1.aud
+	Inherits: OrcaAGMissiles
 	ValidTargets: Air
 	Projectile: Missile
 		Arm: 0
-		Blockable: false
-		Inaccuracy: 128
-		Image: DRAGON
-		HorizontalRateOfTurn: 20
-		TrailImage: smokey
-		ContrailLength: 8
 		Speed: 298
-		RangeLimit: 6c0
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 25
 		ValidTargets: Air
 		Versus:
 			Light: 75
 			Heavy: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud
+	-Warhead@2Smu: LeaveSmudge

 MammothMissiles:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 45
 	Range: 5c0
 	Report: rocket1.aud
-	ValidTargets: Ground, Air
 	Burst: 2
 	BurstDelay: 15
 	Projectile: Missile
-		Arm: 0
-		Blockable: false
-		Inaccuracy: 128
-		Image: DRAGON
 		HorizontalRateOfTurn: 20
-		TrailImage: smokey
-		ContrailLength: 8
 		Speed: 341
 		RangeLimit: 6c0
 	Warhead@1Dam: SpreadDamage
 		Spread: 298
 		Damage: 45
-		ValidTargets: Ground, Air
 		Versus:
 			None: 50
 			Wood: 75
 			Light: 100
 			Heavy: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
 	Warhead@3Eff: CreateEffect
 		Explosions: small_poof
 		ImpactSounds: xplos.aud
@@ -170,6 +112,7 @@ MammothMissiles:
 		ValidImpactTypes: Air, AirHit

 227mm:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 100
 	Range: 12c0
 	MinRange: 3c0
@@ -178,15 +121,11 @@ MammothMissiles:
 	Report: rocket1.aud
 	ValidTargets: Ground
 	Projectile: Bullet
-		Arm: 5
-		Blockable: false
 		Shadow: true
 		Inaccuracy: 853
 		LaunchAngle: 62
 		Image: DRAGON
-		RateOfTurn: 2
 		ContrailLength: 10
-		TrailImage: smokey
 		Speed: 341
 	Warhead@1Dam: SpreadDamage
 		Spread: 683
@@ -197,62 +136,41 @@ MammothMissiles:
 			Wood: 60
 			Light: 100
 			Heavy: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
 	Warhead@3Eff: CreateEffect
 		Explosions: med_frag
 		ImpactSounds: xplos.aud

 227mm.stnk:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 70
 	Range: 7c0
 	Report: rocket1.aud
 	Burst: 2
 	BurstDelay: 10
-	ValidTargets: Ground, Air
 	Projectile: Missile
-		Arm: 0
-		Blockable: false
 		Inaccuracy: 213
-		Image: DRAGON
 		HorizontalRateOfTurn: 10
-		TrailImage: smokey
-		ContrailLength: 8
 		Speed: 213
 		RangeLimit: 8c409
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 60
-		ValidTargets: Ground, Air
 		Versus:
 			None: 25
 			Wood: 75
 			Light: 100
 			Heavy: 90
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_frag
-		ImpactSounds: xplos.aud

 BoatMissile:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 35
 	Range: 8c0
 	Burst: 2
 	BurstDelay: 10
 	Report: rocket2.aud
 	Projectile: Missile
-		Arm: 0
-		Blockable: false
 		Inaccuracy: 426
 		Image: DRAGON
 		HorizontalRateOfTurn: 5
-		TrailImage: smokey
-		ContrailLength: 8
 		Speed: 170
 		RangeLimit: 9c614
 	Warhead@1Dam: SpreadDamage
@@ -264,9 +182,6 @@ BoatMissile:
 			Light: 60
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
 	Warhead@3Eff: CreateEffect
 		Explosions: small_poof
 		ImpactSounds: xplos.aud
@@ -277,18 +192,13 @@ BoatMissile:
 		ValidImpactTypes: Air, AirHit

 TowerMissle:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 15
 	Range: 7c0
 	Report: rocket2.aud
 	ValidTargets: Ground
 	Projectile: Missile
-		Arm: 0
-		Blockable: false
-		Inaccuracy: 128
-		Image: DRAGON
 		HorizontalRateOfTurn: 20
-		TrailImage: smokey
-		ContrailLength: 8
 		Speed: 298
 		RangeLimit: 8c409
 	Warhead@1Dam: SpreadDamage
@@ -298,94 +208,57 @@ TowerMissle:
 		Versus:
 			None: 50
 			Wood: 25
-			Light: 100
-			Heavy: 100
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
 	Warhead@3Eff: CreateEffect
 		Explosions: med_frag
 		ImpactSounds: xplos.aud

 SAMMissile:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 15
 	Range: 8c0
 	Report: rocket2.aud
 	ValidTargets: Air
 	Projectile: Missile
-		Arm: 0
-		Blockable: false
 		Image: MISSILE
 		HorizontalRateOfTurn: 20
 		Speed: 426
 		RangeLimit: 9c614
-		TrailImage: smokey
-		ContrailLength: 8
+		Inaccuracy: 0
 	Warhead@1Dam: SpreadDamage
 		Spread: 682
+		Damage: 35
 		ValidTargets: Air
 		Versus:
 			None: 100
 			Wood: 100
 			Light: 100
 			Heavy: 75
-		Damage: 35
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	-Warhead@2Smu: LeaveSmudge
 	Warhead@3Eff: CreateEffect
 		Explosions: small_building
 		ImpactSounds: xplos.aud

-HonestJohn:
-	ReloadDelay: 200
-	Range: 10c0
-	Report: rocket1.aud
-	Projectile: Bullet
-		Arm: 10
-		Blockable: false
-		Shadow: true
-		Inaccuracy: 213
-		Image: patriot
-		TrailImage: smokey
-		Speed: 187
-		RangeLimit: 35
-		LaunchAngle: 88
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 100
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosions: small_poof
-		ImpactSounds: xplos.aud
-
 Patriot:
+	Inherits: ^MissileWeapon
 	ReloadDelay: 25
 	Range: 9c0
 	MinRange: 1c0
 	Report: rocket2.aud
 	ValidTargets: Air
 	Projectile: Missile
-		Blockable: false
 		Image: patriot
-		TrailImage: smokey
-		ContrailLength: 8
 		HorizontalRateOfTurn: 20
 		Speed: 300
 		RangeLimit: 10c819
+		Inaccuracy: 0
 	Warhead@1Dam: SpreadDamage
 		Spread: 682
+		Damage: 50
 		ValidTargets: Air
 		Versus:
 			Heavy: 75
-		Damage: 50
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	-Warhead@2Smu: LeaveSmudge
 	Warhead@3Eff: CreateEffect
 		Explosions: poof
 		ImpactSounds: xplos.aud
--- a/mods/cnc/weapons/other.yaml
+++ b/mods/cnc/weapons/other.yaml
@@ -1,5 +1,5 @@
-Flamethrower:
-	ValidTargets: Ground, Trees
+^FlameWeapon:
+	ValidTargets: Ground, Water, Trees
 	ReloadDelay: 55
 	Range: 2c512
 	InvalidTargets: Wall
@@ -9,7 +9,7 @@ Flamethrower:
 	Warhead@1Dam: SpreadDamage
 		Spread: 341
 		Damage: 40
-		ValidTargets: Ground, Trees
+		ValidTargets: Ground, Water, Trees
 		InvalidTargets: Wall
 		Versus:
 			None: 100
@@ -24,12 +24,13 @@ Flamethrower:
 		Explosions: small_napalm
 		ImpactSounds: flamer2.aud

+Flamethrower:
+	Inherits: ^FlameWeapon
+
 BigFlamer:
-	ValidTargets: Ground, Trees
+	Inherits: ^FlameWeapon
 	ReloadDelay: 50
 	Range: 3c512
-	InvalidTargets: Wall
-	Report: flamer2.aud
 	Projectile: Bullet
 		Speed: 341
 	Burst: 2
@@ -37,20 +38,10 @@ BigFlamer:
 	Warhead@1Dam: SpreadDamage
 		Spread: 400
 		Damage: 75
-		InvalidTargets: Wall
-		ValidTargets: Ground, Trees
 		Versus:
-			None: 100
-			Wood: 100
-			Light: 100
 			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall
 	Warhead@3Eff: CreateEffect
 		Explosions: med_napalm
-		ImpactSounds: flamer2.aud

 Chemspray:
 	ReloadDelay: 65
@@ -101,7 +92,7 @@ Grenade:
 		ImpactSounds: xplos.aud

 Napalm:
-	ValidTargets: Ground, Water, Trees
+	Inherits: ^FlameWeapon
 	ReloadDelay: 4
 	Range: 2c0
 	Burst: 2
@@ -112,19 +103,10 @@ Napalm:
 		Spread: 341
 		Damage: 30
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		ValidTargets: Ground, Water, Trees
 		Versus:
-			None: 100
-			Wood: 100
-			Light: 100
 			Heavy: 80
-		DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall
 	Warhead@3Eff: CreateEffect
 		Explosions: med_napalm
-		ImpactSounds: flamer2.aud

 Laser:
 	ReloadDelay: 1
@@ -161,7 +143,7 @@ TiberiumExplosion:
 		Explosions: chemball
 		ImpactSounds: xplosml2.aud

-Tail:
+^DinoWeapon:
 	ReloadDelay: 30
 	Range: 1c0
 	Report: dinoatk1.aud
@@ -177,53 +159,23 @@ Tail:
 			Heavy: 10
 		DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath

+Tail:
+	Inherits: ^DinoWeapon
+
 Horn:
+	Inherits: ^DinoWeapon
 	ReloadDelay: 20
-	Range: 1c0
-	Report: dinoatk1.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 213
 		Damage: 120
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-		DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath

 Teeth:
-	ReloadDelay: 30
-	Range: 1c0
-	Report: dinoatk1.aud
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 180
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-		DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath
+	Inherits: ^DinoWeapon

 Claw:
+	Inherits: ^DinoWeapon
 	ReloadDelay: 10
-	Range: 1c0
-	Report: dinoatk1.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 213
 		Damage: 60
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-		DamageTypes: Prone50Percent, TriggerProne, RippedApartDeath

 Demolish:
 	Warhead@1Dam: SpreadDamage
--- a/mods/cnc/weapons/smallcaliber.yaml
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -12,7 +12,7 @@ Sniper:
 		ValidTargets: Infantry
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath

-HighV:
+^HeavyMG:
 	ReloadDelay: 25
 	Range: 6c0
 	Report: gun8.aud
@@ -30,81 +30,51 @@ HighV:
 	Warhead@2Eff: CreateEffect
 		Explosions: piffs

+HighV:
+	Inherits: ^HeavyMG
+
 HeliAGGun:
+	Inherits: ^HeavyMG
 	ReloadDelay: 20
 	Burst: 2
 	BurstDelay: 0
 	Range: 4c0
 	MinRange: 0c768
-	ValidTargets: Ground
 	Report: gun5.aud
 	Projectile: Bullet
-		Speed: 1c682
 		Blockable: false
 	Warhead@1Dam: SpreadDamage
 		Spread: 256
 		Damage: 20
-		ValidTargets: Ground
 		Versus:
 			None: 100
 			Wood: 50
 			Light: 75
 			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs

 HeliAAGun:
-	ReloadDelay: 20
-	Burst: 2
-	BurstDelay: 0
-	Range: 4c0
-	MinRange: 0c768
+	Inherits: HeliAGGun
 	ValidTargets: Air
-	Report: gun5.aud
-	Projectile: Bullet
-		Speed: 1c682
-		Blockable: false
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
-		Damage: 20
 		ValidTargets: Air
 		Versus:
-			None: 100
-			Wood: 50
 			Light: 50
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs

 Pistol:
+	Inherits: ^LightMG
 	ReloadDelay: 7
 	Range: 3c0
-	InvalidTargets: Wall
 	Report: gun18.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 1
-		InvalidTargets: Wall
-		Versus:
-			None: 100
-			Wood: 50
-			Light: 50
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piff

-M16:
+^LightMG:
+	Inherits: ^HeavyMG
 	ReloadDelay: 20
 	Range: 4c0
 	InvalidTargets: Wall
 	Report: mgun2.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 15
@@ -114,62 +84,45 @@ M16:
 			Wood: 25
 			Light: 30
 			Heavy: 10
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: piff

+M16:
+	Inherits: ^LightMG
+
 MachineGun:
-	ReloadDelay: 20
+	Inherits: ^LightMG
 	Burst: 5
-	InvalidTargets: Wall
-	Range: 4c0
 	Report: mgun11.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
-		InvalidTargets: Wall
 		Versus:
-			None: 100
 			Wood: 10
 			Light: 50
-			Heavy: 10
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: piffs

 Vulcan:
-	ValidTargets: Ground, Water
+	Inherits: ^HeavyMG
 	ReloadDelay: 2
-	Range: 6c0
 	Report: gun5.aud
-	Projectile: Bullet
-		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 426
 		Damage: 100
-		ValidTargets: Ground, Water
 		Versus:
 			None: 100
 			Wood: 25
 			Light: 100
 			Heavy: 35
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs

 APCGun:
 	ReloadDelay: 18
 	Range: 5c0
 	Report: gun20.aud
-	ValidTargets: Ground
 	Projectile: Bullet
 		Speed: 1c682
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 15
-		ValidTargets: Ground
 		Versus:
 			None: 50
 			Wood: 50
@@ -180,19 +133,16 @@ APCGun:
 		Explosions: small_poof

 APCGun.AA:
-	ReloadDelay: 18
+	Inherits: APCGun
 	Range: 7c0
-	Report: gun20.aud
 	ValidTargets: Air
 	Projectile: Bullet
 		Speed: 2c0
 		Blockable: false
 	Warhead@1Dam: SpreadDamage
-		Spread: 128
 		Damage: 25
 		ValidTargets: Air
 		Versus:
-			Heavy: 50
-		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
+			Light: 100
 	Warhead@2Eff: CreateEffect
 		Explosions: small_frag