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.

Sign up for GitHub

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

Jump to bottom

LAM in fighter mode uses wrong hit location table #6144 #6176

Merged
merged 2 commits into from
Nov 5, 2024
Merged

LAM in fighter mode uses wrong hit location table #6144 #6176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04dd889
to hit to check if mode is mek
DM0000 Nov 2, 2024
3a7d53c
added the other overloaded rollHitLocation to LAM class to ensure cor…
DM0000 Nov 4, 2024
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
12 changes: 12 additions & 0 deletions megamek/src/megamek/common/LandAirMek.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.Map;
import java.util.Vector;

import megamek.common.enums.AimingMode;
import megamek.common.enums.MPBoosters;
import megamek.common.equipment.AmmoMounted;
import megamek.common.equipment.BombMounted;
Expand Down Expand Up @@ -1498,12 +1499,23 @@ public int getWeaponArc(int wn) {
/**
* Hit location table for fighter mode
*/
@Override
public HitData rollHitLocation(int table, int side, int aimedLocation, AimingMode aimingMode,
int cover) {
if (getConversionMode() != CONV_MODE_FIGHTER) {
return super.rollHitLocation( table, side, aimedLocation, aimingMode,
cover);
}
return rollHitLocation(table, side);
}

@Override
public HitData rollHitLocation(int table, int side) {
if (getConversionMode() != CONV_MODE_FIGHTER) {
return super.rollHitLocation(table, side);
}


int roll = Compute.d6(2);

// first check for above/below
Expand Down