Skip to content

Commit

Permalink
check for not dusk dawn for searchlight penlty reduction
Browse files Browse the repository at this point in the history
  • Loading branch information
kuronekochomusuke committed Feb 3, 2024
1 parent 04dfa08 commit 1f7ec49
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion megamek/src/megamek/common/actions/AbstractAttackAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ public static ToHitData nightModifiers(Game game, Targetable target, AmmoType at
}
}
}
// TO:AR 6TH ed. p.56
// Searchlights reduce the penalty to zero (or 1 for pitch-black)
// (except for dusk/dawn)
int searchlightMod = Math.min(3, night_modifier);
Expand All @@ -146,7 +147,7 @@ public static ToHitData nightModifiers(Game game, Targetable target, AmmoType at
int fireMod = Math.min(2, night_modifier);
toHit.addModifier(-fireMod, "target illuminated by fire");
night_modifier -= fireMod;
} else if (hexIllumLvl.isSearchlight()) {
} else if ((lightCond > PlanetaryConditions.L_DUSK) && (hexIllumLvl.isSearchlight())) {
toHit.addModifier(-searchlightMod, "target illuminated by searchlight");
night_modifier -= searchlightMod;
} else if (atype != null) {
Expand Down

0 comments on commit 1f7ec49

Please sign in to comment.