diff --git a/src/Augmentation/ui/PlayerMultipliers.tsx b/src/Augmentation/ui/PlayerMultipliers.tsx index 007f04f34..ca7b4c58a 100644 --- a/src/Augmentation/ui/PlayerMultipliers.tsx +++ b/src/Augmentation/ui/PlayerMultipliers.tsx @@ -252,7 +252,7 @@ export function PlayerMultipliers(): React.ReactElement { }, ]; - if (Player.canAccessBladeburner()) { + if (Player.canAccessBladeburner() && BitNodeMultipliers.BladeburnerRank > 0) { rightColData.push( { mult: "Bladeburner Success Chance", diff --git a/src/BitNode/BitNode.tsx b/src/BitNode/BitNode.tsx index 6ebca4fe3..f5f1190d5 100644 --- a/src/BitNode/BitNode.tsx +++ b/src/BitNode/BitNode.tsx @@ -655,6 +655,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie } case 8: { return Object.assign(mults, { + BladeburnerRank: 0, ScriptHackMoney: 0.3, ScriptHackMoneyGain: 0, ManualHackMoney: 0, diff --git a/src/BitNode/ui/BitnodeMultipliersDescription.tsx b/src/BitNode/ui/BitnodeMultipliersDescription.tsx index 1acd70f4d..224f62349 100644 --- a/src/BitNode/ui/BitnodeMultipliersDescription.tsx +++ b/src/BitNode/ui/BitnodeMultipliersDescription.tsx @@ -280,6 +280,14 @@ function BladeburnerMults({ mults }: IMultsProps): React.ReactElement { const player = use.Player(); if (!player.canAccessBladeburner()) return <>; + if (mults.BladeburnerRank == 0) { + const rows: IBNMultRows = { + BladeburnerRank: { name: "Disabled", content: "" }, + }; + + return ; + } + const rows: IBNMultRows = { BladeburnerRank: { name: "Rank Gain" }, BladeburnerSkillCost: { name: "Skill Cost" }, @@ -323,6 +331,17 @@ function CorporationMults({ mults }: IMultsProps): React.ReactElement { const player = use.Player(); if (!player.canAccessCorporation()) return <>; + if (mults.CorporationSoftcap < 0.15) { + const rows: IBNMultRows = { + CorporationSoftcap: { + name: "Disabled", + content: "", + }, + }; + + return ; + } + const rows: IBNMultRows = { CorporationSoftcap: { name: "Corporation Softcap", diff --git a/src/Locations/ui/SpecialLocation.tsx b/src/Locations/ui/SpecialLocation.tsx index ecf83e494..bb55be9a4 100644 --- a/src/Locations/ui/SpecialLocation.tsx +++ b/src/Locations/ui/SpecialLocation.tsx @@ -83,7 +83,7 @@ export function SpecialLocation(props: IProps): React.ReactElement { } function renderBladeburner(): React.ReactElement { - if (!player.canAccessBladeburner()) { + if (!player.canAccessBladeburner() || BitNodeMultipliers.BladeburnerRank == 0) { return <>; } const text = inBladeburner ? "Enter Bladeburner Headquarters" : "Apply to Bladeburner Division"; diff --git a/src/NetscriptFunctions/Bladeburner.ts b/src/NetscriptFunctions/Bladeburner.ts index 6c400167f..96b4a92f9 100644 --- a/src/NetscriptFunctions/Bladeburner.ts +++ b/src/NetscriptFunctions/Bladeburner.ts @@ -397,8 +397,8 @@ export function NetscriptBladeburner(): InternalAPI { }, joinBladeburnerDivision: (ctx: NetscriptContext) => (): boolean => { if (player.bitNodeN === 7 || player.sourceFileLvl(7) > 0) { - if (player.bitNodeN === 8) { - return false; + if (BitNodeMultipliers.BladeburnerRank == 0) { + return false; // Disabled in this bitnode } if (player.bladeburner instanceof Bladeburner) { return true; // Already member diff --git a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts index f601eae55..ee0d9e8e9 100644 --- a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts +++ b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts @@ -2,10 +2,6 @@ import { Bladeburner } from "../../Bladeburner/Bladeburner"; import { IPlayer } from "../IPlayer"; export function canAccessBladeburner(this: IPlayer): boolean { - if (this.bitNodeN === 8) { - return false; - } - return this.bitNodeN === 6 || this.bitNodeN === 7 || this.sourceFileLvl(6) > 0 || this.sourceFileLvl(7) > 0; } diff --git a/src/ui/CharacterStats.tsx b/src/ui/CharacterStats.tsx index f0034fbd6..894e644d2 100644 --- a/src/ui/CharacterStats.tsx +++ b/src/ui/CharacterStats.tsx @@ -532,7 +532,7 @@ export function CharacterStats(): React.ReactElement { ]} color={Settings.theme.combat} /> - {player.canAccessBladeburner() && ( + {player.canAccessBladeburner() && BitNodeMultipliers.BladeburnerRank > 0 && (