epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Cleaned up the ingame widget initialization
This commit is contained in:
Matthias Mailänder
2015-01-08 07:40:36 +01:00
parent 88922b056e d4d55bb6dc
commit 89b2f4d5d3
24 changed files with 100 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mods/cnc/maps/shellmap/map.yaml
View File

@@ -997,8 +997,6 @@ Rules:
Loop: true
LuaScript:
Scripts: shellmap.lua
LoadWidgetAtGameStart:
Widget: MENU_BACKGROUND
LST:
Mobile:
Speed: 42

2
mods/cnc/rules/world.yaml
View File

@@ -6,7 +6,7 @@ World:
ScreenMap:
ActorMap:
LoadWidgetAtGameStart:
Widget: INGAME_ROOT
ShellmapRoot: MENU_BACKGROUND
MenuPaletteEffect:
MenuEffect: Desaturated
CloakPaletteEffect:

8
mods/d2k/chrome.yaml
View File

@@ -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

3
mods/d2k/chrome/ingame-player.yaml
View File

@@ -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

2
mods/d2k/chrome/ingame.yaml
View File

@@ -1,5 +1,5 @@
Container@INGAME_ROOT:
Logic: IngameChromeLogic
Logic: LoadIngamePlayerOrObserverUILogic
Children:
Container@WORLD_ROOT:
Children:

2
mods/d2k/maps/shellmap/map.yaml
View File

@@ -116,8 +116,6 @@ Smudges:
Rules:
World:
LoadWidgetAtGameStart:
Widget: MAINMENU
-CrateSpawner:
-SpawnMPUnits:
-MPStartLocations:

1
mods/d2k/rules/world.yaml
View File

@@ -6,7 +6,6 @@ World:
ScreenMap:
ActorMap:
LoadWidgetAtGameStart:
Widget: INGAME_ROOT
ScreenShaker:
BuildingInfluence:
ChooseBuildTabOnSelect:

2
mods/ra/maps/desert-shellmap/map.yaml
View File

@@ -1274,8 +1274,6 @@ Rules:
ValuePerUnit: 0
LuaScript:
Scripts: desert-shellmap.lua
LoadWidgetAtGameStart:
Widget: MAINMENU
-StartGameNotification:
OILB:
CashTrickler:

1
mods/ra/rules/world.yaml
View File

@@ -6,7 +6,6 @@ World:
ScreenMap:
ActorMap:
LoadWidgetAtGameStart:
Widget: INGAME_ROOT
ScreenShaker:
MenuPaletteEffect:
WaterPaletteRotation:

5
mods/ts/chrome.yaml
View File

@@ -6,7 +6,7 @@ chrome-gdi: chrome-gdi.png
tooltip-bg: 0,288,272,136
radar: 297,31,210,222
power-gdi: chrome-gdi.png
sidebar-bits: chrome-gdi.png
power-indicator: 187,4,4,7
palette-gdi: chrome-gdi.png
@@ -43,9 +43,6 @@ chrome-nod: chrome-nod.png
tooltip-bg: 0,288,272,136
radar: 297,31,210,222
power-nod: chrome-nod.png
power-indicator: 187,4,4,7
palette-nod: chrome-nod.png
top: 297,288,201,9
dock-top: 498,274,14,23

3
mods/ts/chrome/ingame-player.yaml
View File

@@ -36,12 +36,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:
@@ -50,6 +52,7 @@ Container@PLAYER_WIDGETS:
Width: 192
Height: 192
ResourceBar@POWERBAR:
Logic: IngamePowerBarLogic
X: 42
Y: 205
Width: 138

2
mods/ts/chrome/ingame.yaml
View File

@@ -1,5 +1,5 @@
Container@INGAME_ROOT:
Logic: IngameChromeLogic
Logic: LoadIngamePlayerOrObserverUILogic
Children:
Container@WORLD_ROOT:
Children:

1
mods/ts/maps/blank-shellmap/map.yaml
View File

@@ -41,7 +41,6 @@ Rules:
-SpawnMPUnits:
-MPStartLocations:
LoadWidgetAtGameStart:
Widget: MAINMENU
Sequences:

1
mods/ts/rules/world.yaml
View File

@@ -6,7 +6,6 @@ World:
ScreenMap:
ActorMap:
LoadWidgetAtGameStart:
Widget: INGAME_ROOT
MenuPaletteEffect:
BuildingInfluence:
ChooseBuildTabOnSelect: