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/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -95,9 +95,10 @@ MIG:
 		Type: Light
 	RevealsShroud:
 		Range: 12
+	Armament:
+		Weapon: Maverick
+		LocalOffset: -15,0,0,0,-10, 15,0,0,0,6
 	AttackPlane:
-		PrimaryWeapon: Maverick
-		PrimaryLocalOffset: -15,0,0,0,-10, 15,0,0,0,6
 		FacingTolerance: 20
 	Plane:
 		InitialFacing: 192
@@ -144,11 +145,13 @@ YAK:
 		Type: Light
 	RevealsShroud:
 		Range: 10
+	Armament@PRIMARY:
+		Weapon: ChainGun.Yak
+		LocalOffset: -5,-6,0,0,0
+	Armament@SECONDARY:
+		Weapon: ChainGun.Yak
+		LocalOffset: 5,-6,0,0,0
 	AttackPlane:
-		PrimaryWeapon: ChainGun.Yak
-		SecondaryWeapon: ChainGun.Yak
-		PrimaryOffset: -5,-6,0,0
-		SecondaryOffset: 5,-6,0,0
 		FacingTolerance: 20
 	Plane:
 		RearmBuildings: afld
@@ -250,11 +253,13 @@ HELI:
 		Type: Light
 	RevealsShroud:
 		Range: 12
+	Armament@PRIMARY:
+		Weapon: HellfireAA
+		LocalOffset: -5,0,0,2,0
+	Armament@SECONDARY:
+		Weapon: HellfireAG
+		Offset: 5,0,0,2,0
 	AttackHeli:
-		PrimaryWeapon: HellfireAG
-		SecondaryWeapon: HellfireAA
-		PrimaryOffset: -5,0,0,2
-		SecondaryOffset: 5,0,0,2
 		FacingTolerance: 20
 	Helicopter:
 		RearmBuildings: hpad
@@ -294,11 +299,13 @@ HIND:
 		Type: Light
 	RevealsShroud:
 		Range: 10
+	Armament@PRIMARY:
+		Weapon: ChainGun
+		LocalOffset: -5,-2,0,2,0
+	Armament@SECONDARY:
+		Weapon: ChainGun
+		LocalOffset: -5,-2,0,2,0
 	AttackHeli:
-		PrimaryWeapon: ChainGun
-		SecondaryWeapon: ChainGun
-		PrimaryOffset: -5,-2,0,2
-		SecondaryOffset: 5,-2,0,2
 		FacingTolerance: 20
 	Helicopter:
 		RearmBuildings: hpad
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -103,9 +103,10 @@ V01.SNIPER:
 	AutoTarget:
 	Turreted:
 		ROT: 255
+	Armament:
+		Weapon: Sniper
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Sniper
-		PrimaryLocalOffset: 0,-11,0,0,0
 	Cargo:
 		InitialUnits: sniper
 		Types: Infantry
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -289,8 +289,9 @@
 		Speed: 4
 	RevealsShroud:
 		Range: 2
+	Armament:
+		Weapon: Pistol
 	AttackFrontal:
-		PrimaryWeapon: Pistol
 	ProximityCaptor:
 		Types:CivilianInfantry
 	-RenderInfantry:
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -20,9 +20,9 @@ DOG:
 		Speed: 7
 	RevealsShroud:
 		Range: 5
-	AutoTarget:
+	Armament:
+		Weapon: DogJaw
 	AttackLeap:
-		PrimaryWeapon: DogJaw
 		CanAttackGround: no
 	RenderInfantry:
 		IdleAnimations: idle1,idle2
@@ -46,8 +46,9 @@ E1:
 		HP: 50
 	Mobile:
 		Speed: 4
+	Armament:
+		Weapon: M1Carbine
 	AttackFrontal:
-		PrimaryWeapon: M1Carbine
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -72,10 +73,11 @@ E2:
 		HP: 50
 	Mobile:
 		Speed: 5
-	AttackFrontal:
-		PrimaryWeapon: Grenade
-		PrimaryOffset: 0,0,0,-13
+	Armament:
+		Weapon: Grenade
+		LocalOffset: 0,0,0,-13,0
 		FireDelay: 15
+	AttackFrontal:
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -102,10 +104,13 @@ E3:
 		HP: 45
 	Mobile:
 		Speed: 3
+	Armament@PRIMARY:
+		Weapon: RedEye
+		LocalOffset: 0,0,0,-13,0
+	Armament@SECONDARY:
+		Weapon: Dragon
+		LocalOffset: 0,0,0,-13,0
 	AttackFrontal:
-		PrimaryWeapon: RedEye
-		SecondaryWeapon: Dragon
-		PrimaryOffset: 0,0,0,-13
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -130,10 +135,11 @@ E4:
 		HP: 40
 	Mobile:
 		Speed: 3
-	AttackFrontal:
-		PrimaryWeapon: Flamer
-		PrimaryOffset: 0,-10,0,-8
+	Armament:
+		Weapon: Flamer
+		LocalOffset: 0,-10,0,-8,0
 		FireDelay: 8
+	AttackFrontal:
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -204,8 +210,9 @@ SPY:
 	-RenderInfantry:
 	RenderSpy:
 		IdleAnimations: idle1,idle2
+	Armament:
+		Weapon: SilencedPPK
 	AttackFrontal:
-		PrimaryWeapon: SilencedPPK

 E7:
 	Inherits: ^Infantry
@@ -234,9 +241,11 @@ E7:
 		C4Delay: 45
 	Passenger:
 		PipType: Red
+	Armament@PRIMARY:
+		Weapon: Colt45
+	Armament@SECONDARY:
+		Weapon: Colt45
 	AttackFrontal:
-		PrimaryWeapon: Colt45
-		SecondaryWeapon: Colt45
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -270,9 +279,11 @@ E8:
 		Range: 4
 	Passenger:
 		PipType: Red
+	Armament@PRIMARY:
+		Weapon: VolkAT
+	Armament@SECONDARY:
+		Weapon: VolkNapalm
 	AttackFrontal:
-		PrimaryWeapon: VolkAT
-		SecondaryWeapon: VolkNapalm
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -308,8 +319,9 @@ MEDI:
 	Passenger:
 		PipType: Yellow
 	AutoHeal:
+	Armament:
+		Weapon: Heal
 	AttackMedic:
-		PrimaryWeapon: Heal
 	TakeCover:
 	-AutoTarget:
 	AttackMove:
@@ -343,8 +355,9 @@ MECH:
 	Passenger:
 		PipType: Yellow
 	AutoHeal:
+	Armament:
+		Weapon: Repair
 	AttackMedic:
-		PrimaryWeapon: Repair
 	TakeCover:
 	-AutoTarget:
 	AttackMove:
@@ -457,9 +470,10 @@ SHOK:
 		Speed: 3
 	RevealsShroud:
 		Range: 4
+	Armament:
+		Weapon: PortaTesla
+		LocalOffset: 0,-10,0,-8,0
 	AttackFrontal:
-		PrimaryWeapon: PortaTesla
-		PrimaryOffset: 0,-10,0,-8
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -492,8 +506,9 @@ SNIPER:
 		Range: 6
 	AutoTarget:
 		InitialStance: HoldFire
+	Armament:
+		Weapon: Sniper
 	AttackFrontal:
-		PrimaryWeapon: Sniper
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -31,10 +31,11 @@ SS:
 		CloakDelay: 50
 		CloakSound: subshow1.aud
 		UncloakSound: subshow1.aud
-	AttackFrontal:
-		PrimaryWeapon: TorpTube
-		PrimaryLocalOffset: -4,0,0,0,0, 4,0,0,0,0
+	Armament:
+		Weapon: TorpTube
+		LocalOffset: -4,0,0,0,0, 4,0,0,0,0
 		FireDelay: 2
+	AttackFrontal:
 	Selectable:
 		Bounds: 38,38
 	Chronoshiftable:
@@ -78,9 +79,10 @@ MSUB:
 		CloakDelay: 100
 		CloakSound: subshow1.aud
 		UncloakSound: subshow1.aud
-	AttackFrontal:
-		PrimaryWeapon: SubMissile
+	Armament:
+		Weapon: SubMissile
 		FireDelay: 2
+	AttackFrontal:
 	Selectable:
 		Bounds: 44,44
 	Chronoshiftable:
@@ -116,11 +118,13 @@ DD:
 		Range: 6
 	Turreted:
 		ROT: 7
+		Offset: 0,-8,0,-3
+	Armament@PRIMARY:
+		Weapon: Stinger
+		LocalOffset: -4,0,0,0,-20, 4,0,0,0,20
+	Armament@SECONDARY:
+		Weapon: DepthCharge
 	AttackTurreted:
-		PrimaryWeapon: Stinger
-		SecondaryWeapon: DepthCharge
-		PrimaryOffset: 0,-8,0,-3
-		PrimaryLocalOffset: -4,0,0,0,-20, 4,0,0,0,20
 	Selectable:
 		Bounds: 38,38
 	RenderUnitTurreted:
@@ -155,19 +159,27 @@ CA:
 		Speed: 2
 	RevealsShroud:
 		Range: 7
-	Turreted:
+	Turreted@PRIMARY:
+		Turret: primary
+		Offset: 0,17,0,-2
 		ROT: 3
+	Turreted@SECONDARY:
+		Turret: secondary
+		Offset: 0,-17,0,-2
+		ROT: 3
+	Armament@PRIMARY:
+		Turret: primary
+		Weapon: 8Inch
+		LocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
+		Recoil: 4
+		RecoilRecovery: 0.8
+	Armament@SECONDARY:
+		Turret: secondary
+		Weapon: 8Inch
+		LocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
+		Recoil: 4
+		RecoilRecovery: 0.8
 	AttackTurreted:
-		PrimaryWeapon: 8Inch
-		SecondaryWeapon: 8Inch
-		PrimaryOffset: 0,17,0,-2
-		SecondaryOffset: 0,-17,0,-2
-		PrimaryLocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
-		SecondaryLocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
-		PrimaryRecoil: 4
-		SecondaryRecoil: 4
-		PrimaryRecoilRecovery: 0.8
-		SecondaryRecoilRecovery: 0.8
 	Selectable:
 		Bounds: 44,44
 	RenderUnitTurreted:
@@ -232,10 +244,12 @@ PT:
 		Range: 7
 	Turreted:
 		ROT: 7
+		Offset: 0,-6,0,-1
+	Armament@PRIMARY:
+		Weapon: 2Inch
+	Armament@SECONDARY:
+		Weapon: DepthCharge
 	AttackTurreted:
-		PrimaryWeapon: 2Inch
-		SecondaryWeapon: DepthCharge
-		PrimaryOffset: 0,-6,0,-1
 	Selectable:
 		Bounds: 32,32
 	RenderUnitTurreted:
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -282,10 +282,11 @@ TSLA:
 	RevealsShroud:
 		Range: 8
 	RenderBuildingCharge:
+	Armament:
+		Weapon: TeslaZap
+		LocalOffset: 0,0,0,-10,0
 	AttackTesla:
-		PrimaryWeapon: TeslaZap
 		ReloadTime: 120
-		PrimaryOffset: 0,0,0,-10
 	AutoTarget:
 	IronCurtainable:
 	-RenderBuilding:
@@ -323,9 +324,11 @@ AGUN:
 		ROT: 15
 		InitialFacing: 224
 	RenderBuildingTurreted:
+	Armament@PRIMARY:
+		Weapon: ZSU-23
+	Armament@SECONDARY:
+		Weapon: ZSU-23
 	AttackTurreted:
-		PrimaryWeapon: ZSU-23
-		SecondaryWeapon: ZSU-23
 	AutoTarget:
 	IronCurtainable:
 	-RenderBuilding:
@@ -442,9 +445,10 @@ PBOX.E1:
 		Image: PBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Vulcan
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Vulcan
-		PrimaryLocalOffset: 0,-11,0,0,0
 	WithMuzzleFlash:
 	Cargo:
 		InitialUnits: e1
@@ -464,9 +468,10 @@ PBOX.E3:
 		Image: PBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Dragon
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Dragon
-		PrimaryLocalOffset: 0,-11,0,0,0

 PBOX.E4:
 	Inherits: PBOX
@@ -476,9 +481,10 @@ PBOX.E4:
 		Image: PBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Flamer
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Flamer
-		PrimaryLocalOffset: 0,-11,0,0,0

 PBOX.E7:
 	Inherits: PBOX
@@ -488,9 +494,10 @@ PBOX.E7:
 		Image: PBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Colt45
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Colt45
-		PrimaryLocalOffset: 0,-11,0,0,0

 PBOX.SHOK:
 	Inherits: PBOX
@@ -500,9 +507,10 @@ PBOX.SHOK:
 		Image: PBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: PortaTesla
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: PortaTesla
-		PrimaryLocalOffset: 0,-11,0,0,0

 PBOX.SNIPER:
 	Inherits: PBOX
@@ -512,9 +520,10 @@ PBOX.SNIPER:
 		Image: PBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Sniper
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Sniper
-		PrimaryLocalOffset: 0,-11,0,0,0

 HBOX:
 	Inherits: ^Building
@@ -599,9 +608,10 @@ HBOX.E1:
 		Image: HBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Vulcan
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Vulcan
-		PrimaryLocalOffset: 0,-11,0,0,0
 	WithMuzzleFlash:
 	Cargo:
 		InitialUnits: e1
@@ -621,9 +631,10 @@ HBOX.E3:
 		Image: HBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Dragon
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Dragon
-		PrimaryLocalOffset: 0,-11,0,0,0

 HBOX.E4:
 	Inherits: HBOX
@@ -633,9 +644,10 @@ HBOX.E4:
 		Image: HBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Flamer
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Flamer
-		PrimaryLocalOffset: 0,-11,0,0,0

 HBOX.E7:
 	Inherits: HBOX
@@ -645,9 +657,10 @@ HBOX.E7:
 		Image: HBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Colt45
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Colt45
-		PrimaryLocalOffset: 0,-11,0,0,0

 HBOX.SHOK:
 	Inherits: HBOX
@@ -657,9 +670,10 @@ HBOX.SHOK:
 		Image: HBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: PortaTesla
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: PortaTesla
-		PrimaryLocalOffset: 0,-11,0,0,0

 HBOX.SNIPER:
 	Inherits: HBOX
@@ -669,9 +683,10 @@ HBOX.SNIPER:
 		Image: HBOX
 	RenderRangeCircle:
 	AutoTarget:
+	Armament:
+		Weapon: Sniper
+		LocalOffset: 0,-11,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: Sniper
-		PrimaryLocalOffset: 0,-11,0,0,0

 GUN:
 	Inherits: ^Building
@@ -699,8 +714,9 @@ GUN:
 		ROT: 12
 		InitialFacing: 50
 	RenderBuildingTurreted:
+	Armament:
+		Weapon: TurretGun
 	AttackTurreted:
-		PrimaryWeapon: TurretGun
 	AutoTarget:
 	IronCurtainable:
 	-RenderBuilding:
@@ -732,10 +748,11 @@ FTUR:
 		Range: 6
 	Turreted:
 		ROT: 255
+		Offset: 0,0,0,-2
+	Armament:
+		Weapon: FireballLauncher
+		LocalOffset: 0,-12,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: FireballLauncher
-		PrimaryOffset: 0,0,0,-2
-		PrimaryLocalOffset: 0,-12,0,0,0
 	AutoTarget:
 	IronCurtainable:
 	RenderRangeCircle:
@@ -770,8 +787,9 @@ SAM:
 		ROT: 30
 		InitialFacing: 0
 	RenderBuildingTurreted:
+	Armament:
+		Weapon: Nike
 	AttackTurreted:
-		PrimaryWeapon: Nike
 	WithMuzzleFlash:
 	AutoTarget:
 	IronCurtainable:
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -19,8 +19,9 @@ V2RL:
 		Speed: 7
 	RevealsShroud:
 		Range: 5
+	Armament:
+		Weapon: SCUD
 	AttackFrontal:
-		PrimaryWeapon: SCUD
 	RenderUnitReload:
 	AutoTarget:
 	Explodes:
@@ -49,10 +50,11 @@ V2RL:
 		Range: 4
 	Turreted:
 		ROT: 5
+	Armament:
+		Weapon: 25mm
+		Recoil: 2
+		RecoilRecovery: 0.5
 	AttackTurreted:
-		PrimaryWeapon: 25mm
-		PrimaryRecoil: 2
-		PrimaryRecoilRecovery: 0.5
 	RenderUnitTurreted:
 	AutoTarget:
 	Explodes:
@@ -85,10 +87,11 @@ V2RL:
 		Range: 5
 	Turreted:
 		ROT: 5
+	Armament:
+		Weapon: 90mm
+		Recoil: 3
+		RecoilRecovery: 0.9
 	AttackTurreted:
-		PrimaryWeapon: 90mm
-		PrimaryRecoil: 3
-		PrimaryRecoilRecovery: 0.9
 	RenderUnitTurreted:
 	AutoTarget:
 	Explodes:
@@ -123,11 +126,12 @@ V2RL:
 		Range: 5
 	Turreted:
 		ROT: 5
+	Armament:
+		Weapon: 105mm
+		Recoil: 3
+		RecoilRecovery: 0.9
+		LocalOffset: 2,0,0,0,0, -2,0,0,0,0
 	AttackTurreted:
-		PrimaryWeapon: 105mm
-		PrimaryRecoil: 3
-		PrimaryRecoilRecovery: 0.9
-		PrimaryLocalOffset: 2,0,0,0,0, -2,0,0,0,0
 	RenderUnitTurreted:
 	AutoTarget:
 	Explodes:
@@ -162,14 +166,16 @@ V2RL:
 		Range: 6
 	Turreted:
 		ROT: 1
+	Armament@PRIMARY:
+		Weapon: 120mm
+		LocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
+		Recoil: 4
+		RecoilRecovery: 0.7
+	Armament@SECONDARY:
+		Weapon: MammothTusk
+		LocalOffset: -7,2,0,0,25, 7,2,0,0,-25
+		Recoil: 1
 	AttackTurreted:
-		PrimaryWeapon: 120mm
-		SecondaryWeapon: MammothTusk
-		PrimaryLocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
-		SecondaryLocalOffset: -7,2,0,0,25, 7,2,0,0,-25
-		PrimaryRecoil: 4
-		PrimaryRecoilRecovery: 0.7
-		SecondaryRecoil: 1
 	RenderUnitTurreted:
 	AutoTarget:
 	Explodes:
@@ -207,8 +213,9 @@ ARTY:
 		Speed: 6
 	RevealsShroud:
 		Range: 5
+	Armament:
+		Weapon: 155mm
 	AttackFrontal:
-		PrimaryWeapon: 155mm
 	RenderUnit:
 	Explodes:
 		Weapon: UnitExplode
@@ -319,9 +326,10 @@ JEEP:
 		Range: 8
 	Turreted:
 		ROT: 10
+		Offset: 0,0,0,-2
+	Armament:
+		Weapon: M60mg
 	AttackTurreted:
-		PrimaryWeapon: M60mg
-		PrimaryOffset: 0,0,0,-2
 	WithMuzzleFlash:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -351,9 +359,10 @@ APC:
 		Speed: 10
 	RevealsShroud:
 		Range: 5
+	Armament:
+		Weapon: M60mg
+		LocalOffset: 0,0,0,-4,0
 	AttackFrontal:
-		PrimaryWeapon: M60mg
-		PrimaryOffset: 0,0,0,-4
 	RenderUnit:
 	WithMuzzleFlash:
 	AutoTarget:
@@ -614,9 +623,10 @@ TTNK:
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 7
+	Armament:
+		Weapon: TTankZap
+		LocalOffset: 0,0,0,-5,0
 	AttackFrontal:
-		PrimaryWeapon: TTankZap
-		PrimaryOffset: 0,0,0,-5
 	RenderUnitSpinner:
 	Selectable:
 		Bounds: 28,28,0,0
@@ -645,10 +655,11 @@ FTRK:
 		Range: 4
 	Turreted:
 		ROT: 5
+		Offset: 0,5,0,-4
+	Armament:
+		Weapon: FLAK-23
+		Recoil: 2
 	AttackTurreted:
-		PrimaryWeapon: FLAK-23
-		PrimaryOffset: 0,5,0,-4
-		PrimaryRecoil: 2
 	RenderUnitTurreted:
 	AutoTarget:
 	Explodes:
@@ -714,9 +725,11 @@ CTNK:
 		Range: 6
 	RenderUnit:
 	AutoTarget:
+	Armament@PRIMARY:
+		Weapon: ChronoTusk
+		LocalOffset: -4,0,0,0,0, -4,0,0,0,0
+	Armament@SECONDARY:
+		Weapon: ChronoTusk
+		LocalOffset: 4,0,0,0,25, 4,0,0,0,-25
 	AttackFrontal:
-		PrimaryWeapon: ChronoTusk
-		SecondaryWeapon: ChronoTusk
-		PrimaryLocalOffset: -4,0,0,0,0, -4,0,0,0,0
-		SecondaryLocalOffset: 4,0,0,0,25, 4,0,0,0,-25
 	ChronoshiftDeploy: