put d2k mod stuff into it's own branch

2012-05-20 15:50:39 +02:00
parent 5a37c84a8b
commit 5426a5fd3c
62 changed files with 1768 additions and 1850 deletions
--- a/mods/d2k/bits/clock.shp
+++ b/mods/d2k/bits/clock.shp
--- a/mods/d2k/bits/mcv.shp
+++ b/mods/d2k/bits/mcv.shp
--- a/mods/d2k/bits/mouse.shp
+++ b/mods/d2k/bits/mouse.shp
--- a/mods/d2k/bits/moveflsh.shp
+++ b/mods/d2k/bits/moveflsh.shp
--- a/mods/d2k/bits/nopower.shp
+++ b/mods/d2k/bits/nopower.shp
--- a/mods/d2k/bits/pips.shp
+++ b/mods/d2k/bits/pips.shp
--- a/mods/d2k/bits/rank.shp
+++ b/mods/d2k/bits/rank.shp
--- a/mods/d2k/bits/shadow.shp
+++ b/mods/d2k/bits/shadow.shp
--- a/mods/d2k/bits/temperat.pal
+++ b/mods/d2k/bits/temperat.pal
--- a/mods/d2k/bits/units.pal
+++ b/mods/d2k/bits/units.pal
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -0,0 +1,174 @@
+chrome-atreides: chrome-atreides.png
+	specialbin-top: 0,0,30,51
+	specialbin-middle: 0,51,30,51
+	specialbin-bottom: 0,153,30,39
+	moneybin: 192,0,320,32
+	tooltip-bg: 0,288,272,136
+
+radar-atreides: chrome-atreides.png
+	left: 297,31,9,192
+	right: 498,31,9,192
+	bottom: 297,223,210,30
+	bg: 306,31,192,192
+
+power-atreides: chrome-atreides.png
+	power-indicator: 187,4,4,7
+
+palette-atreides: chrome-atreides.png
+	top: 297,288,201,9
+	dock-top: 498,274,14,23
+	bottom: 297,489,201,9
+	dock-bottom: 498,489,14,23
+	bg-0: 297,297,201,48
+	dock-0: 498,297,14,48
+	bg-1: 297,345,201,48
+	dock-1: 498,345,14,48
+	bg-2: 297,393,201,48
+	dock-2: 498,393,14,48
+	bg-3: 297,441,201,48
+	dock-3: 498,441,14,48
+
+digits-atreides: chrome-atreides.png
+	0: 32,0,13,17
+	1: 45,0,13,17
+	2: 58,0,13,17
+	3: 71,0,13,17
+	4: 84,0,13,17
+	5: 97,0,13,17
+	6: 110,0,13,17
+	7: 123,0,13,17
+	8: 136,0,13,17
+	9: 149,0,13,17
+
+chrome-harkonnen: chrome-harkonnen.png
+	specialbin-top: 0,0,30,51
+	specialbin-middle: 0,51,30,51
+	specialbin-bottom: 0,153,30,39
+	moneybin: 192,0,320,32
+	tooltip-bg: 0,288,272,136
+
+radar-harkonnen: chrome-harkonnen.png
+	left: 297,31,9,192
+	right: 498,31,9,192
+	bottom: 297,223,210,30
+	bg: 306,31,192,192
+	power-indicator: 187,4,4,7
+
+power-harkonnen: chrome-harkonnen.png
+	power-indicator: 187,4,4,7
+
+palette-harkonnen: chrome-harkonnen.png
+	top: 297,288,201,9
+	dock-top: 498,274,14,23
+	bottom: 297,489,201,9
+	dock-bottom: 498,489,14,23
+	bg-0: 297,297,201,48
+	dock-0: 498,297,14,48
+	bg-1: 297,345,201,48
+	dock-1: 498,345,14,48
+	bg-2: 297,393,201,48
+	dock-2: 498,393,14,48
+	bg-3: 297,441,201,48
+	dock-3: 498,441,14,48
+
+digits-harkonnen: chrome-harkonnen.png
+	0: 32,0,13,17
+	1: 45,0,13,17
+	2: 58,0,13,17
+	3: 71,0,13,17
+	4: 84,0,13,17
+	5: 97,0,13,17
+	6: 110,0,13,17
+	7: 123,0,13,17
+	8: 136,0,13,17
+	9: 149,0,13,17
+
+chrome-ordos: chrome-ordos.png
+	specialbin-top: 0,0,30,51
+	specialbin-middle: 0,51,30,51
+	specialbin-bottom: 0,153,30,39
+	moneybin: 192,0,320,32
+	tooltip-bg: 0,288,272,136
+
+radar-ordos: chrome-ordos.png
+	left: 297,31,9,192
+	right: 498,31,9,192
+	bottom: 297,223,210,30
+	bg: 306,31,192,192
+
+power-ordos: chrome-ordos.png
+	power-indicator: 187,4,4,7
+
+palette-ordos: chrome-ordos.png
+	top: 297,288,201,9
+	dock-top: 498,274,14,23
+	bottom: 297,489,201,9
+	dock-bottom: 498,489,14,23
+	bg-0: 297,297,201,48
+	dock-0: 498,297,14,48
+	bg-1: 297,345,201,48
+	dock-1: 498,345,14,48
+	bg-2: 297,393,201,48
+	dock-2: 498,393,14,48
+	bg-3: 297,441,201,48
+	dock-3: 498,441,14,48
+
+digits-ordos: chrome-ordos.png
+	0: 32,0,13,17
+	1: 45,0,13,17
+	2: 58,0,13,17
+	3: 71,0,13,17
+	4: 84,0,13,17
+	5: 97,0,13,17
+	6: 110,0,13,17
+	7: 123,0,13,17
+	8: 136,0,13,17
+	9: 149,0,13,17
+
+tabs-selected: tabs.png
+	atreides-Building: 0,0,27,41
+	atreides-Defense: 0,40,27,41
+	atreides-Infantry: 0,80,27,41
+	atreides-Vehicle: 0,120,27,41
+	atreides-Plane: 0,160,27,41
+	atreides-Ship: 0,200,27,41
+	harkonnen-Building: 80,0,27,41
+	harkonnen-Defense: 80,40,27,41
+	harkonnen-Infantry: 80,80,27,41
+	harkonnen-Vehicle: 80,120,27,41
+	harkonnen-Plane: 80,160,27,41
+	harkonnen-Ship: 80,200,27,41
+
+tabs-ready: tabs.png
+	atreides-Building: 27,0,27,41
+	atreides-Defense: 27,40,27,41
+	atreides-Infantry: 27,80,27,41
+	atreides-Vehicle: 27,120,27,41
+	atreides-Plane: 27,160,27,41
+	atreides-Ship: 27,200,27,41
+	harkonnen-Building: 107,0,27,41
+	harkonnen-Defense: 107,40,27,41
+	harkonnen-Infantry: 107,80,27,41
+	harkonnen-Vehicle: 107,120,27,41
+	harkonnen-Plane: 107,160,27,41
+	harkonnen-Ship: 107,200,27,41
+
+tabs-normal: tabs.png
+	atreides-Building: 54,0,27,41
+	atreides-Defense: 54,40,27,41
+	atreides-Infantry: 54,80,27,41
+	atreides-Vehicle: 54,120,27,41
+	atreides-Plane: 54,160,27,41
+	atreides-Ship: 54,200,27,41
+	harkonnen-Building: 134,0,27,41
+	harkonnen-Defense: 134,40,27,41
+	harkonnen-Infantry: 134,80,27,41
+	harkonnen-Vehicle: 134,120,27,41
+	harkonnen-Plane: 134,160,27,41
+	harkonnen-Ship: 134,200,27,41
+
+flags: buttons.png
+	atreides: 60,84,30,15
+	harkonnen: 60,84,30,15
+	orodos: 60,84,30,15
+
--- a/mods/d2k/chrome/gamelobby.yaml
+++ b/mods/d2k/chrome/gamelobby.yaml
@@ -1,455 +0,0 @@
-Background@SERVER_LOBBY:
-	Delegate:LobbyDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:800
-	Height:600
-	Visible:false
-	Children:
-		Label@LOBBY_TITLE:
-			X:0
-			Y:20
-			Align:Center
-			Width:800
-			Height:20
-			Bold:True
-			Text:OpenRA Multiplayer Lobby
-		Background@LOBBY_MAP_BG:
-			X:PARENT_RIGHT-268
-			Y:39
-			Width:252
-			Height:252
-			Background:dialog3
-			Children:
-				MapPreview@LOBBY_MAP_PREVIEW:
-					X:4
-					Y:4
-					Width:244
-					Height:244
-		Container@PLAYERS:
-			X:20
-			Y:75
-			Width:500
-			Height:200
-			Children:
-				Container@TEMPLATE_LOCAL:
-					X:0
-					Y:0
-					Width:500
-					Height:30
-					Visible:false
-					Children:
-						TextField@NAME:
-							Text:Name
-							Width:139
-							Height:25
-							X:0
-							Y:0
-							MaxLength:16
-						Button@COLOR:
-							Width:65
-							Height:25
-							X:159
-							Y:0
-							Children:
-								ColorBlock@COLORBLOCK:
-									X:5
-									Y:7
-									Width:PARENT_RIGHT-10
-									Height:PARENT_BOTTOM-12
-						Button@FACTION:
-							Width:110
-							Height:25
-							X:244
-							Y:0
-							Children:
-								Image@FACTIONFLAG:
-									Width:30
-									Height:15
-									X:5
-									Y:5
-								Label@FACTIONNAME:
-									Text:Faction
-									Width:60
-									Height:25
-									X:40
-									Y:0
-						Button@TEAM:
-							Text:Team
-							Width:25
-							Height:25
-							X:374
-							Y:0
-						Checkbox@STATUS:
-							X:455
-							Y:2
-							Width:20
-							Height:20
-				Container@TEMPLATE_REMOTE:
-					X:0
-					Y:0
-					Width:500
-					Height:30
-					Visible:false
-					Children:
-						Label@NAME:
-							Text:Name
-							Width:139
-							Height:25
-							X:0
-							Y:0
-						ColorBlock@COLOR:
-							X:164
-							Y:7
-							Width:55
-							Height:13
-						Label@FACTION:
-							Width:110
-							Height:25
-							X:244
-							Y:0
-							Children:
-								Image@FACTIONFLAG:
-									Width:30
-									Height:15
-									X:5
-									Y:5
-								Label@FACTIONNAME:
-									Text:Faction
-									Width:60
-									Height:25
-									X:40
-									Y:0
-						Label@TEAM:
-							Text:Team
-							Width:70
-							Height:25
-							X:351
-							Y:0
-							Align:Center
-							Bold: false
-						Checkbox@STATUS:
-							X:455
-							Y:2
-							Width:20
-							Height:20
-				Container@TEMPLATE_EMPTY:
-					X:0
-					Y:0
-					Width:500
-					Height:30
-					Visible:false
-					Children:
-						Label@NAME:
-							Text:Name
-							Width:139
-							Height:25
-							X:0
-							Y:0
-						Button@JOIN:
-							Text:Play in this slot
-							Width:PARENT_RIGHT - 160
-							Height:25
-							X:160
-							Y:0
-				Container@TEMPLATE_EMPTY_HOST:
-					X:0
-					Y:0
-					Width:500
-					Height:30
-					Visible:false
-					Children:
-						Button@NAME:		-- TODO: replace with dropdown
-							Text:Name
-							Width:155
-							Height:25
-							X:0
-							Y:0
-						Button@JOIN:
-							Text:Play in this slot
-							Width:PARENT_RIGHT - 160
-							Height:25
-							X:160
-							Y:0
-		Container@LABEL_CONTAINER:
-			X:30
-			Y:45
-			Children:
-				Label@LABEL_LOBBY_NAME:
-					Width:139
-					Height:25
-					X:0
-					Y:0
-					Text:Name
-					Align:Center
-					Bold:True
-				Label@LABEL_LOBBY_COLOR:
-					Width:65
-					Height:25
-					X:159
-					Y:0
-					Text:Color
-					Align:Center
-					Bold:True
-				Label@LABEL_LOBBY_FACTION:
-					Width:110
-					Height:25
-					X:244
-					Y:0
-					Text:Faction
-					Align:Center
-					Bold:True
-				Label@LABEL_LOBBY_TEAM:
-					Width:70
-					Height:25
-					X:351
-					Y:0
-					Text:Team
-					Align:Center
-					Bold:True
-				Label@LABEL_LOBBY_STATUS:
-					X:432
-					Y:0
-					Width:70
-					Height:25
-					Text:Ready
-					Align:Center
-					Bold:True
-		Button@CHANGEMAP_BUTTON:
-			Visible:true
-			X:PARENT_RIGHT-160
-			Y:PARENT_BOTTOM-269
-			Width:120
-			Height:25
-			Text:Change Map
-			Bold:True
-		ChatDisplay@CHAT_DISPLAY:
-			Visible:true
-			X:20
-			Notification:
-			Height:230
-			Y:PARENT_BOTTOM - 289
-			Width:PARENT_RIGHT - 200
-		Label@LABEL_CHATTYPE:
-			Width:65
-			Height:25
-			X:0
-			Y:PARENT_BOTTOM - 50
-			Text:Chat:
-			Align:Right
-		TextField@CHAT_TEXTFIELD:
-			Visible:true
-			X:70
-			Y:PARENT_BOTTOM - 49
-			Width:550
-			Height:25
-		Button@START_GAME_BUTTON:
-			Visible:true
-			X:PARENT_RIGHT-160
-			Y:PARENT_BOTTOM-49
-			Width:120
-			Height:25
-			Text:Start Game
-			Bold:True
-		Button@DISCONNECT_BUTTON:
-			Visible:true
-			X:PARENT_RIGHT-160
-			Y:PARENT_BOTTOM-189
-			Width:120
-			Height:25
-			Text:Disconnect
-			Bold:True
-		Checkbox@LOCKTEAMS_CHECKBOX:
-			Visible: true
-			X: PARENT_RIGHT-160
-			Y: PARENT_BOTTOM-229
-			Width: 80
-			Height: 20
-			Text: Lock Teams
-		Background@COLOR_CHOOSER:
-			Width:500
-			Height:195
-			X:(WINDOW_RIGHT - WIDTH)/2 - PARENT_LEFT
-			Y:100	
-			Visible:false
-			Children:
-				Button@BUTTON_OK:
-					X:PARENT_RIGHT - 180
-					Y:PARENT_BOTTOM - 45
-					Width:160
-					Height:25
-					Text:Ok
-					Bold:True
-				ShpImage@MCV:
-					X:PARENT_RIGHT - 90
-					Y:20
-					Image:mcv
-					Frame:20
-					Palette:colorpicker
-#				ShpImage@FACT:
-#					X:PARENT_RIGHT - 100
-#					Y:70
-#					Image:fact
-#					Palette:colorpicker
-				Label@HUE_LABEL:
-					X:0
-					Y:30
-					Width:110
-					Height:20
-					Align: Right
-					Text: Hue:
-				Slider@HUE:
-					X:120
-					Y:30
-					Width:260
-					Height:20
-					Ticks:5
-				Label@SAT_LABEL:
-					X:0
-					Y:60
-					Width:110
-					Height:20
-					Align: Right
-					Text: Saturation:	
-				Slider@SAT:
-					X:120
-					Y:60
-					Width:260
-					Height:20
-					Ticks:5
-				Label@LUM_LABEL:
-					X:0
-					Y:90
-					Width:110
-					Height:20
-					Align: Right
-					Text: Brightness:	
-				Slider@LUM:
-					X:120
-					Y:90
-					Width:260
-					Height:20
-					Ticks:5
-				Label@RANGE_LABEL:
-					X:0
-					Y:120
-					Width:110
-					Height:20
-					Align: Right
-					Text: Range:	
-				Slider@RANGE:
-					X:120
-					Y:120
-					Width:260
-					Height:20
-					Ticks:5
-Background@MAP_CHOOSER:
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Delegate:MapChooserDelegate
-	Width:800
-	Height:600
-	Visible:false
-	Children:
-		Label@MAPCHOOSER_TITLE:
-			X:0
-			Y:20
-			Align:Center
-			Width:800
-			Height:20
-			Text:Choose Map
-			Bold:True
-		ScrollPanel@MAP_LIST:
-			X:20
-			Y:50
-			Width:500
-			Height:480
-			Children:
-				Label@MAP_TEMPLATE:
-					Width:PARENT_RIGHT-28
-					Height:25
-					X:2
-					Y:0
-					Visible:false
-		Background@MAPCHOOSER_MAP_BG:
-			X:PARENT_RIGHT-268
-			Y:50
-			Width:252
-			Height:252
-			Background:dialog3
-			Children:
-				MapPreview@MAPCHOOSER_MAP_PREVIEW:
-					X:4
-					Y:4
-					Width:244
-					Height:244
-		Label@CURMAP_TITLE_LABEL:
-			X:PARENT_RIGHT - 200 - WIDTH
-			Y:311
-			Align:Right
-			Width:70
-			Height:20
-			Text:Title:
-			Bold:True
-		Label@CURMAP_TITLE:
-			X:PARENT_RIGHT - 195
-			Y:311
-			Align:Left
-			Width:70
-			Height:20
-		Label@CURMAP_SIZE_LABEL:
-			X:PARENT_RIGHT - 200 - WIDTH
-			Y:331
-			Align:Right
-			Width:70
-			Height:20
-			Text:Size:
-			Bold:True
-		Label@CURMAP_SIZE:
-			X:PARENT_RIGHT - 195
-			Y:331
-			Align:Left
-			Width:70
-			Height:20
-		Label@CURMAP_THEATER_LABEL:
-			X:PARENT_RIGHT - 200 - WIDTH
-			Y:351
-			Align:Right
-			Width:70
-			Height:20
-			Text:Theater:
-			Bold:True
-		Label@CURMAP_THEATER:
-			X:PARENT_RIGHT - 195
-			Y:351
-			Align:Left
-			Width:70
-			Height:20
-		Label@CURMAP_PLAYERS_LABEL:
-			X:PARENT_RIGHT - 200 - WIDTH
-			Y:371
-			Align:Right
-			Width:70
-			Height:20
-			Text:Players:
-			Bold:True
-		Label@CURMAP_PLAYERS:
-			X:PARENT_RIGHT - 195
-			Y:371
-			Align:Left
-			Width:70
-			Height:20
-		Button@BUTTON_OK:
-			X:PARENT_RIGHT - 360
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Ok
-			Bold:True
-		Button@BUTTON_CANCEL:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Cancel
-			Bold:True
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -1,247 +0,0 @@
-Container@INGAME_ROOT:
-	Delegate:IngameChromeDelegate
-	Visible:false
-	Children:
-		WorldInteractionController:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		ViewportScrollController:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		Timer@GAME_TIMER:
-			X: WINDOW_RIGHT/2
-			Y: 10
-		Background@POSTGAME_BG:
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:400
-			Height:100
-			Background:dialog4
-			Visible:false
-			Children:
-				Label@TEXT:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:(PARENT_BOTTOM - HEIGHT)/2
-					Width:200
-					Height:40
-					Align:Center
-					Bold:True
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X:0
-			Y:25
-		BuildPalette@INGAME_BUILD_PALETTE:
-			X:WINDOW_RIGHT - 250
-			Y:280
-			Width:250
-			Height:500
-		Button@INGAME_OPTIONS_BUTTON:
-			X:0
-			Y:0
-			Width:160
-			Height:25
-			Text:Options
-			Bold:True
-		Button@INGAME_DIPLOMACY_BUTTON:
-			X:162
-			Y:0
-			Width:160
-			Height:25
-			Text:Diplomacy
-			Bold:True
-		WorldTooltip@INGAME_WORLD_TOOLTIP:
-		Button@INGAME_DEVELOPERMODE_BUTTON:
-			X:324
-			Y:0
-			Width:160
-			Height:25
-			Text:Developer Mode
-			Visible:false
-			Bold:True
-		RadarBin@INGAME_RADAR_BIN:
-		PowerBin@INGAME_POWER_BIN:
-		MoneyBin@INGAME_MONEY_BIN:
-			X:WINDOW_RIGHT - WIDTH
-			Y:0
-			Width:320
-			Height: 32
-			Children:
-				OrderButton@SELL:
-					Delegate:OrderButtonsChromeDelegate
-					X:3
-					Y:0
-					Width:30
-					Height:30
-					Image:sell
-					Description:Sell
-					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
-				OrderButton@POWER_DOWN:
-					Delegate:OrderButtonsChromeDelegate
-					X:39
-					Y:0
-					Width:30
-					Height:30
-					Image:power
-					Description:Powerdown
-					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
-				OrderButton@REPAIR:
-					Delegate:OrderButtonsChromeDelegate
-					X:75
-					Y:0
-					Width:30
-					Height:30
-					Image:repair
-					Description:Repair
-					LongDesc:Repair damaged buildings
-		WorldTooltip:
-		Background@INGAME_OPTIONS_BG:
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:300
-			Height:320
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Options
-					Align:Center
-					Bold:True
-				Button@RESUME:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:60
-					Width:160
-					Height:25
-					Text:Resume
-					Bold:True
-				Button@SETTINGS:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:100
-					Width:160
-					Height:25
-					Text:Settings
-					Bold:True
-				Button@MUSIC:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:140
-					Width:160
-					Height:25
-					Text:Music
-					Bold:True					
-				Button@SURRENDER:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:180
-					Width:160
-					Height:25
-					Text:Surrender
-					Bold:True
-				Button@DISCONNECT:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:220
-					Width:160
-					Height:25
-					Text:Disconnect
-					Bold:True
-				Button@QUIT:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:260
-					Width:160
-					Height:25
-					Text:Quit
-					Bold:True
-		Background@DIPLOMACY_BG:
-			Delegate:DiplomacyDelegate
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:450
-			Height:400
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Diplomacy
-					Align:Center
-					Bold:True
-		ChatDisplay@CHAT_DISPLAY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT - 30
-			Width: 760
-			Height: 200
-			DrawBackground: False
-			RemoveTime:250
-		ChatEntry@CHAT_ENTRY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT
-			Width: 760
-			Height: 30
-		Background@DEVELOPERMODE_BG:
-			Delegate:DeveloperModeDelegate
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:350
-			Height:330
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Developer Mode
-					Align:Center
-				Checkbox@CHECKBOX_SHROUD
-					X:30
-					Y:50
-					Height:20
-					Width:PARENT_RIGHT - 30
-					Text:Disable Shroud
-				Checkbox@CHECKBOX_UNITDEBUG:
-					X:30
-					Y:80
-					Width:PARENT_RIGHT - 30
-					Height:20
-					Text:Show Occupied Cells
-				Checkbox@CHECKBOX_PATHDEBUG:
-					X:30
-					Y:110
-					Width:PARENT_RIGHT - 30
-					Height:20
-					Text:Show Unit Paths
-				Button@GIVE_CASH
-					X:30
-					Y:140
-					Width:200
-					Height:20
-					Text: Give Cash
-				Checkbox@INSTANT_BUILD
-					X:30
-					Y:170
-					Width:PARENT_RIGHT - 30
-					Height:20
-					Text:Instant Build Speed
-				Checkbox@INSTANT_CHARGE
-					X:30
-					Y:200
-					Width:PARENT_RIGHT - 30
-					Height:20
-					Text:Instant Charge Time (Special Powers)
-				Checkbox@ENABLE_TECH
-					X:30
-					Y:230
-					Width:PARENT_RIGHT - 30
-					Height:20
-					Text:Build Everything
-				Button@GIVE_EXPLORATION
-					X:30
-					Y:260
-					Width:200
-					Height:20
-					Text: Give Exploration
--- a/mods/d2k/chrome/mainmenu.yaml
+++ b/mods/d2k/chrome/mainmenu.yaml
@@ -1,220 +1,266 @@
 Background@MAINMENU_BG:
+	Id:MAINMENU_BG
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:250
-	Height:290
-	Delegate:MainMenuButtonsDelegate
+	Height:420
+	Visible:true
+	Logic:MainMenuButtonsLogic
 	Children:
 		Label@MAINMENU_LABEL_TITLE:
+			Id:MAINMENU_LABEL_TITLE
 			X:0
 			Y:20
 			Width:250
 			Height:25
-			Text:OpenRA Main Menu
+			Text:OpenD2k Main Menu
 			Align:Center
-			Bold:True
+			Font:Bold
 		Button@MAINMENU_BUTTON_JOIN:
+			Id:MAINMENU_BUTTON_JOIN
 			X:45
 			Y:70
 			Width:160
 			Height:25
 			Text:Join Game
-			Bold:True
+			Font:Bold
 		Button@MAINMENU_BUTTON_CREATE:
+			Id:MAINMENU_BUTTON_CREATE
 			X:45
 			Y:110
 			Width:160
 			Height:25
 			Text:Create Game
-			Bold:True
-		Button@MAINMENU_BUTTON_SETTINGS:
+			Font:Bold
+		Button@MAINMENU_BUTTON_DIRECTCONNECT:
+			Id:MAINMENU_BUTTON_DIRECTCONNECT
 			X:45
 			Y:150
 			Width:160
 			Height:25
-			Text:Settings
-			Bold:True
-		Button@MAINMENU_BUTTON_MUSIC:
+			Text:Direct Connect
+			Font:Bold
+		Button@MAINMENU_BUTTON_SETTINGS:
+			Id:MAINMENU_BUTTON_SETTINGS
 			X:45
 			Y:190
 			Width:160
 			Height:25
-			Text:Music
-			Bold:True
-		Button@MAINMENU_BUTTON_QUIT:
+			Text:Settings
+			Font:Bold
+		Button@MAINMENU_BUTTON_MODS:
+			Id:MAINMENU_BUTTON_MODS
 			X:45
 			Y:230
 			Width:160
 			Height:25
-			Text:Quit
-			Bold:True
-		Button@MAINMENU_BUTTON_VIDEOPLAYER:
-			Visible:false
+			Text:Mods
+			Font:Bold
+#		Button@MAINMENU_BUTTON_MUSIC:
+#			Id:MAINMENU_BUTTON_MUSIC
+#			X:45
+#			Y:270
+#			Width:160
+#			Height:25
+#			Text:Music
+#			Font:Bold
+		Button@MAINMENU_BUTTON_REPLAY_VIEWER:
+			Id:MAINMENU_BUTTON_REPLAY_VIEWER
 			X:45
-			Y:260
+			Y:310
 			Width:160
 			Height:25
-			Text:Video Player
-			Bold:True
-		Label@VERSION_STRING:
-			X:WINDOW_RIGHT - PARENT_LEFT - WIDTH - 15
-			Y:WINDOW_BOTTOM - PARENT_TOP - 25
-			Width:400
-			Height:35
-			Text:
-			Align:Right
-			Bold:True
+			Text:Replay Viewer
+			Font:Bold
+		Button@MAINMENU_BUTTON_QUIT:
+			Id:MAINMENU_BUTTON_QUIT
+			X:45
+			Y:350
+			Width:160
+			Height:25
+			Text:Quit
+			Font:Bold
 Background@PERF_BG:
 	ClickThrough:true
+	Id:PERF_BG
 	Background:dialog4
-	Delegate:PerfDebugDelegate
+	Logic:PerfDebugLogic
 	X:10
 	Y:WINDOW_BOTTOM - 250
 	Width: 210
 	Height: 250
 	Children:
 		PerfGraph@GRAPH:
+			Id:GRAPH
 			X:5
 			Y:5
 			Width:200
 			Height:200
 		Label@TEXT:
-			Bold: false
+			Id:TEXT
 			X:20
 			Y:205
 			Width:170
 			Height:40
-Background@MUSIC_MENU:
-	Delegate:MusicPlayerDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width: 450
-	Height: 250
-	Visible: false
-	Children:
-		Label@SETTINGS_LABEL_TITLE:
-			X:0
-			Y:20
-			Width:450
-			Height:25
-			Text:Music
-			Align:Center
-			Bold:True
-		Button@BUTTON_CLOSE:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Close
-			Bold:True
-		Container@BUTTONS:
-			X:PARENT_RIGHT - 150
-			Y:50
-			Children:
-				Button@BUTTON_PLAY:
-					X:35
-					Y:0
-					Width:25
-					Height:25
-					Children:
-						Image@IMAGE_PLAY:
-							X:0
-							Y:0
-							Width:25
-							Height:25
-							ImageCollection:music
-							ImageName:play
-				Button@BUTTON_PAUSE:
-					Visible:false
-					X:35
-					Y:0
-					Width:25
-					Height:25
-					Children:
-						Image@IMAGE_PAUSE:
-							X:0
-							Y:0
-							Width:25
-							Height:25
-							ImageCollection:music
-							ImageName:pause
-				Button@BUTTON_STOP:
-					X:70
-					Y:0
-					Width:25
-					Height:25
-					Children:
-						Image@IMAGE_STOP:
-							X:0
-							Y:0
-							Width:25
-							Height:25
-							ImageCollection:music
-							ImageName:stop
-				Button@BUTTON_NEXT:
-					X:105
-					Y:0
-					Width:25
-					Height:25
-					Children:
-						Image@IMAGE_NEXT:
-							X:0
-							Y:0
-							Width:25
-							Height:25
-							ImageCollection:music
-							ImageName:next
-				Button@BUTTON_PREV:
-					X:0
-					Y:0
-					Width:25
-					Height:25
-					Children:
-						Image@IMAGE_PREV:
-							X:0
-							Y:0
-							Width:25
-							Height:25
-							ImageCollection:music
-							ImageName:prev
-		Label@TIME:
-			X:PARENT_RIGHT - 150
-			Y:75
-			Width:140
-			Height:25
-			Align: Center
-		ScrollPanel@MUSIC_LIST:
-			X:10
-			Y:50
-			Width:280
-			Height:140
-			Children:
-				Label@MUSIC_TEMPLATE:
-					Width:PARENT_RIGHT-28
-					Height:25
-					X:2
-					Y:0
-					Visible:false
-					Children:
-						Label@TITLE:
-							X:5
-							Width:PARENT_RIGHT - 10
-							Height:PARENT_BOTTOM
-							Align: Left
-						Label@LENGTH:
-							X:5
-							Width:PARENT_RIGHT - 10
-							Height:PARENT_BOTTOM
-							Align: Right
-		Checkbox@SHUFFLE:
-			X:PARENT_RIGHT - 150
-			Y:110
-			Width:100
-			Height:20
-			Text:Shuffle
-		Checkbox@REPEAT:
-			X:PARENT_RIGHT - 150
-			Y:140
-			Width:100
-			Height:20
-			Text:Repeat
+#Background@MUSIC_MENU:
+#	Id:MUSIC_MENU
+#	Logic:MusicPlayerLogic
+#	X:(WINDOW_RIGHT - WIDTH)/2
+#	Y:(WINDOW_BOTTOM - HEIGHT)/2
+#	Width: 450
+#	Height: 250
+#	Visible: true
+#	Children:
+#		Label@SETTINGS_LABEL_TITLE:
+#			Id:SETTINGS_LABEL_TITLE
+#			X:0
+#			Y:20
+#			Width:450
+#			Height:25
+#			Text:Music
+#			Align:Center
+#			Font:Bold
+#		Button@BUTTON_INSTALL:
+#			Id:BUTTON_INSTALL
+#			X:20
+#			Y:PARENT_BOTTOM - 45
+#			Width:160
+#			Height:25
+#			Text:Install Music
+#			Font:Bold
+#		Button@BUTTON_CLOSE:
+#			Id:BUTTON_CLOSE
+#			X:PARENT_RIGHT - 180
+#			Y:PARENT_BOTTOM - 45
+#			Width:160
+#			Height:25
+#			Text:Close
+#			Font:Bold
+#		Container@BUTTONS:
+#			X:PARENT_RIGHT - 150
+#			Y:50
+#			Children:
+#				Button@BUTTON_PLAY:
+#					Id:BUTTON_PLAY
+#					X:35
+#					Y:0
+#					Width:25
+#					Height:25
+#					Children:
+#						Image@IMAGE_PLAY:
+#							Id:IMAGE_PLAY
+#							X:0
+#							Y:0
+#							Width:25
+#							Height:25
+#							ImageCollection:music
+#							ImageName:play
+#				Button@BUTTON_PAUSE:
+#					Id:BUTTON_PAUSE
+#					Visible:false
+#					X:35
+#					Y:0
+#					Width:25
+#					Height:25
+#					Children:
+#						Image@IMAGE_PAUSE:
+#							Id:IMAGE_PAUSE
+#							X:0
+#							Y:0
+#							Width:25
+#							Height:25
+#							ImageCollection:music
+#							ImageName:pause
+#				Button@BUTTON_STOP:
+#					Id:BUTTON_STOP
+#					X:70
+#					Y:0
+#					Width:25
+#					Height:25
+#					Children:
+#						Image@IMAGE_STOP:
+#							Id:IMAGE_STOP
+#							X:0
+#							Y:0
+#							Width:25
+#							Height:25
+#							ImageCollection:music
+#							ImageName:stop
+#				Button@BUTTON_NEXT:
+#					Id:BUTTON_NEXT
+#					X:105
+#					Y:0
+#					Width:25
+#					Height:25
+#					Children:
+#						Image@IMAGE_NEXT:
+#							Id:IMAGE_NEXT
+#							X:0
+#							Y:0
+#							Width:25
+#							Height:25
+#							ImageCollection:music
+#							ImageName:next
+#				Button@BUTTON_PREV:
+#					Id:BUTTON_PREV
+#					X:0
+#					Y:0
+#					Width:25
+#					Height:25
+#					Children:
+#						Image@IMAGE_PREV:
+#							Id:IMAGE_PREV
+#							X:0
+#							Y:0
+#							Width:25
+#							Height:25
+#							ImageCollection:music
+#							ImageName:prev
+#		Label@TIME:
+#			Id:TIME
+#			X:PARENT_RIGHT - 150
+#			Y:75
+#			Width:140
+#			Height:25
+#			Align: Center
+#		ScrollPanel@MUSIC_LIST:
+#			Id:MUSIC_LIST
+#			X:10
+#			Y:50
+#			Width:280
+#			Height:140
+#			Children:
+#				ScrollItem@MUSIC_TEMPLATE:
+#					Id:MUSIC_TEMPLATE
+#					Width:PARENT_RIGHT-27
+#					Height:25
+#					X:2
+#					Y:0
+#					Visible:false
+#					Children:
+#						Label@TITLE:
+#							Id:TITLE
+#							X:5
+#							Width:PARENT_RIGHT - 10
+#							Height:PARENT_BOTTOM
+#							Align: Left
+#						Label@LENGTH:
+#							Id:LENGTH
+#							X:5
+#							Width:PARENT_RIGHT - 10
+#							Height:PARENT_BOTTOM
+#							Align: Right
+#		Checkbox@SHUFFLE:
+#			Id:SHUFFLE
+#			X:PARENT_RIGHT - 150
+#			Y:110
+#			Width:100
+#			Height:20
+#			Text:Shuffle
+#		Checkbox@REPEAT:
+#			Id:REPEAT
+#			X:PARENT_RIGHT - 150
+#			Y:140
+#			Width:100
+#			Height:20
+#			Text:Loop
--- a/mods/d2k/chrome/serverbrowser.yaml
+++ b/mods/d2k/chrome/serverbrowser.yaml
@@ -1,325 +0,0 @@
-Background@CREATESERVER_BG:
-	Delegate:CreateServerMenuDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:400
-	Height:240
-	Visible:false
-	Children:
-		Label@LABEL_TITLE:
-			X:0
-			Y:20
-			Width:400
-			Height:25
-			Text:Create Server
-			Align:Center
-			Bold:True
-		Label@GAME_TITLE_LABEL:
-			X:50
-			Y:59
-			Width:95
-			Height:25
-			Align: Right
-			Text:Game Title:
-		TextField@GAME_TITLE:
-			X:150
-			Y:60
-			Width:210
-			MaxLength:50
-			Height:25
-			Text:OpenRA Game
-		Label@EXTERNAL_PORT_LABEL:
-			X:50
-			Y:94
-			Width:95
-			Height:25
-			Align: Right
-			Text:External Port:
-		TextField@EXTERNAL_PORT:
-			X:150
-			Y:95
-			Width:50
-			MaxLength:5
-			Height:25
-			Text:OpenRA Game
-		Label@LISTEN_PORT_LABEL:
-			X:210
-			Y:94
-			Width:95
-			Height:25
-			Align: Right
-			Text:Listen Port:
-		TextField@LISTEN_PORT:
-			X:310
-			Y:95
-			Width:50
-			MaxLength:5
-			Height:25
-		Checkbox@CHECKBOX_ONLINE:
-			X:165
-			Y:130
-			Width:300
-			Height:20
-			Text:Advertise game Online
-		Checkbox@CHECKBOX_CHEATS:
-			X:165
-			Y:160
-			Width:300
-			Height:20
-			Text:Allow Cheats
-		Button@BUTTON_START:
-			X:130
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Create
-			Bold:True
-		Button@BUTTON_CANCEL:
-			X:260
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Cancel
-			Bold:True
-Background@JOINSERVER_BG:
-	Delegate:ServerBrowserDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:700
-	Height:410
-	Visible:false
-	Children:
-		Label@JOINSERVER_LABEL_TITLE:
-			X:0
-			Y:20
-			Width:PARENT_RIGHT
-			Height:25
-			Text:Join Server
-			Align:Center
-			Bold:True
-		ScrollPanel@SERVER_LIST:
-			X:20
-			Y:50
-			Width:390
-			Height:300
-			Children:
-				Label@SERVER_TEMPLATE:
-					Width:PARENT_RIGHT-28
-					Height:25
-					X:2
-					Y:0
-					Visible:false
-		Label@JOINSERVER_PROGRESS_TITLE:
-			X:150
-			Y:PARENT_BOTTOM / 2 - HEIGHT
-			Width:150
-			Height:30
-			Background:dialog4
-			Text:Fetching games...
-			Align:Center
-		Container@SERVER_INFO:
-			X:0
-			Y:0
-			Width:PARENT_RIGHT
-			Height:PARENT_BOTTOM
-			Visible:false
-			Children:
-				Label@SERVER_IP_LABEL:
-					X:PARENT_RIGHT - 200 - WIDTH
-					Y:50
-					Align:Right
-					Width:70
-					Height:20
-					Text:Server:
-					Bold:True
-				Label@SERVER_IP:
-					X:PARENT_RIGHT - 195
-					Y:50
-					Align:Left
-					Width:70
-					Height:20
-				Label@SERVER_MODS_LABEL:
-					X:PARENT_RIGHT - 200 - WIDTH
-					Y:70
-					Align:Right
-					Width:70
-					Height:20
-					Text:Mods:
-					Bold:True
-				Label@SERVER_MODS:
-					X:PARENT_RIGHT - 195
-					Y:70
-					Align:Left
-					Width:70
-					Height:20
-				Label@MAP_TITLE_LABEL:
-					X:PARENT_RIGHT - 200 - WIDTH
-					Y:90
-					Align:Right
-					Width:70
-					Height:20
-					Text:Map:
-					Bold:True
-				Label@MAP_TITLE:
-					X:PARENT_RIGHT - 195
-					Y:90
-					Align:Left
-					Width:70
-					Height:20
-				Label@MAP_PLAYERS_LABEL:
-					X:PARENT_RIGHT - 200 - WIDTH
-					Y:110
-					Align:Right
-					Width:70
-					Height:20
-					Text:Players:
-					Bold:True
-				Label@MAP_PLAYERS:
-					X:PARENT_RIGHT - 195
-					Y:110
-					Align:Left
-					Width:70
-					Height:20
-				MapPreview@MAP_PREVIEW:
-					X:PARENT_RIGHT-241
-					Y:140
-					Width:192
-					Height:192
-		Button@DIRECTCONNECT_BUTTON:
-			X:20
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Direct Connect
-			Bold:True
-		Button@REFRESH_BUTTON:
-			X:160
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Refresh
-			Bold:True
-		Button@JOIN_BUTTON:
-			X:PARENT_RIGHT - 140 - 130
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Join
-			Bold:True
-		Button@CANCEL_BUTTON:
-			X:PARENT_RIGHT - 140
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Cancel
-			Bold:True
-Background@DIRECTCONNECT_BG:
-	Delegate:ServerBrowserDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:400
-	Height:155
-	Visible:false
-	Children:
-		Label@DIRECTCONNECT_LABEL_TITLE:
-			X:0
-			Y:20
-			Width:400
-			Height:25
-			Text:Direct Connect
-			Align:Center
-			Bold:True
-		Label@ADDRESS_LABEL:
-			X:50
-			Y:59
-			Width:95
-			Height:25
-			Align:Right
-			Text:Server Address:
-		TextField@SERVER_ADDRESS:
-			X:150
-			Y:60
-			Width:200
-			MaxLength:50
-			Height:25
-		Button@JOIN_BUTTON:
-			X:130
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Join
-			Bold:True
-		Button@CANCEL_BUTTON:
-			X:260
-			Y:PARENT_BOTTOM - 45
-			Width:120
-			Height:25
-			Text:Cancel
-			Bold:True
-Background@CONNECTION_FAILED_BG:
-	Delegate:ConnectionDialogsDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:450
-	Height:150
-	Visible:false
-	Children:
-		Label@CONNECTION_FAILED_TITLE:
-			X:0
-			Y:20
-			Width:450
-			Height:25
-			Text:Connection Failed
-			Align:Center
-			Bold:True
-		Label@CONNECTION_FAILED_DESC:
-			X:0
-			Y:60
-			Width:PARENT_RIGHT
-			Height:25
-			Text:Could not connect to AAA.BBB.CCC.DDD:EEEE
-			Align:Center
-		Button@CONNECTION_BUTTON_RETRY:
-			X:PARENT_RIGHT - 360
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Retry
-			Bold:True
-		Button@CONNECTION_BUTTON_CANCEL:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Cancel
-			Bold:True
-Background@CONNECTING_BG:
-	Delegate:ConnectionDialogsDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:450
-	Height:150
-	Visible:false
-	Children:
-		Label@CONNECTING_TITLE:
-			X:0
-			Y:20
-			Width:450
-			Height:25
-			Text:Connecting
-			Align:Center
-			Bold:True
-		Label@CONNECTING_DESC:
-			X:0
-			Y:60
-			Width:PARENT_RIGHT
-			Height:25
-			Text:Connecting to AAA.BBB.CCC.DDD:EEEE...
-			Align:Center
-		Button@CONNECTION_BUTTON_ABORT:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Abort
-			Bold:True
--- a/mods/d2k/chrome/settings.yaml
+++ b/mods/d2k/chrome/settings.yaml
@@ -1,178 +0,0 @@
-Background@SETTINGS_MENU:
-	Delegate:SettingsMenuDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM- HEIGHT)/2
-	Width: 450
-	Height: 350
-	Visible: false
-	Children:
-		Label@SETTINGS_LABEL_TITLE:
-			X:0
-			Y:20
-			Width:450
-			Height:25
-			Text:Settings
-			Align:Center
-			Bold:True
-		Button@BUTTON_CLOSE:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Close
-			Bold:True
-		Container@TAB_CONTAINER:
-			X:0
-			Y:50
-			Width:PARENT_RIGHT
-			Height:25
-			Children:
-				Button@GENERAL:
-					X:45
-					Y:0
-					Width:90
-					Height:25
-					Text:General
-					Bold:True
-				Button@AUDIO:
-					X:135
-					Y:0
-					Width:90
-					Height:25
-					Text:Audio
-					Bold:True
-				Button@DISPLAY:
-					X:225
-					Y:0
-					Width:90
-					Height:25
-					Text:Display
-					Bold:True
-				Button@DEBUG:
-					X:315
-					Y:0
-					Width:90
-					Height:25
-					Text:Debug
-					Bold:True
-		Container@GENERAL_PANE:
-			X:37
-			Y:100
-			Width:PARENT_RIGHT - 37
-			Height:PARENT_BOTTOM - 100
-			Visible: true
-			Children:
-				Label@SETTINGS_PLAYER_NAME:
-					X:0
-					Y:10
-					Text: Player Name:
-				TextField@NAME:
-					Text:Name
-					Width:139
-					Height:25
-					X:90
-					Y:0
-					MaxLength:16
-				Checkbox@EDGE_SCROLL:
-					X:0
-					Y:30
-					Width:200
-					Height:20
-					Text: Enable Edge Scrolling
-				Checkbox@INVERSE_SCROLL:
-					X:0
-					Y:60
-					Width:200
-					Height:20
-					Text: Invert Mouse Drag Scrolling
-		Container@AUDIO_PANE:
-			X:37
-			Y:100
-			Width:PARENT_RIGHT - 37
-			Height:PARENT_BOTTOM - 100
-			Visible: false
-			Children:
-				Label@SOUND_VOLUME_LABEL:
-					X:0
-					Y:10
-					Text: Sound Volume		
-				Slider@SOUND_VOLUME:
-					X:100
-					Y:0
-					Width:250
-					Height:20
-					Ticks:5
-				Label@MUSIC_VOLUME_LABEL:
-					X:0
-					Y:40
-					Text: Music Volume
-				Slider@MUSIC_VOLUME:
-					X:100
-					Y:30
-					Width:250
-					Height:20
-					Ticks:5
-		Container@DISPLAY_PANE:
-			X:37
-			Y:100
-			Width:PARENT_RIGHT - 37
-			Height:PARENT_BOTTOM - 100
-			Visible: false
-			Children:
-				Checkbox@FULLSCREEN_CHECKBOX:
-					X:0
-					Y:0
-					Width:300
-					Height:20
-					Text:Fullscreen
-				Label@RESOLUTION_LABEL:
-					X:0
-					Y:50
-					Text: Window Resolution:
-				TextField@SCREEN_WIDTH:
-					Text:Width
-					Width:50
-					Height:25
-					X:130
-					Y:40
-					MaxLength:5
-				Label@X:
-					Text:x
-					X:185
-					Y:50
-				TextField@SCREEN_HEIGHT:
-					Text:Height
-					Width:50
-					Height:25
-					X:195
-					Y:40
-					MaxLength:5
-				Label@RESTART:
-					Text: Restart Game To Apply Changes
-					X:0
-					Y:PARENT_BOTTOM - 30
-		Container@DEBUG_PANE:
-			X:37
-			Y:100
-			Width:PARENT_RIGHT - 37
-			Height:PARENT_BOTTOM - 100
-			Visible: false
-			Children:
-				Checkbox@PERFDEBUG_CHECKBOX:
-					X:0
-					Y:0
-					Width:300
-					Height:20
-					Text:Show Performance Information
-				Checkbox@SYNCREPORTS_CHECKBOX:
-					X:0
-					Y:30
-					Width:300
-					Height:20
-					Text:Collect Sync Reports
-				Checkbox@GAMETIME_CHECKBOX:
-					X:0
-					Y:60
-					Width:300
-					Height:20
-					Text:Show Game Time Counter 
--- a/mods/d2k/chrome/videoplayer.yaml
+++ b/mods/d2k/chrome/videoplayer.yaml
@@ -1,67 +0,0 @@
-Background@VIDEOPLAYER_MENU:
-	Delegate:VideoPlayerDelegate
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM- HEIGHT)/2
-	Width: 700
-	Height: 680
-	Visible: false
-	Children:
-		Label@VIDEOPLAYER_TITLE:
-			X:0
-			Y:20
-			Align:Center
-			Width:PARENT_RIGHT
-			Height:20
-			Text:Video Player
-			Bold:True
-		VqaPlayer:
-			X:30
-			Y:50
-			Width:640
-			Height:400
-		ScrollPanel@VIDEO_LIST:
-			X:20
-			Y:460
-			Width:480
-			Height:200
-			Children:
-				Label@VIDEO_TEMPLATE:
-					Width:PARENT_RIGHT-28
-					Height:25
-					X:2
-					Y:0
-					Visible:false
-		Button@BUTTON_PLAYPAUSE:
-			X:600 - WIDTH - 10
-			Y:460
-			Width:25
-			Height:25
-			Children:
-				Image@PLAY:
-					Width:25
-					Height:25
-					ImageCollection:music
-					ImageName:play
-				Image@PAUSE:
-					Width:25
-					Height:25
-					ImageCollection:music
-					ImageName:pause
-		Button@BUTTON_STOP:
-			X:610
-			Y:460
-			Width:25
-			Height:25
-			Children:
-				Image:
-					Width:25
-					Height:25
-					ImageCollection:music
-					ImageName:stop
-		Button@BUTTON_CLOSE:
-			X:PARENT_RIGHT - 180
-			Y:PARENT_BOTTOM - 45
-			Width:160
-			Height:25
-			Text:Close
-			Bold:True
--- a/mods/d2k/cursors.xml
+++ b/mods/d2k/cursors.xml
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<sequences>
-  <cursor src="mouse" palette="cursor">
-  	<sequence name="scroll-t" start="1" x="12" y="12" />
-  	<sequence name="scroll-tr" start="2" x="12" y="12" />
-  	<sequence name="scroll-r" start="3" x="12" y="12" />
-  	<sequence name="scroll-br" start="4" x="12" y="12" />
-  	<sequence name="scroll-b" start="5" x="12" y="12" />
-  	<sequence name="scroll-bl" start="6" x="12" y="12" />
-  	<sequence name="scroll-l" start="7" x="12" y="12" />
-  	<sequence name="scroll-tl" start="8" x="12" y="12" />
-    <sequence name="scroll-t-blocked" start="124" x="12" y="12" />
-    <sequence name="scroll-tr-blocked" start="125" x="12" y="12" />
-    <sequence name="scroll-r-blocked" start="126" x="12" y="12" />
-    <sequence name="scroll-br-blocked" start="127" x="12" y="12" />
-    <sequence name="scroll-b-blocked" start="128" x="12" y="12" />
-    <sequence name="scroll-bl-blocked" start="129" x="12" y="12" />
-    <sequence name="scroll-l-blocked" start="130" x="12" y="12" />
-    <sequence name="scroll-tl-blocked" start="131" x="12" y="12" />
-    <sequence name="select" start="15" length="6" x="12" y="12" />
-
-  	<sequence name="default" start="0" />
-    <sequence name="default-minimap" start="80" />
-    <sequence name="generic-blocked" start="9" />
-    <sequence name="generic-blocked-minimap" start="33" />
-    <sequence name="move" start="10" length="4" x="12" y="12" />
-    <sequence name="move-minimap" start="29" length="4" x="12" y="12" />
-    <sequence name="move-blocked" start="14" x="12" y="12" />
-    <sequence name="move-blocked-minimap" start="33" x="12" y="12" />
-    <sequence name="attack" start="195" length="8" x="12" y="12" />
-    <sequence name="attack-minimap" start="203" length="8" x="12" y="12" />
-    <sequence name="attackmove" start="21" length="8" x="12" y="12" />
-    <sequence name="attackmove-minimap" start="134" length="8" x="12" y="12" />
-    <sequence name="enter" start="113" length="3" x="12" y="12" />
-    <sequence name="enter-minimap" start="139" length="3" x="12" y="12" />
-    <sequence name="enter-blocked" start="212" length="1" x="12" y="12" />
-    <sequence name="enter-blocked-minimap" start="33" />
-    <sequence name="c4" start="116" length="3" x="12" y="12" />
-    <sequence name="c4-minimap" start="121" length="3" x="12" y="12" />
-    <sequence name="guard" start="147" length="1" x="12" y="12" />
-    <sequence name="guard-minimap" start="146" length="1" x="12" y="12" />
-    <sequence name="capture" start="164" length="3" x="12" y="12" />
-    <sequence name="capture-minimap" start="167" length="3" x="12" y="12" />
-    <sequence name="heal" start="160" length="4" x="12" y="12" />
-    <sequence name="heal-minimap" start="194" length="1" x="12" y="12" />
-    <sequence name="ability" start="82" length="8" x="12" y="12" />
-    <sequence name="ability-minimap" start="214" length="8" x="12" y="12" />
-
-	<!-- Want minimap cursors -->
-    <sequence name="deploy" start="59" length="9" x="12" y="12" />
-    <sequence name="deploy-blocked" start="211" length="1" x="12" y="12" />
-    <sequence name="goldwrench" start="170" length="24" x="12" y="12" />
-    <sequence name="goldwrench-blocked" start="213" length="1" x="12" y="12" />
-    <sequence name="nuke" start="90" length="7" x="12" y="12" />
-    <sequence name="chrono-select" start="97" length="8" x="12" y="12" />
-    <sequence name="chrono-target" start="105" length="8" x="12" y="12" />
-
-    <sequence name="sell" start="68" length="12" x="12" y="12" />
-    <sequence name="sell-blocked" start="119" length="1" x="12" y="12" />
-    <sequence name="repair" start="35" length="24" x="12" y="12" />
-    <sequence name="repair-blocked" start="120" length="1" x="12" y="12" />
-    <sequence name="sell2" start="148" length="12" />
-  </cursor>
-  <cursor src="nopower" palette="cursor">
-    <sequence name="powerdown-blocked" start="0" length="1" x="12" y="12" />
-    <sequence name="powerdown" start="1" length="3" x="12" y="12" />
-  </cursor>
-</sequences>
--- a/mods/d2k/maps/blank.oramap
+++ b/mods/d2k/maps/blank.oramap
--- a/mods/d2k/maps/test.oramap
+++ b/mods/d2k/maps/test.oramap
--- a/mods/d2k/maps/test/map.bin
+++ b/mods/d2k/maps/test/map.bin
--- a/mods/d2k/maps/test/map.yaml
+++ b/mods/d2k/maps/test/map.yaml
@@ -1,44 +0,0 @@
-Selectable: True
-
-MapFormat: 3
-
-Title: Name your map here
-
-Description: Describe your map here
-
-Author: Your name here
-
-PlayerCount: 1
-
-Tileset: ARRAKIS
-
-MapSize: 128,128
-
-TopLeft: 16,16
-
-BottomRight: 112,112
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette:
-		Race: allies
-		OwnsWorld: True
-		NonCombatant: True
-		Playable: False
-		DefaultStartingUnits: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-
-Actors:
-
-Waypoints:
-	wp0: 20,20
-
-Smudges:
-
-Rules:
-
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -1,41 +1,123 @@
 Metadata:
 	Title: Dune 2000
-	Description: Work in progress d2k port
-	Version: a0001
-	Author: The OpenRA Developers
+	Description: Converting the OpenRA Red Alert Mod one by one to Dune 2000
+	Version: {DEV_VERSION}
+	Author: The OpenD2k Developers

 Folders:
 	.
-	mods/d2k
-	mods/d2k/bits
-	mods/ra/uibits
+	./mods/d2k
+	./mods/d2k/bits
+	./mods/d2k/uibits
+	~^/Content/d2k
+	./mods/ra
+	./mods/ra/bits
+	./mods/ra/uibits
+	~^/Content/ra
+
 Packages:
+	~main.mix
+	redalert.mix
+	conquer.mix
+	hires.mix
+	local.mix
+	sounds.mix
+	speech.mix
+	allies.mix
+	russian.mix
+	temperat.mix
+	snow.mix
+	interior.mix
+	~scores.mix
+	~movies1.mix
+	~movies2.mix
 	mods/d2k/bits/arrakis.mix
+
 Rules:
-	mods/d2k/rules/defaults.yaml
-	mods/d2k/rules/vehicles.yaml
 	mods/d2k/rules/system.yaml
+	mods/d2k/rules/vehicles.yaml
+	mods/d2k/rules/structures.yaml
+	mods/d2k/rules/aircraft.yaml
+	mods/ra/rules/defaults.yaml
+	mods/ra/rules/system.yaml
+	mods/ra/rules/vehicles.yaml
+	mods/ra/rules/structures.yaml
+	mods/ra/rules/infantry.yaml
+	mods/ra/rules/civilian.yaml
+	mods/ra/rules/trees.yaml
+	mods/ra/rules/aircraft.yaml
+	mods/ra/rules/ships.yaml
+
 Sequences:
 	mods/d2k/sequences.yaml
+	mods/ra/sequences.yaml
+
 Cursors:
-	mods/d2k/cursors.xml
+	mods/ra/cursors.yaml
+
 Chrome:
-	mods/ra/chrome.xml
+	mods/d2k/chrome.yaml
+	mods/ra/chrome.yaml
+
 Assemblies:
+	mods/d2k/OpenRA.Mods.D2k.dll
 	mods/ra/OpenRA.Mods.RA.dll
+
 ChromeLayout:
-	mods/d2k/chrome/ingame.yaml
-	mods/d2k/chrome/mainmenu.yaml
-	mods/d2k/chrome/videoplayer.yaml
-	mods/d2k/chrome/settings.yaml
-	mods/d2k/chrome/gamelobby.yaml
-	mods/d2k/chrome/serverbrowser.yaml
+	mods/ra/chrome/gameinit.yaml
+	mods/ra/chrome/ingame.yaml
+	mods/ra/chrome/mainmenu.yaml
+	mods/ra/chrome/settings.yaml
+	mods/ra/chrome/lobby.yaml
+	mods/ra/chrome/map-chooser.yaml
+	mods/ra/chrome/create-server.yaml
+	mods/ra/chrome/serverbrowser.yaml
+	mods/ra/chrome/replaybrowser.yaml
+	mods/ra/chrome/dropdowns.yaml
+	mods/ra/chrome/modchooser.yaml
+
 Weapons:
+	mods/ra/weapons.yaml
+
 Voices:
+	mods/d2k/voices.yaml
+	mods/ra/voices.yaml
+
 TileSets:
 	mods/d2k/tilesets/arrakis.yaml
+	mods/ra/tilesets/snow.yaml
+	mods/ra/tilesets/interior.yaml
+	mods/ra/tilesets/temperat.yaml
+
 Music:
+
 Movies:
-LoadScreen: NullLoadScreen
-ShellmapUid:1e36d6874ef7960ac0e21edf36bbe1490a4650eb
-TileSize:32
+
+LoadScreen: D2kLoadScreen
+
+ServerTraits:
+	LobbyCommands
+	MasterServerPinger
+
+ChromeMetrics:
+	mods/ra/metrics.yaml
+
+Fonts:
+	Regular:
+		Font:FreeSans.ttf
+		Size:14
+	Bold:
+		Font:FreeSansBold.ttf
+		Size:14
+	Title:
+		Font:titles.ttf
+		Size:48
+	BigBold:
+		Font:FreeSansBold.ttf
+		Size:24
+	Tiny:
+		Font:FreeSans.ttf
+		Size:10
+	TinyBold:
+		Font:FreeSansBold.ttf
+		Size:10
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -0,0 +1,35 @@
+CARRYALL:
+	Inherits: ^Helicopter
+	Buildable:
+		Queue: Plane
+		BuildPaletteOrder: 110
+		Prerequisites: anyhightech
+		BuiltAt: hightecha
+		Owner: atreides
+	Valued:
+		Cost: 1200
+	Tooltip:
+		Name: Carryall
+		Description: Fast drop ship.\n  Unarmed
+	Health:
+		HP: 90
+	Armor: 
+		Type: Light
+	RevealsShroud:
+		Range: 12
+	Helicopter:
+		RearmBuildings: hightecha
+		InitialFacing: 0
+		ROT: 5
+		Speed: 12
+		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
+	RenderUnit:
+		PlayerPalette: d2kplayer
+#	RenderCargo:
+	WithShadow:
+	Cargo:
+		Types: Vehicle
+		MaxWeight: 1
+		PipCount: 1
+	FallsToEarth:
+		Explosion: UnitExplode
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -1,16 +0,0 @@
-^Vehicle:
-	AppearsOnRadar:
-	Mobile:
-		TerrainSpeeds:
-			Clear: 100%
-		ROT: 5
-	Selectable: 
-	Targetable:
-		TargetTypes: Ground
-	Repairable: 
-	Passenger: 
-		CargoType: Vehicle
-	HiddenUnderFog:
-	GainsExperience:
-	GivesExperience:
-	DrawLineToTarget:
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -0,0 +1,232 @@
+CONYARDA:
+	Inherits: ^Building
+	Building:
+		Power: 0
+		Footprint: xxx xxx xxx
+		Dimensions: 3,3
+	Health:
+		HP: 1000
+	Armor:
+		Type: Heavy
+	RevealsShroud:
+		Range: 5
+	Bib:
+	Production:
+		Produces: Building,Defense
+	IronCurtainable: 
+	Valued:
+		Cost: 2500
+	Tooltip:
+		Name: Atreides Construction Yard
+	CustomSellValue:
+		Value: 2500
+	BaseBuilding:
+	Transforms:
+		IntoActor: mcv
+		Offset:1,1
+		Facing: 96
+	ProductionBar:
+	RenderBuilding:
+		PlayerPalette: d2kplayer
+
+PWRA:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 0
+		Owner: atreides
+#		Hotkey: p
+	Valued:
+		Cost: 300
+	Tooltip:
+		Name: Atreides Windtrap
+		Description: Provides power for other Atreides structures
+	ProvidesCustomPrerequisite:
+		Prerequisite: anypower
+	Building:
+		Power: 100
+		Footprint: xx xx
+		Dimensions: 2,2
+	Health:
+		HP: 400
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 4
+	Bib:
+	RenderBuilding:
+		PlayerPalette: d2kplayer
+
+BARRA:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 30
+		Prerequisites: anypower
+		Owner: atreides
+#		Hotkey: b
+	Valued:
+		Cost: 400
+	Tooltip:
+		Name: Atreides Barracks
+		Description: Trains infantry
+	Building:
+		Power: -20
+		Footprint: xx xx xx
+		Dimensions: 2,3
+	Health:
+		HP: 800
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 5
+	Bib:
+	RenderBuilding:
+		PlayerPalette: d2kplayer
+	RallyPoint:
+	Exit@1:
+		SpawnOffset: -1,19
+		ExitCell: 0,2
+	Exit@2:
+		SpawnOffset: -17,15
+		ExitCell: 0,2
+	Production:
+		Produces: Infantry
+	PrimaryBuilding:
+	ProductionBar:
+
+HIGHTECHA:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 50
+		Prerequisites: refa
+		Owner: atreides
+	Valued:
+		Cost: 2000
+	Tooltip:
+		Name: High Tech Factory
+		Description: Produces carryalls
+	ProvidesCustomPrerequisite:
+		Prerequisite: anyhightech
+	Building:
+		Power: -30
+		Footprint: _x_ xxx xxx
+		Dimensions: 3,3
+	Health:
+		HP: 1500
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 4
+	Bib:
+	RenderBuilding:
+		PlayerPalette: d2kplayer
+	RallyPoint:
+	Exit@1:
+		SpawnOffset: 5,0
+		ExitCell: 1,1
+	Production:
+		Produces: Plane
+	PrimaryBuilding:
+	ProductionBar:
+
+REFA:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 10
+		Prerequisites: anypower
+		Owner: atreides
+	Valued:
+		Cost: 1400
+	Tooltip:
+		Name: Spice Refinery
+		Description: Harvesters unload spice here.
+	Building:
+		Power: -30
+		Footprint: _x_ xxx x==
+		Dimensions: 3,3
+	Health:
+		HP: 900
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 6
+	Bib:
+	RenderBuilding:
+		PlayerPalette: d2kplayer
+	OreRefinery:
+	StoresOre:
+		PipCount: 17
+		Capacity: 2000
+	CustomSellValue:
+		Value: 600
+	FreeActor:
+		Actor: HARV
+		InitialActivity: FindResources
+		SpawnOffset: 1,2
+		Facing: 64
+
+SILOA:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 40
+		Prerequisites: refa
+		Owner: atreides
+	Valued:
+		Cost: 150
+	Tooltip:
+		Name: Silo
+		Description: Stores excess harvested Spice
+	Building:
+		Power: -10
+	-GivesBuildableArea:
+	Health:
+		HP: 300
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 4
+#	RenderBuildingSilo:
+	StoresOre:
+		PipCount: 5
+		Capacity: 1500
+	RenderBuilding:
+		PlayerPalette: d2kplayer
+	-EmitInfantryOnSell:
+
+LIGHTA:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 50
+		Prerequisites: refa
+		Owner: atreides
+	Valued:
+		Cost: 2000
+	Tooltip:
+		Name: Light Factory
+		Description: light vehicles.
+	Building:
+		Power: -30
+		Footprint: xxx xxx
+		Dimensions: 3,2
+	Health:
+		HP: 1500
+	Armor:
+		Type: Light
+	RevealsShroud:
+		Range: 4
+	Bib:
+	RenderBuilding:
+		PlayerPalette: d2kplayer
+	RallyPoint:
+	Exit@1:
+		SpawnOffset: 5,0
+		ExitCell: 1,1
+	Production:
+		Produces: Vehicle
+	PrimaryBuilding:
+	ProductionBar:
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -1,79 +1,30 @@
 Player:
-	TechTree:
-	PlayerResources:
-		InitialCash: 5000
-	ActorGroupProxy:
-	DeveloperMode:
-
-World:
-	ScreenShaker:
-	ColorPickerPaletteModifier:
-	BuildingInfluence:
-	UnitInfluence:
-	ChooseBuildTabOnSelect:
-	PaletteFromCurrentTileset:
-		Name: terrain
-	PlayerColorPalette:
-		BasePalette: units
+	PlayerColorPalette@d2kplayer:
+		BasePalette: d2k
+		BaseName: d2kplayer
 		PaletteFormat: d2k
-	PaletteFromFile@units:
-		Name: units
-		Filename: units.pal
+World:	
+	Country@2:
+		Name: Atreides
+		Race: atreides
+#	Country@3:
+#		Name: Harkonnen
+#		Race: harkonnen
+#	Country@4:
+#		Name: Ordos
+#		Race: ordos
+	PaletteFromFile@d2k:
+		Name: d2k
+		Filename: d2k.pal
 	PaletteFromFile@chrome:
 		Name: chrome
-		Filename: temperat.pal
-	PaletteFromFile@effect:
-		Name: effect
-		Filename: temperat.pal
-	PaletteFromFile@cursor:
-		Name: cursor
-		Filename: temperat.pal
-	PaletteFromRGBA@shadow:
-		Name: shadow
-		R: 0
-		G: 0
-		B: 0
-		A: 140
-	PaletteFromRGBA@highlight:
-		Name: highlight
-		R: 255
-		G: 255
-		B: 255
-		A: 128
-	PaletteFromRGBA@disabled:
-		Name: disabled
-		R: 0
-		G: 0
-		B: 0
-		A: 180
-	ShroudPalette@shroud:
-	ShroudPalette@fog:
-		IsFog: yes
-		Name: fog
-	Country@0:
-		Name: Allies
-		Race: allies
-	SpawnMapActors:
-	CreateMPPlayers:
-	MPStartLocations:
-	SpawnMPUnits:
-	EvaAlerts:
-		RadarUp:
-		RadarDown:
-		BuildingSelectAudio:
-		BuildingReadyAudio:
-		BuildingCannotPlaceAudio:
-		UnitSelectAudio:
-		UnitReadyAudio:
-		OnHoldAudio:
-		CancelledAudio:
-		CashTickUp:
-		CashTickDown:
-		LowPower:
-		SilosNeeded:
-		PrimaryBuildingSelected:
-		AbilityInsufficientPower:
-		LevelUp:
-	SpatialBins:
-		BinSize: 4
-	Shroud:
+		Filename: d2k.pal
+#	ResourceType@spice:
+#		ResourceType: 1
+#		Palette: d2k
+#		SpriteNames: spice #?
+#		ValuePerUnit: 25
+#		Name: Spice
+#		PipColor: Yellow
+#		AllowedTerrainTypes: Sand
+#		AllowUnderActors: false
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -1,21 +1,69 @@
 MCV:
+	Transforms:
+		IntoActor: conyarda
+	RenderUnit:
+		Image: MCV
+		PlayerPalette: d2kplayer
+
+TRIKE:
 	Inherits: ^Vehicle
 	Valued:
-		Cost: 2000
+		Cost: 200
 	Tooltip:
-		Name: Mobile Construction Vehicle
-		Description: Deploys into another Construction Yard.\n  Unarmed
+		Name: Scout Trike
+		Icon: trikeicon
+		Description: Weak Scout.\n Decent vs. Infantry
+	Buildable:
+		BuildPaletteOrder: 15
+		Prerequisites: lighta
+		Owner: atreides
 	Selectable:
-		Priority: 3
-		Bounds: 42,42
+		Bounds: 24,24
+	Mobile:
+		ROT: 15
+		Speed: 20
 	Health:
-		HP: 600
+		HP: 75
 	Armor:
 		Type: Light
-	Mobile:
-		Speed: 6
 	RevealsShroud:
-		Range: 4
+		Range: 8
+	AttackFrontal:
+		PrimaryWeapon: M60mg
+		PrimaryOffset: 0,0,0,-4
 	RenderUnit:
-	MustBeDestroyed:
-	BaseBuilding:
+		PlayerPalette: d2kplayer
+	WithMuzzleFlash:
+		PrimaryOffset: 0,3,0,0
+	AutoTarget:
+
+QUAD:
+	Inherits: ^Vehicle
+	Valued:
+		Cost: 400
+	Tooltip:
+		Name: Quad
+		Description: Fast scout vehicle, armed with \nrockets.\n  Strong vs Vehicles, Aircraft\n  Weak vs Infantry
+	Buildable:
+		BuildPaletteOrder: 30
+		Prerequisites: lighta
+		Owner: atreides
+	Mobile:
+		ROT: 10
+		Speed: 13
+	Health:
+		HP: 120
+	Armor: 
+		Type: Light
+	RevealsShroud:
+		Range: 7
+	AttackFrontal:
+		PrimaryWeapon: RedEye
+		SecondaryWeapon: Dragon
+		PrimaryOffset: 0,0,0,-2
+		PrimaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25
+		SecondaryOffset: 0,0,0,-2
+		SecondaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25
+	RenderUnit:
+		PlayerPalette: d2kplayer
+	AutoTarget:
--- a/mods/d2k/sequences.yaml
+++ b/mods/d2k/sequences.yaml
@@ -3,42 +3,86 @@ mcv:
 		Start: 0
 		Facings: 32

-moveflsh:
+conyarda:
 	idle:
 		Start: 0
-		Length: *
-
-pips:
-	groups:
-		Start: 8
-		Length: 10
-	medic:
-		Start: 20
-	ready:
-		Start: 3
-	hold:
-		Start: 4
-	pip-empty:
+	make: conmake
 		Start: 0
-	pip-green:
+		Length: *
+	damaged-idle:
 		Start: 1
-	pip-yellow:
-		Start: 5
-	pip-gray:
-		Start: 6
-	pip-red:
-		Start: 7
-	tag-fake:
-		Start: 18
-	tag-primary:
+
+pwra:
+	idle:
+		Start: 0
+	make: wtrpmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+barra:
+	idle:
+		Start: 0
+	make: barramake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+refa:
+	idle:
+		Start: 1
+	make: refmake
+		Start: 0
+		Length: *
+	damaged-idle:
 		Start: 2

-clock:
+siloa:
 	idle:
 		Start: 0
+#		Length: 3
+		Length: 1
+	damaged-idle:
+		Start: 4
+		Length: 1
+	make: silomake
+		Start: 0
 		Length: *

-rank:
-	rank:
+hightecha:
+	idle:
 		Start: 0
-		Length: *
+	make: highmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 1
+
+lighta:
+	idle:
+		Start: 1
+	make: lightmake
+		Start: 0
+		Length: *
+	damaged-idle:
+		Start: 2
+
+carryall:
+	idle:
+		Start: 0
+		Facings: 32
+	unload:
+		Start: 0
+		Facings: 32
+
+trike:
+	idle:
+		Start: 0
+		Facings: 32
+
+quad:
+	idle:
+		Start: 0
+		Facings: 32
--- a/mods/d2k/uibits/chrome-atreides.png
+++ b/mods/d2k/uibits/chrome-atreides.png
--- a/mods/d2k/uibits/chrome-harkonnen.png
+++ b/mods/d2k/uibits/chrome-harkonnen.png
--- a/mods/d2k/uibits/chrome-ordos.png
+++ b/mods/d2k/uibits/chrome-ordos.png
--- a/mods/d2k/uibits/dialog.png
+++ b/mods/d2k/uibits/dialog.png
--- a/mods/d2k/uibits/loadscreen.png
+++ b/mods/d2k/uibits/loadscreen.png
--- a/mods/d2k/voices.yaml
+++ b/mods/d2k/voices.yaml
@@ -0,0 +1,13 @@
+# Classic Red Alert Mod -- Package Manifest
+
+GenericVoice:
+	Variants:
+		atreides: .v01,.v03
+		harkonnen: .v01,.v03
+		ordos: .v01,.v03
+
+VehicleVoice:
+	Variants:
+		atreides: .v00,.v02
+		harkonnen: .v00,.v02
+		ordos: .v00,.v02
--- a/mods/default/bogus.tem
+++ b/mods/default/bogus.tem
--- a/mods/default/chrome.xml
+++ b/mods/default/chrome.xml
@@ -1,35 +0,0 @@
-<chrome>
-	<collection name="dialog2" src="dialog.png">
-		<image name="background" x="513" y="1" width="126" height="126" />
-		<image name="border-r" x="639" y="1" width="1" height="126" />
-		<image name="border-l" x="512" y="1" width="1" height="126" />
-		<image name="border-b" x="513" y="127" width="126" height="1" />
-		<image name="border-t" x="513" y="0" width="126" height="1" />
-		<image name="corner-tl" x="512" y="0" width="1" height="1" />
-		<image name="corner-tr" x="594" y="0" width="1" height="1" />
-		<image name="corner-bl" x="512" y="82" width="1" height="1" />
-		<image name="corner-br" x="594" y="82" width="1" height="1" />
-	</collection>
-	<collection name="dialog3" src="dialog.png">
-		<image name="background" x="641" y="1" width="126" height="126" />
-		<image name="border-r" x="767" y="1" width="1" height="126" />
-		<image name="border-l" x="640" y="1" width="1" height="126" />
-		<image name="border-b" x="641" y="127" width="126" height="1" />
-		<image name="border-t" x="641" y="0" width="126" height="1" />
-		<image name="corner-tl" x="640" y="0" width="1" height="1" />
-		<image name="corner-tr" x="722" y="0" width="1" height="1" />
-		<image name="corner-bl" x="640" y="82" width="1" height="1" />
-		<image name="corner-br" x="722" y="82" width="1" height="1" />
-	</collection>
-	<collection name="dialog" src="dialog.png">
-		<image name="background" x="0" y="0" width="480" height="480" />
-		<image name="border-r" x="489" y="0" width="9" height="192" />
-		<image name="border-l" x="480" y="0" width="9" height="192" />
-		<image name="border-b" x="0" y="489" width="191" height="9" />
-		<image name="border-t" x="0" y="480" width="191" height="9" />
-		<image name="corner-tl" x="191" y="480" width="9" height="9" />
-		<image name="corner-tr" x="200" y="480" width="9" height="9" />
-		<image name="corner-bl" x="191" y="489" width="9" height="9" />
-		<image name="corner-br" x="200" y="489" width="9" height="9" />
-	</collection>
-</chrome>
--- a/mods/default/cursors.xml
+++ b/mods/default/cursors.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<sequences>
-  <cursor src="mouse" palette="cursor">
-    <sequence name="default" start="0" />
-  </cursor>
-</sequences>
--- a/mods/default/dialog.png
+++ b/mods/default/dialog.png
--- a/mods/default/maps/shellmap/map.bin
+++ b/mods/default/maps/shellmap/map.bin
--- a/mods/default/maps/shellmap/map.yaml
+++ b/mods/default/maps/shellmap/map.yaml
@@ -1,15 +0,0 @@
-Selectable: False
-MapFormat: 2
-Title: Default Shellmap 
-Description: A default empty map to use when no custom shellmap is wanted
-Author: alzeih
-PlayerCount: 0
-Tileset: DUMMY
-MapSize: 128,128
-TopLeft: 16,16
-BottomRight: 112,112
-Players:
-Actors:
-Waypoints:
-Smudges:
-Rules:
--- a/mods/default/maps/shellmap/preview.png
+++ b/mods/default/maps/shellmap/preview.png
--- a/mods/default/menus.yaml
+++ b/mods/default/menus.yaml
@@ -1,15 +0,0 @@
-Background@MAINMENU_BG:
-	Id:MAINMENU_BG
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:250
-	Height:65
-	Delegate:MainMenuButtonsDelegate
-	Children:
-		Button@MAINMENU_BUTTON_QUIT:
-			Id:MAINMENU_BUTTON_QUIT
-			X:45
-			Y:20
-			Width:160
-			Height:25
-			Text:Quit
--- a/mods/default/mod.yaml
+++ b/mods/default/mod.yaml
@@ -1,24 +0,0 @@
-Metadata:
-	Title: Default Mod Template
-	Description: Minimal template for creating a base mod
-	Version: a0001
-	Author: The OpenRA Developers
-
-Folders:
-	.
-	mods/default
-Rules:
-	mods/default/system.yaml
-Cursors:
-	mods/default/cursors.xml
-Assemblies:
-	mods/ra/OpenRA.Mods.RA.dll
-TileSets:
-	mods/default/tileset-dummy.yaml
-Chrome:
-	mods/default/chrome.xml:
-ChromeLayout:
-	mods/default/menus.yaml:
-
-LoadScreen: NullLoadScreen
-ShellmapUid: 95c34889e85a903d7dbb41f13d6c373b44a8b62e
--- a/mods/default/mouse.shp
+++ b/mods/default/mouse.shp
--- a/mods/default/system.yaml
+++ b/mods/default/system.yaml
@@ -1,9 +0,0 @@
-World:
-	PaletteFromFile@chrome:
-		Name: chrome
-		Filename: temperat.pal
-	PaletteFromFile@cursor:
-		Name: cursor
-		Filename: temperat.pal
-	SpatialBins:
-	UnitInfluence:
--- a/mods/default/temperat.pal
+++ b/mods/default/temperat.pal
--- a/mods/default/tileset-dummy.yaml
+++ b/mods/default/tileset-dummy.yaml
@@ -1,15 +0,0 @@
-General:
-	Name: Dummy
-	Id: DUMMY
-	Extensions: .shp, .tem
-	Palette: temperat.pal
-Terrain:
-	TerrainType@Blank:
-		Type: Blank
-Templates:
-	Template@255:
-		Id: 255
-		Image: bogus
-		Size: 1,1
-		Tiles:
-			0: Blank
--- a/mods/palettetest/d2k.pal
+++ b/mods/palettetest/d2k.pal
--- a/mods/palettetest/mcv.shp
+++ b/mods/palettetest/mcv.shp
--- a/mods/palettetest/mcv.yaml
+++ b/mods/palettetest/mcv.yaml
@@ -1,13 +0,0 @@
-MCV:
-	RenderUnit:
-		PlayerPalette: d2kplayer
-
-Player:
-	PlayerColorPalette@d2k:
-		BasePalette: d2k
-		BaseName: d2kplayer
-		PaletteFormat: d2k
-World:
-	PaletteFromFile@d2k:
-		Name: d2k
-		Filename: d2k.pal
--- a/mods/palettetest/mod.yaml
+++ b/mods/palettetest/mod.yaml
@@ -1,11 +0,0 @@
-Metadata:
-	Title: Player Palette Test
-	Description: Replaces the mcv artwork with the d2k mcv
-	Version: a0001
-	Author: The OpenRA Developers
-	Requires: ra
-
-Folders:
-	mods/palettetest
-Rules:
-	mods/palettetest/mcv.yaml