Move weapon/turret definitions out of AttackBase.

Weapons are now defined with the Armament trait and turret parameters live in Turreted. This has the side effect of allowing any number and distribution of weapons and turrets.
2013-03-14 03:55:34 +13:00
parent aa6f12f0a1
commit 0167bbfbaa
81 changed files with 4023 additions and 820 deletions
--- a/mods/cnc/rules/aircraft.yaml
+++ b/mods/cnc/rules/aircraft.yaml
@@ -68,13 +68,13 @@ HELI:
 		Type: Light
 	RevealsShroud:
 		Range: 8
+	Armament@PRIMARY:
+		Weapon: HeliAGGun
+		LocalOffset: -5,-3,0,2,0, 5,-3,0,2,0
+	Armament@SECONDARY:
+		Weapon: HeliAGGun
+		LocalOffset: -5,-3,0,2,0, 5,-3,0,2,0
 	AttackHeli:
-		PrimaryWeapon: HeliAGGun
-		PrimaryOffset: 0,-3,0,2
-		PrimaryLocalOffset: -5,0,0,0,0, 5,0,0,0,0
-		SecondaryWeapon: HeliAAGun
-		SecondaryOffset: 0,-3,0,2
-		SecondaryLocalOffset: -5,0,0,0,0, 5,0,0,0,0
 		FacingTolerance: 20
 	LimitedAmmo:
 		Ammo: 10
@@ -119,13 +119,13 @@ ORCA:
 		Type: Light
 	RevealsShroud:
 		Range: 8
+	Armament@PRIMARY:
+		Weapon: OrcaAGMissiles
+		LocalOffset: -4,-10,0,5,0, 4,-10,0,5,0
+	Armament@SECONDARY:
+		Weapon: OrcaAAMissiles
+		LocalOffset: -4,-10,0,5,0, 4,-10,0,5,0
 	AttackHeli:
-		PrimaryWeapon: OrcaAGMissiles
-		PrimaryOffset: 0,-10,0,5
-		PrimaryLocalOffset: -4,0,0,0,0, 4,0,0,0,0
-		SecondaryWeapon: OrcaAAMissiles
-		SecondaryOffset: 0,-10,0,5
-		SecondaryLocalOffset: -4,0,0,0,0, 4,0,0,0,0
 		FacingTolerance: 20
 	LimitedAmmo:
 		Ammo: 10
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -404,8 +404,9 @@ VICE:
 		Cost: 1000
 	Tooltip:
 		Name: Viceroid
+	Armament:
+		Weapon: Chemspray
 	AttackFrontal:
-		PrimaryWeapon: Chemspray
 	AttackWander:
 	RenderUnit:
 	WithMuzzleFlash:
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -124,7 +124,7 @@
 	Buildable:
 		Queue: Infantry
 	TakeCover:
-		BarrelOffset: 0,-2,0,4
+		ProneOffset: 0,-2,0,4
 	RenderInfantryProne:
 	AttackMove:
 	Passenger:
@@ -164,8 +164,9 @@
 		HP: 25
 	RevealsShroud:
 		Range: 2
+	Armament:
+		Weapon: Pistol
 	AttackFrontal:
-		PrimaryWeapon: Pistol
 	ActorLostNotification:
 		Notification: civdead1.aud
 		NotifyAll: true
--- a/mods/cnc/rules/infantry.yaml
+++ b/mods/cnc/rules/infantry.yaml
@@ -15,8 +15,9 @@ E1:
 		Speed: 4
 	Health:
 		HP: 50
+	Armament:
+		Weapon: M16
 	AttackFrontal:
-		PrimaryWeapon: M16
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2,idle3,idle4
 	DetectCloaked:
@@ -40,10 +41,11 @@ E2:
 		Speed: 5
 	Health:
 		HP: 50
-	AttackFrontal:
-		PrimaryWeapon: Grenade
-		PrimaryOffset: 0,0,0,-10
+	Armament:
+		Weapon: Grenade
+		LocalOffset: 0,0,0,-10,0
 		FireDelay: 15
+	AttackFrontal:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
 	Explodes:
@@ -70,10 +72,11 @@ E3:
 		Speed: 3
 	Health:
 		HP: 45
-	AttackFrontal:
-		PrimaryWeapon: Rockets
-		PrimaryOffset: 1,-6,0,-8
+	Armament:
+		Weapon: Rockets
+		LocalOffset: 1,-6,0,-8,0
 		FireDelay: 5
+	AttackFrontal:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
 	DetectCloaked:
@@ -97,10 +100,11 @@ E4:
 		Speed: 5
 	Health:
 		HP: 90
-	AttackFrontal:
-		PrimaryWeapon: Flamethrower
-		PrimaryOffset: 0,-2,2,-4
+	Armament:
+		Weapon: Flamethrower
+		LocalOffset: 0,-2,2,-4,0
 		FireDelay: 3
+	AttackFrontal:
 	WithMuzzleFlash:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
@@ -130,10 +134,11 @@ E5:
 				PathingCost: 80
 	Health:
 		HP: 90
-	AttackFrontal:
-		PrimaryWeapon: Chemspray
-		PrimaryOffset: 0,-2,2,-9
+	Armament:
+		Weapon: Chemspray
+		LocalOffset: 0,-2,2,-9,0
 		FireDelay: 3
+	AttackFrontal:
 	WithMuzzleFlash:
 	-PoisonedByTiberium:
 	RenderInfantryProne:
@@ -197,8 +202,9 @@ RMBO:
 		ScanRadius: 5
 	C4Demolition:
 		C4Delay: 45
+	Armament:
+		Weapon: Sniper
 	AttackFrontal:
-		PrimaryWeapon: Sniper
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2,idle3
 	AnnounceOnBuild:
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -18,10 +18,11 @@ BOAT:
 		Range: 7
 	Turreted:
 		ROT: 7
+		Offset: 0,-15,0,-4
+	Armament:
+		Weapon: BoatMissile
+		LocalOffset: -3,-5,0,0,0, 3,-5,0,0,0, 0,-5,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: BoatMissile
-		PrimaryOffset: 0,-15,0,-4
-		PrimaryLocalOffset: -3,-5,0,0,0, 3,-5,0,0,0, 0,-5,0,0,0
 	RenderGunboat:
 	AutoTarget:
 		AllowMovement: false
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -510,9 +510,10 @@ GUN:
 		ROT: 12
 		InitialFacing: 50
 	RenderBuildingTurreted:
+	Armament:
+		Weapon: TurretGun
+		LocalOffset: 0,4,0,-2,0
 	AttackTurreted:
-		PrimaryWeapon: TurretGun
-		PrimaryLocalOffset: 0,4,0,-2,0
 	AutoTarget:
 	-AutoTargetIgnore:
 	-RenderBuilding:
@@ -551,8 +552,9 @@ SAM:
 		ROT: 7
 		InitialFacing: 0
 	RenderBuildingTurreted:
+	Armament:
+		Weapon: SAMMissile
 	AttackPopupTurreted:
-		PrimaryWeapon: SAMMissile
 	WithMuzzleFlash:
 	AutoTarget:
 	-RenderBuilding:
@@ -585,10 +587,11 @@ OBLI:
 		Range: 8
 	RenderBuildingCharge:
 		ChargeAudio: obelpowr.aud
-	AttackTurreted:
-		PrimaryWeapon: Laser
-		PrimaryOffset: 0,0,-2,-17
+	Armament:
+		Weapon: Laser
+		LocalOffset: 0,0,-2,-17,0
 		FireDelay: 8
+	AttackTurreted:
 	Turreted:
 		ROT:255
 	AutoTarget:
@@ -620,10 +623,10 @@ GTWR:
 		HP: 600
 	RevealsShroud:
 		Range: 7
+	Armament:
+		Weapon: HighV
+		LocalOffset: 0,-6,0,-6,0
 	AttackTurreted:
-		PrimaryWeapon: HighV
-		PrimaryOffset: 0,0,0,-6
-		PrimaryLocalOffset: 0,-6,0,0,0
 	AutoTarget:
 	-AutoTargetIgnore:
 	DetectCloaked:
@@ -659,10 +662,10 @@ ATWR:
 		Type: Heavy
 	RevealsShroud:
 		Range: 9
+	Armament:
+		Weapon: TowerMissle
+		LocalOffset: 7,-7,5,2,-25, -7,-7,5,2,25
 	AttackTurreted:
-		PrimaryWeapon: TowerMissle
-		PrimaryOffset: 0,0,5,2
-		PrimaryLocalOffset: 7,-7,0,0,-25, -7,-7,0,0,25
 	Turreted:
 		ROT:255
 	AutoTarget:
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -100,13 +100,13 @@ APC:
 		Range: 7
 	Turreted:
 		ROT: 10
+	Armament@PRIMARY:
+		Weapon: APCGun
+		LocalOffset: 2,-2,0,-7,0, -2,-2,0,-7,0
+	Armament@SECONDARY:
+		Weapon: APCGun.AA
+		LocalOffset: 2,-2,0,-7,0, -2,-2,0,-7,0
 	AttackTurreted:
-		PrimaryWeapon: APCGun
-		PrimaryOffset: 0,0,0,0
-		PrimaryLocalOffset: 2,-2,0,-7,0, -2,-2,0,-7,0
-		SecondaryWeapon: APCGun.AA
-		SecondaryOffset: 0,0,0,0
-		SecondaryLocalOffset: 2,-2,0,-7,0, -2,-2,0,-7,0
 	WithMuzzleFlash:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -139,9 +139,10 @@ ARTY:
 		Type: Light
 	RevealsShroud:
 		Range: 9
+	Armament:
+		Weapon: ArtilleryShell
+		LocalOffset: 0,-7,0,-3,0
 	AttackFrontal:
-		PrimaryWeapon: ArtilleryShell
-		PrimaryOffset: 0,-7,0,-3
 	RenderUnit:
 	Explodes:
 	AutoTarget:
@@ -170,10 +171,10 @@ FTNK:
 		Type: Light
 	RevealsShroud:
 		Range: 5
+	Armament:
+		Weapon: BigFlamer
+		LocalOffset: 5,-5,3,2,0, -5,-5,3,2,0
 	AttackFrontal:
-		PrimaryWeapon: BigFlamer
-		PrimaryOffset: 0,-5,3,2
-		PrimaryLocalOffset: 5,0,0,0,0, -5,0,0,0,0
 	RenderUnit:
 	AutoTarget:
 	WithMuzzleFlash:
@@ -206,9 +207,10 @@ BGGY:
 		Range: 7
 	Turreted:
 		ROT: 10
+		Offset: 0,1,0,-3
+	Armament:
+		Weapon: MachineGun
 	AttackTurreted:
-		PrimaryWeapon: MachineGun
-		PrimaryOffset: 0,1,0,-3
 	WithMuzzleFlash:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -243,10 +245,10 @@ BIKE:
 		Type: Light
 	RevealsShroud:
 		Range: 8
+	Armament:
+		Weapon: BikeRockets
+		LocalOffset: -4,0,0,-2,25, 4,0,0,-2,-25
 	AttackFrontal:
-		PrimaryWeapon: BikeRockets
-		PrimaryOffset: 0,0,0,-2
-		PrimaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25
 	RenderUnit:
 	AutoTarget:
 	LeavesHusk:
@@ -275,9 +277,10 @@ JEEP:
 		Range: 8
 	Turreted:
 		ROT: 10
+		Offset: 0,2,0,-4
+	Armament:
+		Weapon: MachineGun
 	AttackTurreted:
-		PrimaryWeapon: MachineGun
-		PrimaryOffset: 0,2,0,-4
 	WithMuzzleFlash:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -307,11 +310,12 @@ LTNK:
 		Range: 6
 	Turreted:
 		ROT: 5
+	Armament:
+		Weapon: 70mm
+		Recoil: 2
+		RecoilRecovery: 0.4
+		LocalOffset: 0,3,0,-2,0
 	AttackTurreted:
-		PrimaryWeapon: 70mm
-		PrimaryRecoil: 2
-		PrimaryRecoilRecovery: 0.4
-		PrimaryLocalOffset: 0,3,0,-2,0
 	RenderUnitTurreted:
 	AutoTarget:
 	LeavesHusk:
@@ -333,7 +337,6 @@ MTNK:
 		Prerequisites: hq
 		Owner: gdi
 	Mobile:
-		
 		Speed: 6
 	Health:
 		HP: 400
@@ -343,11 +346,12 @@ MTNK:
 		Range: 6
 	Turreted:
 		ROT: 5
+	Armament:
+		Weapon: 120mm
+		Recoil: 3
+		RecoilRecovery: 0.6
+		LocalOffset: 0,0,0,-1,0
 	AttackTurreted:
-		PrimaryWeapon: 120mm
-		PrimaryRecoil: 3
-		PrimaryRecoilRecovery: 0.6
-		PrimaryLocalOffset: 0,0,0,-1,0
 	RenderUnitTurreted:
 	AutoTarget:
 	LeavesHusk:
@@ -381,14 +385,16 @@ HTNK:
 		Range: 6
 	Turreted:
 		ROT: 2
+	Armament@PRIMARY:
+		Weapon: 120mmDual
+		LocalOffset: -5,-5,0,-10,0, 5,-5,0,-10,0
+		Recoil: 4
+		RecoilRecovery: 1
+	Armament@SECONDARY:
+		Weapon: MammothMissiles
+		LocalOffset: -9,2,0,0,25, 9,2,0,0,-25
+		Recoil: 1
 	AttackTurreted:
-		PrimaryWeapon: 120mmDual
-		SecondaryWeapon: MammothMissiles
-		PrimaryLocalOffset: -5,-5,0,-10,0, 5,-5,0,-10,0
-		SecondaryLocalOffset: -9,2,0,0,25, 9,2,0,0,-25
-		PrimaryRecoil: 4
-		SecondaryRecoil: 1
-		PrimaryRecoilRecovery: 1
 	RenderUnitTurreted:
 	AutoTarget:
 	SelfHealing:
@@ -425,10 +431,11 @@ MSAM:
 		Range: 10
 	Turreted:
 		ROT: 255
+		Offset: 0,6,0,-3
+	Armament:
+		Weapon: 227mm
+		LocalOffset: 3,-5,0,0,0, -3,-5,0,0,0
 	AttackFrontal:
-		PrimaryWeapon: 227mm
-		PrimaryOffset: 0,6,0,-3
-		PrimaryLocalOffset: 3,-5,0,0,0, -3,-5,0,0,0
 	RenderUnitTurretedAim:
 	AutoTarget:
 	LeavesHusk:
@@ -456,11 +463,15 @@ MLRS:
 		Range: 10
 	Turreted:
 		ROT: 5
+		Offset: 0,3,0,-3
+		AlignWhenIdle: true
+	Armament@PRIMARY:
+		Weapon: Patriot
+		LocalOffset: -4,0,0,0,0
+	Armament@SECONDARY:
+		Weapon: Patriot
+		LocalOffset: 4,0,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Patriot
-		PrimaryOffset: 0,3,0,-3
-		PrimaryLocalOffset: -4,0,0,0,0, 4,0,0,0,0
-		AlignIdleTurrets: true
 	RenderUnitTurretedAim:
 	AutoTarget:
 	Explodes:
@@ -497,10 +508,10 @@ STNK:
 		CloakDelay: 80
 		CloakSound: trans1.aud
 		UncloakSound: trans1.aud
+	Armament:
+		Weapon: 227mm.stnk
+		LocalOffset: 1,-5,0,-3,0, -1,-5,0,-3,0
 	AttackFrontal:
-		PrimaryWeapon: 227mm.stnk
-		PrimaryOffset: 0,-5,0,-3
-		PrimaryLocalOffset: 1,0,0,0,0, -1,0,0,0,0
 	RenderUnit:
 	AutoTarget:
 		InitialStance: HoldFire