Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for space station rotation #4895

Merged
merged 1 commit into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions megamek/src/megamek/common/Jumpship.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
5 changes: 5 additions & 0 deletions megamek/src/megamek/common/SpaceStation.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ public int getECMRange() {
return range;
}

@Override
public boolean isBattleStation() {
return designType == MILITARY;
}

@Override
public double getBVTypeModifier() {
return 0.7;
Expand Down
5 changes: 0 additions & 5 deletions megamek/src/megamek/common/loaders/BLKSpaceStationFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down