Merge pull request #6223 from Scoppio/gm-control-all-bots

feat: Allows GM to control any bot in the game
MegaMek · Nov 29, 2024 · 9767b10 · 9767b10
2 parents c6d3619 + 58eafea
commit 9767b10
Showing 1 changed file with 32 additions and 23 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/MapMenu.java b/megamek/src/megamek/client/ui/swing/MapMenu.java
@@ -29,6 +29,7 @@
 import javax.swing.*;
 
 import megamek.client.Client;
+import megamek.client.bot.princess.CardinalEdge;
 import megamek.client.event.BoardViewEvent;
 import megamek.client.ui.Messages;
 import megamek.client.ui.swing.gmCommands.GamemasterCommandPanel;
@@ -415,28 +416,26 @@ private JMenu createSpecialHexDisplayMenu() {
      */
     private JMenu createPleaToRoyaltyMenu() {
         JMenu menu = new JMenu(Messages.getString("Bot.commands.title"));
-
+        var isGM = client.getLocalPlayer().isGameMaster();
         for (var player : client.getGame().getPlayersList()) {
-            if (!player.isEnemyOf(client.getLocalPlayer()) && player.isBot()) {
+            var isEnemy = player.isEnemyOf(client.getLocalPlayer());
+            var playerIsBot = player.isBot();
+            if (playerIsBot && (!isEnemy || isGM)) {
                 menu.add(createBotCommands(player));
             }
         }
         return menu;
     }
 
     private JMenu createBotCommands(Player bot) {
-        JMenu menu = new JMenu(bot.getName());
+        JMenu menu = new JMenu(bot.getName() + " (" + Player.TEAM_NAMES[bot.getTeam()] + ")");
 
         JMenu targetHexMenu = new JMenu(Messages.getString("Bot.commands.targetHex"));
         JMenu prioritizeTargetUnitMenu = new JMenu(Messages.getString("Bot.commands.priority"));
         JMenu ignoreTargetMenu= new JMenu(Messages.getString("Bot.commands.ignore"));
-
-        JMenu fleeMenu = new JMenu(Messages.getString("Bot.commands.flee"));
+        JMenu fleeMenu = createFleeMenu(bot);
         JMenu behaviorMenu = createBehaviorMenu(bot);
 
-
-        behaviorMenu.add(createBehaviorMenu(bot));
-        fleeMenu.add(createFleeMenu(bot));
         targetHexMenu.add(createTargetHexMenuItem(bot));
         menu.add(targetHexMenu);
 
@@ -565,23 +564,33 @@ JMenu createCautionMenu(Player bot) {
     }
 
 
-    JMenuItem createFleeMenu(Player bot) {
-        JMenuItem item = new JMenuItem(Messages.getString("Bot.commands.flee.text"));
-        item.addActionListener(evt -> {
-                int confirm = JOptionPane.showConfirmDialog(
-                    gui.getFrame(),
-                    Messages.getString("Bot.commands.flee.confirmation", bot.getName()),
-                    Messages.getString("Bot.commands.flee.confirm"),
-                    JOptionPane.YES_NO_OPTION);
+    JMenu createFleeMenu(Player bot) {
+        JMenu menu = new JMenu(Messages.getString("Bot.commands.flee"));
+        menu.add(setFleeAction(new JMenuItem(Messages.getString("BotConfigDialog.northEdge")), bot, CardinalEdge.NORTH));
+        menu.add(setFleeAction(new JMenuItem(Messages.getString("BotConfigDialog.southEdge")), bot, CardinalEdge.SOUTH));
+        menu.add(setFleeAction(new JMenuItem(Messages.getString("BotConfigDialog.westEdge")), bot, CardinalEdge.WEST));
+        menu.add(setFleeAction(new JMenuItem(Messages.getString("BotConfigDialog.eastEdge")), bot, CardinalEdge.EAST));
+        menu.add(setFleeAction(new JMenuItem(Messages.getString("BotConfigDialog.nearestEdge")), bot, CardinalEdge.NEAREST));
+        return menu;
+    }
 
-                if (confirm == JOptionPane.YES_OPTION) {
-                    client.sendChat(String.format("%s: flee",
-                        bot.getName()
-                    ));
-                }
+    private JMenuItem setFleeAction(JMenuItem fleeMenuItem, Player bot, CardinalEdge cardinalEdge) {
+        fleeMenuItem.addActionListener(evt -> {
+            int confirm = JOptionPane.showConfirmDialog(
+                gui.getFrame(),
+                Messages.getString("Bot.commands.flee.confirmation", bot.getName()),
+                Messages.getString("Bot.commands.flee.confirm"),
+                JOptionPane.YES_NO_OPTION);
+
+            if (confirm == JOptionPane.YES_OPTION) {
+                client.sendChat(String.format("%s: flee : %d",
+                    bot.getName(),
+                    cardinalEdge.getIndex()
+                ));
             }
-        );
-        return item;
+        });
+
+        return fleeMenuItem;
     }
 
     JMenuItem createIgnoreTargetUnitMenu(Player bot, Entity entity) {