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

Bv weapon heat #2469

Merged
merged 2 commits into from
Dec 4, 2020
Merged

Bv weapon heat #2469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b4e479
Apply streak missile heat BV adjustment to iATM
neoancient Nov 29, 2020
8e202ae
Account for extra heat for prototype laser in BV calculations.
neoancient Nov 29, 2020
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
13 changes: 12 additions & 1 deletion megamek/src/megamek/common/Mech.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import megamek.common.weapons.other.ISMekTaser;
import megamek.common.weapons.other.TSEMPWeapon;
import megamek.common.weapons.ppc.PPCWeapon;
import megamek.common.weapons.prototypes.*;

/**
* You know what mechs are, silly.
Expand Down Expand Up @@ -4472,6 +4473,15 @@ && locationHasCase(loc)) {
weaponHeat *= 6;
}

// 1d6 extra heat; add half for heat calculations (1d3/+2 for small pulse)
if ((wtype instanceof ISERLaserLargePrototype)
|| (wtype instanceof ISPulseLaserLargePrototype)
|| (wtype instanceof ISPulseLaserMediumPrototype)
|| (wtype instanceof ISPulseLaserMediumRecovered)) {
weaponHeat += 3;
} else if (wtype instanceof ISPulseLaserSmallPrototype) {
weaponHeat += 2;
}

String name = wtype.getName();

Expand Down Expand Up @@ -4500,7 +4510,8 @@ && locationHasCase(loc)) {
// half heat for streaks
if ((wtype.getAmmoType() == AmmoType.T_SRM_STREAK)
|| (wtype.getAmmoType() == AmmoType.T_MRM_STREAK)
|| (wtype.getAmmoType() == AmmoType.T_LRM_STREAK)) {
|| (wtype.getAmmoType() == AmmoType.T_LRM_STREAK)
|| (wtype.getAmmoType() == AmmoType.T_IATM)) {
weaponHeat *= 0.5;
}
// check to see if the weapon is a PPC and has a Capacitor attached
Expand Down