Merge pull request #7217 from Mailaender/chrome-init-cleanup

Cleaned up the ingame widget initialization
2015-01-08 07:40:36 +01:00
parent 88922b056e d4d55bb6dc
commit 89b2f4d5d3
24 changed files with 100 additions and 161 deletions
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -6,7 +6,7 @@ chrome-atreides: chrome-atreides.png
 	radar: 297,31,210,222
 	tooltip-bg: 0,288,272,136

-power-atreides: chrome-atreides.png
+sidebar-bits: chrome-atreides.png
 	power-indicator: 187,4,4,7

 palette-atreides: chrome-atreides.png
@@ -43,9 +43,6 @@ chrome-harkonnen: chrome-harkonnen.png
 	radar: 297,31,210,222
 	tooltip-bg: 0,288,272,136

-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
@@ -80,9 +77,6 @@ chrome-ordos: chrome-ordos.png
 	radar: 297,31,210,222
 	tooltip-bg: 0,288,272,136

-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
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -34,12 +34,14 @@ Container@PLAYER_WIDGETS:
 			Font: Bold
 			Key: escape Shift
 		SlidingContainer@INGAME_RADAR_BIN:
+			Logic: SlidingRadarBinLogic
 			X: WINDOW_RIGHT-215
 			Y: 0
 			OpenOffset: 0,29
 			ClosedOffset: 0,-166
 			AnimationLength: 15
 			Children:
+				LogicTicker@RADAR_TICKER:
 				Image@RADAR_BIN_BG:
 					ImageName: radar
 				Radar@RADAR_MINIMAP:
@@ -48,6 +50,7 @@ Container@PLAYER_WIDGETS:
 					Width: 192
 					Height: 192
 				ResourceBar@POWERBAR:
+					Logic: IngamePowerBarLogic
 					X: 42
 					Y: 205
 					Width: 138
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -1,5 +1,5 @@
 Container@INGAME_ROOT:
-	Logic: IngameChromeLogic
+	Logic: LoadIngamePlayerOrObserverUILogic
 	Children:
 		Container@WORLD_ROOT:
 			Children:
--- a/mods/d2k/maps/shellmap/map.yaml
+++ b/mods/d2k/maps/shellmap/map.yaml
@@ -116,8 +116,6 @@ Smudges:

 Rules:
 	World:
-		LoadWidgetAtGameStart:
-			Widget: MAINMENU
 		-CrateSpawner:
 		-SpawnMPUnits:
 		-MPStartLocations:
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -6,7 +6,6 @@ World:
 	ScreenMap:
 	ActorMap:
 	LoadWidgetAtGameStart:
-		Widget: INGAME_ROOT
 	ScreenShaker:
 	BuildingInfluence:
 	ChooseBuildTabOnSelect: