added d2k superweapons, fixed c4/nuke cursor

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

@@ -102,9 +102,9 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2083", "2114", Path.Combine(PathToSHPs, "devast"), "--vehicle"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2115", "2146", Path.Combine(PathToSHPs, "combathturret"), "--vehicle"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2147", "2148", Path.Combine(PathToSHPs, "deathhandmissile")},
+
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2245", "2284", Path.Combine(PathToSHPs, "saboteur"), "--infantry"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2325", "2388", Path.Combine(PathToSHPs, "saboteurdeath"), "--infantrydeath"},
-				//rifleinfantry repetitions?
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2389", "2420", Path.Combine(PathToSHPs, "deviatortank"), "--vehicle"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2421", "2452", Path.Combine(PathToSHPs, "raider"), "--vehicle"},
 				new string[] {"--r8", PathToDataR8, PathToPalette, "2453", "2484", Path.Combine(PathToSHPs, "combato"), "--vehicle"},

mods/d2k/TODO

@@ -13,11 +13,8 @@
 # add more spice tiles and make them fit
 # add game logic for concrete plates (use terrain overlay from bridges/ressources)
 # allow placing turrets on walls
-# add grenade thrower
+# make sandworm behave like a moving anti-everything mine (currently not attacking anything)
-# make sandworm behave like a moving anti-vehicle mine
 # add neutral buildings: emperor palace, fremen siech, smugglers factory
-# add deathhand missile (nuke)
-# maybe add ornithocopter strikes (they are currently directly contrallable units with non-reloading machine guns as in Dune II)
 # allow upgrades
 # add muzzles and explosions (currently falls back to RA)
 # create a shellmap (currently just a blank placeholder)
@@ -26,7 +23,7 @@
 # starport prices should vary
 # black spots on buildings should be fading team colors
 # gamefile extraction (setup/setup.z) from CD fails
-# support patch 1.06 gamefiles: DATA.R8 has more frames and currently fails to extract, also featuring new terrain with white houses and new unit: grenade thrower
+# support patch 1.06 gamefiles: DATA.R8 has more frames and currently fails to extract, also featuring new terrain with white houses and new units: grenade thrower, stealth raider icon
 # put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI)
 # group number metrics are off
 # building offsets wrong (worst for towers)

mods/d2k/cursors.yaml

@@ -150,13 +150,13 @@ Cursors:
 		enter-blocked-minimap:
 			start:104
 		c4:
-			start:252
+			start:248
-			length: 4
+			length: 8
 			x: 12
 			y: 12
 		c4-minimap:
-			start:252
+			start:248
-			length: 4
+			length: 8
 			x: 12
 			y: 12
 		guard:
@@ -202,7 +202,7 @@ Cursors:
 			x: 12
 			y: 12
 		nuke:
-			start:244
+			start:240
 			length: 8
 			x: 12
 			y: 12

mods/d2k/mod.yaml

@@ -1,8 +1,8 @@
 Metadata:
-	Title: Dune 2000
+	Title: Dune 2000 (beta)
 	Description: early version of the Dune 2000 mod
 	Version: {DEV_VERSION}
-	Author: The OpenD2k Developers
+	Author: The OpenRA Developers
 
 Folders:
 	.

mods/d2k/rules/aircraft.yaml

@@ -71,7 +71,7 @@ ORNI:
 	Valued:
 		Cost: 1000
 	Tooltip:
-		Name: Ornithocopter
+		Name: Ornithopter
 		Description: Helicopter Gunship with Chainguns.\n  Strong vs Infantry, Light Vehicles.\n  Weak vs Tanks
 	Health:
 		HP: 150
@@ -97,4 +97,58 @@ ORNI:
 	FallsToEarth:
 		Explosion: UnitExplode
 	SmokeTrailWhenDamaged:
-		Offset: 0,-10
+		Offset: 0,-10
+
+ORNI.bomber:
+	CarpetBomb:
+		Range: 3
+		Weapon: ParaBomb
+	Inherits: ^Plane
+	Health:
+		HP: 60
+	Armor:
+		Type: Light
+	Plane:
+		ROT: 5
+		Speed: 16
+	LimitedAmmo:
+		Ammo: 7
+	RenderUnit:
+		Image: orni
+	WithShadow:
+	-Selectable:
+	-GainsExperience:
+	Tooltip:
+		Name: Ornithopter
+	FallsToEarth:
+		Spins: no
+		Moves: yes
+		Explosion: UnitExplode
+	SmokeTrailWhenDamaged:
+		Offset: 0,-10
+
+CARRYALL.infantry:
+	ParaDrop:
+		LZRange: 4
+	Inherits: ^Plane
+	Health:
+		HP: 60
+	Armor:
+		Type: Light
+	Plane:
+		ROT: 5
+		Speed: 16
+	RenderUnit:
+		Image: carryall
+	WithShadow:
+	Cargo:
+		MaxWeight: 5
+		Types: Infantry
+	-Selectable:
+	-GainsExperience:
+	Tooltip:
+		Name: Carryall
+	FallsToEarth:
+		Spins: no
+		Moves: yes
+		Explosion: UnitExplode

mods/d2k/rules/atreides.yaml

@@ -140,6 +140,17 @@ PALACEA:
 	Buildable:
 		Prerequisites: researcha
 		Owner: atreides
+	AirstrikePower:
+		Image: orniicon
+		Description: Air Strike
+		ChargeTime: 180
+		LongDesc: Ornithopter drops a load of parachuted\nbombs on your target.
+		UnitType: orni.bomber
+		SelectTargetSound: 
+		FlareType:
+	CanPowerDown:
+	RequiresPower:
+	SupportPowerChargeBar:
 
 SILOA:
 	Inherits: ^SILO

mods/d2k/rules/harkonnen.yaml

@@ -140,6 +140,20 @@ PALACEH:
 	Buildable:
 		Prerequisites: researchh
 		Owner: harkonnen
+	NukePower:
+		Image: deathhandicon
+		ChargeTime: 540
+		Description: Death Hand
+		LongDesc: Launches a nuclear missile at a target location.
+		BeginChargeSound: HI_PREP.AUD
+		EndChargeSound: HI_DHRDY.AUD
+		SelectTargetSound: 
+		LaunchSound: HI_LAUNC.AUD
+		MissileWeapon: atomic
+		SpawnOffset: 10,0
+	CanPowerDown:
+	RequiresPower:
+	SupportPowerChargeBar:
 
 SILOH:
 	Inherits: ^SILO

mods/d2k/rules/ordos.yaml

@@ -91,6 +91,20 @@ PALACEO:
 	Buildable:
 		Prerequisites: researcho
 		Owner: ordos
+	ParatroopersPower:
+		Image: carryallicon
+		UnitType: carryall.infantry
+		FlareTime: 0
+		ChargeTime: 360
+		Description: Paratroopers
+		LongDesc: A Carryall drops a squad of Infantry \nanywhere on the map
+		Prerequisites: HIGHTECHO
+		DropItems: RIFLE, RIFLE, ENGINEER, BAZOOKA, BAZOOKA
+		SelectTargetSound:
+		FlareType:
+	CanPowerDown:
+	RequiresPower:
+	SupportPowerChargeBar:
 
 SILOO:
 	Inherits: ^SILO

mods/d2k/sequences.yaml

@@ -532,6 +532,14 @@ conyarda:
 		Length: *
 	damaged-idle:
 		Start: 1
+#	build: cranea
+#		Start: 0
+#		Length: 14
+#		Tick: 75
+#	damaged-build: cranea
+#		Start: 0
+#		Length: 14
+#		Tick: 75
 
 repaira:
 	idle:
@@ -1285,4 +1293,30 @@ sandworm:
 		Tick: 1600		
 	wormattack: wormjaw
 		Start: 0
-		Length: 15
+		Length: 15
+
+atomic:
+	up: deathhandmissile
+		Start: 0
+		Length: 1
+	down: deathhandmissile
+		Start: 1
+		Length: 1
+
+# falls back to RA
+parabomb:
+	open:
+		Start: 0
+		Length: 8
+	idle:
+		Start: 8
+		Length: 5
+
+# falls back to RA
+parach:
+	open:
+		Start: 0
+		Length: 5
+	idle:
+		Start: 5
+		Length: 11

mods/d2k/weapons.yaml

@@ -571,4 +571,24 @@ Vulcan:
 		Explosion: piffs
 		InfDeath: 2
 		Damage: 10
-		Delay: 10
+		Delay: 10
+
+ParaBomb:
+	ROF: 10
+	Range: 4.5
+	Report: 
+	Projectile: GravityBomb
+		Image: PARABOMB
+	Warhead:
+		Spread: 6
+		Versus: 
+			None: 30%
+			Wood: 75%
+			Light: 75%
+			Concrete: 50%
+		Explosion: self_destruct
+		WaterExplosion: small_splash
+		InfDeath: 4
+		SmudgeType: Crater
+		Damage: 500
+		ImpactSound: kaboom15