added harvester unload, thumper which spawns sandworms

worm won't attack, dogjaw is stupid and moving mine did not work

OpenRA.Mods.D2k/Widgets/Logic/D2kExtractGameFilesLogic.cs

@@ -59,7 +59,9 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 			var PathToTilesets = Path.Combine(Platform.SupportDir, "Content/d2k/Tilesets");
 
 			var ExtractGameFiles = new string[][]
-			{	new string[] {"--r8", PathToDataR8, PathToPalette, "0", "2", Path.Combine(PathToSHPs, "overlay")},
+			{
+				new string[] {"--r8", PathToDataR8, PathToPalette, "0", "2", Path.Combine(PathToSHPs, "overlay")},
+				new string[] {"--r8", PathToDataR8, PathToPalette, "15", "16", Path.Combine(PathToSHPs, "dots")},
 				//new string[] {"--r8", PathToDataR8, PathToPalette, "40", "101", Path.Combine(PathToSHPs, "shadow")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "102", "105", Path.Combine(PathToSHPs, "crates")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "107", "109", Path.Combine(PathToSHPs, "spicebloom")},
@@ -67,6 +69,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--r8", PathToDataR8, PathToPalette, "130", "145", Path.Combine(PathToSHPs, "rockcrater2")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "146", "161", Path.Combine(PathToSHPs, "sandcrater1")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "162", "177", Path.Combine(PathToSHPs, "sandcrater2")},
+				// ?
 				new string[] {"--r8", PathToDataR8, PathToPalette, "206", "381", Path.Combine(PathToSHPs, "rifle"), "--infantry"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "382", "457", Path.Combine(PathToSHPs, "rifledeath"), "--infantrydeath"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "458", "693", Path.Combine(PathToSHPs, "bazooka"), "--infantry"},
@@ -154,8 +157,8 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2996", "2997", Path.Combine(PathToSHPs, "palaceo"), "--building"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3370", "3380", Path.Combine(PathToSHPs, "unload"), "--vehicle"},
 				//explosions
-				new string[] {"--r8", PathToDataR8, PathToPalette, "3549", "3564", Path.Combine(PathToSHPs, "sandwormmouth")},
+				new string[] {"--r8", PathToDataR8, PathToPalette, "3549", "3564", Path.Combine(PathToSHPs, "wormjaw")},
-				new string[] {"--r8", PathToDataR8, PathToPalette, "3565", "3585", Path.Combine(PathToSHPs, "sandwormdust")},
+				new string[] {"--r8", PathToDataR8, PathToPalette, "3565", "3585", Path.Combine(PathToSHPs, "wormdust")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3586", "3600", Path.Combine(PathToSHPs, "wormsigns1")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3601", "3610", Path.Combine(PathToSHPs, "wormsigns2")},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "3611", "3615", Path.Combine(PathToSHPs, "wormsigns3")},
@@ -269,6 +272,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 			var SHPsToCreate = new string[][]
 			{
 				new string[] {"--shp", Path.Combine(PathToSHPs, "overlay.png"), "32"},
+				new string[] {"--shp", Path.Combine(PathToSHPs, "dots.png"), "4"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "crates.png"), "32"},
 				//new string[] {"--shp", Path.Combine(PathToSHPs, "shadow.png"), "32"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "spicebloom.png"), "32"},
@@ -357,8 +361,8 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--shp", Path.Combine(PathToSHPs, "lighto.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "palaceo.png"), "96"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "unload.png"), "48"},
-				new string[] {"--shp", Path.Combine(PathToSHPs, "sandwormmouth.png"), "68"},
+				new string[] {"--shp", Path.Combine(PathToSHPs, "wormjaw.png"), "68"},
-				new string[] {"--shp", Path.Combine(PathToSHPs, "sandwormdust.png"), "68"},
+				new string[] {"--shp", Path.Combine(PathToSHPs, "wormdust.png"), "68"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns1.png"), "16"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns2.png"), "16"},
 				new string[] {"--shp", Path.Combine(PathToSHPs, "wormsigns3.png"), "16"},

mods/d2k/rules/atreides.yaml

@@ -158,7 +158,6 @@ FREMEN:
 	Health:
 		HP: 200
 	Passenger:
-		PipType: Red
 	RevealsShroud:
 		Range: 6
 	AutoTarget:

mods/d2k/rules/infantry.yaml

@@ -40,7 +40,6 @@ ENGINEER:
 	Mobile:
 		Speed: 4
 	Passenger:
-		PipType: Yellow
 	EngineerRepair:
 	Captures:
 	TakeCover:
@@ -71,4 +70,57 @@ BAZOOKA:
 		PrimaryOffset: 0,0,0,-13
 	TakeCover:
 	-RenderInfantry:
-	RenderInfantryProne:
+	RenderInfantryProne:
+
+THUMPER:
+	Inherits: ^Infantry
+	Buildable:
+		Queue: Infantry
+		BuildPaletteOrder: 50
+		Owner: atreides,harkonnen,ordos
+	Valued:
+		Cost: 400
+	Tooltip:
+		Name: Thumper
+		Description: Attracts sandsworm through vibrations.\n  Strong vs Nothing\n  Weak vs Everything
+	Selectable:
+#		Voice: EngineerVoice
+		Bounds: 12,17,0,-9
+	Health:
+		HP: 25
+	Mobile:
+		Speed: 4
+	Passenger:
+	-AutoTarget:
+	AttackMove:
+		JustMove: true
+	Transforms:
+		IntoActor: thumping
+		Offset:1,1
+		Facing: 1
+
+THUMPING:
+	Inherits: ^Building
+	Building:
+		Power: 0
+		Footprint: x
+		Dimensions: 1,1
+		TerrainTypes: Sand, Dune
+	Health:
+		HP: 25
+	Armor:
+		Type: None
+	RevealsShroud:
+		Range: 5
+	Valued:
+		Cost: 400
+	Tooltip:
+		Name: Thumper
+	CustomSellValue:
+		Value: 0
+	-GivesBuildableArea:
+	-EmitInfantryOnSell:
+	FreeActor:
+		Actor: SANDWORM
+		SpawnOffset: 1,2
+		Facing: 1

mods/d2k/rules/system.yaml

@@ -290,7 +290,6 @@ SPICEBLOOM:
 		Terrain: Spice
 
 SANDWORM:
-	Inherits: ^Infantry
 	Buildable:
 		Owner: Creep
 	Valued:
@@ -298,18 +297,29 @@ SANDWORM:
 	Tooltip:
 		Name: Sandworm
 		Description: Attracted by vibrations in the sand. Will eat units whole and has a large appetite.
-		Icon: sandwormdust
+		Icon: wormjaw
 	Health:
 		HP: 10000
+		Radius: 3
+	Armor:
+		Type: None
 	Mobile:
 		Speed: 5
 		TerrainSpeeds:
 			Sand: 100
 			Dune: 100
+			Spice: 100
+	TargetableUnit:
+		TargetTypes: Ground
 	AutoTarget:
+	AttackMove:
+		JustMove: true
 	AttackWander:
 	AttackLeap:
 		PrimaryWeapon: WormJaw
 		CanAttackGround: no
 	RenderInfantry:
-	BelowUnits:
+	BelowUnits:
+	GivesExperience:
+	GivesBounty:
+	DrawLineToTarget:

mods/d2k/sequences.yaml

@@ -11,11 +11,11 @@ harvester:
 		Start: 0
 		Length: 0
 		Facings: 8
-	dock:
+	dock: unload
-		Start: 0
-		Length: 1
-	dock-loop:
 		Start: 0
+		Length: 10
+	dock-loop: unload
+		Start: 10
 		Length: 1
 
 wall:
@@ -246,6 +246,53 @@ engineer:
 		Length: 22
 		Tick: 1600
 
+thumper:
+	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: rifledeath
+		Start: 26
+		Length: 7
+	die-crushed: rifledeath
+		Start: 54
+		Length: 22
+		Tick: 1600
+
+thumping:
+	idle: thumper
+		Start: 57
+		Length: 4
+		Tick: 150
+	make: thumper
+		Start: 56
+		Length: 5
+	damaged-idle: thumper
+		Start: 57
+		Length: 4
+		Tick: 150
+
 fremen:
 	stand:
 		Start: 0
@@ -875,18 +922,18 @@ pips:
 		Start: 18
 	tag-primary:
 		Start: 2
-	pip-empty: pips2
+	pip-empty: dots
 		Start: 0
-	pip-green: pips2
+	pip-green: dots
+		Start: 1
+	pip-yellow: dots
+		Start: 1
+	pip-gray: dots
+		Start: 0
+	pip-red: dots
+		Start: 1
+	pip-blue: dots
 		Start: 1
-	pip-yellow: pips2
-		Start: 2
-	pip-gray: pips2
-		Start: 3
-	pip-red: pips2
-		Start: 4
-	pip-blue: pips2
-		Start: 5
 
 clock:
 	idle:
@@ -1092,37 +1139,35 @@ spicebloom:
 		Start: 2
 
 sandworm:
-	stand: wormsigns2
+	stand: wormsigns1
 		Start: 0
 		Length: *
-		Tick: 150
+	run: wormsigns2
-	run: sandwormdust
 		Start: 0
-		Facings: 4
+		Facings: 15
-		Length: 5
+		Length: 1
-		Tick: 150
+	die1: wormsigns3
-	die1: sandwormdust
 		Start: 0
 		Length: 1
-	die2: sandwormdust
+	die2: wormsigns3
 		Start: 0
 		Length: 1
-	die3: sandwormdust
+	die3: wormsigns3
 		Start: 0
 		Length: 1
-	die4: sandwormdust
+	die4: wormsigns3
 		Start: 0
 		Length: 1
-	die5: sandwormdust
+	die5: wormsigns3
 		Start: 0
 		Length: 1
-	die6: sandwormdust
+	die6: wormsigns3
 		Start: 0
 		Length: 1
-	die-crushed: sandwormdust
+	die-crushed: wormsigns3
 		Start: 0
 		Length: 1
 		Tick: 1600		
-	wormattack: sandwormmouth
+	wormattack: wormjaw
 		Start: 0
 		Length: 15