From c1722e127021e5ee7e78b57fbb2d990f5e8a544b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Tue, 24 Jul 2012 21:17:31 +0200
Subject: [PATCH] remove broken sandworm and thumper, fixes #2332

---
 mods/d2k/TODO                |   3 +-
 mods/d2k/rules/infantry.yaml | 102 +++++++++++++++++------------------
 mods/d2k/rules/system.yaml   |  68 +++++++++++------------
 3 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/mods/d2k/TODO b/mods/d2k/TODO
index e0c02962e2..804dd98eb9 100644
--- a/mods/d2k/TODO
+++ b/mods/d2k/TODO
@@ -24,4 +24,5 @@
 # building offsets wrong (worst for towers)
 # spice blooms should explode and create new spice field instead of growing spice
 # fix BuiltAt to build vehicles at appropriate factories
-# transpose breaks thumping animation (split into several SHPs)
\ No newline at end of file
+# transpose breaks thumping animation (split into several SHPs)
+# missile sound is wrong
\ No newline at end of file
diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml
index ad6de498a9..3667112146 100644
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -72,54 +72,54 @@ BAZOOKA:
 	-RenderInfantry:
 	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:
-		Bounds: 12,17,0,0
-	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
-	-Capturable:
-	-CapturableBar:
-	-Sellable:
-	-GivesBuildableArea:
-	FreeActor:
-		Actor: SANDWORM
-		SpawnOffset: 1,2
-		Facing: 1
\ No newline at end of file
+#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:
+#		Bounds: 12,17,0,0
+#	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
+#	-Capturable:
+#	-CapturableBar:
+#	-Sellable:
+#	-GivesBuildableArea:
+#	FreeActor:
+#		Actor: SANDWORM
+#		SpawnOffset: 1,2
+#		Facing: 1
\ No newline at end of file
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 8becf7a3ca..8ee78e3965 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -338,37 +338,37 @@ SPICEBLOOM:
 	RadarColorFromTerrain:
 		Terrain: Spice
 
-SANDWORM:
-	Buildable:
-		Owner: Creep
-	Valued:
-		Cost: 1000
-	Tooltip:
-		Name: Sandworm
-		Description: Attracted by vibrations in the sand. Will eat units whole and has a large appetite.
-		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:
-	GivesExperience:
-	GivesBounty:
-	DrawLineToTarget:
+#SANDWORM:
+#	Buildable:
+#		Owner: Creep
+#	Valued:
+#		Cost: 1000
+#	Tooltip:
+#		Name: Sandworm
+#		Description: Attracted by vibrations in the sand. Will eat units whole and has a large appetite.
+#		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:
+#	GivesExperience:
+#	GivesBounty:
+#	DrawLineToTarget:
\ No newline at end of file