Weight calc correction, some utility

MegaMek · Dec 21, 2023 · af6286c · af6286c
1 parent 9489d66
commit af6286c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -11073,6 +11073,11 @@ public Engine getEngine() {
         return engine;
     }
 
+    /** @return The type of engine if it has an engine, or Engine.NONE, if it has no engine. */
+    public int getEngineType() {
+        return hasEngine() ? getEngine().getEngineType() : Engine.NONE;
+    }
+
     public boolean hasEngine() {
         return (null != engine);
     }

diff --git a/megamek/src/megamek/common/verifier/TestEntity.java b/megamek/src/megamek/common/verifier/TestEntity.java
@@ -1689,6 +1689,14 @@ boolean usesKgStandard() {
         return usesKgStandard(getEntity());
     }
 
+
+    public int totalCritSlotCount() {
+        int slotCount = 0;
+        for (int i = 0; i < getEntity().locations(); i++) {
+            slotCount += getEntity().getNumberOfCriticals(i);
+        }
+        return slotCount;
+    }
 } // End class TestEntity
 
 class Armor {

diff --git a/megamek/src/megamek/common/verifier/TestSupportVehicle.java b/megamek/src/megamek/common/verifier/TestSupportVehicle.java
@@ -720,7 +720,7 @@ public double calculateWeight() {
 
     @Override
     public double calculateWeightExact() {
-        return super.calculateWeight() + getFuelTonnage();
+        return super.calculateWeightExact() + getFuelTonnage();
     }
 
     @Override