added install rules for d2k mod, fixes carryall landing

Makefile

@@ -202,7 +202,7 @@ BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
 INSTALL_DIR = $(DESTDIR)$(datadir)/openra
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
-CORE = fileformats rcg rgl rsdl rnull game editor utility
+CORE = fileformats rcg rgl rsdl rnull game editor utility tsbuild
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
@@ -210,6 +210,10 @@ install: all
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
 	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(INSTALL_DIR)/mods/cnc
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/d2k
+	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) $(INSTALL_DIR)/mods/d2k
 
 	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
@@ -219,8 +223,6 @@ install: all
 	@cp -r mods/cnc/sequences $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/tilesets $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/uibits $(INSTALL_DIR)/mods/cnc
-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
-	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
 
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
@@ -229,6 +231,14 @@ install: all
 	@cp -r mods/ra/rules $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/uibits $(INSTALL_DIR)/mods/ra
+	
+	@-cp $(foreach f,$(shell ls mods/d2k --hide=*.dll),mods/d2k/$(f)) $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/maps $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/bits $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/chrome $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/rules $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/tilesets $(INSTALL_DIR)/mods/d2k
+	@cp -r mods/d2k/uibits $(INSTALL_DIR)/mods/d2k
 
 	@cp -r glsl $(INSTALL_DIR)
 	@cp -r cg $(INSTALL_DIR)
@@ -251,3 +261,4 @@ install: all
 uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra
+	@-rm $(DESTDIR)$(bindir)/openra-editor

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

@@ -259,7 +259,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 			{
 				new string[] {"--shp", Path.Combine(PathToImages, "overlay.png"), "32"},
 				new string[] {"--shp", Path.Combine(PathToImages, "crates.png"), "32"},
-				//new string[] {"--shp", Path.Combine(PathToImages, "shadow.png"), "32
+				//new string[] {"--shp", Path.Combine(PathToImages, "shadow.png"), "32"},
 				new string[] {"--shp", Path.Combine(PathToImages, "spicebloom.png"), "32"},
 				new string[] {"--shp", Path.Combine(PathToImages, "rockcrater1.png"), "32"},
 				new string[] {"--shp", Path.Combine(PathToImages, "rockcrater2.png"), "32"},

mods/d2k/TODO

@@ -19,16 +19,14 @@
 # add deathhand missile (nuke)
 # add sandworm
 # add thumper which really attracts sandworms
-# add neutral buildings: emperor palace, fremen siech, smugglers house
+# add neutral buildings: emperor palace, fremen siech, smugglers factory
 # allow upgrades
 # allow different EVA voices for each faction (currently Atreides only)
 # add SOUND.TS .wav file extractor to RA.Utility.exe
 # convert .wav to .aud or support .wav files for Dune 2000 sounds
 # add muzzles and explosions with lightning (might need engine update)
-# ingame gamefile extractor at first start when SHPs are not found
 # create a shellmap (currently just a blank placeholder)
 # rework chrome UI, dialoges, tabs
-# 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)
 # allow frigate to deliver 5 units at once to starport

mods/d2k/mod.yaml

@@ -1,6 +1,6 @@
 Metadata:
 	Title: Dune 2000
-	Description: Converting the OpenRA Red Alert Mod one by one to Dune 2000
+	Description: early version of the Dune 2000 mod
 	Version: {DEV_VERSION}
 	Author: The OpenD2k Developers
 

mods/d2k/rules/aircraft.yaml

@@ -12,7 +12,7 @@ CARRYALL:
 		Name: Carryall
 		Description: Fast drop ship.\n  Unarmed
 	Health:
-		HP: 90
+		HP: 500
 	Armor: 
 		Type: Light
 	RevealsShroud:
@@ -21,7 +21,7 @@ CARRYALL:
 		InitialFacing: 0
 		ROT: 5
 		Speed: 15
-		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
+		LandableTerrainTypes: Sand, Rock, Spice, Dune
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: hightecha
 	RenderUnit: