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

Improved Logging for Force Generation Process. #5274

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Improved Logging for Force Generation Process. #5274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 21 additions & 10 deletions MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,13 @@ private static int generateForces(AtBDynamicScenario scenario, AtBContract contr
effectiveUnitCount = calculateEffectiveUnitCount(scenario, campaign, false);

for (ScenarioForceTemplate forceTemplate : currentForceTemplates) {
logger.info(String.format("++ Generating a force for the %s template ++",
forceTemplate.getForceName()).toUpperCase());

if (forceTemplate.getGenerationMethod() == ForceGenerationMethod.FixedMUL.ordinal()) {
generatedLanceCount += generateFixedForce(scenario, contract, campaign, forceTemplate);
} else {
int weightClass = randomForceWeight();
logger.info(String.format("++ Generating a force for the %s template ++", forceTemplate.getForceName()).toUpperCase());

generatedLanceCount += generateForce(scenario, contract, campaign,
effectiveBV, effectiveUnitCount, weightClass, forceTemplate, false);
}
Expand Down Expand Up @@ -398,6 +399,10 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
effectiveBV = (int) round(effectiveBV * difficultyMultiplier);
effectiveUnitCount = (int) round(effectiveUnitCount * difficultyMultiplier);

if (forceTemplate.getGenerationMethod() == ForceGenerationMethod.BVScaled.ordinal()) {
logger.info(String.format("Effective xBV Budget: %s (adjusted for difficulty)",
effectiveBV));
}
// Intentional fall-through: opposing third parties are either the contracted
// enemy or "Unidentified Hostiles" which are considered pirates or bandit caste
// with random quality and skill
Expand Down Expand Up @@ -445,12 +450,15 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
int forceBV = 0;
double forceMultiplier = forceTemplate.getForceMultiplier();

if (forceMultiplier == 0) {
forceMultiplier = 1;
}
if (forceTemplate.getGenerationMethod() == ForceGenerationMethod.BVScaled.ordinal()
|| forceTemplate.getGenerationMethod() == ForceGenerationMethod.UnitCountScaled.ordinal()) {
// This means force multiplier wasn't initialized in the template
if (forceMultiplier == 0) {
forceMultiplier = 1;
logger.warn(String.format("Force multiplier is zero for %s", forceTemplate.getForceName()));
}

if (forceMultiplier != 1) {
logger.info(String.format("Force BV Multiplier: %s (from scenario template)", forceMultiplier));
logger.info(String.format("Force Multiplier: %s (from scenario template)", forceMultiplier));
}

int forceBVBudget = (int) (effectiveBV * forceMultiplier);
Expand All @@ -459,15 +467,18 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
forceBVBudget = (int) (forceBVBudget * ((double) campaign.getCampaignOptions().getScenarioModBV() / 100));
}

if (forceTemplate.getForceMultiplier() != 1) {
logger.info(String.format("BV Budget was %s, now %s (includes Modifier settings and Multiplier)",
if (forceTemplate.getForceMultiplier() != 1 && forceTemplate.getGenerationMethod() == ForceGenerationMethod.BVScaled.ordinal()) {
logger.info(String.format("BV Budget was %s, now %s",
effectiveBV, forceBVBudget));
}

int forceUnitBudget = 0;

if (forceTemplate.getGenerationMethod() == ForceGenerationMethod.UnitCountScaled.ordinal()) {
forceUnitBudget = (int) (effectiveUnitCount * forceTemplate.getForceMultiplier());

logger.info(String.format("Unit Budget was %s, now %s",
effectiveUnitCount, forceUnitBudget));
} else if ((forceTemplate.getGenerationMethod() == ForceGenerationMethod.FixedUnitCount.ordinal())
|| (forceTemplate.getGenerationMethod() == ForceGenerationMethod.PlayerOrFixedUnitCount.ordinal())) {
forceUnitBudget = forceTemplate.getFixedUnitCount() == ScenarioForceTemplate.FIXED_UNIT_SIZE_LANCE ? lanceSize : forceTemplate.getFixedUnitCount();
Expand Down Expand Up @@ -2957,7 +2968,7 @@ public static int calculateEffectiveBV(AtBDynamicScenario scenario, Campaign cam
}
}

logger.info(String.format("Total Base %s Budget: %s (adjusted for campaign difficulty)",
logger.info(String.format("Total Base %s Budget: %s (may be adjusted by Effective Player BV Multiplier)",
generationMethod, bvBudget));

return bvBudget;
Expand Down
3 changes: 3 additions & 0 deletions MekHQ/src/mekhq/campaign/mission/atb/AtBScenarioModifierApplicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ private static void postAddForce(Campaign campaign, AtBDynamicScenario scenario,

int weightClass = randomForceWeight();

logger.info(String.format("++ Generating a force for the %s template ++",
templateToApply.getForceName()).toUpperCase());

generateForce(scenario, scenario.getContract(campaign), campaign, effectiveBV,
effectiveUnitCount, weightClass, templateToApply, true);

Expand Down
Loading