From d29ca41e75a23990ab6f7f3d9f1ef1a3b43bbf33 Mon Sep 17 00:00:00 2001 From: cwspain Date: Thu, 16 Nov 2023 10:50:17 -0600 Subject: [PATCH] Remove battlestation field and use designType instead. --- megamek/src/megamek/common/Jumpship.java | 10 +--------- megamek/src/megamek/common/SpaceStation.java | 5 +++++ .../megamek/common/loaders/BLKSpaceStationFile.java | 5 ----- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/megamek/src/megamek/common/Jumpship.java b/megamek/src/megamek/common/Jumpship.java index 1291464b5e4..b302efd7a40 100644 --- a/megamek/src/megamek/common/Jumpship.java +++ b/megamek/src/megamek/common/Jumpship.java @@ -82,9 +82,6 @@ public class Jumpship extends Aero { private int escapePodsLaunched = 0; private int lifeBoatsLaunched = 0; - // Battlestation - private boolean isBattleStation = false; - // HPG private boolean hasHPG = false; @@ -482,13 +479,8 @@ public boolean hasHPG() { return hasHPG; } - public void setBattleStation(boolean b) { - isBattleStation = b; - - } - public boolean isBattleStation() { - return isBattleStation; + return false; } public void setLF(boolean b) { diff --git a/megamek/src/megamek/common/SpaceStation.java b/megamek/src/megamek/common/SpaceStation.java index 4c726beca83..a6885da71bc 100644 --- a/megamek/src/megamek/common/SpaceStation.java +++ b/megamek/src/megamek/common/SpaceStation.java @@ -117,6 +117,11 @@ public int getECMRange() { return range; } + @Override + public boolean isBattleStation() { + return designType == MILITARY; + } + @Override public double getBVTypeModifier() { return 0.7; diff --git a/megamek/src/megamek/common/loaders/BLKSpaceStationFile.java b/megamek/src/megamek/common/loaders/BLKSpaceStationFile.java index 6334262a804..29bb52e961e 100644 --- a/megamek/src/megamek/common/loaders/BLKSpaceStationFile.java +++ b/megamek/src/megamek/common/loaders/BLKSpaceStationFile.java @@ -147,11 +147,6 @@ public Entity getEntity() throws EntityLoadingException { a.setModular(true); } - // BattleStation - if (dataFile.exists("Battlestation")) { - a.setBattleStation(true); - } - // Grav Decks - two approaches // First, the old method, where a number of grav decks for each category is specified // This doesn't allow us to specify precise size