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

check for not dusk dawn for searchlight penalty reduction #5122

Merged
merged 1 commit into from
Feb 4, 2024
Merged
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
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
Loading