mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2026-04-16 06:18:42 +02:00
MISC: Apply SF override to charisma calculations (#2642)
This commit is contained in:
@@ -602,6 +602,10 @@ export function canAccessCotMG(this: PlayerObject): boolean {
|
|||||||
return canAccessBitNodeFeature(13);
|
return canAccessBitNodeFeature(13);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To ensure the "SF override" option work properly, this function should only be used in special cases. In most cases,
|
||||||
|
* activeSourceFileLvl should be used instead.
|
||||||
|
*/
|
||||||
export function sourceFileLvl(this: PlayerObject, n: number): number {
|
export function sourceFileLvl(this: PlayerObject, n: number): number {
|
||||||
return this.sourceFiles.get(n) ?? 0;
|
return this.sourceFiles.get(n) ?? 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ export function getFactionFieldWorkRepGain(p: IPerson, favor: number): number {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getDarknetCharismaBonus(p: IPerson, scalar: number = 1): number {
|
function getDarknetCharismaBonus(p: IPerson, scalar: number = 1): number {
|
||||||
if (Player.sourceFileLvl(15) >= 3) {
|
if (Player.activeSourceFileLvl(15) >= 3) {
|
||||||
return p.skills.charisma * scalar;
|
return p.skills.charisma * scalar;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -310,7 +310,7 @@ export function prestigeSourceFile(isFlume: boolean): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// BitNode 12: The Recursion
|
// BitNode 12: The Recursion
|
||||||
if (Player.bitNodeN === 12 && Player.activeSourceFileLvl(12) > 100) {
|
if (Player.bitNodeN === 12 && Player.sourceFileLvl(12) > 100) {
|
||||||
delayedDialog("Saynt_Garmo is watching you");
|
delayedDialog("Saynt_Garmo is watching you");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ export const calculateCompanyWorkStats = (
|
|||||||
// If player has SF-11, calculate salary multiplier from favor
|
// If player has SF-11, calculate salary multiplier from favor
|
||||||
const favorMult = isNaN(favor) ? 1 : 1 + favor / 100;
|
const favorMult = isNaN(favor) ? 1 : 1 + favor / 100;
|
||||||
const bn11Mult = Player.activeSourceFileLvl(11) > 0 ? favorMult : 1;
|
const bn11Mult = Player.activeSourceFileLvl(11) > 0 ? favorMult : 1;
|
||||||
const sf15Mult = Player.sourceFileLvl(15) > 1 ? getMultiplierFromCharisma(1.5) : 1;
|
const sf15Mult = Player.activeSourceFileLvl(15) > 1 ? getMultiplierFromCharisma(1.5) : 1;
|
||||||
|
|
||||||
const gains = scaleWorkStats(
|
const gains = scaleWorkStats(
|
||||||
multWorkStats(
|
multWorkStats(
|
||||||
|
|||||||
Reference in New Issue
Block a user