Merge pull request #3249 from ApamNapat/fix_field_analysis_log

Log info for field analysis now displays actual rank gained
This commit is contained in:
hydroflame 2022-03-29 11:10:53 -04:00 committed by GitHub
commit 4a6d1c67c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1466,20 +1466,19 @@ export class Bladeburner implements IBladeburner {
if (isNaN(eff) || eff < 0) { if (isNaN(eff) || eff < 0) {
throw new Error("Field Analysis Effectiveness calculated to be NaN or negative"); throw new Error("Field Analysis Effectiveness calculated to be NaN or negative");
} }
const hackingExpGain = 20 * player.hacking_exp_mult, const hackingExpGain = 20 * player.hacking_exp_mult;
charismaExpGain = 20 * player.charisma_exp_mult; const charismaExpGain = 20 * player.charisma_exp_mult;
const rankGain = 0.1 * BitNodeMultipliers.BladeburnerRank;
player.gainHackingExp(hackingExpGain); player.gainHackingExp(hackingExpGain);
player.gainIntelligenceExp(BladeburnerConstants.BaseIntGain); player.gainIntelligenceExp(BladeburnerConstants.BaseIntGain);
player.gainCharismaExp(charismaExpGain); player.gainCharismaExp(charismaExpGain);
this.changeRank(player, 0.1 * BitNodeMultipliers.BladeburnerRank); this.changeRank(player, rankGain);
this.getCurrentCity().improvePopulationEstimateByPercentage(eff * this.skillMultipliers.successChanceEstimate); this.getCurrentCity().improvePopulationEstimateByPercentage(eff * this.skillMultipliers.successChanceEstimate);
if (this.logging.general) { if (this.logging.general) {
this.log( this.log(
"Field analysis completed. Gained 0.1 rank, " + `Field analysis completed. Gained ${formatNumber(rankGain, 2)} rank, ` +
formatNumber(hackingExpGain, 1) + `${formatNumber(hackingExpGain, 1)} hacking exp, and ` +
" hacking exp, and " + `${formatNumber(charismaExpGain, 1)} charisma exp`,
formatNumber(charismaExpGain, 1) +
" charisma exp",
); );
} }
this.startAction(player, this.action); // Repeat action this.startAction(player, this.action); // Repeat action