added Ordos

OpenRA.Utility/Program.cs

@@ -60,8 +60,8 @@ namespace OpenRA.Utility
 			Console.WriteLine("  --extract MOD[,MOD]* FILES                                          Extract files from mod packages");
 			Console.WriteLine("  --tmp-png MOD[,MOD]* THEATER FILES                                  Extract terrain tiles to PNG");
 			Console.WriteLine("  --remap SRCMOD:PAL DESTMOD:PAL SRCSHP DESTSHP                       Remap SHPs to another palette");
-			Console.WriteLine("  --r8 R8FILE PALETTE STARTFRAME ENDFRAME FILENAME [--transparent] ");
+			Console.WriteLine("  --r8 R8FILE PALETTE STARTFRAME ENDFRAME FILENAME [--transparent]");
-			Console.WriteLine("       [--infrantry] [--vehicle] [--projectile] [--building]       Convert Dune 2000 DATA.R8 to PNGs choosing start- and endframe as well as unit type for correct offset to append multiple frames to one PNG named by filename optionally setting up transparency");
+			Console.WriteLine("       [--infrantry] [--vehicle] [--projectile] [--building] [--wall] Convert Dune 2000 DATA.R8 to PNGs choosing start- and endframe as well as unit type for correct offset to append multiple frames to one PNG named by filename optionally setting up transparency");
 		}
 
 		static string GetNamedArg(string[] args, string arg)

mods/d2k/TODO

@@ -15,11 +15,15 @@
 # repair bay should really repair vehicles
 # ornithocopter should flap (might need new RenderOrni code for proper animation)
 # R8 converter needs infantry frame resorter
-# add infantry
+# add infantry dieing animation
+# add trooper
+# add engineer
+# add fremen
+# add saboteur
+# add deathhand missile (nuke)
 # add sandworm
 # add thumper which really attracts sandworms
 # allow upgrades
-# add ordos/harkonnen (avoid redundancy using inheritances)
 # add voices (Dune 2000/DATA/SFX folder contains .aud files)
 # muzzles and explosions with lightning (might need engine update)
 # ingame gamefile extractor at first start when SHPs are not found
@@ -28,4 +32,5 @@
 # add install rules to makefile (once more polished)
 # idea: frame 2998 (fremen siech) could become a tunnel to make Ordos really insidious (similiar mechanism to paratroopers powerproxy)
 # 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

mods/d2k/chrome.yaml

@@ -138,6 +138,12 @@ tabs-selected: tabs.png
 	harkonnen-Vehicle: 80,120,27,41
 	harkonnen-Plane: 80,160,27,41
 	harkonnen-Ship: 80,200,27,41
+	ordos-Building: 0,0,27,41
+	ordos-Defense: 0,40,27,41
+	ordos-Infantry: 0,80,27,41
+	ordos-Vehicle: 0,120,27,41
+	ordos-Plane: 0,160,27,41
+	ordos-Ship: 0,200,27,41
 
 tabs-ready: tabs.png
 	atreides-Building: 27,0,27,41
@@ -152,6 +158,12 @@ tabs-ready: tabs.png
 	harkonnen-Vehicle: 107,120,27,41
 	harkonnen-Plane: 107,160,27,41
 	harkonnen-Ship: 107,200,27,41
+	ordos-Building: 27,0,27,41
+	ordos-Defense: 27,40,27,41
+	ordos-Infantry: 27,80,27,41
+	ordos-Vehicle: 27,120,27,41
+	ordos-Plane: 27,160,27,41
+	ordos-Ship: 27,200,27,41
 
 tabs-normal: tabs.png
 	atreides-Building: 54,0,27,41
@@ -166,13 +178,19 @@ tabs-normal: tabs.png
 	harkonnen-Vehicle: 134,120,27,41
 	harkonnen-Plane: 134,160,27,41
 	harkonnen-Ship: 134,200,27,41
+	ordos-Building: 54,0,27,41
+	ordos-Defense: 54,40,27,41
+	ordos-Infantry: 54,80,27,41
+	ordos-Vehicle: 54,120,27,41
+	ordos-Plane: 54,160,27,41
+	ordos-Ship: 54,200,27,41
 
 flags: buttons.png
-	atreides: 0,84,21,107
+	atreides: 0,84,21,23
-	harkonnen: 22,84,23,107
+	harkonnen: 22,84,23,23
-	ordos: 45,84,22,107
+	ordos: 45,84,22,23
-	random: 67,84,90,107
+	random: 67,84,23,23
-	spectator: 67,84,90,107
+	spectator: 67,84,23,23
 
 dialog2: dialog.png
 	background: 513,1,126,126

mods/d2k/mod.yaml

@@ -43,6 +43,7 @@ Rules:
 	mods/d2k/rules/infantry.yaml
 	mods/d2k/rules/atreides.yaml
 	mods/d2k/rules/harkonnen.yaml
+	mods/d2k/rules/ordos.yaml
 
 Sequences:
 	mods/d2k/sequences.yaml

mods/d2k/rules/aircraft.yaml

@@ -5,7 +5,7 @@ CARRYALL:
 		BuildPaletteOrder: 110
 		Prerequisites: anyhightech
 		BuiltAt: hightecha
-		Owner: atreides,harkonnen
+		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 1200
 	Tooltip:

mods/d2k/rules/infantry.yaml

@@ -3,7 +3,7 @@ RIFLE:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: atreides,harkonnen
+		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 100
 	Tooltip:

mods/d2k/rules/ordos.yaml

@@ -0,0 +1,167 @@
+CONYARDO:
+	Inherits: ^CONYARD
+	Buildable:
+		Owner: ordos
+	Transforms:
+		IntoActor: mcvo
+		Offset:1,1
+		Facing: 270
+
+PWRO:
+	Inherits: ^POWER
+	Buildable:
+		Prerequisites: conyardo
+		Owner: ordos
+
+REFO:
+	Inherits: ^REFINERY
+	Buildable:
+		Prerequisites: pwro
+		Owner: ordos
+	RenderBuildingWarFactory:
+		Image: REFO
+
+BARRO:
+	Inherits: ^BARRACKS
+	Buildable:
+		Prerequisites: pwro
+		Owner: ordos
+
+HIGHTECHO:
+	Inherits: ^HIGHTECH
+	Buildable:
+		Prerequisites: radaro
+		Owner: ordos
+
+RESEARCHO:
+	Inherits: ^RESEARCH
+	Buildable:
+		Prerequisites: radaro,heavyo
+		Owner: ordos
+
+PALACEO:
+	Inherits: ^PALACE
+	Buildable:
+		Prerequisites: researcho
+		Owner: ordos
+
+SILOO:
+	Inherits: ^SILO
+	Buildable:
+		Prerequisites: refo
+		Owner: ordos
+
+LIGHTO:
+	Inherits: ^LIGHT
+	Buildable:
+		Prerequisites: refo
+		Owner: ordos
+	RenderBuildingWarFactory:
+		Image: LIGHTO
+
+HEAVYO:
+	Inherits: ^HEAVY
+	Buildable:
+		Prerequisites: lighto
+		Owner: ordos
+	RenderBuildingWarFactory:
+		Image: HEAVYO
+
+RADARO:
+	Inherits: ^RADAR
+	Buildable:
+		Prerequisites: barro
+		Owner: ordos
+
+STARPORTO:
+	Inherits: ^STARPORT
+	Buildable:
+		Prerequisites: radaro
+		Owner: ordos
+	ProductionQueue:
+		QueuedAudio: OI_ORDER.AUD
+		ReadyAudio: OI_REINF.AUD
+		OnHoldAudio: OI_HOLD.AUD
+		CancelledAudio: OI_CANCL.AUD
+
+REPAIRO:
+	Inherits: ^REPAIR
+	Buildable:
+		Prerequisites: heavyo
+		Owner: ordos
+
+MCVO:
+	Inherits: ^MCV
+	Buildable:
+		Prerequisites: heavyo,repairo
+		Owner: ordos
+	Transforms:
+		Facing: 10
+		IntoActor: conyardo
+		Offset:-1,-1
+		TransformSounds:
+		NoTransformSounds: OI_DPLOY.AUD
+
+COMBATO:
+	Inherits: ^COMBAT
+	Buildable:
+		Prerequisites: heavyo
+		Owner: ordos
+
+RAIDER:
+	Inherits: ^Vehicle
+	Buildable:
+		Queue: Vehicle
+		BuildPaletteOrder: 15
+		Prerequisites: anylight
+		Owner: ordos
+	Valued:
+		Cost: 200
+	Tooltip:
+		Name: Raider
+		Description: Weak Scout.\n Decent vs. Infantry
+	Selectable:
+		Bounds: 24,24
+	Health:
+		HP: 125
+	Armor:
+		Type: Light
+	Mobile:
+		ROT: 15
+		Speed: 20
+	RevealsShroud:
+		Range: 8
+	RenderUnit:
+	AttackFrontal:
+		PrimaryWeapon: M60mg
+		PrimaryOffset: 0,0,0,-4
+		SecondaryWeapon: M60mg
+		SecondaryOffset: 0,0,0,-4
+	AutoTarget:
+
+DEVIATOR:
+	Inherits: ^Tank
+	Valued:
+		Cost: 800
+	Tooltip:
+		Name: Deviator
+		Description: Long range artillery.\n  Strong vs Infantry, Tanks, Air\n  Weak vs Buildings
+	Buildable:
+		Queue: Vehicle
+		BuildPaletteOrder: 50
+		Prerequisites: anyheavy
+		Owner: ordos
+	Mobile:
+		Speed: 6
+	Health:
+		HP: 150
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 6
+	RenderUnit:
+	AttackFrontal:
+		PrimaryWeapon: MammothTusk
+		PrimaryLocalOffset: -7,2,0,0,25, 7,2,0,0,-25
+		PrimaryRecoil: 1
+	AutoTarget:

mods/d2k/rules/system.yaml

@@ -36,6 +36,32 @@ Player:
 		InitialCash: 5000
 	ActorGroupProxy:
 	DeveloperMode:
+#	HackyAI@EasyAI:
+#		Name:Easy AI
+#		BuildingFractions:
+#			refa: 30%
+#			refh: 30%
+#			powra: 35%
+#			powrh: 35%
+#			barra: 1%
+#			barrh: 1%
+#			lighta: 1%
+#			lighth: 1%
+#			heavya: 1%
+#			heavyh: 1%
+#			researcha: 1%
+#			researchh: 1%
+#			repaira: 0.1%
+#			radara: 10%
+#		UnitsToBuild:
+#			trike: 30%
+#			quad: 40%
+#			siege: 15%
+#			combata: 70%
+#			combath: 70%
+#			sonic: 25%
+#			devast: 25%
+#		SquadSize: 10
 	PlayerColorPalette:
 		BasePalette: d2k
 		PaletteFormat: d2k
@@ -55,7 +81,11 @@ World:
 	-LightPaletteRotator:
 	BuildingInfluence:
 	ChooseBuildTabOnSelect:
-	-CrateDrop:
+	CrateSpawner:
+		Minimum: 1
+		Maximum: 3
+		SpawnInterval: 120
+		WaterChance: 0
 	PaletteFromCurrentTileset:
 		Name: terrain
 	PaletteFromFile@d2k:
@@ -102,15 +132,15 @@ World:
 	ShroudPalette@fog:
 		IsFog: yes
 		Name: fog
-	Country@2:
+	Country@Atreides:
 		Name: Atreides
 		Race: atreides
-	Country@3:
+	Country@Harkonnen:
 		Name: Harkonnen
 		Race: harkonnen
-#	Country@4:
+	Country@Ordos:
-#		Name: Ordos
+		Name: Ordos
-#		Race: ordos
+		Race: ordos
 #	BibLayer:
 	ResourceLayer:
 #	ResourceType@spice:
@@ -140,9 +170,20 @@ World:
 	SpawnMPUnits@harkonnen:
 		InitialUnit: mcvh
 		Faction: harkonnen
-#	SpawnMPUnits@ordos:
+	SpawnMPUnits@ordos:
-#		InitialUnit: mcvo
+		InitialUnit: mcvo
+		Faction: ordos
 	EvaAlerts:
+		RadarUp:
+		RadarDown:
+		BuildingCannotPlaceAudio:
+		CashTickUp:
+		CashTickDown:
+		LowPower:
+		SilosNeeded:
+		PrimaryBuildingSelected:
+		AbilityInsufficientPower:
+		LevelUp:
 	SpatialBins:
 		BinSize: 4
 	Shroud:

mods/d2k/rules/vehicles.yaml

@@ -33,7 +33,7 @@ HARVESTER:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
 		Prerequisites: anyref,anyheavy
-		Owner: atreides
+		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 1100
 	Tooltip:
@@ -93,7 +93,7 @@ QUAD:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Prerequisites: anylight
-		Owner: atreides,harkonnen
+		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 400
 	Tooltip:
@@ -154,7 +154,7 @@ SIEGE:
 		Queue: Vehicle
 		BuildPaletteOrder: 80
 		Prerequisites: anyradar
-		Owner: atreides,harkonnen
+		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -192,7 +192,7 @@ Missile:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
 		Prerequisites: anyheavy
-		Owner: atreides,harkonnen
+		Owner: atreides,harkonnen,ordos
 	Mobile:
 		Speed: 6
 	Health:

mods/d2k/sequences.yaml

@@ -473,6 +473,182 @@ devast:
 		Start: 0
 		Facings: 32
 
+conyardo:
+	idle:
+		Start: 0
+	make: conmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+repairo:
+	idle:
+		Start: 0
+	make: repairmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+starporto:
+	idle:
+		Start: 0
+	active:
+		Start: 0
+		Length: 1
+	damaged-idle:
+		Start: 1
+	damaged-active:
+		Start: 1
+	make: starportmake
+		Start: 0
+		Length: *
+
+pwro:
+	idle:
+		Start: 0
+	make: wtrpmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+barro:
+	idle:
+		Start: 0
+	make: barramake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+radaro:
+	idle:
+		Start: 0
+	make: radarmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+refo:
+	idle:
+		Start: 0
+		Length: 1
+	make: refmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 0
+	build-top:
+		Start: 1
+		Length: 1
+	damaged-build-top:
+		Start: 2
+		Length: 1
+	idle-top:
+		Start: 1
+	damaged-idle-top:
+		Start: 2
+
+siloo:
+	idle:
+		Start: 0
+		Length: 4
+	damaged-idle:
+		Start: 4
+		Length: 1
+	make: silomake
+		Start: 0
+		Length: *
+
+hightecho:
+	idle:
+		Start: 0
+	make: highmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+researcho:
+	idle:
+		Start: 0
+	make: researchmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+palaceo:
+	idle:
+		Start: 0
+	make: palacemake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+
+lighto:
+	idle:
+		Start: 0
+		Length: 1
+	make: lightmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 0
+	build-top:
+		Start: 1
+		Length: 1
+	damaged-build-top:
+		Start: 2
+		Length: 1
+	idle-top:
+		Start: 1
+	damaged-idle-top:
+		Start: 2
+
+heavyo:
+	idle:
+		Start: 0
+		Length: 1
+	make: heavymake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 0
+	build-top:
+		Start: 1
+		Length: 1
+	damaged-build-top:
+		Start: 2
+		Length: 1
+	idle-top:
+		Start: 1
+	damaged-idle-top:
+		Start: 2
+
+combato:
+	idle:
+		Start: 0
+		Facings: 32
+	turret: combatoturret
+		Start: 0
+		Facings: 32
+
+raider:
+	idle:
+		Start: 0
+		Facings: 32
+
+deviator:
+	idle:
+		Start: 0
+		Facings: 32
+
 pips:
 	groups:
 		Start: 8
@@ -509,6 +685,12 @@ powerdown:
 	disabled: speed
 		Start: 3
 
+poweroff:
+	offline:
+		Start: 0
+		Length: *
+		Tick: 160
+
 rank:
 	rank:
 		Start: 0
@@ -607,3 +789,67 @@ litning:
 	dim:
 		Start: 4
 		Length: 4
+
+crate:
+	idle: scrate
+		Start: 0
+	water: wwcrate
+		Start: 0
+		Length: *
+		Tick: 500
+	land: sh-crate
+		Start: 0
+
+crate-effects:
+	speed: speed
+		Start: 0
+		Length: *
+	dollar: dollar
+		Start: 0
+		Length: *
+	reveal-map: earth
+		Start: 0
+		Length: *
+	hide-map: empulse
+		Start: 0
+		Length: *
+	fpower: fpower
+		Start: 0
+		Length: *
+	gps: gpsbox
+		Start: 0
+		Length: *
+	invuln: invulbox
+		Start: 0
+		Length: *
+	heal: invun
+		Start: 0
+		Length: *
+	nuke: missile2
+		Start: 0
+		Length: *
+	parabombs: parabox
+		Start: 0
+		Length: *
+	sonar: sonarbox
+		Start: 0
+		Length: *
+	stealth: stealth2
+		Start: 0
+		Length: *
+	timequake: tquake
+		Start: 0
+		Length: *
+	armor: armor
+		Start: 0
+		Length: *
+	chrono: chronbox
+		Start: 0
+		Length: *
+	airstrike: deviator
+		Start: 0
+		Length: *
+	levelup: levelup
+		Start: 0
+		Length: *
+		Tick: 200

ripD2kGameFiles.sh

@@ -143,6 +143,39 @@ mono OpenRA.Utility.exe --r8 $R8 $PAL 2833 2835 "lighth" --building
 mono OpenRA.Utility.exe --shp lighth.png 96
 mono OpenRA.Utility.exe --r8 $R8 $PAL 2836 2837 "palaceh" --building
 mono OpenRA.Utility.exe --shp palaceh.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2838 2840 "heavyo" --building
+mono OpenRA.Utility.exe --shp heavyo.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2841 2842 "radaro" --building
+mono OpenRA.Utility.exe --shp radaro.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2843 2844 "pwro" --building
+mono OpenRA.Utility.exe --shp pwro.png 64
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2845 2846 "barro" --building
+mono OpenRA.Utility.exe --shp barro.png 64
+# identical wall
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2879 2880 "conyardo" --building
+mono OpenRA.Utility.exe --shp conyardo.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2881 2883 "refo" --building
+mono OpenRA.Utility.exe --shp refo.png 120
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2884 2885 "hightecho" --building
+mono OpenRA.Utility.exe --shp hightecho.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2886 2890 "siloo" --building
+mono OpenRA.Utility.exe --shp siloo.png 32
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2891 2892 "repairo" --building
+mono OpenRA.Utility.exe --shp repairo.png 96
+#identical guntower
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2909 2940 "gunturreto" --building
+mono OpenRA.Utility.exe --shp gunturreto.png 48
+#identical rockettower
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2957 2988 "rocketturreto" --building
+mono OpenRA.Utility.exe --shp rocketturreto.png 48
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2989 2990 "researcho" --building
+mono OpenRA.Utility.exe --shp researcho.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2991 2992 "starporto" --building
+mono OpenRA.Utility.exe --shp starporto.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2993 2995 "lighto" --building
+mono OpenRA.Utility.exe --shp lighto.png 96
+mono OpenRA.Utility.exe --r8 $R8 $PAL 2996 2997 "palaceo" --building
+mono OpenRA.Utility.exe --shp palaceo.png 96
 
 mono OpenRA.Utility.exe --r8 $R8 $PAL 3549 3564 "sandwormmouth"
 mono OpenRA.Utility.exe --shp sandwormmouth.png 68
@@ -230,8 +263,8 @@ mono OpenRA.Utility.exe --r8 $R8 $PAL 4060 4060 "barrhicon"
 mono OpenRA.Utility.exe --shp barrhicon.png 60
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4061 4061 "barroicon"
 mono OpenRA.Utility.exe --shp barroicon.png 60
-mono OpenRA.Utility.exe --r8 $R8 $PAL 4063 4063 "wallaicon" # = 4061..4062
+mono OpenRA.Utility.exe --r8 $R8 $PAL 4063 4063 "wallicon" # = 4061..4062
-mono OpenRA.Utility.exe --shp wallaicon.png 60
+mono OpenRA.Utility.exe --shp wallicon.png 60
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4066 4066 "refaicon"
 mono OpenRA.Utility.exe --shp refaicon.png 60
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4067 4067 "refhicon"
@@ -286,7 +319,7 @@ mono OpenRA.Utility.exe --shp repairaicon.png 60
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4097 4097 "repairhicon"
 mono OpenRA.Utility.exe --shp repairhicon.png 60
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4098 4098 "repairoicon"
-mono OpenRA.Utility.exe --shp repairhicon.png 60
+mono OpenRA.Utility.exe --shp repairoicon.png 60
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4099 4099 "researchaicon"
 mono OpenRA.Utility.exe --shp researchaicon.png 60
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4100 4100 "researchhicon"