Merge remote changes with local updates

MegaMek · Dec 28, 2023 · ac56176 · ac56176
2 parents e248415 + 6a44891
commit ac56176
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/LandAirMech.java b/megamek/src/megamek/common/LandAirMech.java
@@ -1121,6 +1121,28 @@ public void setIntBombChoices(int[] bc) {
  }
  }
 
+ public void setUsedInternalBombs(int b){
+ // Do nothing; LAMs don't take internal bomb bay hits like this
+ }
+
+ public void increaseUsedInternalBombs(int b){
+ // Do nothing
+ }
+
+ public int getUsedInternalBombs() {
+ // Currently not possible
+ return 0;
+ }
+
+ @Override
+ public int[] getExtBombChoices() {
+ return extBombChoices;
+ }
+
+ @Override
+ public void setExtBombChoices(int[] bc) {
+ }
+
  @Override
  public void setUsedInternalBombs(int b){
  // Do nothing; LAMs don't take internal bomb bay hits like this

diff --git a/megamek/src/megamek/common/VTOL.java b/megamek/src/megamek/common/VTOL.java
@@ -301,6 +301,19 @@ public int reduceMPByBombLoad(int t) {
  return Math.max(0, (t - (int) this.getBombs().stream().filter(m -> (m.getUsableShotsLeft() > 0)).count()));
  }
 
+ public void setUsedInternalBombs(int b){
+ // Do nothing
+ }
+
+ public void increaseUsedInternalBombs(int b){
+ // Do nothing
+ }
+
+ public int getUsedInternalBombs() {
+ // Currently not possible
+ return 0;
+ }
+
  @Override
  public void setUsedInternalBombs(int b){
  // Do nothing

diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -24890,7 +24890,9 @@ private Vector<Report> applyAeroCritical(Aero aero, int loc, CriticalSlot cs, in
  js = (Jumpship) aero;
  }
 
- switch (cs.getIndex()) {
+ // For testing purposes
+ // switch (cs.getIndex()) {
+ switch (Aero.CRIT_CARGO) {
  case Aero.CRIT_NONE:
  // no effect
  r = new Report(6005);