Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-22 23:53:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

swap if for Math.min

Browse Source
This commit is contained in:
pigalot 2022-01-14 10:05:00 +00:00
parent 4f391682b7
commit 416c4ad619
1 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Corporation/Industry.ts
View File

@ -435,17 +435,11 @@ export class Industry implements IIndustry {
const popularityGain = corporation.getDreamSenseGain(), const popularityGain = corporation.getDreamSenseGain(),
awarenessGain = popularityGain * 4; awarenessGain = popularityGain * 4;
if (popularityGain > 0) { if (popularityGain > 0) {
if (this.awareness === Number.MAX_VALUE || this.awareness + (awarenessGain * marketCycles) > Number.MAX_VALUE) { const awareness = this.awareness + (awarenessGain * marketCycles);
this.awareness = Number.MAX_VALUE; this.awareness = Math.min(awareness, Number.MAX_VALUE);
} else {
this.awareness += awarenessGain * marketCycles;
}
if (this.popularity === Number.MAX_VALUE || this.popularity + (popularityGain * marketCycles) > Number.MAX_VALUE) { const popularity = this.popularity + (popularityGain * marketCycles);
this.popularity = Number.MAX_VALUE; this.popularity = Math.min(popularity, Number.MAX_VALUE);
} else {
this.popularity += popularityGain * marketCycles;
}
} }
return; return;
@ -1288,31 +1282,11 @@ export class Industry implements IIndustry {
case 1: { case 1: {
//AdVert.Inc, //AdVert.Inc,
const advMult = corporation.getAdvertisingMultiplier() * this.getAdvertisingMultiplier(); const advMult = corporation.getAdvertisingMultiplier() * this.getAdvertisingMultiplier();
if (this.awareness === Number.MAX_VALUE || this.awareness + (3 * advMult) > Number.MAX_VALUE) { const awareness = (this.awareness + (3 * advMult)) * (1.01 * advMult);
this.awareness = Number.MAX_VALUE; this.awareness = Math.min(awareness, Number.MAX_VALUE);
} else {
this.awareness += 3 * advMult;
}
if (this.awareness === Number.MAX_VALUE || this.awareness * (1.01 * advMult) > Number.MAX_VALUE) {
this.awareness = Number.MAX_VALUE;
} else {
this.awareness *= 1.01 * advMult;
}
if (this.popularity === Number.MAX_VALUE || this.popularity + (1 * advMult) > Number.MAX_VALUE) {
this.popularity = Number.MAX_VALUE;
} else {
this.popularity += 1 * advMult;
}
const rand = (1 + getRandomInt(1, 3) / 100);
if (this.popularity === Number.MAX_VALUE || this.popularity * (rand * advMult) > Number.MAX_VALUE) {
this.popularity = Number.MAX_VALUE;
} else {
this.popularity *= rand * advMult;
}
const popularity = (this.popularity + (1 * advMult)) * ((1 + getRandomInt(1, 3) / 100) * advMult);
this.popularity = Math.min(popularity, Number.MAX_VALUE);
break; break;
} }
default: { default: {