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

C&C main menu improvements:

Browse Source 
- Disable target reticle when a window is open.
- Show the faction logos when the shellmap is disabled.
This commit is contained in:
Paul Chote
2013-10-23 19:22:10 +13:00
parent cd84ac92b4
commit bc174f1e82
2 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
View File

@@ -102,7 +102,12 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
settingsMenu.Get<ButtonWidget>("BACK_BUTTON").OnClick = () => menuType = MenuType.Main; settingsMenu.Get<ButtonWidget>("BACK_BUTTON").OnClick = () => menuType = MenuType.Main;
rootMenu.Get<ImageWidget>("RECBLOCK").IsVisible = () => world.FrameNumber / 25 % 2 == 0; var shellmapDecorations = widget.Get("SHELLMAP_DECORATIONS");
shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap;
shellmapDecorations.Get<ImageWidget>("RECBLOCK").IsVisible = () => world.FrameNumber / 25 % 2 == 0;
var shellmapDisabledDecorations = widget.Get("SHELLMAP_DISABLED_DECORATIONS");
shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap;
} }
void OpenGamePanel(string id) void OpenGamePanel(string id)

54
mods/cnc/chrome/mainmenu.yaml
View File

@@ -3,26 +3,40 @@ Container@MENU_BACKGROUND:
Height:WINDOW_BOTTOM Height:WINDOW_BOTTOM
Logic:CncMenuLogic Logic:CncMenuLogic
Children: Children:
Image@RETICLE: Container@SHELLMAP_DECORATIONS:
X:(WINDOW_RIGHT-WIDTH)/2 Children:
Y:(WINDOW_BOTTOM-HEIGHT)/2 Image@RETICLE:
Width:512 X:(WINDOW_RIGHT-WIDTH)/2
Height:512 Y:(WINDOW_BOTTOM-HEIGHT)/2
ImageCollection:shellmap Width:512
ImageName:reticle Height:512
Label@REC: ImageCollection:shellmap
X:(WINDOW_RIGHT-512)/2+10 ImageName:reticle
Y:(WINDOW_BOTTOM+512)/2-28 Label@REC:
Height:18 X:(WINDOW_RIGHT-512)/2+10
Font:Bold Y:(WINDOW_BOTTOM+512)/2-28
Text:REC Height:18
Image@RECBLOCK: Font:Bold
X:(WINDOW_RIGHT-512)/2+40 Text:REC
Y:(WINDOW_BOTTOM+512)/2-25 Image@RECBLOCK:
Width:16 X:(WINDOW_RIGHT-512)/2+40
Height:16 Y:(WINDOW_BOTTOM+512)/2-25
ImageCollection:shellmapbits Width:16
ImageName:record Height:16
ImageCollection:shellmapbits
ImageName:record
Container@SHELLMAP_DISABLED_DECORATIONS:
Children:
Image@NOD:
X:WINDOW_RIGHT/2-384
Y:(WINDOW_BOTTOM-256)/2
ImageCollection:logos
ImageName:nod-load
Image@GDI:
X:WINDOW_RIGHT/2+128
Y:(WINDOW_BOTTOM-256)/2
ImageCollection:logos
ImageName:gdi-load
Image@EVA: Image@EVA:
X:WINDOW_RIGHT-128-43 X:WINDOW_RIGHT-128-43
Y:43 Y:43