Skip to content

Commit

Permalink
Use ModifiedConstantSkillGenerator for Skill Generation
Browse files Browse the repository at this point in the history
Replaced `TaharqaSkillGenerator` with `ModifiedConstantSkillGenerator` in `AtBScenarioModifierApplicator` and `BotForceRandomizer`.

This ensures consistency with updated skill generation logic used elsewhere in MekHQ. I updated our generation methods back in 2024, but apparently missed these two instances.
  • Loading branch information
IllianiCBT committed Feb 3, 2025
1 parent 7ba1cf4 commit af91811
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions MekHQ/src/mekhq/campaign/mission/BotForceRandomizer.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2024 - The Megamek Team. All Rights Reserved.
* Copyright (c) 2021-2025 - The Megamek Team. All Rights Reserved.
*
* This file is part of MekHQ.
*
Expand All @@ -23,7 +23,7 @@
import megamek.client.generator.RandomNameGenerator;
import megamek.client.generator.enums.SkillGeneratorType;
import megamek.client.generator.skillGenerators.AbstractSkillGenerator;
import megamek.client.generator.skillGenerators.TaharqaSkillGenerator;
import megamek.client.generator.skillGenerators.ModifiedConstantSkillGenerator;
import megamek.codeUtilities.StringUtility;
import megamek.common.*;
import megamek.common.annotations.Nullable;
Expand Down Expand Up @@ -491,7 +491,7 @@ public Entity getEntity(int uType, int weightClass, Campaign campaign) {
innerMap.put(Crew.MAP_GIVEN_NAME, crewNameArray[0]);
innerMap.put(Crew.MAP_SURNAME, crewNameArray[1]);

final AbstractSkillGenerator skillGenerator = new TaharqaSkillGenerator();
final AbstractSkillGenerator skillGenerator = new ModifiedConstantSkillGenerator();
skillGenerator.setLevel(skill);
if (faction.isClan()) {
skillGenerator.setType(SkillGeneratorType.CLAN);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2022 - The MegaMek Team. All Rights Reserved.
* Copyright (c) 2019-2025 - The MegaMek Team. All Rights Reserved.
*
* This file is part of MekHQ.
*
Expand All @@ -20,7 +20,7 @@

import megamek.client.generator.enums.SkillGeneratorType;
import megamek.client.generator.skillGenerators.AbstractSkillGenerator;
import megamek.client.generator.skillGenerators.TaharqaSkillGenerator;
import megamek.client.generator.skillGenerators.ModifiedConstantSkillGenerator;
import megamek.codeUtilities.MathUtility;
import megamek.common.*;
import megamek.common.enums.SkillLevel;
Expand Down Expand Up @@ -214,7 +214,7 @@ public static void adjustSkill(AtBDynamicScenario scenario, Campaign campaign,
scenario.getEffectiveOpforSkill().ordinal() + skillAdjustment,
SkillLevel.ULTRA_GREEN.ordinal(), SkillLevel.LEGENDARY.ordinal())];
// fire up a skill generator set to the appropriate skill model
final AbstractSkillGenerator abstractSkillGenerator = new TaharqaSkillGenerator();
final AbstractSkillGenerator abstractSkillGenerator = new ModifiedConstantSkillGenerator();
abstractSkillGenerator.setLevel(adjustedSkill);

if (Factions.getInstance().getFaction(scenario.getContract(campaign).getEnemyCode()).isClan()) {
Expand Down

0 comments on commit af91811

Please sign in to comment.