Add Play button to map editor

OpenRA · Aug 29, 2022 · 7f0793a · 7f0793a
1 parent d742de9
commit 7f0793a
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 4 deletions.
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
@@ -37,6 +37,8 @@ public class IngameMenuLogic : ChromeLogic
 		bool leaving;
 		bool hideMenu;
 
+		public static bool LastGameEditor = false;
+
 		[ObjectCreator.UseCtor]
 		public IngameMenuLogic(Widget widget, ModData modData, World world, Action onExit, WorldRenderer worldRenderer,
 			IngameInfoPanel initialPanel, Dictionary<string, MiniYaml> logicArgs)
@@ -49,6 +51,7 @@ public class IngameMenuLogic : ChromeLogic
 			var buttonHandlers = new Dictionary<string, Action>
 			{
 				{ "ABORT_MISSION", CreateAbortMissionButton },
+				{ "BACK_TO_EDITOR", CreateBackToEditorButton },
 				{ "RESTART", CreateRestartButton },
 				{ "SURRENDER", CreateSurrenderButton },
 				{ "LOAD_GAME", CreateLoadGameButton },
@@ -57,6 +60,7 @@ public class IngameMenuLogic : ChromeLogic
 				{ "SETTINGS", CreateSettingsButton },
 				{ "RESUME", CreateResumeButton },
 				{ "SAVE_MAP", CreateSaveMapButton },
+				{ "PLAY_MAP", CreatePlayMapButton },
 				{ "EXIT_EDITOR", CreateExitEditorButton }
 			};
 
@@ -141,8 +145,13 @@ void OnQuit()
 
 			Game.RunAfterDelay(exitDelay, () =>
 			{
-				if (!Game.IsCurrentWorld(world))
+				if (!Game.IsCurrentWorld(world) && !LastGameEditor)
+				{
+					LastGameEditor = false;
 					return;
+				}
+
+				LastGameEditor = false;
 
 				Game.Disconnect();
 				Ui.ResetAll();
@@ -378,6 +387,108 @@ void CreateSaveMapButton()
 			};
 		}
 
+		void CreatePlayMapButton()
+		{
+			if (world.Type != WorldType.Editor)
+				return;
+
+			var actionManager = world.WorldActor.Trait<EditorActionManager>();
+
+			Action<string, MapVisibility> openPlayMenu = (uid, visibility) =>
+			{
+				if (visibility == MapVisibility.Lobby)
+				{
+					ConnectionLogic.Connect(Game.CreateLocalServer(uid),
+						"",
+						() => Game.OpenWindow("SERVER_LOBBY", new WidgetArgs
+						{
+							{ "onExit", () => { ShowMenu(); } },
+							{ "onStart", () => { } },
+							{ "skirmishMode", true }
+						}),
+						() => { Game.CloseServer(); });
+				}
+				else if (visibility == MapVisibility.MissionSelector)
+				{
+					Game.OpenWindow("MISSIONBROWSER_PANEL", new WidgetArgs
+					{
+						{ "onExit", () => { ShowMenu(); } },
+						{ "onStart", () => { } },
+						{ "initialMap", uid }
+					});
+				}
+			};
+
+			var button = AddButton("PLAY_MAP", "Play Map");
+			button.OnClick = () =>
+			{
+				var uid = modData.MapCache.GetUpdatedMap(world.Map.Uid);
+				var map = uid == null ? null : modData.MapCache[uid];
+				if (map == null || (map.Visibility != MapVisibility.Lobby && map.Visibility != MapVisibility.MissionSelector))
+				{
+					hideMenu = true;
+					ConfirmationDialogs.ButtonPrompt(
+						title: "Warning",
+						text: "The map may have been deleted or has\n errors preventing it from being loaded",
+						onConfirm: () => { LastGameEditor = true; openPlayMenu(uid, map.Visibility); },
+						onCancel: ShowMenu,
+						confirmText: "Okay",
+						cancelText: "Okay");
+					return;
+				}
+
+				hideMenu = true;
+				if (actionManager.HasUnsavedItems())
+				{
+					hideMenu = true;
+					ConfirmationDialogs.ButtonPrompt(
+						title: "Exit Map Editor",
+						text: "Exit and lose all unsaved changes?",
+						onConfirm: () => { LastGameEditor = true; openPlayMenu(uid, map.Visibility); },
+						onCancel: ShowMenu);
+				}
+				else
+				{
+					LastGameEditor = true;
+					openPlayMenu(uid, map.Visibility);
+				}
+			};
+		}
+
+		void CreateBackToEditorButton()
+		{
+			if (world.Type != WorldType.Regular || !LastGameEditor)
+				return;
+
+			var button = AddButton("BACK_TO_EDITOR", "Back To Editor");
+
+			button.OnClick = () =>
+			{
+				hideMenu = true;
+
+				Action onConfirm = () =>
+				{
+					LastGameEditor = false;
+					var map = modData.MapCache.GetUpdatedMap(world.Map.Uid);
+					if (map == null)
+						Game.LoadShellMap();
+					else
+					{
+						DiscordService.UpdateStatus(DiscordState.InMapEditor);
+						Game.LoadEditor(map);
+					}
+				};
+
+				ConfirmationDialogs.ButtonPrompt(
+					title: "Leave Mission",
+					text: "Leave this game and return to the editor?",
+					onConfirm: onConfirm,
+					onCancel: ShowMenu,
+					confirmText: "Back To Editor",
+					cancelText: "Stay");
+			};
+		}
+
 		void CreateExitEditorButton()
 		{
 			if (world.Type != WorldType.Editor)

diff --git a/mods/cnc/chrome/ingame-menu.yaml b/mods/cnc/chrome/ingame-menu.yaml
@@ -2,7 +2,7 @@ Container@INGAME_MENU:
 	Width: WINDOW_RIGHT
 	Height: WINDOW_BOTTOM
 	Logic: IngameMenuLogic
-		Buttons: EXIT_EDITOR, SAVE_MAP, ABORT_MISSION, SURRENDER, RESTART, LOAD_GAME, SAVE_GAME, MUSIC, SETTINGS, RESUME
+		Buttons: EXIT_EDITOR, PLAY_MAP, SAVE_MAP, ABORT_MISSION, BACK_TO_EDITOR, SURRENDER, RESTART, LOAD_GAME, SAVE_GAME, MUSIC, SETTINGS, RESUME
 		ButtonStride: 130, 0
 	Children:
 		Image@EVA:

diff --git a/mods/common/chrome/ingame-menu.yaml b/mods/common/chrome/ingame-menu.yaml
@@ -2,7 +2,7 @@ Container@INGAME_MENU:
 	Width: WINDOW_RIGHT
 	Height: WINDOW_BOTTOM
 	Logic: IngameMenuLogic
-		Buttons: RESUME, LOAD_GAME, SAVE_GAME, SETTINGS, MUSIC, SURRENDER, RESTART, ABORT_MISSION, SAVE_MAP, EXIT_EDITOR
+		Buttons: RESUME, LOAD_GAME, SAVE_GAME, SETTINGS, MUSIC, SURRENDER, RESTART, BACK_TO_EDITOR, ABORT_MISSION, SAVE_MAP, PLAY_MAP, EXIT_EDITOR
 		ButtonStride: 0, 40
 	Children:
 		Background@BORDER:

diff --git a/mods/d2k/chrome/ingame-menu.yaml b/mods/d2k/chrome/ingame-menu.yaml
@@ -2,7 +2,7 @@ Container@INGAME_MENU:
 	Width: WINDOW_RIGHT
 	Height: WINDOW_BOTTOM
 	Logic: IngameMenuLogic
-		Buttons: RESUME, LOAD_GAME, SAVE_GAME, SETTINGS, MUSIC, SURRENDER, RESTART, ABORT_MISSION, SAVE_MAP, EXIT_EDITOR
+		Buttons: RESUME, LOAD_GAME, SAVE_GAME, SETTINGS, MUSIC, SURRENDER, RESTART, BACK_TO_EDITOR, ABORT_MISSION, SAVE_MAP, PLAY_MAP, EXIT_EDITOR
 		ButtonStride: 0, 40
 	Children:
 		Label@VERSION_LABEL: