From 2807f179874f26b84246a9eb3facfa6187b8cd93 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Wed, 14 May 2025 11:17:26 -0500 Subject: [PATCH 1/2] Fix: Fixed Tactics Bonus to No Longer Use the Tactic Number as a Bonus --- MekHQ/src/mekhq/campaign/unit/Unit.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/unit/Unit.java b/MekHQ/src/mekhq/campaign/unit/Unit.java index 9fb3b806002..998b6449545 100644 --- a/MekHQ/src/mekhq/campaign/unit/Unit.java +++ b/MekHQ/src/mekhq/campaign/unit/Unit.java @@ -4477,8 +4477,7 @@ public void resetPilotAndEntity() { // Tactics command bonus. This should actually reflect the unit's commander if (null != commander && commander.hasSkill(SkillType.S_TACTICS)) { entity.getCrew() - .setCommandBonus(commander.getSkill(SkillType.S_TACTICS) - .getFinalSkillValue(commander.getOptions())); + .setCommandBonus(commander.getSkill(SkillType.S_TACTICS).getTotalSkillLevel()); } } From 721f2922b85f27131869ae8155c8ad526bbbad91 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Wed, 14 May 2025 11:59:21 -0500 Subject: [PATCH 2/2] Fix: Fixed Tactics Bonus to No Longer Use the Tactic Number as a Bonus --- MekHQ/src/mekhq/campaign/CampaignOptions.java | 2 +- MekHQ/src/mekhq/campaign/unit/Unit.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/CampaignOptions.java b/MekHQ/src/mekhq/campaign/CampaignOptions.java index da113d45f85..bb99cc8350f 100644 --- a/MekHQ/src/mekhq/campaign/CampaignOptions.java +++ b/MekHQ/src/mekhq/campaign/CampaignOptions.java @@ -6777,8 +6777,8 @@ public void updateCampaignOptionsFromGameOptions(GameOptions gameOptions) { * @param gameOptions the {@link GameOptions} to update based on the current campaign options. */ public void updateGameOptionsFromCampaignOptions(GameOptions gameOptions) { - gameOptions.getOption(RPG_COMMAND_INIT).setValue(useTactics); gameOptions.getOption(RPG_INDIVIDUAL_INITIATIVE).setValue(useInitiativeBonus); + gameOptions.getOption(RPG_COMMAND_INIT).setValue(useTactics || useInitiativeBonus); gameOptions.getOption(RPG_TOUGHNESS).setValue(useToughness); gameOptions.getOption(RPG_ARTILLERY_SKILL).setValue(useArtillery); gameOptions.getOption(RPG_PILOT_ADVANTAGES).setValue(useAbilities); diff --git a/MekHQ/src/mekhq/campaign/unit/Unit.java b/MekHQ/src/mekhq/campaign/unit/Unit.java index 998b6449545..3b0963a454a 100644 --- a/MekHQ/src/mekhq/campaign/unit/Unit.java +++ b/MekHQ/src/mekhq/campaign/unit/Unit.java @@ -4473,7 +4473,8 @@ public void resetPilotAndEntity() { // Set Tactics-based Commander's Initiative Bonus, if applicable entity.getCrew().setCommandBonus(0); - if (getCampaign().getCampaignOptions().isUseTactics()) { + if (getCampaign().getCampaignOptions().isUseTactics() || + getCampaign().getCampaignOptions().isUseInitiativeBonus()) { // Tactics command bonus. This should actually reflect the unit's commander if (null != commander && commander.hasSkill(SkillType.S_TACTICS)) { entity.getCrew()