Start moving towards saner RA widget logic. This switches players to observer mode after they have finished playing in RA/D2k and removes some legacy code.

2013-04-21 18:34:48 +12:00
parent 7ec4bcad0e
commit ca80ac2d1f
35 changed files with 951 additions and 1290 deletions
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -1,232 +0,0 @@
-Container@INGAME_ROOT:
-	Logic:IngameChromeLogic
-	Children:
-		WorldInteractionController@INTERACTION_CONTROLLER:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		ViewportScrollController:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		WorldCommand:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		Timer@GAME_TIMER:
-			X: WINDOW_RIGHT/2
-			Y: 0-10
-		StrategicProgress@STRATEGIC_PROGRESS:
-			X: WINDOW_RIGHT/2
-			Y: 40
-		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:0
-					Width:200
-					Height:80
-					Align:Center
-				Button@POSTGAME_OBSERVE:
-					X:10
-					Y:(PARENT_BOTTOM - HEIGHT - 10)
-					Width:150
-					Height:25
-					Font:Bold
-					Text:Observe
-				Button@POSTGAME_QUIT:
-					X:(PARENT_RIGHT - WIDTH - 10)
-					Y:(PARENT_BOTTOM - HEIGHT - 10)
-					Width:150
-					Height:25
-					Font:Bold
-					Text:Leave
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X:0
-			Y:25
-			ReadyText: READY
-			HoldText: ON HOLD
-		BuildPalette@INGAME_BUILD_PALETTE:
-			X:WINDOW_RIGHT - 250
-			Y:280
-			Width:250
-			Height:500
-			ReadyText: READY
-			HoldText: ON HOLD
-			RequiresText: Requires
-			IconWidth: 60
-			IconHeight: 47
-		Button@INGAME_OPTIONS_BUTTON:
-			X:0
-			Y:0
-			Width:160
-			Height:25
-			Text:Options (ESC)
-			Font:Bold
-			Key: escape
-		Button@INGAME_DIPLOMACY_BUTTON:
-			X:162
-			Y:0
-			Width:160
-			Height:25
-			Text:Diplomacy (F1)
-			Font:Bold
-			Key: f1
-		Button@CHEATS_BUTTON:
-			X:324
-			Y:0
-			Width:160
-			Height:25
-			Text:Cheats (F2)
-			Visible:false
-			Font:Bold
-			Key: f2
-		Button@OBJECTIVES_BUTTON:
-			X:486
-			Y:0
-			Width:160
-			Height:25
-			Text:Objectives (F3)
-			Visible:false
-			Font:Bold
-			Key: f3
-		RadarBin@INGAME_RADAR_BIN:
-			WorldInteractionController:INTERACTION_CONTROLLER
-		PowerBin@INGAME_POWER_BIN:
-		MoneyBin@INGAME_MONEY_BIN:
-			X:WINDOW_RIGHT - WIDTH
-			Y:0
-			Width:320
-			Height: 32
-			Children:
-				OrderButton@SELL:
-					Logic:OrderButtonsChromeLogic
-					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:
-					Logic:OrderButtonsChromeLogic
-					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:
-					Logic:OrderButtonsChromeLogic
-					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:295
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Options
-					Align:Center
-					Font:Bold
-				Button@RESUME:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:60
-					Width:160
-					Height:25
-					Text:Resume
-					Font:Bold
-					Key:escape
-				Button@SETTINGS:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:100
-					Width:160
-					Height:25
-					Text:Settings
-					Font:Bold
-				Button@MUSIC:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:140
-					Width:160
-					Height:25
-					Text:Music
-					Font:Bold
-				Button@SURRENDER:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:180
-					Width:160
-					Height:25
-					Text:Surrender
-					Font:Bold
-				Button@DISCONNECT:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:220
-					Width:160
-					Height:25
-					Text:Abort Mission
-					Font:Bold
-		Background@DIPLOMACY_BG:
-			Logic:DiplomacyLogic
-			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
-					Font:Bold
-				Button@CLOSE_DIPLOMACY:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:350
-					Width:160
-					Height:25
-					Text:Close
-					Font:Bold
-					Key:escape
-		Background@PERF_BG:
-			ClickThrough:true
-			Background:dialog4
-			Logic:PerfDebugLogic
-			X:10
-			Y:WINDOW_BOTTOM - 250
-			Width: 210
-			Height: 250
-			Children:
-				PerfGraph@GRAPH:
-					X:5
-					Y:5
-					Width:200
-					Height:200
-				Label@TEXT:
-					X:20
-					Y:205
-					Width:170
-					Height:40
--- a/mods/d2k/chrome/mainmenu.yaml
+++ b/mods/d2k/chrome/mainmenu.yaml
@@ -1,4 +1,4 @@
-Background@MAINMENU_BG:
+Background@MAINMENU:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:250
--- a/mods/d2k/maps/Brimstone.oramap
+++ b/mods/d2k/maps/Brimstone.oramap
--- a/mods/d2k/maps/DeathDepths.oramap
+++ b/mods/d2k/maps/DeathDepths.oramap
--- a/mods/d2k/maps/DeathDepths2.oramap
+++ b/mods/d2k/maps/DeathDepths2.oramap
--- a/mods/d2k/maps/dune_boogie.oramap
+++ b/mods/d2k/maps/dune_boogie.oramap
--- a/mods/d2k/maps/shellmap/map.bin
+++ b/mods/d2k/maps/shellmap/map.bin
--- a/mods/d2k/maps/shellmap/map.yaml
+++ b/mods/d2k/maps/shellmap/map.yaml
@@ -0,0 +1,100 @@
+Selectable: False
+
+MapFormat: 5
+
+Title: Shellmap
+
+Description: Shellmap
+
+Author: Westwood Studios
+
+Tileset: ARRAKIS
+
+MapSize: 128,128
+
+Bounds: 16,16,80,80
+
+UseAsShellmap: True
+
+Type: Conquest
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		OwnsWorld: True
+		Race: allies
+Actors:
+	Actor0: spicebloom
+		Location: 27,42
+		Owner: Neutral
+	Actor3: spicebloom
+		Location: 43,22
+		Owner: Neutral
+	Actor4: spicebloom
+		Location: 50,53
+		Owner: Neutral
+	Actor5: spicebloom
+		Location: 50,65
+		Owner: Neutral
+	Actor6: spicebloom
+		Location: 45,75
+		Owner: Neutral
+	Actor7: spicebloom
+		Location: 64,52
+		Owner: Neutral
+	Actor8: spicebloom
+		Location: 65,64
+		Owner: Neutral
+	Actor9: spicebloom
+		Location: 65,20
+		Owner: Neutral
+	Actor12: spicebloom
+		Location: 85,42
+		Owner: Neutral
+	Actor13: spicebloom
+		Location: 40,45
+		Owner: Neutral
+	Actor14: spicebloom
+		Location: 52,37
+		Owner: Neutral
+	Actor15: spicebloom
+		Location: 67,34
+		Owner: Neutral
+	Actor16: spicebloom
+		Location: 76,43
+		Owner: Neutral
+	Actor17: spicebloom
+		Location: 26,75
+		Owner: Neutral
+	Actor18: spicebloom
+		Location: 48,91
+		Owner: Neutral
+	Actor19: spicebloom
+		Location: 29,61
+		Owner: Neutral
+	Actor22: spicebloom
+		Location: 93,68
+		Owner: Neutral
+	Actor23: spicebloom
+		Location: 71,74
+		Owner: Neutral
+	Actor24: spicebloom
+		Location: 62,92
+		Owner: Neutral
+	Actor25: spicebloom
+		Location: 82,65
+		Owner: Neutral
+
+Smudges:
+
+Rules:
+	World:
+		LoadWidgetAtGameStart:
+			Widget: MAINMENU
+Sequences:
+
+Weapons:
+
+Voices:
+
+Notifications:
--- a/mods/d2k/maps/the-duell.oramap
+++ b/mods/d2k/maps/the-duell.oramap
--- a/mods/d2k/maps/tucks-sietch.oramap
+++ b/mods/d2k/maps/tucks-sietch.oramap
--- a/mods/d2k/maps/venac-ditch.oramap
+++ b/mods/d2k/maps/venac-ditch.oramap
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -45,10 +45,11 @@ Assemblies:

 ChromeLayout:
 	mods/d2k/chrome/gameinit.yaml
-	mods/d2k/chrome/ingame.yaml
+	mods/ra/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
-	mods/ra/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
+	mods/ra/chrome/ingame-menu.yaml
+	mods/ra/chrome/ingame-observerstats.yaml
 	mods/d2k/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/d2k/chrome/lobby.yaml
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -273,9 +273,8 @@ Player:
 	HarvesterAttackNotifier:

 World:
-	OpenWidgetAtGameStart:
+	LoadWidgetAtGameStart:
 		Widget: INGAME_ROOT
-		ObserverWidget: OBSERVER_ROOT
 	ScreenShaker:
 	NukePaletteEffect:
 	BuildingInfluence: