added engineer, bazooka

mods/d2k/TODO

@@ -12,8 +12,6 @@
 # RenderBuildingTurreted does not support separate turret sequence
 # ornithocopter should flap (might need new RenderOrni code for proper animation)
 # R8 converter needs infantry frame resorter
-# add trooper (carries bazooka)
-# add engineer
 # add fremen (stealthed)
 # add saboteur (stealthed with C4)
 # add grenade thrower

mods/d2k/cursors.yaml

@@ -225,6 +225,16 @@ Cursors:
 			length: 1
 			x: 12
 			y: 12
+		goldwrench:
+			start:88
+			length: 8
+			x: 12
+			y: 12
+		goldwrench-blocked:
+			start:64
+			length: 1
+			x: 12
+			y: 12
 
 	nopower: cursor
 		powerdown-blocked:

mods/d2k/rules/atreides.yaml

@@ -110,7 +110,7 @@ COMBATA:
 		Prerequisites: heavya
 		Owner: atreides
 
-SONIC:
+SONICTANK:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle

mods/d2k/rules/infantry.yaml

@@ -7,7 +7,7 @@ RIFLE:
 	Valued:
 		Cost: 100
 	Tooltip:
-		Name: Rifle Infantry
+		Name: Rifleman
 		Description: General-purpose infantry.\n  Strong vs Infantry\n  Weak vs Vehicles
 	Selectable:
 		Bounds: 12,17,0,0
@@ -19,4 +19,56 @@ RIFLE:
 		PrimaryWeapon: M1Carbine
 	TakeCover:
 	-RenderInfantry:
+	RenderInfantryProne:
+
+ENGINEER:
+	Inherits: ^Infantry
+	Buildable:
+		Queue: Infantry
+		BuildPaletteOrder: 50
+		Owner: atreides,harkonnen,ordos
+	Valued:
+		Cost: 500
+	Tooltip:
+		Name: Engineer
+		Description: Infiltrates and captures enemy structures.\n  Strong vs Nothing\n  Weak vs Everything
+	Selectable:
+#		Voice: EngineerVoice
+		Bounds: 12,17,0,-9
+	Health:
+		HP: 25
+	Mobile:
+		Speed: 4
+	Passenger:
+		PipType: Yellow
+	EngineerRepair:
+	Captures:
+	TakeCover:
+	-AutoTarget:
+	AttackMove:
+		JustMove: true
+
+BAZOOKA:
+	Inherits: ^Infantry
+	Buildable:
+		Queue: Infantry
+		BuildPaletteOrder: 20
+		Owner: atreides,harkonnen,ordos
+	Valued:
+		Cost: 300
+	Tooltip:
+		Name: Trooper
+		Description: Anti-tank/Anti-aircraft infantry.\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
+	Selectable:
+		Bounds: 12,17,0,-9
+	Health:
+		HP: 45
+	Mobile:
+		Speed: 3
+	AttackFrontal:
+		PrimaryWeapon: RedEye
+		SecondaryWeapon: Dragon
+		PrimaryOffset: 0,0,0,-13
+	TakeCover:
+	-RenderInfantry:
 	RenderInfantryProne:

mods/d2k/rules/ordos.yaml

@@ -141,7 +141,7 @@ RAIDER:
 		SecondaryOffset: 0,0,0,-4
 	AutoTarget:
 
-DEVIATOR:
+DEVIATORTANK:
 	Inherits: ^Tank
 	Valued:
 		Cost: 800

mods/d2k/rules/structures.yaml

@@ -423,7 +423,6 @@ GUNTOWER:
 	RenderRangeCircle:
 	-RenderBuilding:
 	RenderBuildingTurreted:
-		Palette: d2k
 	Turreted:
 		ROT: 12
 		InitialFacing: 50

mods/d2k/rules/vehicles.yaml

@@ -146,7 +146,7 @@ QUAD:
 	Selectable:
 		Bounds: 30,30
 
-SIEGE:
+SIEGETANK:
 	Inherits: ^Tank
 	Buildable:
 		Queue: Vehicle
@@ -179,7 +179,7 @@ SIEGE:
 		Chance: 75  
 	AutoTarget:
 
-MISSILE:
+MISSILETANK:
 	Inherits: ^Tank
 	Valued:
 		Cost: 800

mods/d2k/sequences.yaml

@@ -55,9 +55,7 @@ quad:
 		Start: 0
 		Facings: 32
 
-
-
-siege:
+siegetank:
 	idle:
 		Start: 0
 		Facings: 32
@@ -65,12 +63,12 @@ siege:
 		Start: 0
 		Facings: 32
 
-missile:
+missiletank:
 	idle:
 		Start: 0
 		Facings: 32
 
-sonic:
+sonictank:
 	idle:
 		Start: 0
 		Facings: 32
@@ -149,6 +147,100 @@ rifle:
 	die5: rifledeath
 		Start: 26
 		Length: 7
+	die6: electro
+		Start: 0
+		Length: *
+	die-crushed: rifledeath
+		Start: 54
+		Length: 22
+		Tick: 1600
+
+bazooka:
+	stand:
+		Start: 0
+		Facings: 8
+	stand2:
+		Start: 0
+		Facings: 8
+	stand3:
+		Start: 0
+		Facings: 8
+	run:
+		Start: 8
+		Length: 6
+		Facings: 8
+	shoot:
+		Start: 56
+		Length: 5
+		Facings: 8
+	prone-stand:
+		Start: 104
+		Length: 1
+		Facings: 8
+	prone-run:
+		Start: 112
+		Length: 3
+		Facings: 8
+	standup-0:
+		Start: 96
+		Length: 1
+		Facings: 8
+	prone-shoot:
+		Start: 136
+		Length: 5
+		Facings: 8
+	die1: rifledeath
+		Start: 0
+		Length: 5
+	die2: rifledeath
+		Start: 5
+		Length: 7
+	die3: rifledeath
+		Start: 12
+		Length: 7
+	die4: rifledeath
+		Start: 19
+		Length: 7
+	die5: rifledeath
+		Start: 26
+		Length: 7
+	die6: electro
+		Start: 0
+		Length: *
+	die-crushed: rifledeath
+		Start: 54
+		Length: 22
+		Tick: 1600
+
+engineer:
+	stand:
+		Start: 0
+		Facings: 8
+	stand2:
+		Start: 0
+		Facings: 8
+	run:
+		Start: 8
+		Length: 6
+		Facings: 8
+	die1: rifledeath
+		Start: 0
+		Length: 5
+	die2: rifledeath
+		Start: 5
+		Length: 7
+	die3: rifledeath
+		Start: 12
+		Length: 7
+	die4: rifledeath
+		Start: 19
+		Length: 7
+	die5: rifledeath
+		Start: 26
+		Length: 7
+	die6: electro
+		Start: 0
+		Length: *
 	die-crushed: rifledeath
 		Start: 54
 		Length: 22
@@ -662,7 +754,7 @@ raider:
 		Start: 0
 		Facings: 32
 
-deviator:
+deviatortank:
 	idle:
 		Start: 0
 		Facings: 32
@@ -882,6 +974,11 @@ parach:
 		Start: 5
 		Length: 11
 
+missile:
+	idle:
+		Start: 0
+		Facings: 32
+
 spicebloom:
 	make:
 		Start: 0

mods/d2k/weapons.yaml

@@ -439,4 +439,32 @@ WormJaw:
 		Versus: 
 			Wood: 0%
 			Concrete: 0%
-		Damage: 100
+		Damage: 100
+
+RedEye:
+	ROF: 50
+	Range: 7.5
+	Report: MISSILE1
+	ValidTargets: Air
+	Projectile: Missile
+		Arm: 3
+		High: true
+		Shadow: false
+		Proximity: true
+#		Trail: smokey
+		ContrailLength: 10
+		Image: MISSILE
+		ROT: 20
+		RangeLimit: 30
+		Speed: 35
+	Warhead:
+		Spread: 3
+		Versus: 
+			None: 90%
+			Wood: 75%
+			Light: 60%
+			Heavy: 25%
+		Explosion: med_explosion
+		InfDeath: 2
+		SmudgeType: Crater
+		Damage: 40