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

Merge pull request #4104 from Mughur/dev

Browse Source 
MISC: multiple hasAugmentation checks didn't check if the augment was installed
This commit is contained in:
hydroflame 2022-09-23 00:32:16 -03:00 committed by GitHub
commit c449680256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Message/MessageHelpers.ts
View File

@ -69,7 +69,7 @@ function checkForMessagesToSend(): void {
const truthGazer = Messages[MessageFilenames.TruthGazer]; const truthGazer = Messages[MessageFilenames.TruthGazer];
const redpill = Messages[MessageFilenames.RedPill]; const redpill = Messages[MessageFilenames.RedPill];
if (Player.hasAugmentation(AugmentationNames.TheRedPill)) { if (Player.hasAugmentation(AugmentationNames.TheRedPill, true)) {
//Get the world daemon required hacking level //Get the world daemon required hacking level
const worldDaemon = GetServer(SpecialServers.WorldDaemon); const worldDaemon = GetServer(SpecialServers.WorldDaemon);
if (!(worldDaemon instanceof Server)) { if (!(worldDaemon instanceof Server)) {

2
src/NetscriptFunctions/Stanek.ts
View File

@ -142,7 +142,7 @@ export function NetscriptStanek(): InternalAPI<IStanek> {
//Return true iff the player is in CotMG and has the first Stanek aug installed //Return true iff the player is in CotMG and has the first Stanek aug installed
return ( return (
Factions[FactionNames.ChurchOfTheMachineGod].isMember && Factions[FactionNames.ChurchOfTheMachineGod].isMember &&
player.hasAugmentation(AugmentationNames.StaneksGift1) player.hasAugmentation(AugmentationNames.StaneksGift1, true)
); );
}, },
}; };

2
src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
View File

@ -1462,7 +1462,7 @@ export function sourceFileLvl(this: IPlayer, n: number): number {
export function focusPenalty(this: IPlayer): number { export function focusPenalty(this: IPlayer): number {
let focus = 1; let focus = 1;
if (!this.hasAugmentation(AugmentationNames["NeuroreceptorManager"])) { if (!this.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
focus = this.focus ? 1 : CONSTANTS.BaseFocusBonus; focus = this.focus ? 1 : CONSTANTS.BaseFocusBonus;
} }
return focus; return focus;

13
src/Prestige.ts
View File

@ -55,15 +55,15 @@ export function prestigeAugmentation(): void {
AddToAllServers(homeComp); AddToAllServers(homeComp);
prestigeHomeComputer(Player, homeComp); prestigeHomeComputer(Player, homeComp);
if (augmentationExists(AugmentationNames.Neurolink) && Player.hasAugmentation(AugmentationNames.Neurolink)) { if (augmentationExists(AugmentationNames.Neurolink) && Player.hasAugmentation(AugmentationNames.Neurolink, true)) {
homeComp.programs.push(Programs.FTPCrackProgram.name); homeComp.programs.push(Programs.FTPCrackProgram.name);
homeComp.programs.push(Programs.RelaySMTPProgram.name); homeComp.programs.push(Programs.RelaySMTPProgram.name);
} }
if (augmentationExists(AugmentationNames.CashRoot) && Player.hasAugmentation(AugmentationNames.CashRoot)) { if (augmentationExists(AugmentationNames.CashRoot) && Player.hasAugmentation(AugmentationNames.CashRoot, true)) {
Player.setMoney(1e6); Player.setMoney(1e6);
homeComp.programs.push(Programs.BruteSSHProgram.name); homeComp.programs.push(Programs.BruteSSHProgram.name);
} }
if (augmentationExists(AugmentationNames.PCMatrix) && Player.hasAugmentation(AugmentationNames.PCMatrix)) { if (augmentationExists(AugmentationNames.PCMatrix) && Player.hasAugmentation(AugmentationNames.PCMatrix, true)) {
homeComp.programs.push(Programs.DeepscanV1.name); homeComp.programs.push(Programs.DeepscanV1.name);
homeComp.programs.push(Programs.AutoLink.name); homeComp.programs.push(Programs.AutoLink.name);
} }
@ -151,7 +151,7 @@ export function prestigeAugmentation(): void {
} }
// Red Pill // Red Pill
if (augmentationExists(AugmentationNames.TheRedPill) && Player.hasAugmentation(AugmentationNames.TheRedPill)) { if (augmentationExists(AugmentationNames.TheRedPill) && Player.hasAugmentation(AugmentationNames.TheRedPill, true)) {
const WorldDaemon = GetServer(SpecialServers.WorldDaemon); const WorldDaemon = GetServer(SpecialServers.WorldDaemon);
const DaedalusServer = GetServer(SpecialServers.DaedalusServer); const DaedalusServer = GetServer(SpecialServers.DaedalusServer);
if (WorldDaemon && DaedalusServer) { if (WorldDaemon && DaedalusServer) {
@ -160,7 +160,10 @@ export function prestigeAugmentation(): void {
} }
} }
if (augmentationExists(AugmentationNames.StaneksGift1) && Player.hasAugmentation(AugmentationNames.StaneksGift1)) { if (
augmentationExists(AugmentationNames.StaneksGift1) &&
Player.hasAugmentation(AugmentationNames.StaneksGift1, true)
) {
joinFaction(Factions[FactionNames.ChurchOfTheMachineGod]); joinFaction(Factions[FactionNames.ChurchOfTheMachineGod]);
} }

2
src/Work/CompanyWork.tsx
View File

@ -35,7 +35,7 @@ export class CompanyWork extends Work {
getGainRates(player: IPlayer): WorkStats { getGainRates(player: IPlayer): WorkStats {
let focusBonus = 1; let focusBonus = 1;
if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager)) { if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus; focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus;
} }
return scaleWorkStats(calculateCompanyWorkStats(player, player, this.getCompany()), focusBonus); return scaleWorkStats(calculateCompanyWorkStats(player, player, this.getCompany()), focusBonus);

2
src/Work/CreateProgramWork.ts
View File

@ -58,7 +58,7 @@ export class CreateProgramWork extends Work {
process(player: IPlayer, cycles: number): boolean { process(player: IPlayer, cycles: number): boolean {
let focusBonus = 1; let focusBonus = 1;
if (!player.hasAugmentation(AugmentationNames["NeuroreceptorManager"])) { if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus; focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus;
} }
//Higher hacking skill will allow you to create programs faster //Higher hacking skill will allow you to create programs faster

4
src/Work/FactionWork.tsx
View File

@ -39,7 +39,7 @@ export class FactionWork extends Work {
getReputationRate(player: IPlayer): number { getReputationRate(player: IPlayer): number {
let focusBonus = 1; let focusBonus = 1;
if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager)) { if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus; focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus;
} }
return calculateFactionRep(player, this.factionWorkType, this.getFaction().favor) * focusBonus; return calculateFactionRep(player, this.factionWorkType, this.getFaction().favor) * focusBonus;
@ -47,7 +47,7 @@ export class FactionWork extends Work {
getExpRates(player: IPlayer): WorkStats { getExpRates(player: IPlayer): WorkStats {
let focusBonus = 1; let focusBonus = 1;
if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager)) { if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus; focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus;
} }
const rate = calculateFactionExp(player, this.factionWorkType); const rate = calculateFactionExp(player, this.factionWorkType);

6
src/Work/GraftingWork.tsx
View File

@ -37,7 +37,7 @@ export class GraftingWork extends Work {
process(player: IPlayer, cycles: number): boolean { process(player: IPlayer, cycles: number): boolean {
let focusBonus = 1; let focusBonus = 1;
if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager)) { if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus; focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus;
} }
@ -52,7 +52,7 @@ export class GraftingWork extends Work {
if (!cancelled) { if (!cancelled) {
applyAugmentation({ name: augName, level: 1 }); applyAugmentation({ name: augName, level: 1 });
if (!player.hasAugmentation(AugmentationNames.CongruityImplant)) { if (!player.hasAugmentation(AugmentationNames.CongruityImplant, true)) {
player.entropy += 1; player.entropy += 1;
player.applyEntropy(player.entropy); player.applyEntropy(player.entropy);
} }
@ -62,7 +62,7 @@ export class GraftingWork extends Work {
<> <>
You've finished grafting {augName}.<br /> You've finished grafting {augName}.<br />
The augmentation has been applied to your body{" "} The augmentation has been applied to your body{" "}
{player.hasAugmentation(AugmentationNames.CongruityImplant) ? "." : ", but you feel a bit off."} {player.hasAugmentation(AugmentationNames.CongruityImplant, true) ? "." : ", but you feel a bit off."}
</>, </>,
); );
} }