Merge pull request #1652 from pavelbraginskiy/fix-1651

Fix claw modifier in RS
MegaMek · Nov 5, 2024 · 7d4e904 · 7d4e904
2 parents 0fcf925 + 51bc6fe
commit 7d4e904
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/megameklab/src/megameklab/printing/reference/PhysicalAttacks.java b/megameklab/src/megameklab/printing/reference/PhysicalAttacks.java
@@ -13,6 +13,7 @@
  */
 package megameklab.printing.reference;
 
+import megamek.logging.MMLogger;
 import org.apache.batik.util.SVGConstants;
 
 import megamek.common.Entity;
@@ -31,6 +32,8 @@
  */
 public class PhysicalAttacks extends ReferenceTable {
 
+    private static final MMLogger logger = MMLogger.create(PhysicalAttacks.class);
+
     public PhysicalAttacks(PrintMek sheet) {
         super(sheet, 0.05, 0.5, 0.8);
         setHeaders(bundle.getString("attack"), bundle.getString("toHit"), bundle.getString("damage"));
@@ -120,10 +123,17 @@ private void addPunchAttack(String name, int actuators, int baseDamage, boolean
 
     private void addPhysicalWeapon(Entity entity) {
         for (Mounted<?> mounted : entity.getMisc()) {
-            if (mounted.getType().hasFlag(MiscType.F_CLUB) || mounted.getType().hasFlag(MiscType.F_HAND_WEAPON)) {
+            if (mounted.getType().hasFlag(MiscType.F_CLUB)) {
                 addRow(mounted.getName(),
                         String.format("%+d", ClubAttackAction.getHitModFor((MiscType) mounted.getType())),
                         StringUtils.getEquipmentInfo(entity, mounted));
+            } else if (mounted.getType().hasFlag(MiscType.F_HAND_WEAPON)) {
+                if (mounted.getType().hasSubType(MiscType.S_CLAW)) {
+                    addRow(mounted.getName(), "+1", StringUtils.getEquipmentInfo(entity, mounted));
+                } else {
+                    logger.error("Unknown hand weapon %s!".formatted(mounted.getName()));
+                    addRow(mounted.getName(), "???", StringUtils.getEquipmentInfo(entity, mounted));
+                }
             }
         }
     }