From 49adf023bbb6dd9e1dfe624ba020431de86892fc Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Mon, 25 Aug 2014 18:39:00 +0200 Subject: [PATCH 1/3] Remove unused usings and arguments --- OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs index 9c52a6e69a..5433d2130d 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs @@ -9,17 +9,15 @@ #endregion using System.Linq; -using OpenRA.Network; using OpenRA.Traits; using OpenRA.Widgets; -using OpenRA.Mods.RA; namespace OpenRA.Mods.RA.Widgets { class LeaveMapLogic { [ObjectCreator.UseCtor] - public LeaveMapLogic(Widget widget, OrderManager orderManager, World world) + public LeaveMapLogic(Widget widget, World world) { widget.Get("VERSION_LABEL").Text = Game.modData.Manifest.Mod.Version; From c61516c55e111afb644b885b46dfa8e2e8c60ec4 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Mon, 25 Aug 2014 18:25:47 +0200 Subject: [PATCH 2/3] Add stats button to end game dialog Also adds the statistics window to TD. There is no button for it in observer mode, though, but it is available from the end game dialog. Fixes #6312. --- .../Widgets/Logic/Ingame/LeaveMapLogic.cs | 14 +- mods/cnc/chrome/ingame-infostats.yaml | 2 +- mods/cnc/chrome/ingame-leavemap.yaml | 12 +- mods/cnc/chrome/ingame-observerstats.yaml | 495 ++++++++++++++++++ mods/cnc/mod.yaml | 1 + mods/d2k/chrome/ingame-leavemap.yaml | 12 +- mods/ra/chrome/ingame-leavemap.yaml | 12 +- 7 files changed, 525 insertions(+), 23 deletions(-) create mode 100644 mods/cnc/chrome/ingame-observerstats.yaml diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs index 5433d2130d..8380f61bbe 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs @@ -29,10 +29,22 @@ namespace OpenRA.Mods.RA.Widgets if (showObjectives) panelName = "LEAVE_RESTART_FULL"; + var showStats = false; + var dialog = widget.Get(panelName); - dialog.IsVisible = () => true; + dialog.IsVisible = () => !showStats; widget.IsVisible = () => Ui.CurrentWindow() == null; + var statsButton = dialog.Get("STATS_BUTTON"); + statsButton.OnClick = () => + { + showStats = true; + Game.LoadWidget(world, "INGAME_OBSERVERSTATS_BG", Ui.Root, new WidgetArgs() + { + { "onExit", () => showStats = false } + }); + }; + var leaveButton = dialog.Get("LEAVE_BUTTON"); leaveButton.OnClick = () => { diff --git a/mods/cnc/chrome/ingame-infostats.yaml b/mods/cnc/chrome/ingame-infostats.yaml index 46dcfa0f0d..f2f99e6431 100644 --- a/mods/cnc/chrome/ingame-infostats.yaml +++ b/mods/cnc/chrome/ingame-infostats.yaml @@ -68,7 +68,7 @@ Container@SKIRMISH_STATS: X: 15 Y: 105 Width: 482 - Height: 250 + Height: 255 ItemSpacing: 5 Children: Container@PLAYER_TEMPLATE: diff --git a/mods/cnc/chrome/ingame-leavemap.yaml b/mods/cnc/chrome/ingame-leavemap.yaml index 1b150db223..8766bf52d8 100644 --- a/mods/cnc/chrome/ingame-leavemap.yaml +++ b/mods/cnc/chrome/ingame-leavemap.yaml @@ -51,14 +51,13 @@ Container@LEAVE_RESTART_WIDGET: Height: 35 Font: Bold Text: Leave - Button@RESTART_BUTTON: - X: 150 + Button@STATS_BUTTON: + X: PARENT_RIGHT - WIDTH Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Font: Bold - Text: Restart - Visible: false + Text: Statistics Container@LEAVE_RESTART_FULL: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 @@ -86,13 +85,12 @@ Container@LEAVE_RESTART_WIDGET: Height: 35 Font: Bold Text: Leave - Button@RESTART_BUTTON: + Button@STATS_BUTTON: X: 150 Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Font: Bold - Text: Restart - Visible: false + Text: Statistics Container@OBJECTIVES: diff --git a/mods/cnc/chrome/ingame-observerstats.yaml b/mods/cnc/chrome/ingame-observerstats.yaml new file mode 100644 index 0000000000..3bcbae7631 --- /dev/null +++ b/mods/cnc/chrome/ingame-observerstats.yaml @@ -0,0 +1,495 @@ +Background@INGAME_OBSERVERSTATS_BG: + Logic: ObserverStatsLogic + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 + Width: 940 + Height: 500 + Children: + Background@BACKGROUND: + Width: PARENT_RIGHT + Background: panel-black + Height: PARENT_BOTTOM - 35 + Children: + Label@TITLE: + X: 0 + Y: 0-25 + Width: PARENT_RIGHT + Font: BigBold + Align: Center + Contrast: True + Text: Statistics + DropDownButton@STATS_DROPDOWN: + X: PARENT_RIGHT-200 + Y: 15 + Width: 185 + Height: 25 + Font: Bold + Container@BASIC_STATS_HEADERS: + X: 0 + Y: 0 + Width: PARENT_RIGHT + Height: PARENT_BOTTOM + Children: + Label@PLAYER_HEADER: + X: 75 + Y: 40 + Width: 160 + Height: 25 + Font: Bold + Text: Player + Label@CASH_HEADER: + X: 235 + Y: 40 + Width: 80 + Height: 25 + Font: Bold + Text: Cash + Label@EARNED_MIN_HEADER: + X: 315 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Earned/min + Label@POWER_HEADER: + X: 415 + Y: 40 + Width: 80 + Height: 25 + Font: Bold + Text: Power + Label@KILLS_HEADER: + X: 495 + Y: 40 + Width: 40 + Height: 25 + Font: Bold + Text: Kills + Align: Right + Label@DEATHS_HEADER: + X: 555 + Y: 40 + Width: 40 + Height: 25 + Font: Bold + Text: Deaths + Align: Right + Label@ACTIONS_MIN_HEADER: + X: 655 + Y: 40 + Width: 40 + Height: 25 + Font: Bold + Text: Actions/min + Align: Right + Container@ECONOMY_STATS_HEADERS: + X: 0 + Y: 0 + Width: PARENT_RIGHT + Height: PARENT_BOTTOM + Children: + Label@PLAYER_HEADER: + X: 75 + Y: 40 + Width: 160 + Height: 25 + Font: Bold + Text: Player + Label@CASH_HEADER: + X: 235 + Y: 40 + Width: 80 + Height: 25 + Font: Bold + Text: Cash + Label@EARNED_MIN_HEADER: + X: 315 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Earned/min + Label@EARNED_THIS_MIN_HEADER: + X: 415 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Earned this min + Label@ASSETS_HEADER: + X: 555 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Assets + Label@EARNED_HEADER: + X: 635 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Earned + Label@SPENT_HEADER: + X: 715 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Spent + Label@HARVESTERS_HEADER: + X: 795 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Harvesters + Align: Right + Container@PRODUCTION_STATS_HEADERS: + X: 0 + Y: 0 + Width: PARENT_RIGHT + Height: PARENT_BOTTOM + Children: + Label@PLAYER_HEADER: + X: 75 + Y: 40 + Width: 160 + Height: 25 + Font: Bold + Text: Player + Label@PRODUCTION_HEADER: + X: 235 + Y: 40 + Width: 320 + Height: 25 + Font: Bold + Text: Production + Label@SUPPORT_POWERS_HEADER: + X: 555 + Y: 40 + Width: 320 + Height: 25 + Font: Bold + Text: Support Powers + Container@COMBAT_STATS_HEADERS: + X: 0 + Y: 0 + Width: PARENT_RIGHT + Height: PARENT_BOTTOM + Children: + Label@PLAYER_HEADER: + X: 75 + Y: 40 + Width: 160 + Height: 25 + Font: Bold + Text: Player + Label@CONTROL_HEADER: + X: 235 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Control + Label@KILLS_COST_HEADER: + X: 315 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Kills + Label@DEATHS_COST_HEADER: + X: 395 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Deaths + Label@UNITS_KILLED_HEADER: + X: 495 + Y: 40 + Width: 40 + Height: 25 + Font: Bold + Text: Units Killed + Align: Right + Label@UNITS_DEAD_HEADER: + X: 595 + Y: 40 + Width: 40 + Height: 25 + Font: Bold + Text: Units Lost + Align: Right + Label@BUILDINGS_KILLED_HEADER: + X: 715 + Y: 40 + Width: 40 + Height: 25 + Font: Bold + Text: Bldg Killed + Align: Right + Label@BUILDINGS_DEAD_HEADER: + X: 815 + Y: 40 + Width: 40 + Height: 25 + Font: Bold + Text: Bldg Lost + Align: Right + Container@EARNED_THIS_MIN_GRAPH_HEADERS: + X: 0 + Y: 0 + Width: PARENT_RIGHT + Height: PARENT_BOTTOM + Children: + Label@EARNED_THIS_MIN_HEADER: + X: 0 + Y: 40 + Width: PARENT_RIGHT + Height: 25 + Font: Bold + Text: Earnings received each minute + Align: Center + ScrollPanel@PLAYER_STATS_PANEL: + X: 15 + Y: 70 + Width: PARENT_RIGHT-30 + Height: PARENT_BOTTOM-35-50 + ItemSpacing: 5 + Children: + ScrollItem@TEAM_TEMPLATE: + X: 0 + Y: 0 + Width: PARENT_RIGHT-35 + Height: 25 + Children: + Label@TEAM: + X: 0 + Y: 0 + Width: PARENT_RIGHT + Height: PARENT_BOTTOM + Font: Bold + ScrollItem@BASIC_PLAYER_TEMPLATE: + X: 0 + Y: 0 + Width: PARENT_RIGHT-35 + Height: 25 + Children: + Image@FLAG: + X: 20 + Y: 5 + Width: 35 + Height: PARENT_BOTTOM-5 + ImageName: random + ImageCollection: flags + Label@PLAYER: + X: 55 + Y: 0 + Width: 160 + Height: PARENT_BOTTOM + Font: Bold + Label@CASH: + X: 215 + Y: 0 + Width: 80 + Height: PARENT_BOTTOM + Label@EARNED_MIN: + X: 295 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@POWER: + X: 395 + Y: 0 + Width: 80 + Height: PARENT_BOTTOM + Label@KILLS: + X: 475 + Y: 0 + Width: 40 + Height: PARENT_BOTTOM + Align: Right + Label@DEATHS: + X: 535 + Y: 0 + Width: 40 + Height: PARENT_BOTTOM + Align: Right + Label@ACTIONS_MIN: + X: 635 + Y: 0 + Width: 40 + Height: PARENT_BOTTOM + Align: Right + ScrollItem@ECONOMY_PLAYER_TEMPLATE: + X: 0 + Y: 0 + Width: PARENT_RIGHT-35 + Height: 25 + Children: + Image@FLAG: + X: 20 + Y: 5 + Width: 35 + Height: PARENT_BOTTOM-5 + ImageName: random + ImageCollection: flags + Label@PLAYER: + X: 55 + Y: 0 + Width: 160 + Height: PARENT_BOTTOM + Font: Bold + Label@CASH: + X: 215 + Y: 0 + Width: 80 + Height: PARENT_BOTTOM + Label@EARNED_MIN: + X: 295 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@EARNED_THIS_MIN: + X: 395 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@ASSETS: + X: 535 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@EARNED: + X: 615 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@SPENT: + X: 695 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@HARVESTERS: + X: 775 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Align: Right + ScrollItem@PRODUCTION_PLAYER_TEMPLATE: + X: 0 + Y: 0 + Width: PARENT_RIGHT-35 + Height: 25 + Children: + Image@FLAG: + X: 20 + Y: 5 + Width: 35 + Height: PARENT_BOTTOM-5 + ImageName: random + ImageCollection: flags + Label@PLAYER: + X: 55 + Y: 0 + Width: 160 + Height: PARENT_BOTTOM + Font: Bold + ObserverProductionIcons@PRODUCTION_ICONS: + X: 215 + Y: 0 + Width: 320 + Height: PARENT_BOTTOM + ObserverSupportPowerIcons@SUPPORT_POWER_ICONS: + X: 535 + Y: 0 + Width: 320 + Height: PARENT_BOTTOM + ScrollItem@COMBAT_PLAYER_TEMPLATE: + X: 0 + Y: 0 + Width: PARENT_RIGHT-35 + Height: 25 + Children: + Image@FLAG: + X: 20 + Y: 5 + Width: 35 + Height: PARENT_BOTTOM-5 + ImageName: random + ImageCollection: flags + Label@PLAYER: + X: 55 + Y: 0 + Width: 160 + Height: PARENT_BOTTOM + Font: Bold + Label@CONTROL: + X: 215 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@KILLS_COST: + X: 295 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@DEATHS_COST: + X: 375 + Y: 0 + Width: 60 + Height: PARENT_BOTTOM + Label@UNITS_KILLED: + X: 475 + Y: 0 + Width: 40 + Height: PARENT_BOTTOM + Align: Right + Label@UNITS_DEAD: + X: 575 + Y: 0 + Width: 40 + Height: PARENT_BOTTOM + Align: Right + Label@BUILDINGS_KILLED: + X: 695 + Y: 0 + Width: 40 + Height: PARENT_BOTTOM + Align: Right + Label@BUILDINGS_DEAD: + X: 795 + Y: 0 + Width: 40 + Height: PARENT_BOTTOM + Align: Right + Container@EARNED_THIS_MIN_GRAPH_TEMPLATE: + X: 10 + Y: 10 + Width: PARENT_RIGHT-100 + Height: PARENT_BOTTOM-60 + Children: + LineGraph@EARNED_THIS_MIN_GRAPH: + X: 0 + Y: 0 + Width: PARENT_RIGHT + Height: PARENT_BOTTOM + ValueFormat: ${0} + XAxisValueFormat: {0} + YAxisValueFormat: ${0:F0} + XAxisSize: 20 + YAxisSize: 10 + XAxisLabel: m + YAxisLabel: $ + LabelFont: TinyBold + AxisFont: Bold + Button@CLOSE: + X: 0 + Y: PARENT_BOTTOM - 36 + Width: 140 + Height: 35 + Text: Close + Key: escape + Font: Bold diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index f0be53262e..bba5b0f568 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -95,6 +95,7 @@ ChromeLayout: mods/cnc/chrome/ingame-infoobjectives.yaml mods/cnc/chrome/ingame-infostats.yaml mods/cnc/chrome/ingame-leavemap.yaml + mods/cnc/chrome/ingame-observerstats.yaml mods/cnc/chrome/music.yaml mods/cnc/chrome/settings.yaml mods/cnc/chrome/credits.yaml diff --git a/mods/d2k/chrome/ingame-leavemap.yaml b/mods/d2k/chrome/ingame-leavemap.yaml index cd78d046f0..df5cd3d6a1 100644 --- a/mods/d2k/chrome/ingame-leavemap.yaml +++ b/mods/d2k/chrome/ingame-leavemap.yaml @@ -38,16 +38,15 @@ Container@LEAVE_RESTART_WIDGET: Height: 65 Text: Press 'Leave' to return to the main menu. Align: Center - Button@RESTART_BUTTON: + Button@STATS_BUTTON: X: 20 Y: PARENT_BOTTOM - 45 Width: 140 Height: 25 Font: Bold - Text: Restart - Visible: false + Text: Statistics Button@LEAVE_BUTTON: - X: (PARENT_RIGHT - WIDTH) / 2 + X: PARENT_RIGHT - WIDTH - 20 Y: PARENT_BOTTOM - 45 Width: 140 Height: 25 @@ -72,14 +71,13 @@ Container@LEAVE_RESTART_WIDGET: Font: Bold Align: Center Text: The game has ended - Button@RESTART_BUTTON: + Button@STATS_BUTTON: X: PARENT_RIGHT - 2 * (WIDTH + 20) Y: PARENT_BOTTOM - 45 Width: 120 Height: 25 Font: Bold - Text: Restart - Visible: false + Text: Statistics Button@LEAVE_BUTTON: X: PARENT_RIGHT - WIDTH - 20 Y: PARENT_BOTTOM - 45 diff --git a/mods/ra/chrome/ingame-leavemap.yaml b/mods/ra/chrome/ingame-leavemap.yaml index 1bebfd9716..bd43f41653 100644 --- a/mods/ra/chrome/ingame-leavemap.yaml +++ b/mods/ra/chrome/ingame-leavemap.yaml @@ -45,16 +45,15 @@ Container@LEAVE_RESTART_WIDGET: Height: 65 Text: Press 'Leave' to return to the main menu. Align: Center - Button@RESTART_BUTTON: + Button@STATS_BUTTON: X: 20 Y: PARENT_BOTTOM - 45 Width: 140 Height: 25 Font: Bold - Text: Restart - Visible: false + Text: Statistics Button@LEAVE_BUTTON: - X: (PARENT_RIGHT - WIDTH) / 2 + X: PARENT_RIGHT - WIDTH - 20 Y: PARENT_BOTTOM - 45 Width: 140 Height: 25 @@ -79,14 +78,13 @@ Container@LEAVE_RESTART_WIDGET: Font: Bold Align: Center Text: The game has ended - Button@RESTART_BUTTON: + Button@STATS_BUTTON: X: PARENT_RIGHT - 2 * (WIDTH + 20) Y: PARENT_BOTTOM - 45 Width: 120 Height: 25 Font: Bold - Text: Restart - Visible: false + Text: Statistics Button@LEAVE_BUTTON: X: PARENT_RIGHT - WIDTH - 20 Y: PARENT_BOTTOM - 45 From bf9a63ff95a1974628bd954a7c399592fa33c94a Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Fri, 5 Sep 2014 20:08:46 +0200 Subject: [PATCH 3/3] Rename widgets --- OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs | 4 ++-- .../Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs | 2 +- mods/cnc/chrome/ingame-leavemap.yaml | 10 +++++----- mods/d2k/chrome/ingame-leavemap.yaml | 10 +++++----- mods/ra/chrome/ingame-leavemap.yaml | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs index 10256037e2..f08752c1ab 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs @@ -48,7 +48,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic Action ShowLeaveRestartDialog = () => { gameRoot.RemoveChildren(); - Game.LoadWidget(world, "LEAVE_RESTART_WIDGET", Ui.Root, new WidgetArgs()); + Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs()); }; world.GameOver += ShowLeaveRestartDialog; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs index 8380f61bbe..7ecd717705 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs @@ -21,13 +21,13 @@ namespace OpenRA.Mods.RA.Widgets { widget.Get("VERSION_LABEL").Text = Game.modData.Manifest.Mod.Version; - var panelName = "LEAVE_RESTART_SIMPLE"; + var panelName = "LEAVE_MAP_SIMPLE"; var iop = world.WorldActor.TraitsImplementing().FirstOrDefault(); var showObjectives = iop != null && iop.PanelName != null && world.LocalPlayer != null; if (showObjectives) - panelName = "LEAVE_RESTART_FULL"; + panelName = "LEAVE_MAP_FULL"; var showStats = false; diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs index 366dedef46..ad4d096bbf 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs @@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic Action ShowLeaveRestartDialog = () => { ingameRoot.RemoveChildren(); - Game.LoadWidget(world, "LEAVE_RESTART_WIDGET", Ui.Root, new WidgetArgs()); + Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs()); }; world.GameOver += ShowLeaveRestartDialog; } diff --git a/mods/cnc/chrome/ingame-leavemap.yaml b/mods/cnc/chrome/ingame-leavemap.yaml index 8766bf52d8..6909729c10 100644 --- a/mods/cnc/chrome/ingame-leavemap.yaml +++ b/mods/cnc/chrome/ingame-leavemap.yaml @@ -1,4 +1,4 @@ -Container@LEAVE_RESTART_WIDGET: +Container@LEAVE_MAP_WIDGET: Logic: LeaveMapLogic Children: Image@EVA: @@ -18,14 +18,14 @@ Container@LEAVE_RESTART_WIDGET: Width: WINDOW_RIGHT Height: WINDOW_BOTTOM Background: shellmapborder - Container@LEAVE_RESTART_SIMPLE + Container@LEAVE_MAP_SIMPLE X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 370 Height: 125 Visible: False Children: - Background@LEAVE_RESTART_SIMPLE_BG: + Background@LEAVE_MAP_SIMPLE_BG: Width: PARENT_RIGHT Height: PARENT_BOTTOM - 35 Background: panel-black @@ -58,14 +58,14 @@ Container@LEAVE_RESTART_WIDGET: Height: 35 Font: Bold Text: Statistics - Container@LEAVE_RESTART_FULL: + Container@LEAVE_MAP_FULL: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 512 Height: 410 Visible: False Children: - Background@LEAVE_RESTART_BG: + Background@LEAVE_MAP_BG: Width: PARENT_RIGHT Height: PARENT_BOTTOM - 35 Background: panel-black diff --git a/mods/d2k/chrome/ingame-leavemap.yaml b/mods/d2k/chrome/ingame-leavemap.yaml index df5cd3d6a1..463a24b246 100644 --- a/mods/d2k/chrome/ingame-leavemap.yaml +++ b/mods/d2k/chrome/ingame-leavemap.yaml @@ -1,4 +1,4 @@ -Container@LEAVE_RESTART_WIDGET: +Container@LEAVE_MAP_WIDGET: Logic: LeaveMapLogic Children: Background@BORDER: @@ -13,14 +13,14 @@ Container@LEAVE_RESTART_WIDGET: Align: Right Font: Regular Contrast: True - Container@LEAVE_RESTART_SIMPLE + Container@LEAVE_MAP_SIMPLE X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 370 Height: 175 Visible: False Children: - Background@LEAVE_RESTART_SIMPLE_BG: + Background@LEAVE_MAP_SIMPLE_BG: Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: @@ -52,14 +52,14 @@ Container@LEAVE_RESTART_WIDGET: Height: 25 Font: Bold Text: Leave - Container@LEAVE_RESTART_FULL: + Container@LEAVE_MAP_FULL: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 522 Height: 470 Visible: False Children: - Background@LEAVE_RESTART_BG: + Background@LEAVE_MAP_BG: Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: diff --git a/mods/ra/chrome/ingame-leavemap.yaml b/mods/ra/chrome/ingame-leavemap.yaml index bd43f41653..efda7f6c5c 100644 --- a/mods/ra/chrome/ingame-leavemap.yaml +++ b/mods/ra/chrome/ingame-leavemap.yaml @@ -1,4 +1,4 @@ -Container@LEAVE_RESTART_WIDGET: +Container@LEAVE_MAP_WIDGET: Logic: LeaveMapLogic Children: Background@BORDER: @@ -20,14 +20,14 @@ Container@LEAVE_RESTART_WIDGET: Align: Center Font: Regular Contrast: True - Container@LEAVE_RESTART_SIMPLE + Container@LEAVE_MAP_SIMPLE X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 370 Height: 175 Visible: False Children: - Background@LEAVE_RESTART_SIMPLE_BG: + Background@LEAVE_MAP_SIMPLE_BG: Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: @@ -59,14 +59,14 @@ Container@LEAVE_RESTART_WIDGET: Height: 25 Font: Bold Text: Leave - Container@LEAVE_RESTART_FULL: + Container@LEAVE_MAP_FULL: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 522 Height: 470 Visible: False Children: - Background@LEAVE_RESTART_BG: + Background@LEAVE_MAP_BG: Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: