feat: Allows GM to control any bot in the game

MegaMek · Nov 26, 2024 · 6522f8a · 6522f8a
1 parent 61d2def
commit 6522f8a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/MapMenu.java b/megamek/src/megamek/client/ui/swing/MapMenu.java
@@ -415,17 +415,19 @@ 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"));