felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-04-17 14:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

CODEBASE: Refactor ns.singularity.purchaseAugmentation (#1879)

Browse Source
This commit is contained in:
catloversg
2025-01-29 01:42:25 +07:00
committed by GitHub
parent 2965f51879
commit ada903f356
5 changed files with 196 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Augmentation/ui/PurchaseAugmentationModal.tsx
View File

@@ -40,7 +40,7 @@ export function PurchaseAugmentationModal({ aug, faction, onClose, open }: IProp
<Button
autoFocus
onClick={() => {
purchaseAugmentation(aug, faction);
purchaseAugmentation(faction, aug);
onClose();
}}
>

105
src/Faction/FactionHelpers.tsx
View File

@@ -20,6 +20,7 @@ import { SFC32RNG } from "../Casino/RNG";
import { isFactionWork } from "../Work/FactionWork";
import { getAugCost } from "../Augmentation/AugmentationHelpers";
import { getRecordKeys } from "../Types/Record";
import type { Result } from "../types";
export function inviteToFaction(faction: Faction): void {
if (faction.alreadyInvited || faction.isMember) return;
@@ -58,52 +59,76 @@ export function hasAugmentationPrereqs(aug: Augmentation): boolean {
return aug.prereqs.every((aug) => Player.hasAugmentation(aug));
}
export function purchaseAugmentation(aug: Augmentation, fac: Faction, sing = false): string {
const hasPrereqs = hasAugmentationPrereqs(aug);
const augCosts = getAugCost(aug);
if (!hasPrereqs) {
const txt = `You must first purchase or install ${aug.prereqs
.filter((req) => !Player.hasAugmentation(req))
.join(",")} before you can purchase this one.`;
if (sing) {
return txt;
} else {
dialogBoxCreate(txt);
}
} else if (augCosts.moneyCost !== 0 && Player.money < augCosts.moneyCost) {
const txt = "You don't have enough money to purchase " + aug.name;
if (sing) {
return txt;
}
dialogBoxCreate(txt);
} else if (fac.playerReputation < augCosts.repCost) {
const txt = "You don't have enough faction reputation to purchase " + aug.name;
if (sing) {
return txt;
}
dialogBoxCreate(txt);
} else if (augCosts.moneyCost === 0 || Player.money >= augCosts.moneyCost) {
Player.queueAugmentation(aug.name);
function checkIfPlayerCanPurchaseAugmentation(faction: Faction, augmentation: Augmentation): Result {
if (!Player.factions.includes(faction.name)) {
return {
success: false,
message: `You can't purchase augmentations from '${faction.name}' because you aren't a member.`,
};
}
Player.loseMoney(augCosts.moneyCost, "augmentations");
if (!getFactionAugmentationsFiltered(faction).includes(augmentation.name)) {
return {
success: false,
message: `Faction '${faction.name}' does not have the '${augmentation.name}' augmentation.`,
};
}
if (sing) {
return "You purchased " + aug.name;
} else if (!Settings.SuppressBuyAugmentationConfirmation) {
dialogBoxCreate(
`You purchased ${aug.name}. Its enhancements will not take effect until they are installed. ` +
"To install your augmentations, go to the 'Augmentations' tab on the left-hand navigation menu. " +
"Purchasing additional augmentations will now be more expensive.",
);
if (augmentation.name !== AugmentationName.NeuroFluxGovernor) {
for (const queuedAugmentation of Player.queuedAugmentations) {
if (queuedAugmentation.name === augmentation.name) {
return { success: false, message: `You already purchased the '${augmentation.name}' augmentation.` };
}
}
} else {
for (const installedAugmentation of Player.augmentations) {
if (installedAugmentation.name === augmentation.name) {
return { success: false, message: `You already installed the '${augmentation.name}' augmentation.` };
}
}
}
if (!hasAugmentationPrereqs(augmentation)) {
return {
success: false,
message: `You must first purchase or install ${augmentation.prereqs
.filter((req) => !Player.hasAugmentation(req))
.join(",")} before you can purchase this one.`,
};
}
const augCosts = getAugCost(augmentation);
if (augCosts.moneyCost !== 0 && Player.money < augCosts.moneyCost) {
return { success: false, message: `You don't have enough money to purchase ${augmentation.name}.` };
}
if (faction.playerReputation < augCosts.repCost) {
return { success: false, message: `You don't have enough faction reputation to purchase ${augmentation.name}.` };
}
return { success: true };
}
export function purchaseAugmentation(faction: Faction, augmentation: Augmentation, singularity = false): Result {
const result = checkIfPlayerCanPurchaseAugmentation(faction, augmentation);
if (!result.success) {
if (!singularity) {
dialogBoxCreate(result.message);
}
return { success: false, message: result.message };
}
const augCosts = getAugCost(augmentation);
Player.queueAugmentation(augmentation.name);
Player.loseMoney(augCosts.moneyCost, "augmentations");
if (!singularity && !Settings.SuppressBuyAugmentationConfirmation) {
dialogBoxCreate(
"Hmm, something went wrong when trying to purchase an Augmentation. " +
"Please report this to the game developer with an explanation of how to " +
"reproduce this.",
`You purchased ${augmentation.name}. Its enhancements will not take effect until they are installed. ` +
"To install your augmentations, go to the 'Augmentations' tab on the left-hand navigation menu. " +
"Purchasing additional augmentations will now be more expensive.",
);
}
return "";
return { success: true };
}
export function processPassiveFactionRepGain(numCycles: number): void {

2
src/Faction/ui/AugmentationsPage.tsx
View File

@@ -250,7 +250,7 @@ export function AugmentationsPage({ faction }: { faction: Faction }): React.Reac
if (!Settings.SuppressBuyAugmentationConfirmation) {
showModal(true);
} else {
purchaseAugmentation(aug, faction);
purchaseAugmentation(faction, aug);
rerender();
}
}}

51
src/NetscriptFunctions/Singularity.ts
View File

@@ -1,7 +1,7 @@
import type { Singularity as ISingularity } from "@nsdefs";
import { Player } from "@player";
import { AugmentationName, CityName, FactionWorkType, GymType, LocationName, UniversityClassType } from "@enums";
import { CityName, FactionWorkType, GymType, LocationName, UniversityClassType } from "@enums";
import { purchaseAugmentation, joinFaction, getFactionAugmentationsFiltered } from "../Faction/FactionHelpers";
import { startWorkerScript } from "../NetscriptWorker";
import { Augmentations } from "../Augmentation/Augmentations";
@@ -163,50 +163,17 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
helpers.checkSingularityAccess(ctx);
const facName = getEnumHelper("FactionName").nsGetMember(ctx, _facName);
const augName = getEnumHelper("AugmentationName").nsGetMember(ctx, _augName);
const fac = Factions[facName];
const aug = Augmentations[augName];
const faction = Factions[facName];
const augmentation = Augmentations[augName];
const factionAugs = getFactionAugmentationsFiltered(fac);
if (!Player.factions.includes(facName)) {
helpers.log(ctx, () => `You can't purchase augmentations from '${facName}' because you aren't a member`);
return false;
}
if (!factionAugs.includes(augName)) {
helpers.log(ctx, () => `Faction '${facName}' does not have the '${augName}' augmentation.`);
return false;
}
const isNeuroflux = aug.name === AugmentationName.NeuroFluxGovernor;
if (!isNeuroflux) {
for (let j = 0; j < Player.queuedAugmentations.length; ++j) {
if (Player.queuedAugmentations[j].name === aug.name) {
helpers.log(ctx, () => `You already have the '${augName}' augmentation.`);
return false;
}
}
for (let j = 0; j < Player.augmentations.length; ++j) {
if (Player.augmentations[j].name === aug.name) {
helpers.log(ctx, () => `You already have the '${augName}' augmentation.`);
return false;
}
}
}
if (fac.playerReputation < getAugCost(aug).repCost) {
helpers.log(ctx, () => `You do not have enough reputation with '${fac.name}'.`);
return false;
}
const res = purchaseAugmentation(aug, fac, true);
helpers.log(ctx, () => res);
if (res.startsWith("You purchased")) {
Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
return true;
} else {
const result = purchaseAugmentation(faction, augmentation, true);
if (!result.success) {
helpers.log(ctx, () => result.message);
return false;
}
helpers.log(ctx, () => `You purchased ${augName}.`);
Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
return true;
},
softReset: (ctx) => (_cbScript) => {
helpers.checkSingularityAccess(ctx);