Disallow armored components for superheavy Meks.

+Fix #50: Super heavies shouldn't be allowed to use certain equipment.
MegaMek · Feb 18, 2017 · 6741a57 · 6741a57
1 parent 2d3f400
commit 6741a57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/docs/history.txt b/docs/history.txt
@@ -1,5 +1,8 @@
 VERSION HISTORY:
 ----------------
+v0.42.2-git
++ Issue #50: Super heavies shouldn't be allowed to use certain equipment.
+
 v0.42.1 (2017-02-13 03:30 UTC)
 + Printing for conventional infantry record sheets.
 + New infantry motive types: VTOL and SCUBA.

diff --git a/src/megameklab/com/util/Mech/DropTargetCriticalList.java b/src/megameklab/com/util/Mech/DropTargetCriticalList.java
@@ -447,7 +447,7 @@ public void actionPerformed(ActionEvent e) {
                         });
                         popup.add(info);
 
-                    } else {
+                    } else if (!(getUnit() instanceof Mech && ((Mech)getUnit()).isSuperHeavy())) {
                         JMenuItem info = new JMenuItem("Add Armoring");
                         info.setActionCommand(Integer.toString(location));
                         info.addActionListener(new ActionListener() {

diff --git a/src/megameklab/com/util/UnitUtil.java b/src/megameklab/com/util/UnitUtil.java
@@ -2390,7 +2390,6 @@ public static boolean isMechEquipment(EquipmentType eq, Mech unit) {
                             || eq.hasFlag(MiscType.F_MASC) // to catch Supercharger
                             || eq.hasFlag(MiscType.F_MODULAR_ARMOR)
                             || eq.hasFlag(MiscType.F_PARTIAL_WING)
-                            || eq.hasFlag(MiscType.F_SCM)
                             || eq.hasFlag(MiscType.F_UMU))) {
                 return false;
             }