Merge pull request #2770 from pchote/turret-cleanup

Weapon / Turret refactoring

mods/d2k/rules/aircraft.yaml

@@ -82,9 +82,10 @@ ORNI:
 		Type: Light
 	RevealsShroud:
 		Range: 10
+	Armament:
+		Weapon: ChainGun
+		LocalOffset: -5,-2,0,2,0
 	AttackHeli:
-		PrimaryWeapon: ChainGun
-		PrimaryOffset: -5,-2,0,2
 		FacingTolerance: 20
 	Helicopter:
 		LandWhenIdle: false

mods/d2k/rules/atreides.yaml

@@ -143,11 +143,12 @@ COMBATA:
 		Prerequisites: heavya
 		Owner: atreides
 		BuiltAt: heavya
+	Armament:
+		Weapon: 90mma
+		Recoil: 4
+		RecoilRecovery: 0.8
+		LocalOffset: 0,-2,0,-3,0
 	AttackTurreted:
-		PrimaryWeapon: 90mma
-		PrimaryRecoil: 4
-		PrimaryRecoilRecovery: 0.8
-		PrimaryLocalOffset: 0,-2,0,-3,0
 	RenderUnitTurreted:
 		Image: COMBATA
 	LeavesHusk:
@@ -196,9 +197,10 @@ SONICTANK:
 		Range: 6
 	RenderUnit:
 		Image: SONICTANK
+	Armament:
+		Weapon: TTankZap
+		LocalOffset: 0,-15,0,-10,0
 	AttackFrontal:
-		PrimaryWeapon: TTankZap
-		PrimaryLocalOffset: 0,-15,0,-10,0
 	AutoTarget:
 		InitialStance: Defend
 	Explodes:
@@ -239,8 +241,9 @@ FREMEN:
 		Range: 7
 	AutoTarget:
 		ScanRadius: 7
+	Armament:
+		Weapon: Sniper
 	AttackFrontal:
-		PrimaryWeapon: Sniper
 	RenderInfantryProne:
 	-RenderInfantry:
 	TakeCover:

mods/d2k/rules/harkonnen.yaml

@@ -38,9 +38,10 @@ REFH:
 #	Mobile:
 #		ROT: 9
 #		Speed: 11
+#	Armament:
+#		Weapon: M60mg
+#		LocalOffset: 0,-1,0,-3,0
 #	AttackFrontal:
-#		PrimaryWeapon: M60mg
-#		PrimaryLocalOffset: 0,-1,0,-3,0
 #	RenderUnit:
 #		Image: QUAD
 
@@ -213,9 +214,10 @@ DEVAST:
 	RevealsShroud:
 		Range: 7
 	RenderUnit:
+	Armament:
+		Weapon: 120mm
+		LocalOffset: 5,-16,0,-2,0, -4,-16,0,-2,0
 	AttackFrontal:
-		PrimaryWeapon: 120mm
-		PrimaryLocalOffset: 5,-16,0,-2,0, -4,-16,0,-2,0
 	AutoTarget:
 		InitialStance: Defend
 	Explodes:
@@ -260,6 +262,8 @@ SARDAUKAR:
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
-	AttackFrontal:
-		PrimaryWeapon: Vulcan
-		SecondaryWeapon: Slung
+	Armament@PRIMARY:
+		Weapon: Vulcan
+	Armament@SECONDARY:
+		Weapon: Slung
+	AttackFrontal:

mods/d2k/rules/infantry.yaml

@@ -16,8 +16,9 @@ RIFLE:
 		HP: 50
 	Mobile:
 		Speed: 5
+	Armament:
+		Weapon: M1Carbine
 	AttackFrontal:
-		PrimaryWeapon: M1Carbine
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
@@ -69,10 +70,13 @@ BAZOOKA:
 		HP: 45
 	Mobile:
 		Speed: 4
+	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:
@@ -100,8 +104,9 @@ MEDIC:
 	Mobile:
 		Speed: 4
 	AutoHeal:
+	Armament:
+		Weapon: Heal
 	AttackMedic:
-		PrimaryWeapon: Heal
 	Passenger:
 		PipType: Blue
 	-AutoTarget:

mods/d2k/rules/ordos.yaml

@@ -158,10 +158,10 @@ TRIKEO:
 		Speed: 14
 	RenderUnit:
 		Image: RAIDER
+	Armament:
+		Weapon: M60mgo
+		LocalOffset: 0,-6,0,-3,0
 	AttackFrontal:
-		PrimaryWeapon: M60mgo
-		PrimaryOffset: 0,-6,0,-3
-		#PrimaryLocalOffset: 1,0,0,-3,0, -1,0,0,-3,0
 
 
 
@@ -212,9 +212,10 @@ DEVIATORTANK:
 	RevealsShroud:
 		Range: 5
 	RenderUnit:
+	Armament:
+		Weapon: FakeMissile
+		LocalOffset: 0,7,0,-2,0 #7
 	AttackLoyalty:
-		PrimaryWeapon: FakeMissile
-		PrimaryLocalOffset: 0,7,0,-2,0 #7
 	AutoTarget:
 		InitialStance: Defend
 	Explodes:

mods/d2k/rules/structures.yaml

@@ -474,9 +474,10 @@ GUNTOWER:
 	Turreted:
 		ROT: 6
 		InitialFacing: 128
+	Armament:
+		Weapon: TurretGun
+		LocalOffset: 0,-11,0,-7,0
 	AttackTurreted:
-		PrimaryWeapon: TurretGun
-		PrimaryLocalOffset: 0,-11,0,-7,0
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: Guntower.Husk
@@ -529,9 +530,10 @@ ROCKETTOWER:
 	#-AutoTargetIgnore:
 	RenderBuildingSeparateTurret:
 	#	HasMakeAnimation: false
+	Armament:
+		Weapon: TowerMissile
+		LocalOffset: 14,-2,0,-11,0, -14,-2,0,-11,0
 	AttackTurreted:
-		PrimaryWeapon: TowerMissile
-		PrimaryLocalOffset: 14,-2,0,-11,0, -14,-2,0,-11,0
 	Turreted:
 		ROT: 8
 		InitialFacing: 128

mods/d2k/rules/system.yaml

@@ -541,8 +541,9 @@ SPICEBLOOM:
 #	AttackMove:
 #		JustMove: true
 #	AttackWander:
+#	Armament:
+#		Weapon: WormJaw
 #	AttackLeap:
-#		PrimaryWeapon: WormJaw
 #		CanAttackGround: no
 #	RenderInfantry:
 #	BelowUnits:

mods/d2k/rules/vehicles.yaml

@@ -131,10 +131,10 @@ HARVESTER.starport:
 		Range: 8
 	RenderUnit:
 	WithMuzzleFlash:
+	Armament:
+		Weapon: M60mg
+		LocalOffset: 0,-6,0,-3, 0
 	AttackFrontal:
-		PrimaryWeapon: M60mg
-		PrimaryOffset: 0,-6,0,-3
-		#PrimaryLocalOffset: 1,-1,0,-3,0, -1,-1,0,-3,0
 	AutoTarget:
 		InitialStance: Defend
 	Explodes:
@@ -172,9 +172,10 @@ QUAD:
 		Range: 7
 	RenderUnit:
 		Image: QUAD
+	Armament:
+		Weapon: QuadRockets
+		LocalOffset: 0,-3,0,-2,0 #-4
 	AttackFrontal:
-		PrimaryWeapon: QuadRockets
-		PrimaryLocalOffset: 0,-3,0,-2,0 #-4
 	AutoTarget:
 		InitialStance: Defend
 	Explodes:
@@ -213,12 +214,13 @@ QUAD.starport:
 		Range: 6
 	Turreted:
 		ROT: 6
+		AlignWhenIdle: true
+	Armament:
+		Weapon: 90mm
+		Recoil: 4
+		RecoilRecovery: 0.8
+		LocalOffset: 0,-2,0,-3,0
 	AttackTurreted:
-		AlignIdleTurrets: true
-		PrimaryWeapon: 90mm
-		PrimaryRecoil: 4
-		PrimaryRecoilRecovery: 0.8
-		PrimaryLocalOffset: 0,-2,0,-3,0
 	RenderUnitTurreted:
 	AutoTarget:
 		InitialStance: Defend
@@ -265,11 +267,12 @@ SIEGETANK:
 		Range: 5
 	Turreted:
 		ROT: 3
+	Armament:
+		Weapon: 155mm
+		Recoil: 7
+		RecoilRecovery: 0.45
+		LocalOffset: 0,-4,0,-7,0
 	AttackFrontal:
-		PrimaryWeapon: 155mm
-		PrimaryRecoil: 7
-		PrimaryRecoilRecovery: 0.45
-		PrimaryLocalOffset: 0,-4,0,-7,0
 	RenderUnitTurreted:
 		Image: SIEGETANK
 	Explodes:
@@ -328,9 +331,10 @@ MISSILETANK:
 		Range: 6
 	RenderUnit:
 		Image: MISSILETANK
+	Armament:
+		Weapon: 227mm
+		LocalOffset: 3,5,0,-4,0, -6,5,0,-4,0
 	AttackFrontal:
-		PrimaryWeapon: 227mm
-		PrimaryLocalOffset: 3,5,0,-4,0, -6,5,0,-4,0
 	AutoTarget:
 		InitialStance: Defend
 	Explodes: