More cleanup around IBB cargo crits

MegaMek · Dec 28, 2023 · e248415 · e248415
1 parent 1a8774e
commit e248415
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -24890,9 +24890,7 @@ private Vector<Report> applyAeroCritical(Aero aero, int loc, CriticalSlot cs, in
  js = (Jumpship) aero;
  }
 
- // For testing purposes
- // switch (cs.getIndex()) {
- switch (Aero.CRIT_CARGO) {
+ switch (cs.getIndex()) {
  case Aero.CRIT_NONE:
  // no effect
  r = new Report(6005);
@@ -25637,9 +25635,9 @@ private void applyCargoCritical(Aero aero, int damageCaused, Vector<Report> repo
  // Prompt user, but just randomize bot's bombs to lose.
  destroyed = (int) percentDestroyed * aero.getMaxIntBombPoints();
  r = new Report(5605);
- r.choose(!aero.getOwner().isBot());
  r.subject = aero.getId();
  r.addDesc(aero);
+ r.choose(!aero.getOwner().isBot());
  r.add((int) destroyed);
  reports.add(r);
  int bombsDestroyed = (int) (aero.getInternalBombsDamageTotal() / destroyed);
@@ -25681,6 +25679,7 @@ private void applyCargoCritical(Aero aero, int damageCaused, Vector<Report> repo
  }
 
  private void damageBomb(Mounted bomb) {
+ bomb.setShotsLeft(0);
  bomb.setHit(true);
  if (bomb.getLinked() != null && (bomb.getLinked().getUsableShotsLeft() > 0)) {
  bomb.getLinked().setHit(true);