From 309d64f2a3c7c18ae4498b65987b555c325fb604 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Fri, 26 Dec 2014 23:37:34 +0100
Subject: [PATCH] Split cnc weapons.yaml into multiple rough categories

---
 mods/cnc/mod.yaml                  |   11 +-
 mods/cnc/weapons.yaml              | 1155 ----------------------------
 mods/cnc/weapons/explosions.yaml   |   85 ++
 mods/cnc/weapons/largecaliber.yaml |  141 ++++
 mods/cnc/weapons/missiles.yaml     |  393 ++++++++++
 mods/cnc/weapons/other.yaml        |  238 ++++++
 mods/cnc/weapons/smallcaliber.yaml |  194 +++++
 mods/cnc/weapons/superweapons.yaml |   99 +++
 8 files changed, 1158 insertions(+), 1158 deletions(-)
 delete mode 100644 mods/cnc/weapons.yaml
 create mode 100644 mods/cnc/weapons/explosions.yaml
 create mode 100644 mods/cnc/weapons/largecaliber.yaml
 create mode 100644 mods/cnc/weapons/missiles.yaml
 create mode 100644 mods/cnc/weapons/other.yaml
 create mode 100644 mods/cnc/weapons/smallcaliber.yaml
 create mode 100644 mods/cnc/weapons/superweapons.yaml

diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index d9f10c2634..e59c2b2587 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -61,6 +61,14 @@ Sequences:
 	./mods/cnc/sequences/civilian.yaml
 	./mods/cnc/sequences/campaign.yaml
 
+Weapons:
+	./mods/cnc/weapons/explosions.yaml
+	./mods/cnc/weapons/largecaliber.yaml
+	./mods/cnc/weapons/missiles.yaml
+	./mods/cnc/weapons/other.yaml
+	./mods/cnc/weapons/smallcaliber.yaml
+	./mods/cnc/weapons/superweapons.yaml
+
 Cursors:
 	./mods/cnc/cursors.yaml
 
@@ -106,9 +114,6 @@ ChromeLayout:
 	./mods/cnc/chrome/assetbrowser.yaml
 	./mods/cnc/chrome/missionbrowser.yaml
 
-Weapons:
-	./mods/cnc/weapons.yaml
-
 Movies:
 	./mods/cnc/movies-gdi.yaml
 	./mods/cnc/movies-nod.yaml
diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml
deleted file mode 100644
index 475071f6dc..0000000000
--- a/mods/cnc/weapons.yaml
+++ /dev/null
@@ -1,1155 +0,0 @@
-FlametankExplode:
-	Warhead@1Dam: SpreadDamage
-		Spread: 1c0
-		Damage: 100
-		DeathType: 5
-	Warhead@2Eff: CreateEffect
-		Explosion: big_napalm
-		ImpactSound: xplobig6.aud
-
-HeliCrash:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 40
-		DeathType: 4
-	Warhead@2Eff: CreateEffect
-		Explosion: poof
-		ImpactSound: xplos.aud
-
-HeliExplode:
-	Warhead@1Dam: SpreadDamage
-		DeathType: 4
-	Warhead@2Eff: CreateEffect
-		Explosion: small_building
-		ImpactSound: xplos.aud
-
-UnitExplode:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 50
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 4
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: poof
-		ImpactSound: xplobig6.aud
-
-UnitExplodeSmall:
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 40
-		DeathType: 4
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: big_frag
-		ImpactSound: xplobig4.aud
-
-GrenadierExplode:
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 10
-		DeathType: 3
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: poof
-		ImpactSound: xplosml2.aud
-
-Atomic:
-	ValidTargets: Ground, Air
-	Report: nukemisl.aud
-	Warhead@1Dam_impact: SpreadDamage
-		Spread: 1c0
-		Damage: 150
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		ValidTargets: Ground, Air
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 60
-			Heavy: 50
-	Warhead@2Eff_impact: CreateEffect
-		Explosion: nuke_explosion
-		ImpactSound: nukexplo.aud
-	Warhead@3Dam_areanukea: SpreadDamage
-		Spread: 2c512
-		Damage: 100
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Delay: 3
-		ValidTargets: Ground, Air
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 60
-			Heavy: 50
-	Warhead@4Res_areanukea: DestroyResource
-		Size: 3
-		Delay: 3
-	Warhead@5Smu_areanukea: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 3
-		Delay: 3
-	Warhead@6Eff_areanukea: CreateEffect
-		ImpactSound: xplobig4.aud
-		Delay: 3
-	Warhead@7Dam_areanukeb: SpreadDamage
-		Spread: 3c768
-		Damage: 50
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Delay: 6
-		ValidTargets: Ground, Air
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 60
-			Heavy: 50
-	Warhead@8Res_areanukeb: DestroyResource
-		Size: 4
-		Delay: 6
-	Warhead@9Smu_areanukeb: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 4
-		Delay: 6
-	Warhead@10Dam_areanukec: SpreadDamage
-		Spread: 5c0
-		Damage: 20
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Delay: 9
-		ValidTargets: Ground, Air
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 60
-			Heavy: 50
-	Warhead@11Res_areanukec: DestroyResource
-		Size: 5
-		Delay: 9
-	Warhead@12Smu_areanukec: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 5
-		Delay: 9
-
-IonCannon:
-	ValidTargets: Ground, Air
-	Warhead@1Dam_impact: SpreadDamage
-		Range: 0, 1c1, 2c1, 2c512
-		Damage: 100
-		Falloff: 1000, 1000, 250, 100
-		DeathType: 5
-		ValidTargets: Ground, Air
-	Warhead@2Smu_impact: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Smu_area: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 1
-		Delay: 3
-	Warhead@4Res_area2: DestroyResource
-		Size: 2
-		Delay: 6
-	Warhead@5Smu_area2: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 2,1
-		Delay: 6
-
-Sniper:
-	Report: RAMGUN2.AUD
-	ValidTargets: Infantry
-	ReloadDelay: 40
-	Range: 6c0
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 100
-		DeathType: 2
-		ValidTargets: Infantry
-
-HighV:
-	ReloadDelay: 25
-	Range: 6c0
-	Report: GUN8.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 683
-		Damage: 30
-		DeathType: 2
-		Versus:
-			None: 100
-			Wood: 50
-			Light: 70
-			Heavy: 35
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-
-HeliAGGun:
-	ReloadDelay: 20
-	Burst: 2
-	BurstDelay: 0
-	Range: 4c0
-	ValidTargets: Ground
-	Report: gun5.aud
-	Projectile: Bullet
-		Speed: 1c682
-		High: True
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 20
-		DeathType: 2
-		ValidTargets: Ground
-		Versus:
-			None: 100
-			Wood: 50
-			Light: 75
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-
-HeliAAGun:
-	ReloadDelay: 20
-	Burst: 2
-	BurstDelay: 0
-	Range: 4c0
-	ValidTargets: Air
-	Report: gun5.aud
-	Projectile: Bullet
-		Speed: 1c682
-		High: True
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 20
-		DeathType: 2
-		ValidTargets: Air
-		Versus:
-			None: 100
-			Wood: 50
-			Light: 50
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-
-Pistol:
-	ReloadDelay: 7
-	Range: 3c0
-	InvalidTargets: Wall
-	Report: GUN18.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 1
-		DeathType: 2
-		InvalidTargets: Wall
-		Versus:
-			None: 100
-			Wood: 50
-			Light: 50
-			Heavy: 25
-	Warhead@2Eff: CreateEffect
-		Explosion: piff
-
-M16:
-	ReloadDelay: 20
-	Range: 4c0
-	InvalidTargets: Wall
-	Report: MGUN2.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
-		DeathType: 2
-		InvalidTargets: Wall
-		Versus:
-			None: 100
-			Wood: 25
-			Light: 30
-			Heavy: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piff
-
-Rockets:
-	ReloadDelay: 50
-	Range: 6c0
-	MinRange: 0c512
-	Report: BAZOOK1.AUD
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 128
-		Image: DRAGON
-		ROT: 15
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 298
-		RangeLimit: 20
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
-		DeathType: 4
-		ValidTargets: Ground, Air
-		Versus:
-			None: 50
-			Wood: 85
-			Light: 100
-			Heavy: 100
-			Concrete: 25
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-BikeRockets:
-	ReloadDelay: 50
-	Range: 6c0
-	Report: BAZOOK1.AUD
-	ValidTargets: Ground, Air
-	Burst: 2
-	BurstDelay: 10
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 128
-		Image: DRAGON
-		ROT: 10
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 213
-		RangeLimit: 30
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
-		DeathType: 4
-		ValidTargets: Ground, Air
-		Versus:
-			None: 25
-			Wood: 75
-			Light: 100
-			Heavy: 100
-			Concrete: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-OrcaAGMissiles:
-	ReloadDelay: 12
-	Burst: 2
-	BurstDelay: 12
-	Range: 5c0
-	Report: BAZOOK1.AUD
-	ValidTargets: Ground
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 128
-		Image: DRAGON
-		ROT: 20
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 298
-		RangeLimit: 30
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 25
-		DeathType: 4
-		ValidTargets: Ground
-		Versus:
-			None: 50
-			Wood: 100
-			Light: 100
-			Heavy: 75
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-OrcaAAMissiles:
-	ReloadDelay: 12
-	Burst: 2
-	BurstDelay: 12
-	Range: 5c0
-	Report: BAZOOK1.AUD
-	ValidTargets: Air
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 128
-		Image: DRAGON
-		ROT: 20
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 298
-		RangeLimit: 30
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 25
-		DeathType: 4
-		ValidTargets: Air
-		Versus:
-			Light: 75
-			Heavy: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-Flamethrower:
-	ReloadDelay: 55
-	Range: 2c512
-	InvalidTargets: Wall
-	Report: FLAMER2.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 341
-		Damage: 40
-		DeathType: 5
-		InvalidTargets: Wall
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 100
-			Heavy: 20
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
-		ImpactSound: flamer2.aud
-
-BigFlamer:
-	ReloadDelay: 50
-	Range: 3c512
-	InvalidTargets: Wall
-	Report: FLAMER2.AUD
-	Projectile: Bullet
-		Speed: 341
-	Burst: 2
-	BurstDelay: 25
-	Warhead@1Dam: SpreadDamage
-		Spread: 341
-		Damage: 75
-		DeathType: 5
-		InvalidTargets: Wall
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 67
-			Heavy: 25
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Eff: CreateEffect
-		Explosion: med_napalm
-		ImpactSound: flamer2.aud
-
-Chemspray:
-	ReloadDelay: 70
-	Range: 3c0
-	Report: FLAMER2.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 80
-		DeathType: 6
-		Versus:
-			None: 100
-			Wood: 35
-			Light: 75
-			Heavy: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Eff: CreateEffect
-		Explosion: chemball
-		ImpactSound: xplos.aud
-
-Grenade:
-	ReloadDelay: 50
-	Range: 4c0
-	Report: toss1.aud
-	Projectile: Bullet
-		Speed: 119
-		High: yes
-		Angle: 62
-		Inaccuracy: 213
-		Image: BOMB
-	Warhead@1Dam: SpreadDamage
-		Spread: 341
-		Damage: 50
-		DeathType: 3
-		Versus:
-			None: 100
-			Wood: 50
-			Light: 75
-			Heavy: 35
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
-		ImpactSound: xplos.aud
-
-70mm:
-	ReloadDelay: 30
-	Range: 4c0
-	Report: TNKFIRE3.AUD
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 853
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 25
-		DeathType: 4
-		Versus:
-			None: 25
-			Wood: 75
-			Light: 100
-			Heavy: 100
-			Concrete: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-105mm:
-	ReloadDelay: 50
-	Range: 4c768
-	Report: TNKFIRE4.AUD
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 30
-		DeathType: 4
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 75
-			Heavy: 100
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-120mm:
-	ReloadDelay: 40
-	Range: 4c768
-	Report: TNKFIRE6.AUD
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		DeathType: 4
-		Versus:
-			None: 25
-			Wood: 100
-			Light: 100
-			Heavy: 100
-			Concrete: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-120mmDual:
-	ReloadDelay: 40
-	Range: 4c768
-	Report: TNKFIRE6.AUD
-	Burst: 2
-	BurstDelay: 8
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		DeathType: 4
-		Versus:
-			None: 25
-			Wood: 100
-			Light: 100
-			Heavy: 100
-			Concrete: 100
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-TurretGun:
-	ReloadDelay: 20
-	Range: 6c0
-	Report: TNKFIRE6.AUD
-	Projectile: Bullet
-		Image: 120MM
-		Speed: 853
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 40
-		DeathType: 4
-		Versus:
-			None: 20
-			Wood: 25
-			Light: 100
-			Heavy: 100
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-MammothMissiles:
-	ReloadDelay: 45
-	Range: 5c0
-	Report: ROCKET1.AUD
-	ValidTargets: Ground, Air
-	Burst: 2
-	BurstDelay: 15
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 128
-		Image: DRAGON
-		ROT: 20
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 341
-		RangeLimit: 35
-	Warhead@1Dam: SpreadDamage
-		Spread: 298
-		Damage: 45
-		DeathType: 4
-		ValidTargets: Ground, Air
-		Versus:
-			None: 50
-			Wood: 75
-			Light: 100
-			Heavy: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
-		ImpactSound: xplos.aud
-		InvalidImpactTypes: Air, AirHit
-	Warhead@4EffAir: CreateEffect
-		Explosion: small_building
-		ImpactSound: xplos.aud
-		ValidImpactTypes: Air, AirHit
-
-227mm:
-	ReloadDelay: 140
-	Range: 12c0
-	MinRange: 3c0
-	Burst: 4
-	BurstDelay: 4
-	Report: ROCKET1.AUD
-	ValidTargets: Ground
-	Projectile: Bullet
-		Arm: 5
-		High: yes
-		Shadow: true
-		Inaccuracy: 853
-		Angle: 62
-		Image: DRAGON
-		ROT: 2
-		ContrailLength: 10
-		Trail: smokey
-		Speed: 341
-	Warhead@1Dam: SpreadDamage
-		Spread: 683
-		Damage: 25
-		DeathType: 4
-		ValidTargets: Ground
-		Versus:
-			None: 35
-			Wood: 60
-			Light: 100
-			Heavy: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: med_frag
-		ImpactSound: xplos.aud
-
-227mm.stnk:
-	ReloadDelay: 70
-	Range: 7c0
-	Report: ROCKET1.AUD
-	Burst: 2
-	BurstDelay: 10
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 213
-		Image: DRAGON
-		ROT: 10
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 213
-		RangeLimit: 40
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 60
-		DeathType: 4
-		ValidTargets: Ground, Air
-		Versus:
-			None: 25
-			Wood: 75
-			Light: 100
-			Heavy: 90
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
-		ImpactSound: xplos.aud
-
-ArtilleryShell:
-	ReloadDelay: 65
-	Range: 11c0
-	MinRange: 2c896
-	Report: TNKFIRE2.AUD
-	Projectile: Bullet
-		Speed: 204
-		High: yes
-		Angle: 56
-		Inaccuracy: 1c256
-		ContrailLength: 30
-		Image: 120MM
-	Warhead@1Dam: SpreadDamage
-		Spread: 341
-		Damage: 150
-		DeathType: 3
-		Versus:
-			None: 100
-			Wood: 80
-			Light: 75
-			Heavy: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: poof
-		ImpactSound: XPLOSML2.AUD
-
-MachineGun:
-	ReloadDelay: 20
-	Burst: 5
-	InvalidTargets: Wall
-	Range: 4c0
-	Report: MGUN11.AUD
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
-		DeathType: 2
-		InvalidTargets: Wall
-		Versus:
-			None: 100
-			Wood: 20
-			Light: 50
-			Heavy: 20
-			Concrete: 10
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-
-BoatMissile:
-	ReloadDelay: 35
-	Range: 8c0
-	Burst: 2
-	BurstDelay: 7
-	Report: ROCKET2.AUD
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 213
-		Image: DRAGON
-		ROT: 10
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 170
-		RangeLimit: 60
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 60
-		DeathType: 3
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
-		ImpactSound: xplos.aud
-		InvalidImpactTypes: Air, AirHit
-	Warhead@4EffAir: CreateEffect
-		Explosion: small_building
-		ImpactSound: xplos.aud
-		ValidImpactTypes: Air, AirHit
-
-TowerMissle:
-	ReloadDelay: 15
-	Range: 7c0
-	Report: ROCKET2.AUD
-	ValidTargets: Ground
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Inaccuracy: 128
-		Image: DRAGON
-		ROT: 20
-		Trail: smokey
-		ContrailLength: 8
-		Speed: 298
-		RangeLimit: 40
-	Warhead@1Dam: SpreadDamage
-		Spread: 683
-		Damage: 25
-		DeathType: 3
-		ValidTargets: Ground
-		Versus:
-			None: 50
-			Wood: 25
-			Light: 100
-			Heavy: 100
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: med_frag
-		ImpactSound: xplos.aud
-
-Vulcan:
-	ValidTargets: Ground, Water
-	ReloadDelay: 2
-	Range: 6c0
-	Report: gun5.aud
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 100
-		DeathType: 2
-		ValidTargets: Ground, Water
-		Versus:
-			None: 100
-			Wood: 25
-			Light: 100
-			Heavy: 35
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-
-Napalm:
-	ValidTargets: Ground, Water
-	ReloadDelay: 4
-	Range: 2c0
-	Burst: 2
-	BurstDelay: 2
-	Projectile: GravityBomb
-		Image: BOMBLET
-	Warhead@1Dam: SpreadDamage
-		Spread: 341
-		Damage: 30
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		ValidTargets: Ground, Water
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 100
-			Heavy: 80
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Eff: CreateEffect
-		Explosion: med_napalm
-		ImpactSound: flamer2.aud
-
-Napalm.Crate:
-	Warhead@1Dam: SpreadDamage
-		Spread: 170
-		Damage: 50
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		DeathType: 5
-		Versus:
-			None: 90
-			Wood: 100
-			Light: 60
-			Heavy: 25
-		AffectsParent: true
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Eff: CreateEffect
-		Explosion: med_napalm
-		ImpactSound: flamer2.aud
-
-Laser:
-	ReloadDelay: 1
-	Range: 7c512
-	Charges: true
-	Report: OBELRAY1.AUD
-	Projectile: LaserZap
-		BeamWidth: 2
-		HitAnim: laserfire
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 360
-		DeathType: 5
-		Versus:
-			Wood: 50
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-
-SAMMissile:
-	ReloadDelay: 15
-	Range: 8c0
-	Report: ROCKET2.AUD
-	ValidTargets: Air
-	Projectile: Missile
-		Arm: 0
-		High: yes
-		Image: MISSILE
-		ROT: 20
-		Speed: 426
-		RangeLimit: 35
-		Trail: smokey
-		ContrailLength: 8
-	Warhead@1Dam: SpreadDamage
-		Spread: 682
-		ValidTargets: Air
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 100
-			Heavy: 75
-		DeathType: 4
-		Damage: 30
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_building
-		ImpactSound: xplos.aud
-
-HonestJohn:
-	ReloadDelay: 200
-	Range: 10c0
-	Report: ROCKET1.AUD
-	Projectile: Bullet
-		Arm: 10
-		High: yes
-		Shadow: true
-		Inaccuracy: 213
-		Image: patriot
-		Trail: smokey
-		Speed: 187
-		RangeLimit: 35
-		Angle: 88
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 100
-		DeathType: 3
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
-		ImpactSound: xplos.aud
-
-Tiberium:
-	ReloadDelay: 16
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 2
-		DeathType: 6
-		PreventProne: yes
-
-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: chemball
-		ImpactSound: xplosml2.aud
-
-Heal:
-	ReloadDelay: 4
-	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: -1
-		PreventProne: yes
-
-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
-			Light: 100
-			Heavy: 50
-	Warhead@2Eff: CreateEffect
-		Explosion: small_poof
-
-APCGun.AA:
-	ReloadDelay: 18
-	Range: 7c0
-	Report: gun20.aud
-	ValidTargets: Air
-	Projectile: Bullet
-		Speed: 1c682
-		High: true
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 25
-		ValidTargets: Air
-		Versus:
-			Heavy: 50
-	Warhead@2Eff: CreateEffect
-		Explosion: small_frag
-
-Patriot:
-	ReloadDelay: 25
-	Range: 9c0
-	MinRange: 1c0
-	Report: ROCKET2.AUD
-	ValidTargets: Air
-	Projectile: Missile
-		High: yes
-		Image: patriot
-		Trail: smokey
-		ContrailLength: 8
-		ROT: 20
-		Speed: 341
-		RangeLimit: 30
-		Angle: 88
-	Warhead@1Dam: SpreadDamage
-		Spread: 682
-		ValidTargets: Air
-		Versus:
-			None: 100
-			Wood: 100
-			Light: 100
-			Heavy: 75
-		DeathType: 4
-		Damage: 32
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-	Warhead@3Eff: CreateEffect
-		Explosion: poof
-		ImpactSound: xplos.aud
-
-Tail:
-	ReloadDelay: 30
-	Range: 1c0
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 180
-		DeathType: 1
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-
-Horn:
-	ReloadDelay: 20
-	Range: 1c0
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 120
-		DeathType: 1
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-
-Teeth:
-	ReloadDelay: 30
-	Range: 1c0
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 180
-		DeathType: 1
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-
-Claw:
-	ReloadDelay: 10
-	Range: 1c0
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 60
-		DeathType: 1
-		Versus:
-			None: 90
-			Wood: 10
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-
-Demolish:
-	Warhead@1Dam: SpreadDamage
-	Warhead@2Eff: CreateEffect
-		Explosion: building
-		ImpactSound: xplobig6.aud
-
diff --git a/mods/cnc/weapons/explosions.yaml b/mods/cnc/weapons/explosions.yaml
new file mode 100644
index 0000000000..0ff192d4d2
--- /dev/null
+++ b/mods/cnc/weapons/explosions.yaml
@@ -0,0 +1,85 @@
+FlametankExplode:
+	Warhead@1Dam: SpreadDamage
+		Spread: 1c0
+		Damage: 100
+		DeathType: 5
+	Warhead@2Eff: CreateEffect
+		Explosion: big_napalm
+		ImpactSound: xplobig6.aud
+
+HeliCrash:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 40
+		DeathType: 4
+	Warhead@2Eff: CreateEffect
+		Explosion: poof
+		ImpactSound: xplos.aud
+
+HeliExplode:
+	Warhead@1Dam: SpreadDamage
+		DeathType: 4
+	Warhead@2Eff: CreateEffect
+		Explosion: small_building
+		ImpactSound: xplos.aud
+
+UnitExplode:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 50
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 4
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: poof
+		ImpactSound: xplobig6.aud
+
+UnitExplodeSmall:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 40
+		DeathType: 4
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: big_frag
+		ImpactSound: xplobig4.aud
+
+GrenadierExplode:
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 10
+		DeathType: 3
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: poof
+		ImpactSound: xplosml2.aud
+
+Napalm.Crate:
+	Warhead@1Dam: SpreadDamage
+		Spread: 170
+		Damage: 50
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Versus:
+			None: 90
+			Wood: 100
+			Light: 60
+			Heavy: 25
+		AffectsParent: true
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch
+	Warhead@3Eff: CreateEffect
+		Explosion: med_napalm
+		ImpactSound: flamer2.aud
diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/largecaliber.yaml
new file mode 100644
index 0000000000..7a190ec3c8
--- /dev/null
+++ b/mods/cnc/weapons/largecaliber.yaml
@@ -0,0 +1,141 @@
+70mm:
+	ReloadDelay: 30
+	Range: 4c0
+	Report: TNKFIRE3.AUD
+	Projectile: Bullet
+		Image: 120MM
+		Speed: 853
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 25
+		DeathType: 4
+		Versus:
+			None: 25
+			Wood: 75
+			Light: 100
+			Heavy: 100
+			Concrete: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+105mm:
+	ReloadDelay: 50
+	Range: 4c768
+	Report: TNKFIRE4.AUD
+	Projectile: Bullet
+		Image: 120MM
+		Speed: 682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 30
+		DeathType: 4
+		Versus:
+			None: 30
+			Wood: 75
+			Light: 75
+			Heavy: 100
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+120mm:
+	ReloadDelay: 40
+	Range: 4c768
+	Report: TNKFIRE6.AUD
+	Projectile: Bullet
+		Image: 120MM
+		Speed: 682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 40
+		DeathType: 4
+		Versus:
+			None: 25
+			Wood: 100
+			Light: 100
+			Heavy: 100
+			Concrete: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+120mmDual:
+	ReloadDelay: 40
+	Range: 4c768
+	Report: TNKFIRE6.AUD
+	Burst: 2
+	BurstDelay: 8
+	Projectile: Bullet
+		Image: 120MM
+		Speed: 682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 40
+		DeathType: 4
+		Versus:
+			None: 25
+			Wood: 100
+			Light: 100
+			Heavy: 100
+			Concrete: 100
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+TurretGun:
+	ReloadDelay: 20
+	Range: 6c0
+	Report: TNKFIRE6.AUD
+	Projectile: Bullet
+		Image: 120MM
+		Speed: 853
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 40
+		DeathType: 4
+		Versus:
+			None: 20
+			Wood: 25
+			Light: 100
+			Heavy: 100
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+ArtilleryShell:
+	ReloadDelay: 65
+	Range: 11c0
+	MinRange: 2c896
+	Report: TNKFIRE2.AUD
+	Projectile: Bullet
+		Speed: 204
+		High: yes
+		Angle: 56
+		Inaccuracy: 1c256
+		ContrailLength: 30
+		Image: 120MM
+	Warhead@1Dam: SpreadDamage
+		Spread: 341
+		Damage: 150
+		DeathType: 3
+		Versus:
+			None: 100
+			Wood: 80
+			Light: 75
+			Heavy: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: poof
+		ImpactSound: XPLOSML2.AUD
diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml
new file mode 100644
index 0000000000..0a6c881aee
--- /dev/null
+++ b/mods/cnc/weapons/missiles.yaml
@@ -0,0 +1,393 @@
+Rockets:
+	ReloadDelay: 50
+	Range: 6c0
+	MinRange: 0c512
+	Report: BAZOOK1.AUD
+	ValidTargets: Ground, Air
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 128
+		Image: DRAGON
+		ROT: 15
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 298
+		RangeLimit: 20
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 30
+		DeathType: 4
+		ValidTargets: Ground, Air
+		Versus:
+			None: 50
+			Wood: 85
+			Light: 100
+			Heavy: 100
+			Concrete: 25
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+BikeRockets:
+	ReloadDelay: 50
+	Range: 6c0
+	Report: BAZOOK1.AUD
+	ValidTargets: Ground, Air
+	Burst: 2
+	BurstDelay: 10
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 128
+		Image: DRAGON
+		ROT: 10
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 213
+		RangeLimit: 30
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 30
+		DeathType: 4
+		ValidTargets: Ground, Air
+		Versus:
+			None: 25
+			Wood: 75
+			Light: 100
+			Heavy: 100
+			Concrete: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+OrcaAGMissiles:
+	ReloadDelay: 12
+	Burst: 2
+	BurstDelay: 12
+	Range: 5c0
+	Report: BAZOOK1.AUD
+	ValidTargets: Ground
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 128
+		Image: DRAGON
+		ROT: 20
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 298
+		RangeLimit: 30
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 25
+		DeathType: 4
+		ValidTargets: Ground
+		Versus:
+			None: 50
+			Wood: 100
+			Light: 100
+			Heavy: 75
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+OrcaAAMissiles:
+	ReloadDelay: 12
+	Burst: 2
+	BurstDelay: 12
+	Range: 5c0
+	Report: BAZOOK1.AUD
+	ValidTargets: Air
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 128
+		Image: DRAGON
+		ROT: 20
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 298
+		RangeLimit: 30
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 25
+		DeathType: 4
+		ValidTargets: Air
+		Versus:
+			Light: 75
+			Heavy: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+MammothMissiles:
+	ReloadDelay: 45
+	Range: 5c0
+	Report: ROCKET1.AUD
+	ValidTargets: Ground, Air
+	Burst: 2
+	BurstDelay: 15
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 128
+		Image: DRAGON
+		ROT: 20
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 341
+		RangeLimit: 35
+	Warhead@1Dam: SpreadDamage
+		Spread: 298
+		Damage: 45
+		DeathType: 4
+		ValidTargets: Ground, Air
+		Versus:
+			None: 50
+			Wood: 75
+			Light: 100
+			Heavy: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_poof
+		ImpactSound: xplos.aud
+		InvalidImpactTypes: Air, AirHit
+	Warhead@4EffAir: CreateEffect
+		Explosion: small_building
+		ImpactSound: xplos.aud
+		ValidImpactTypes: Air, AirHit
+
+227mm:
+	ReloadDelay: 140
+	Range: 12c0
+	MinRange: 3c0
+	Burst: 4
+	BurstDelay: 4
+	Report: ROCKET1.AUD
+	ValidTargets: Ground
+	Projectile: Bullet
+		Arm: 5
+		High: yes
+		Shadow: true
+		Inaccuracy: 853
+		Angle: 62
+		Image: DRAGON
+		ROT: 2
+		ContrailLength: 10
+		Trail: smokey
+		Speed: 341
+	Warhead@1Dam: SpreadDamage
+		Spread: 683
+		Damage: 25
+		DeathType: 4
+		ValidTargets: Ground
+		Versus:
+			None: 35
+			Wood: 60
+			Light: 100
+			Heavy: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: med_frag
+		ImpactSound: xplos.aud
+
+227mm.stnk:
+	ReloadDelay: 70
+	Range: 7c0
+	Report: ROCKET1.AUD
+	Burst: 2
+	BurstDelay: 10
+	ValidTargets: Ground, Air
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 213
+		Image: DRAGON
+		ROT: 10
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 213
+		RangeLimit: 40
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 60
+		DeathType: 4
+		ValidTargets: Ground, Air
+		Versus:
+			None: 25
+			Wood: 75
+			Light: 100
+			Heavy: 90
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_frag
+		ImpactSound: xplos.aud
+
+BoatMissile:
+	ReloadDelay: 35
+	Range: 8c0
+	Burst: 2
+	BurstDelay: 7
+	Report: ROCKET2.AUD
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 213
+		Image: DRAGON
+		ROT: 10
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 170
+		RangeLimit: 60
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 60
+		DeathType: 3
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_poof
+		ImpactSound: xplos.aud
+		InvalidImpactTypes: Air, AirHit
+	Warhead@4EffAir: CreateEffect
+		Explosion: small_building
+		ImpactSound: xplos.aud
+		ValidImpactTypes: Air, AirHit
+
+TowerMissle:
+	ReloadDelay: 15
+	Range: 7c0
+	Report: ROCKET2.AUD
+	ValidTargets: Ground
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Inaccuracy: 128
+		Image: DRAGON
+		ROT: 20
+		Trail: smokey
+		ContrailLength: 8
+		Speed: 298
+		RangeLimit: 40
+	Warhead@1Dam: SpreadDamage
+		Spread: 683
+		Damage: 25
+		DeathType: 3
+		ValidTargets: Ground
+		Versus:
+			None: 50
+			Wood: 25
+			Light: 100
+			Heavy: 100
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: med_frag
+		ImpactSound: xplos.aud
+
+SAMMissile:
+	ReloadDelay: 15
+	Range: 8c0
+	Report: ROCKET2.AUD
+	ValidTargets: Air
+	Projectile: Missile
+		Arm: 0
+		High: yes
+		Image: MISSILE
+		ROT: 20
+		Speed: 426
+		RangeLimit: 35
+		Trail: smokey
+		ContrailLength: 8
+	Warhead@1Dam: SpreadDamage
+		Spread: 682
+		ValidTargets: Air
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 100
+			Heavy: 75
+		DeathType: 4
+		Damage: 30
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_building
+		ImpactSound: xplos.aud
+
+HonestJohn:
+	ReloadDelay: 200
+	Range: 10c0
+	Report: ROCKET1.AUD
+	Projectile: Bullet
+		Arm: 10
+		High: yes
+		Shadow: true
+		Inaccuracy: 213
+		Image: patriot
+		Trail: smokey
+		Speed: 187
+		RangeLimit: 35
+		Angle: 88
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 100
+		DeathType: 3
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_poof
+		ImpactSound: xplos.aud
+
+Patriot:
+	ReloadDelay: 25
+	Range: 9c0
+	MinRange: 1c0
+	Report: ROCKET2.AUD
+	ValidTargets: Air
+	Projectile: Missile
+		High: yes
+		Image: patriot
+		Trail: smokey
+		ContrailLength: 8
+		ROT: 20
+		Speed: 341
+		RangeLimit: 30
+		Angle: 88
+	Warhead@1Dam: SpreadDamage
+		Spread: 682
+		ValidTargets: Air
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 100
+			Heavy: 75
+		DeathType: 4
+		Damage: 32
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: poof
+		ImpactSound: xplos.aud
diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml
new file mode 100644
index 0000000000..d97f2312ca
--- /dev/null
+++ b/mods/cnc/weapons/other.yaml
@@ -0,0 +1,238 @@
+
+Flamethrower:
+	ReloadDelay: 55
+	Range: 2c512
+	InvalidTargets: Wall
+	Report: FLAMER2.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 341
+		Damage: 40
+		DeathType: 5
+		InvalidTargets: Wall
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 100
+			Heavy: 20
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch
+	Warhead@3Eff: CreateEffect
+		Explosion: small_napalm
+		ImpactSound: flamer2.aud
+
+BigFlamer:
+	ReloadDelay: 50
+	Range: 3c512
+	InvalidTargets: Wall
+	Report: FLAMER2.AUD
+	Projectile: Bullet
+		Speed: 341
+	Burst: 2
+	BurstDelay: 25
+	Warhead@1Dam: SpreadDamage
+		Spread: 341
+		Damage: 75
+		DeathType: 5
+		InvalidTargets: Wall
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 67
+			Heavy: 25
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch
+	Warhead@3Eff: CreateEffect
+		Explosion: med_napalm
+		ImpactSound: flamer2.aud
+
+Chemspray:
+	ReloadDelay: 70
+	Range: 3c0
+	Report: FLAMER2.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 80
+		DeathType: 6
+		Versus:
+			None: 100
+			Wood: 35
+			Light: 75
+			Heavy: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch
+	Warhead@3Eff: CreateEffect
+		Explosion: chemball
+		ImpactSound: xplos.aud
+
+Grenade:
+	ReloadDelay: 50
+	Range: 4c0
+	Report: toss1.aud
+	Projectile: Bullet
+		Speed: 119
+		High: yes
+		Angle: 62
+		Inaccuracy: 213
+		Image: BOMB
+	Warhead@1Dam: SpreadDamage
+		Spread: 341
+		Damage: 50
+		DeathType: 3
+		Versus:
+			None: 100
+			Wood: 50
+			Light: 75
+			Heavy: 35
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
+		Explosion: small_poof
+		ImpactSound: xplos.aud
+
+Napalm:
+	ValidTargets: Ground, Water
+	ReloadDelay: 4
+	Range: 2c0
+	Burst: 2
+	BurstDelay: 2
+	Projectile: GravityBomb
+		Image: BOMBLET
+	Warhead@1Dam: SpreadDamage
+		Spread: 341
+		Damage: 30
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		ValidTargets: Ground, Water
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 100
+			Heavy: 80
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch
+	Warhead@3Eff: CreateEffect
+		Explosion: med_napalm
+		ImpactSound: flamer2.aud
+
+Laser:
+	ReloadDelay: 1
+	Range: 7c512
+	Charges: true
+	Report: OBELRAY1.AUD
+	Projectile: LaserZap
+		BeamWidth: 2
+		HitAnim: laserfire
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 360
+		DeathType: 5
+		Versus:
+			Wood: 50
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch
+
+Tiberium:
+	ReloadDelay: 16
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 2
+		DeathType: 6
+		PreventProne: yes
+
+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: chemball
+		ImpactSound: xplosml2.aud
+
+Heal:
+	ReloadDelay: 4
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: -1
+		PreventProne: yes
+
+Tail:
+	ReloadDelay: 30
+	Range: 1c0
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: 180
+		DeathType: 1
+		Versus:
+			None: 90
+			Wood: 10
+			Light: 30
+			Heavy: 10
+			Concrete: 10
+
+Horn:
+	ReloadDelay: 20
+	Range: 1c0
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: 120
+		DeathType: 1
+		Versus:
+			None: 90
+			Wood: 10
+			Light: 30
+			Heavy: 10
+			Concrete: 10
+
+Teeth:
+	ReloadDelay: 30
+	Range: 1c0
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: 180
+		DeathType: 1
+		Versus:
+			None: 90
+			Wood: 10
+			Light: 30
+			Heavy: 10
+			Concrete: 10
+
+Claw:
+	ReloadDelay: 10
+	Range: 1c0
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: 60
+		DeathType: 1
+		Versus:
+			None: 90
+			Wood: 10
+			Light: 30
+			Heavy: 10
+			Concrete: 10
+
+Demolish:
+	Warhead@1Dam: SpreadDamage
+	Warhead@2Eff: CreateEffect
+		Explosion: building
+		ImpactSound: xplobig6.aud
diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml
new file mode 100644
index 0000000000..a3bc7676f6
--- /dev/null
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -0,0 +1,194 @@
+Sniper:
+	Report: RAMGUN2.AUD
+	ValidTargets: Infantry
+	ReloadDelay: 40
+	Range: 6c0
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 42
+		Damage: 100
+		DeathType: 2
+		ValidTargets: Infantry
+
+HighV:
+	ReloadDelay: 25
+	Range: 6c0
+	Report: GUN8.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 683
+		Damage: 30
+		DeathType: 2
+		Versus:
+			None: 100
+			Wood: 50
+			Light: 70
+			Heavy: 35
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+
+HeliAGGun:
+	ReloadDelay: 20
+	Burst: 2
+	BurstDelay: 0
+	Range: 4c0
+	ValidTargets: Ground
+	Report: gun5.aud
+	Projectile: Bullet
+		Speed: 1c682
+		High: True
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 20
+		DeathType: 2
+		ValidTargets: Ground
+		Versus:
+			None: 100
+			Wood: 50
+			Light: 75
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+
+HeliAAGun:
+	ReloadDelay: 20
+	Burst: 2
+	BurstDelay: 0
+	Range: 4c0
+	ValidTargets: Air
+	Report: gun5.aud
+	Projectile: Bullet
+		Speed: 1c682
+		High: True
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 20
+		DeathType: 2
+		ValidTargets: Air
+		Versus:
+			None: 100
+			Wood: 50
+			Light: 50
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+
+Pistol:
+	ReloadDelay: 7
+	Range: 3c0
+	InvalidTargets: Wall
+	Report: GUN18.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 1
+		DeathType: 2
+		InvalidTargets: Wall
+		Versus:
+			None: 100
+			Wood: 50
+			Light: 50
+			Heavy: 25
+	Warhead@2Eff: CreateEffect
+		Explosion: piff
+
+M16:
+	ReloadDelay: 20
+	Range: 4c0
+	InvalidTargets: Wall
+	Report: MGUN2.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 15
+		DeathType: 2
+		InvalidTargets: Wall
+		Versus:
+			None: 100
+			Wood: 25
+			Light: 30
+			Heavy: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piff
+
+MachineGun:
+	ReloadDelay: 20
+	Burst: 5
+	InvalidTargets: Wall
+	Range: 4c0
+	Report: MGUN11.AUD
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 15
+		DeathType: 2
+		InvalidTargets: Wall
+		Versus:
+			None: 100
+			Wood: 20
+			Light: 50
+			Heavy: 20
+			Concrete: 10
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+
+Vulcan:
+	ValidTargets: Ground, Water
+	ReloadDelay: 2
+	Range: 6c0
+	Report: gun5.aud
+	Projectile: Bullet
+		Speed: 1c682
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 100
+		DeathType: 2
+		ValidTargets: Ground, Water
+		Versus:
+			None: 100
+			Wood: 25
+			Light: 100
+			Heavy: 35
+	Warhead@2Eff: CreateEffect
+		Explosion: 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
+			Light: 100
+			Heavy: 50
+	Warhead@2Eff: CreateEffect
+		Explosion: small_poof
+
+APCGun.AA:
+	ReloadDelay: 18
+	Range: 7c0
+	Report: gun20.aud
+	ValidTargets: Air
+	Projectile: Bullet
+		Speed: 1c682
+		High: true
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 25
+		ValidTargets: Air
+		Versus:
+			Heavy: 50
+	Warhead@2Eff: CreateEffect
+		Explosion: small_frag
diff --git a/mods/cnc/weapons/superweapons.yaml b/mods/cnc/weapons/superweapons.yaml
new file mode 100644
index 0000000000..6356e1c875
--- /dev/null
+++ b/mods/cnc/weapons/superweapons.yaml
@@ -0,0 +1,99 @@
+Atomic:
+	ValidTargets: Ground, Air
+	Report: nukemisl.aud
+	Warhead@1Dam_impact: SpreadDamage
+		Spread: 1c0
+		Damage: 150
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		ValidTargets: Ground, Air
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 60
+			Heavy: 50
+	Warhead@2Eff_impact: CreateEffect
+		Explosion: nuke_explosion
+		ImpactSound: nukexplo.aud
+	Warhead@3Dam_areanukea: SpreadDamage
+		Spread: 2c512
+		Damage: 100
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Delay: 3
+		ValidTargets: Ground, Air
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 60
+			Heavy: 50
+	Warhead@4Res_areanukea: DestroyResource
+		Size: 3
+		Delay: 3
+	Warhead@5Smu_areanukea: LeaveSmudge
+		SmudgeType: Scorch
+		Size: 3
+		Delay: 3
+	Warhead@6Eff_areanukea: CreateEffect
+		ImpactSound: xplobig4.aud
+		Delay: 3
+	Warhead@7Dam_areanukeb: SpreadDamage
+		Spread: 3c768
+		Damage: 50
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Delay: 6
+		ValidTargets: Ground, Air
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 60
+			Heavy: 50
+	Warhead@8Res_areanukeb: DestroyResource
+		Size: 4
+		Delay: 6
+	Warhead@9Smu_areanukeb: LeaveSmudge
+		SmudgeType: Scorch
+		Size: 4
+		Delay: 6
+	Warhead@10Dam_areanukec: SpreadDamage
+		Spread: 5c0
+		Damage: 20
+		Falloff: 1000, 368, 135, 50, 18, 7, 0
+		DeathType: 5
+		Delay: 9
+		ValidTargets: Ground, Air
+		Versus:
+			None: 100
+			Wood: 100
+			Light: 60
+			Heavy: 50
+	Warhead@11Res_areanukec: DestroyResource
+		Size: 5
+		Delay: 9
+	Warhead@12Smu_areanukec: LeaveSmudge
+		SmudgeType: Scorch
+		Size: 5
+		Delay: 9
+
+IonCannon:
+	ValidTargets: Ground, Air
+	Warhead@1Dam_impact: SpreadDamage
+		Range: 0, 1c1, 2c1, 2c512
+		Damage: 100
+		Falloff: 1000, 1000, 250, 100
+		DeathType: 5
+		ValidTargets: Ground, Air
+	Warhead@2Smu_impact: LeaveSmudge
+		SmudgeType: Scorch
+	Warhead@3Smu_area: LeaveSmudge
+		SmudgeType: Scorch
+		Size: 1
+		Delay: 3
+	Warhead@4Res_area2: DestroyResource
+		Size: 2
+		Delay: 6
+	Warhead@5Smu_area2: LeaveSmudge
+		SmudgeType: Scorch
+		Size: 2,1
+		Delay: 6