From fded4395faf903c87a7f2491db11387eab5bbbea Mon Sep 17 00:00:00 2001 From: kuronekochomusuke Date: Sat, 25 Nov 2023 15:45:27 -0500 Subject: [PATCH 1/2] weapon panel factor in combat computer with displaying heat buildup --- .../src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java index 36bb651529b..ea05333c3a0 100644 --- a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java +++ b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java @@ -1151,6 +1151,10 @@ public void displayMech(Entity en) { currentHeatBuildup++; } + if (entity.hasQuirk(OptionsConstants.QUIRK_POS_COMBAT_COMPUTER)) { + currentHeatBuildup -= 4; + } + // check for negative values due to extreme temp if (currentHeatBuildup < 0) { currentHeatBuildup = 0; From e0d49811b8cf16f7902e1ea7fc7b3c7d8866896d Mon Sep 17 00:00:00 2001 From: kuronekochomusuke Date: Sat, 25 Nov 2023 15:55:38 -0500 Subject: [PATCH 2/2] typo --- .../src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java index ea05333c3a0..82bf11938b2 100644 --- a/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java +++ b/megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java @@ -1151,7 +1151,7 @@ public void displayMech(Entity en) { currentHeatBuildup++; } - if (entity.hasQuirk(OptionsConstants.QUIRK_POS_COMBAT_COMPUTER)) { + if (en.hasQuirk(OptionsConstants.QUIRK_POS_COMBAT_COMPUTER)) { currentHeatBuildup -= 4; }