Merge pull request #2503 from MegaMek/superheavy_talons

Two talon bugs
MegaMek · Dec 12, 2020 · 7708064 · 7708064
2 parents 527218b + 06fbfcf
commit 7708064
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 36 deletions.
diff --git a/megamek/src/megamek/common/MechFileParser.java b/megamek/src/megamek/common/MechFileParser.java
@@ -593,42 +593,18 @@ else if (m.getType().hasFlag(MiscType.F_APOLLO)
             }
 
             if (m.getType().hasFlag(MiscType.F_TALON)) {
-                if (ent instanceof BipedMech) {
-                    if ((m.getLocation() != Mech.LOC_LLEG)
-                            && (m.getLocation() != Mech.LOC_RLEG)) {
-                        throw new EntityLoadingException(
-                                "Talons are only legal in the Legs for "+ent.getShortName());
+                if (ent instanceof Mech) {
+                    if (!ent.locationIsLeg(m.getLocation())) {
+                        throw new EntityLoadingException("Talons are only legal in the Legs for " + ent.getShortName());
                     }
-
-                    if (!ent.hasWorkingMisc(MiscType.F_TALON, -1, Mech.LOC_RLEG)
-                            || !ent.hasWorkingMisc(MiscType.F_TALON, -1,
-                                    Mech.LOC_LLEG)) {
-                        throw new EntityLoadingException(
-                                "Talons must be in all legs for "+ent.getShortName());
-                    }
-                } else if (ent instanceof QuadMech) {
-                    if ((m.getLocation() != Mech.LOC_LLEG)
-                            && (m.getLocation() != Mech.LOC_RLEG)
-                            && (m.getLocation() != Mech.LOC_LARM)
-                            && (m.getLocation() != Mech.LOC_RARM)) {
-                        throw new EntityLoadingException(
-                                "Talons are only legal in the Legs for "+ent.getShortName());
-                    }
-
-                    if (!ent.hasWorkingMisc(MiscType.F_TALON, -1, Mech.LOC_RLEG)
-                            || !ent.hasWorkingMisc(MiscType.F_TALON, -1,
-                                    Mech.LOC_LLEG)
-                            || !ent.hasWorkingMisc(MiscType.F_TALON, -1,
-                                    Mech.LOC_LARM)
-                            || !ent.hasWorkingMisc(MiscType.F_TALON, -1,
-                                    Mech.LOC_LARM)) {
-                        throw new EntityLoadingException(
-                                "Talons must be in all legs for "+ent.getShortName());
+                    for (int loc = 0; loc < ent.locations(); loc++) {
+                        if (ent.locationIsLeg(loc) && !ent.hasWorkingMisc(MiscType.F_TALON, -1, loc)) {
+                            throw new EntityLoadingException("Talons must be in all legs for " + ent.getShortName());
+                        }
                     }
-
                 } else {
-                    throw new EntityLoadingException(
-                            "Unable to load talons in non-Mek entity for "+ent.getShortName());
+                    throw new EntityLoadingException("Unable to load talons in non-Mek entity for "
+                            + ent.getShortName());
                 }
             }
 

diff --git a/megamek/src/megamek/common/verifier/TestMech.java b/megamek/src/megamek/common/verifier/TestMech.java
@@ -1001,11 +1001,11 @@ && countCriticalSlotsFromEquipInLocation(mech, m, loc) != 1) {
             }
 
             if (m.getType().hasFlag(MiscType.F_TALON)) {
+                int slots = getMech().isSuperHeavy() ? 1 : 2;
                 for (int loc = 0; loc < mech.locations(); loc++) {
-                    if (mech.locationIsLeg(loc)
-                            && countCriticalSlotsFromEquipInLocation(mech, m, loc) != 2) {
+                    if (mech.locationIsLeg(loc) && countCriticalSlotsFromEquipInLocation(mech, m, loc) != slots) {
                         illegal = true;
-                        buff.append("Talons require two critical slots in each leg.\n");
+                        buff.append("Talons require ").append(slots).append(" critical slots in each leg.\n");
                         break;
                     }
                 }