allow gm to see and edit all units on any team hidden or not in lobby

MegaMek · Nov 25, 2023 · b3150d6 · b3150d6
1 parent 262b730
commit b3150d6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/lobby/ChatLounge.java b/megamek/src/megamek/client/ui/swing/lobby/ChatLounge.java
@@ -1269,7 +1269,8 @@ private void refreshMekTable() {
             boolean localUnit = entity.getOwner().equals(localPlayer());
             boolean teamUnit = !entity.getOwner().isEnemyOf(localPlayer());
             boolean realBlindDrop = opts.booleanOption(OptionsConstants.BASE_REAL_BLIND_DROP);
-            if (localUnit || teamUnit || !realBlindDrop) {
+            boolean localGM = localPlayer().isGameMaster();
+            if (localUnit || teamUnit || !realBlindDrop || localGM) {
                 mekModel.addUnit(entity);
             }
         }
@@ -1504,8 +1505,9 @@ void disembarkAll(Collection<Entity> entities) {
      * own units (and bots) though.
      */
     boolean isEditable(Entity entity) {
-        return clientgui.getLocalBots().containsKey(entity.getOwner().getName())
-                || (entity.getOwnerId() == localPlayer().getId());
+        boolean localGM = clientgui.getClient().getLocalPlayer().isGameMaster();
+        return !localGM && (clientgui.getLocalBots().containsKey(entity.getOwner().getName())
+                || (entity.getOwnerId() == localPlayer().getId()));
     }
 
     /**

diff --git a/megamek/src/megamek/client/ui/swing/lobby/LobbyActions.java b/megamek/src/megamek/client/ui/swing/lobby/LobbyActions.java
@@ -1192,7 +1192,9 @@ private Client correctSender(Force force) {
      * player is allowed to change everything.
      */
     boolean isEditable(Entity entity) {
-        return client().localBots.containsKey(entity.getOwner().getName())
+        boolean localGM = client().getLocalPlayer().isGameMaster();
+        return localGM
+                || client().localBots.containsKey(entity.getOwner().getName())
                 || (entity.getOwnerId() == localPlayer().getId())
                 || (entity.partOfForce() && isSelfOrLocalBot(game().getForces().getOwner(entity.getForceId())))
                 || (entity.partOfForce() && isEditable(game().getForces().getForce(entity)));
@@ -1222,7 +1224,8 @@ boolean isEditable(Collection<Entity> entities) {
      * of the entities are not on his team.
      */
     boolean canSeeAll(Collection<Entity> entities) {
-        if (!isBlindDrop(game()) && !isRealBlindDrop(game())) {
+        boolean localGM = client().getLocalPlayer().isGameMaster();
+        if (localGM || (!isBlindDrop(game()) && !isRealBlindDrop(game()))) {
             return true;
         }
         return entities.stream().noneMatch(this::isLocalEnemy);

diff --git a/megamek/src/megamek/client/ui/swing/lobby/LobbyMekCellFormatter.java b/megamek/src/megamek/client/ui/swing/lobby/LobbyMekCellFormatter.java
@@ -85,7 +85,8 @@ static String formatUnitFull(Entity entity, ChatLounge lobby, boolean forceView)
         GameOptions options = game.getOptions();
         Player localPlayer = client.getLocalPlayer();
         Player owner = entity.getOwner();
-        boolean hideEntity = owner.isEnemyOf(localPlayer)
+        boolean localGM = localPlayer.isGameMaster();
+        boolean hideEntity = !localGM && owner.isEnemyOf(localPlayer)
                 && options.booleanOption(OptionsConstants.BASE_BLIND_DROP);
         if (hideEntity) {
             result.append(DOT_SPACER);
@@ -493,7 +494,8 @@ static String formatUnitCompact(Entity entity, ChatLounge lobby, boolean forceVi
         GameOptions options = game.getOptions();
         Player localPlayer = client.getLocalPlayer();
         Player owner = entity.getOwner();
-        boolean hideEntity = owner.isEnemyOf(localPlayer)
+        boolean localGM = localPlayer.isGameMaster();
+        boolean hideEntity = !localGM && owner.isEnemyOf(localPlayer)
                 && options.booleanOption(OptionsConstants.BASE_BLIND_DROP);
         if (hideEntity) {
             String value = "<HTML><NOBR>&nbsp;&nbsp;";

diff --git a/megamek/src/megamek/client/ui/swing/lobby/MekTableModel.java b/megamek/src/megamek/client/ui/swing/lobby/MekTableModel.java
@@ -104,7 +104,8 @@ public Object getValueAt(int row, int col) {
         if (col == COLS.BV.ordinal()) {
             boolean isEnemy = clientGui.getClient().getLocalPlayer().isEnemyOf(ownerOf(entity));
             boolean isBlindDrop = clientGui.getClient().getGame().getOptions().booleanOption(OptionsConstants.BASE_BLIND_DROP);
-            boolean hideEntity = isEnemy && isBlindDrop;
+            boolean localGM = clientGui.getClient().getLocalPlayer().isGameMaster();
+            boolean hideEntity = !localGM && isEnemy && isBlindDrop;
             float size = chatLounge.isCompact() ? 0 : 0.2f;
             return hideEntity ? "" : guiScaledFontHTML(size) + NumberFormat.getIntegerInstance().format(bv.get(row));
 
@@ -176,8 +177,10 @@ private void addCellData(InGameObject entity) {
         // Note that units of a player's bots are obscured because they could be added from
         // a MekHQ AtB campaign. Thus, the player can still configure them and so can identify
         // the obscured units but has to actively decide to do it.
-        boolean hideEntity = clientGui.getClient().getLocalPlayer().isEnemyOf(owner)
+        boolean localGM = clientGui.getClient().getLocalPlayer().isGameMaster();
+        boolean hideEntity = !localGM && clientGui.getClient().getLocalPlayer().isEnemyOf(owner)
                 && clientGui.getClient().getGame().getOptions().booleanOption(OptionsConstants.BASE_BLIND_DROP);
+
         if (hideEntity) {
             unitTooltips.add(null);
             pilotTooltips.add(null);
@@ -295,7 +298,8 @@ public Component getTableCellRendererComponent(final JTable table,
             }
 
             Player owner = ownerOf(entity);
-            boolean showAsUnknown = clientGui.getClient().getLocalPlayer().isEnemyOf(owner)
+            boolean localGM = clientGui.getClient().getLocalPlayer().isGameMaster();
+            boolean showAsUnknown = !localGM && clientGui.getClient().getLocalPlayer().isEnemyOf(owner)
                     && clientGui.getClient().getGame().getOptions().booleanOption(OptionsConstants.BASE_BLIND_DROP);
             int size = UIUtil.scaleForGUI(MEKTABLE_IMGHEIGHT);