added spice as a ressource

still needs work though

OpenRA.Mods.D2k/D2kLoadScreen.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using System.IO;
 using System.Drawing;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
@@ -36,8 +37,7 @@ namespace OpenRA.Mods.D2k
 			// can display loadscreen as early as possible
 			r = Game.Renderer;
 			if (r == null) return;
-
+			var s = new Sheet(Path.Combine(Path.Combine(Path.Combine("mods", "d2k"), "uibits"), "loadscreen.png"));
-			var s = new Sheet("mods/d2k/uibits/loadscreen.png");
 			Logo = new Sprite(s, new Rectangle(0,0,256,256), TextureChannel.Alpha);
 			Stripe = new Sprite(s, new Rectangle(256,0,256,256), TextureChannel.Alpha);
 			StripeRect = new Rectangle(0, Renderer.Resolution.Height/2 - 128, Renderer.Resolution.Width, 256);

README

@@ -2,4 +2,4 @@ OpenRA is a Libre/Free Real Time Strategy game engine supporting early Westwood
 
 Distributed mods include a reimagining and updating of both the Red Alert and Command & Conquer multiplayer games. This repository tries to add Dune 2000. It is already a standalone mod, but still falls back to Red Alert gamefiles at some times.
 
-Please read INSTALL on how to install an OpenRA development environment, HACKING for an overview of the engine and mods/d2k/TODO to find out about the still missing features. You need to copy "Dune 2000/Data/GAMESFX" and "Dune 2000/DATA/DATA.R8" to ~/.openra/Content/d2k/ and run the bash script ripD2kGameFiles.sh before starting the d2k mod.
+Please read INSTALL on how to install an OpenRA development environment, HACKING for an overview of the engine and mods/d2k/TODO to find out about the still missing features. You need to copy "Dune 2000/Data/GAMESFX" and "Dune 2000/DATA/DATA.R8" and "Dune 2000/DATA/MOUSE.R8" to ~/.openra/Content/d2k/ and run the bash script ripD2kGameFiles.sh before starting the d2k mod.

mods/d2k/TODO

@@ -7,7 +7,8 @@
 # welding animation (factories) missing
 # chimney animation (refinery) missing
 # create a tileset extractor for gamefiles to remove copyrighted content from distribution
-# replace ore with spice and mines with spice blooms
+# replace mines with spice blooms
+# spice tiles do not fit
 # add Smudge Types (stored in SHPs not in tileset)
 # add game logic for concrete plates (use terrain overlay from bridges/ressources)
 # allow placing turrets on walls
@@ -33,7 +34,6 @@
 # add install rules to makefile (once more polished)
 # add sonic tank weapon (currently uses tesla)
 # make deviator change the allegiance of ememy units (currently shoots rockets)
-# replace RA mouse.shp, nopower.shp with Dune 2000 equivalent
 # complete Arrakis tileset (blocked by issue #2178)
 # allow frigate to deliver 5 units at once to starport
 # starport prices should vary

mods/d2k/rules/defaults.yaml

@@ -6,7 +6,7 @@
 			Clear: 80
 			Rough: 40
 			Road: 100
-			Ore: 70
+			Spice: 70
 			Beach: 40
 		ROT: 5
 	SelectionDecorations:
@@ -38,7 +38,7 @@
 			Clear: 80
 			Rough: 70
 			Road: 100
-			Ore: 70
+			Spice: 70
 			Beach: 70
 		ROT: 5
 	SelectionDecorations:
@@ -77,7 +77,7 @@
 			Clear: 90
 			Rough: 80
 			Road: 100
-			Ore: 80
+			Spice: 80
 			Beach: 80
 	SelectionDecorations:
 	Selectable:

mods/d2k/rules/system.yaml

@@ -100,10 +100,6 @@ Player:
 	PlayerColorPalette:
 		BasePalette: d2k
 		PaletteFormat: d2k
-	DebugResourceCash:
-	DebugResourceOre:
-	DebugResourceOreCapacity:
-	-GpsWatcher:
 	BaseAttackNotifier:
 		Audio: AI_ATACK.AUD
 
@@ -112,9 +108,7 @@ World:
 		Widget: INGAME_ROOT
 		ObserverWidget: OBSERVER_ROOT
 	ScreenShaker:
-	-WaterPaletteRotation:
 	NukePaletteEffect:
-	-LightPaletteRotator:
 	BuildingInfluence:
 	ChooseBuildTabOnSelect:
 	CrateSpawner:
@@ -179,15 +173,16 @@ World:
 		Race: ordos
 #	BibLayer:
 	ResourceLayer:
-#	ResourceType@spice:
+	ResourceType@spice:
-#		ResourceType: 1
+		ResourceType: 1
-#		Palette: d2k
+		Palette: d2k
-#		SpriteNames: spice #?
+		TerrainType: Spice
-#		ValuePerUnit: 25
+		SpriteNames: spice0
-#		Name: Spice
+		ValuePerUnit: 35
-#		PipColor: Yellow
+		Name: Spice
-#		AllowedTerrainTypes: Sand
+		PipColor: Yellow
-#		AllowUnderActors: false
+		AllowedTerrainTypes: Clear
+		AllowUnderActors: false
 #	SmudgeLayer@SCORCH:
 #		Type:Scorch
 #		SmokePercentage:50
@@ -232,7 +227,7 @@ CRATE:
 		Name: Crate
 	Crate:
 		Lifetime: 120
-		TerrainTypes: Clear, Rough, Road, Water, Ore, Beach
+		TerrainTypes: Clear, Rough, Road, Water, Beach
 	GiveCashCrateAction:
 		Amount: 1000
 		SelectionShares: 50

mods/d2k/tilesets/arrakis.yaml

@@ -12,6 +12,12 @@ Terrain:
 		AcceptSmudge: True
 		IsWater: False
 		Color: 255,255,255,255
+	TerrainType@Spice:
+		Type: Spice
+		Buildable: False
+		AcceptSmudge: False
+		IsWater: False
+		Color: 255,255,255,255
 
 Templates:
 	Template@0:

mods/d2k/voices.yaml

@@ -1,4 +1,4 @@
-# requires Dune 2000/DATA/GAMESFX copied to OpenRA/Content/d2k
+# requires Dune 2000/DATA/GAMESFX copied to ~/.openra/Content/d2k
 
 GenericVoice:
 	Variants:

ripD2kGameFiles.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-R8="/home/matthias/.openra/Content/d2k/DATA.R8"
+R8="$HOME/.openra/Content/d2k/DATA.R8"
 PAL="mods/d2k/bits/d2k.pal"
 
 mono OpenRA.Utility.exe --r8 $R8 $PAL 0 2 "overlay"
@@ -13,8 +13,8 @@ mono OpenRA.Utility.exe --r8 $R8 $PAL 106 109 "spicebloom"
 mono OpenRA.Utility.exe --shp spicebloom.png 32
 
 
-mono OpenRA.Utility.exe --r8 $R8 $PAL 194 205 "spice"
+#mono OpenRA.Utility.exe --r8 $R8 $PAL 194 205 "spice"
-mono OpenRA.Utility.exe --shp spice.png 48
+#mono OpenRA.Utility.exe --shp spice.png 48
 mono OpenRA.Utility.exe --r8 $R8 $PAL 206 381 "rifle" --infantry
 mono OpenRA.Utility.exe --shp rifle.png 48
 mono OpenRA.Utility.exe --r8 $R8 $PAL 382 457 "rifledeath" --infantrydeath
@@ -376,10 +376,14 @@ mono OpenRA.Utility.exe --shp windtrap_anim.png 96
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4820 4840 "missile_launch"
 mono OpenRA.Utility.exe --shp missile_launch.png 96
 
-R8="/home/matthias/.openra/Content/d2k/MOUSE.R8"
+R8="$HOME/.openra/Content/d2k/MOUSE.R8"
-PAL="mods/d2k/bits/d2k.pal"
 
 mono OpenRA.Utility.exe --r8 $R8 $PAL 0 264 "mouse" --transparent
 mono OpenRA.Utility.exe --shp mouse.png 48
 
+R8="$HOME/.openra/Content/d2k/BLOXBASE.R8"
+mono OpenRA.Utility.exe --r8 $R8 $PAL 0 799 "BLOXBASE"
+#mono OpenRA.Utility.exe --r8 $R8 $PAL 748 757 "spice0"
+#mono OpenRA.Utility.exe --shp spice0.png 32
+
 mv *.shp mods/d2k/bits