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

Unify cheats -> debug and adjust plumbing for new RA UI.

Browse Source
This commit is contained in:
Paul Chote
2014-07-17 13:54:30 +12:00
parent e7ae615ac9
commit 9e2b3ce0b8
14 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
View File

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
{
panelType = PanelType.Debug;
visibleButtons++;
var debugPanel = Game.LoadWidget(world, "CHEATS_PANEL", panelParent, new WidgetArgs() { { "onExit", doNothing } });
var debugPanel = Game.LoadWidget(world, "DEBUG_PANEL", panelParent, new WidgetArgs() { { "onExit", doNothing }, { "transient", true } });
debugPanel.IsVisible = () => panelType == PanelType.Debug;
debugButton.IsVisible = () => visibleButtons > 1;
}

2
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -411,7 +411,6 @@
<Compile Include="InfiltrateForExploration.cs" />
<Compile Include="InfiltrateForCash.cs" />
<Compile Include="RenderShroudCircle.cs" />
<Compile Include="Widgets\Logic\CheatsLogic.cs" />
<Compile Include="CloakPaletteEffect.cs" />
<Compile Include="Widgets\ColorPreviewManagerWidget.cs" />
<Compile Include="Infiltrates.cs" />
@@ -542,6 +541,7 @@
<Compile Include="Widgets\Logic\Ingame\IngameSiloBarLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\LoadIngamePlayerOrObserverUILogic.cs" />
<Compile Include="Widgets\MenuButtonWidget.cs" />
<Compile Include="Widgets\Logic\DebugMenuLogic.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

19
OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs → OpenRA.Mods.RA/Widgets/Logic/DebugMenuLogic.cs
View File

@@ -15,12 +15,10 @@ using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
{
public class CheatsLogic
public class DebugMenuLogic
{
public static MersenneTwister CosmeticRandom = new MersenneTwister();
[ObjectCreator.UseCtor]
public CheatsLogic(Widget widget, Action onExit, World world)
public DebugMenuLogic(Widget widget, Action onExit, World world, bool transient)
{
var devTrait = world.LocalPlayer.PlayerActor.Trait<DeveloperMode>();
@@ -117,7 +115,18 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var close = widget.GetOrNull<ButtonWidget>("CLOSE");
if (close != null)
close.OnClick = () => { Ui.CloseWindow(); onExit(); };
{
close.OnClick = () =>
{
if (transient)
{
Ui.CloseWindow();
Ui.Root.RemoveChild(widget);
}
onExit();
};
}
}
public void Order(World world, string order)

7
OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
View File

@@ -97,11 +97,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic
diplomacyButton.IsVisible = () => validPlayers > 0;
Widget cheats = null;
cheats = Game.LoadWidget(world, "CHEATS_PANEL", playerWidgets, new WidgetArgs
cheats = Game.LoadWidget(world, "INGAME_DEBUG_BG", playerWidgets, new WidgetArgs
{
{ "transient", true },
{ "onExit", () => cheats.Visible = false }
});
var cheatsButton = playerWidgets.Get<ButtonWidget>("CHEATS_BUTTON");
cheats.Visible = false;
var cheatsButton = playerWidgets.Get<ButtonWidget>("INGAME_DEBUG_BUTTON");
cheatsButton.OnClick = () => cheats.Visible ^= true;
cheatsButton.IsVisible = () => world.LobbyInfo.GlobalSettings.AllowCheats;

7
OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
View File

@@ -62,6 +62,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic
options.OnClick = () => OpenMenuPanel(options);
}
var debug = widget.GetOrNull<MenuButtonWidget>("DEBUG_BUTTON");
if (debug != null)
{
debug.IsVisible = () => world.LobbyInfo.GlobalSettings.AllowCheats;
debug.IsDisabled = () => disableSystemButtons;
debug.OnClick = () => OpenMenuPanel(debug);
}
}
void OpenMenuPanel(MenuButtonWidget button)

4
mods/cnc/chrome/cheats.yaml → mods/cnc/chrome/ingame-debug.yaml
View File

@@ -1,5 +1,5 @@
Container@CHEATS_PANEL:
Logic: CheatsLogic
Container@DEBUG_PANEL:
Logic: DebugMenuLogic
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:

0
mods/cnc/chrome/ingamemenu.yaml → mods/cnc/chrome/ingame-menu.yaml
View File

4
mods/cnc/mod.yaml
View File

@@ -88,11 +88,11 @@ ChromeLayout:
mods/cnc/chrome/replaybrowser.yaml
mods/cnc/chrome/ingame.yaml
mods/cnc/chrome/ingame-chat.yaml
mods/cnc/chrome/ingamemenu.yaml
mods/cnc/chrome/ingame-debug.yaml
mods/cnc/chrome/ingame-menu.yaml
mods/cnc/chrome/music.yaml
mods/cnc/chrome/settings.yaml
mods/cnc/chrome/credits.yaml
mods/cnc/chrome/cheats.yaml
mods/cnc/chrome/dialogs.yaml
mods/cnc/chrome/objectives.yaml
mods/cnc/chrome/tooltips.yaml

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

@@ -11,12 +11,12 @@ Container@PLAYER_WIDGETS:
Text: Diplomacy (F1)
Font: Bold
Key: f1
Button@CHEATS_BUTTON:
Button@INGAME_DEBUG_BUTTON:
X: 324
Y: 0
Width: 160
Height: 25
Text: Cheats (F2)
Text: Debug (F2)
Visible: false
Font: Bold
Key: f2

2
mods/d2k/mod.yaml
View File

@@ -65,6 +65,7 @@ ChromeLayout:
mods/d2k/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-observerstats.yaml
mods/d2k/chrome/ingame-player.yaml
mods/ra/chrome/ingame-debug.yaml
mods/d2k/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml
@@ -80,7 +81,6 @@ ChromeLayout:
mods/ra/chrome/directconnect.yaml
mods/ra/chrome/replaybrowser.yaml
mods/d2k/chrome/dropdowns.yaml
mods/ra/chrome/cheats.yaml
mods/ra/chrome/musicplayer.yaml
mods/d2k/chrome/tooltips.yaml
mods/ra/chrome/assetbrowser.yaml

8
mods/ra/chrome/cheats.yaml → mods/ra/chrome/ingame-debug.yaml
View File

@@ -1,17 +1,16 @@
Background@CHEATS_PANEL:
Logic: CheatsLogic
Background@INGAME_DEBUG_BG:
Logic: DebugMenuLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 350
Height: 475
Visible: false
Children:
Label@LABEL_TITLE:
X: (PARENT_RIGHT - WIDTH)/2
Y: 20
Width: 250
Height: 25
Text: Cheats
Text: Debug Options
Align: Center
Font: Bold
Checkbox@DISABLE_SHROUD:
@@ -107,4 +106,5 @@ Background@CHEATS_PANEL:
Height: 25
Text: Close
Key: escape
Font: Bold

4
mods/ra/chrome/ingame-player.yaml
View File

@@ -11,12 +11,12 @@ Container@PLAYER_WIDGETS:
Text: Diplomacy (F1)
Font: Bold
Key: f1
Button@CHEATS_BUTTON:
Button@INGAME_DEBUG_BUTTON:
X: 324
Y: 0
Width: 160
Height: 25
Text: Cheats (F2)
Text: Debug (F2)
Visible: false
Font: Bold
Key: f2

2
mods/ra/mod.yaml
View File

@@ -79,6 +79,7 @@ ChromeLayout:
mods/ra/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-observerstats.yaml
mods/ra/chrome/ingame-player.yaml
mods/ra/chrome/ingame-debug.yaml
mods/ra/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml
@@ -94,7 +95,6 @@ ChromeLayout:
mods/ra/chrome/directconnect.yaml
mods/ra/chrome/replaybrowser.yaml
mods/ra/chrome/dropdowns.yaml
mods/ra/chrome/cheats.yaml
mods/ra/chrome/musicplayer.yaml
mods/ra/chrome/tooltips.yaml
mods/ra/chrome/assetbrowser.yaml

2
mods/ts/mod.yaml
View File

@@ -108,6 +108,7 @@ ChromeLayout:
mods/ra/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-observerstats.yaml
mods/ra/chrome/ingame-player.yaml
mods/ra/chrome/ingame-debug.yaml
mods/ra/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml
@@ -123,7 +124,6 @@ ChromeLayout:
mods/ra/chrome/directconnect.yaml
mods/ra/chrome/replaybrowser.yaml
mods/ra/chrome/dropdowns.yaml
mods/ra/chrome/cheats.yaml
mods/ra/chrome/musicplayer.yaml
mods/ra/chrome/tooltips.yaml
mods/ra/chrome/assetbrowser.yaml