added TilesetBuilder command line, added Tileset extractor

removing all copyrighted raw tileset files

mods/d2k/TODO

@@ -6,7 +6,6 @@
 # construction yard crane animations missing
 # welding animation (factories) missing
 # chimney animation (refinery) missing
-# create a tileset extractor for gamefiles to remove copyrighted content from distribution (convert BLOX*.R8 to TMP files)
 # 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
@@ -37,5 +36,4 @@
 # reinforcements have arrived is played twice when ordering via starport
 # add shroud (Dune's 32x32 tiles differ completely from RA/CnC)
 # black spots on buildings should be transparent
-# gamefile extraction (setup/setup.z) from CD fails
-# TilesetBuilder does not support TerrainTypes other then "Clear"
+# gamefile extraction (setup/setup.z) from CD fails

mods/d2k/mod.yaml

@@ -9,16 +9,16 @@ Folders:
 	./mods/d2k
 	./mods/d2k/bits
 	./mods/d2k/uibits
-	./mods/d2k/tilesets/bloxbase
 	~^/Content/d2k
 	~^/Content/d2k/GAMESFX
 	~^/Content/d2k/Music
+	~^/Content/d2k/Tilesets
+	~^/Content/d2k/SHPs
 	./mods/ra/bits
 	./mods/ra/uibits
 	~^/Content/ra
 
 Packages:
-	arrakis.mix
 	~main.mix
 	redalert.mix
 	conquer.mix
@@ -81,8 +81,7 @@ Voices:
 	mods/d2k/voices.yaml
 
 TileSets:
-	mods/d2k/tilesets/arrakis.yaml
-	mods/d2k/tilesets/bloxbase.yaml
+	mods/d2k/tilesets/base.yaml
 
 TileSize: 32
 

mods/d2k/rules/atreides.yaml

@@ -101,6 +101,8 @@ MCVA:
 		Offset:-1,-1
 		TransformSounds:
 		NoTransformSounds: AI_DPLOY.AUD
+	RenderUnit:
+		Image: DMCV
 
 COMBATA:
 	Inherits: ^COMBAT

mods/d2k/rules/defaults.yaml

@@ -3,11 +3,12 @@
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
-			Clear: 80
-			Rough: 40
-			Road: 100
+			Sand: 80
+			Rock: 90
+			Concrete: 100
 			Spice: 70
-			Beach: 40
+			SpiceBlobs: 70
+			Dune: 40
 		ROT: 5
 	SelectionDecorations:
 	Selectable: 
@@ -35,11 +36,12 @@
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
-			Clear: 80
-			Rough: 70
-			Road: 100
+			Sand: 80
+			Rock: 90
+			Concrete: 100
 			Spice: 70
-			Beach: 70
+			SpiceBlobs: 70
+			Dune: 40
 		ROT: 5
 	SelectionDecorations:
 	Selectable: 
@@ -74,11 +76,13 @@
 		Crushes: crate
 		SharesCell: true
 		TerrainSpeeds:
-			Clear: 90
-			Rough: 80
-			Road: 100
-			Spice: 80
-			Beach: 80
+			Sand: 80
+			Rock: 90
+			Concrete: 100
+			Spice: 70
+			SpiceBlobs: 70
+			Dune: 40
+			Rough: 60
 	SelectionDecorations:
 	Selectable:
 		Voice: GenericVoice
@@ -140,7 +144,7 @@
 	Building:
 		Dimensions: 1,1
 		Footprint: x
-		TerrainTypes: Clear,Road
+		TerrainTypes: Rock, Concrete
 	GivesBuildableArea:
 	Capturable:
 	CapturableBar:

mods/d2k/rules/harkonnen.yaml

@@ -101,6 +101,8 @@ MCVH:
 		Offset:-1,-1
 		TransformSounds:
 		NoTransformSounds: HI_DPLOY.AUD
+	RenderUnit:
+		Image: DMCV
 
 COMBATH:
 	Inherits: ^COMBAT

mods/d2k/rules/ordos.yaml

@@ -101,6 +101,8 @@ MCVO:
 		Offset:-1,-1
 		TransformSounds:
 		NoTransformSounds: OI_DPLOY.AUD
+	RenderUnit:
+		Image: DMCV
 
 COMBATO:
 	Inherits: ^COMBAT

mods/d2k/rules/system.yaml

@@ -61,30 +61,30 @@ Player:
 		Name:Omnius
 		RallypointTestBuilding: conyarda
 		BuildingFractions:
-			refa: 30%
-			refh: 30%
-			refo: 30%
-			powra: 35%
-			powrh: 35%
-			powro: 35%
-			barra: 1%
-			barrh: 1%
-			barro: 1%
-			lighta: 1%
-			lighth: 1%
-			lighto: 1%
-			heavya: 1%
-			heavyh: 1%
-			heavyo: 1%
-			researcha: 1%
-			researchh: 1%
-			researcho: 1%
+			refa: 25.1%
+			refh: 25.1%
+			refo: 25.1%
+			barra: 0.1%
+			barrh: 0.1%
+			barro: 0.1%
+			lighta: 0.1%
+			lighth: 0.1%
+			lighto: 0.1%
+			heavya: 0.1%
+			heavyh: 0.1%
+			heavyo: 0.1%
+			researcha: 0.1%
+			researchh: 0.1%
+			researcho: 0.1%
 			repaira: 0.1%
 			repairh: 0.1%
 			repairo: 0.1%
-			radara: 10%
-			radaro: 10%
-			radarh: 10%
+			radara: 0.1%
+			radaro: 0.1%
+			radarh: 0.1%
+			powra: 35%
+			powrh: 35%
+			powro: 35%
 		UnitsToBuild:
 			trike: 30%
 			raider: 30%
@@ -181,7 +181,7 @@ World:
 		ValuePerUnit: 35
 		Name: Spice
 		PipColor: Yellow
-		AllowedTerrainTypes: Clear
+		AllowedTerrainTypes: Sand
 		AllowUnderActors: false
 	SmudgeLayer@CRATER:
 		Type:Crater
@@ -222,7 +222,7 @@ CRATE:
 		Name: Crate
 	Crate:
 		Lifetime: 120
-		TerrainTypes: Clear, Rough, Road, Water, Beach
+		TerrainTypes: Sand, Dune, Rock
 	GiveCashCrateAction:
 		Amount: 1000
 		SelectionShares: 50

mods/d2k/rules/vehicles.yaml

@@ -21,8 +21,6 @@
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 4
-	RenderUnit:
-		Image: MCV
 	MustBeDestroyed:
 	BaseBuilding:
 	-AttackMove:
@@ -181,7 +179,7 @@ SIEGE:
 		Chance: 75  
 	AutoTarget:
 
-Missile:
+MISSILE:
 	Inherits: ^Tank
 	Valued:
 		Cost: 800

mods/d2k/sequences.yaml

@@ -1,4 +1,4 @@
-mcv:
+dmcv:
 	idle:
 		Start: 0
 		Facings: 32
@@ -874,6 +874,15 @@ allyrepair:
 		Length: *
 		Tick: 160
 
+parach:
+	open:
+		Start: 0
+		Length: 5
+	idle:
+		Start: 5
+		Length: 11
+
+
 spicebloom:
 	make:
 		Start: 0

mods/d2k/tilesets/arrakis.yaml

@@ -1,291 +0,0 @@
-General:
-	Name: Arrakis
-	TileSize: 32
-	Id: ARRAKIS
-	Palette: arrakis.pal
-	Extensions: .arr,.shp
-
-Terrain:
-	TerrainType@Clear:
-		Type: Clear
-		Buildable: True
-		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:
-		Id: 0
-		Image: t00
-		Size: 1,1
-		PickAny: False
-		Tiles:
-			0: Clear
-	Template@1:
-		Id: 1
-		Image: t01
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@2:
-		Id: 2
-		Image: t02
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@3:
-		Id: 3
-		Image: t03
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@4:
-		Id: 4
-		Image: t04
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@5:
-		Id: 5
-		Image: t05
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@6:
-		Id: 6
-		Image: t06
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@7:
-		Id: 7
-		Image: t07
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@8:
-		Id: 8
-		Image: t08
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@9:
-		Id: 9
-		Image: t09
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@10:
-		Id: 10
-		Image: t10
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@11:
-		Id: 11
-		Image: t11
-		Size: 5,3
-		PickAny: False
-		Tiles:
-			0: Clear
-			6: Clear
-			1: Clear
-			5: Clear
-			10: Clear
-			11: Clear
-			12: Clear
-			13: Clear
-			14: Clear
-			9: Clear
-			4: Clear
-			3: Clear
-			2: Clear
-			7: Clear
-			8: Clear
-	Template@12:
-		Id: 12
-		Image: t12
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@13:
-		Id: 13
-		Image: t13
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@14:
-		Id: 14
-		Image: t14
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@15:
-		Id: 15
-		Image: t15
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@16:
-		Id: 16
-		Image: t16
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@17:
-		Id: 17
-		Image: t17
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@18:
-		Id: 18
-		Image: t18
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@19:
-		Id: 19
-		Image: t19
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@20:
-		Id: 20
-		Image: t20
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@21:
-		Id: 21
-		Image: t21
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@22:
-		Id: 22
-		Image: t22
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@23:
-		Id: 23
-		Image: t23
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@24:
-		Id: 24
-		Image: t24
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-	Template@25:
-		Id: 25
-		Image: t25
-		Size: 2,2
-		PickAny: False
-		Tiles:
-			0: Clear
-			1: Clear
-			3: Clear
-			2: Clear
-