mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-11-22 07:33:48 +01:00
BLADE: Fix population estimate percent growth when estimate is 0 (#1620)
This commit is contained in:
parent
be515cc195
commit
2141032432
@ -35,9 +35,9 @@ export class City {
|
|||||||
improvePopulationEstimateByCount(n: number): void {
|
improvePopulationEstimateByCount(n: number): void {
|
||||||
n = clampInteger(n, 0);
|
n = clampInteger(n, 0);
|
||||||
const diff = Math.abs(this.popEst - this.pop);
|
const diff = Math.abs(this.popEst - this.pop);
|
||||||
// Chgnge would overshoot actual population -> make estimate accurate
|
// Change would overshoot actual population -> make estimate accurate
|
||||||
if (diff <= n) this.popEst = this.pop;
|
if (diff <= n) this.popEst = this.pop;
|
||||||
// Otherwise make enstimate closer by n
|
// Otherwise make estimate closer by n
|
||||||
else if (this.popEst < this.pop) this.popEst += n;
|
else if (this.popEst < this.pop) this.popEst += n;
|
||||||
else this.popEst -= n;
|
else this.popEst -= n;
|
||||||
}
|
}
|
||||||
@ -46,10 +46,10 @@ export class City {
|
|||||||
improvePopulationEstimateByPercentage(p: number, skillMult = 1): void {
|
improvePopulationEstimateByPercentage(p: number, skillMult = 1): void {
|
||||||
p = clampNumber((p * skillMult) / 100);
|
p = clampNumber((p * skillMult) / 100);
|
||||||
const diff = Math.abs(this.popEst - this.pop);
|
const diff = Math.abs(this.popEst - this.pop);
|
||||||
// Chgnge would overshoot actual population -> make estimate accurate
|
// Change would overshoot actual population -> make estimate accurate
|
||||||
if (diff <= p * this.popEst) this.popEst = this.pop;
|
if (diff <= p * this.popEst) this.popEst = this.pop;
|
||||||
// Otherwise make enstimate closer by n
|
// Otherwise make estimate closer by n
|
||||||
else if (this.popEst < this.pop) this.popEst = clampNumber(this.popEst * (1 + p));
|
else if (this.popEst < this.pop) this.popEst = clampNumber(this.popEst * (1 + p), 1);
|
||||||
else this.popEst = clampNumber(this.popEst * (1 - p));
|
else this.popEst = clampNumber(this.popEst * (1 - p));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user