From 35f0d6bfdf37a90d6c1c0d882bf06eb02ec1ba21 Mon Sep 17 00:00:00 2001 From: Pavel Braginskiy Date: Wed, 22 Jan 2025 00:26:05 -0800 Subject: [PATCH] Include door count for SV transport bays --- .../src/megameklab/printing/InventoryWriter.java | 2 +- megameklab/src/megameklab/printing/PrintTank.java | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/megameklab/src/megameklab/printing/InventoryWriter.java b/megameklab/src/megameklab/printing/InventoryWriter.java index 235088d15..171054bca 100644 --- a/megameklab/src/megameklab/printing/InventoryWriter.java +++ b/megameklab/src/megameklab/printing/InventoryWriter.java @@ -407,7 +407,7 @@ public void writeEquipment() { float[] metrics = scaleText(viewHeight - (yPosition - viewY), this::calcLineCount); yPosition = printEquipmentTable(equipment, yPosition, metrics[0], metrics[1]); - if (sheet.getEntity() instanceof SmallCraft && !transportBays.isEmpty()) { + if ((sheet.getEntity() instanceof SmallCraft || sheet.getEntity() instanceof SupportTank) && !transportBays.isEmpty()) { printBayInfo(metrics[0], metrics[1], yPosition); } if (sheet.showHeatProfile()) { diff --git a/megameklab/src/megameklab/printing/PrintTank.java b/megameklab/src/megameklab/printing/PrintTank.java index c51656a71..7c5b39951 100644 --- a/megameklab/src/megameklab/printing/PrintTank.java +++ b/megameklab/src/megameklab/printing/PrintTank.java @@ -23,18 +23,12 @@ import java.util.StringJoiner; import java.util.stream.Collectors; +import megamek.common.*; +import megameklab.util.CConfig; +import megameklab.util.RSScale; import org.w3c.dom.Element; import org.w3c.dom.svg.SVGRectElement; -import megamek.common.Bay; -import megamek.common.Entity; -import megamek.common.EntityMovementMode; -import megamek.common.MiscType; -import megamek.common.StandardSeatCargoBay; -import megamek.common.Tank; -import megamek.common.Transporter; -import megamek.common.InfantryCompartment; -import megamek.common.VTOL; import megameklab.printing.reference.ClusterHitsTable; import megameklab.printing.reference.GroundMovementRecord; import megameklab.printing.reference.GroundToHitMods; @@ -203,7 +197,8 @@ public String formatFeatures() { transport.merge("Infantry Compartment", t.getUnused(), Double::sum); } else if (t instanceof StandardSeatCargoBay) { seating.merge(((Bay) t).getType(), (int) ((Bay) t).getCapacity(), Integer::sum); - } else if (t instanceof Bay) { + // SVs have separate Bay handling similar to Small Craft, with doors. CVs just have bulk cargo space. + } else if (t instanceof Bay && !(tank instanceof SupportTank)) { transport.merge(((Bay) t).getType(), ((Bay) t).getCapacity(), Double::sum); } }