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

move ctx.log to NetscriptHelpers

Browse Source
This commit is contained in:
Snarling
2022-08-08 15:51:50 -04:00
parent 8f8d9a1d23
commit 01e63b10a1
11 changed files with 296 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NetscriptFunctions/Bladeburner.ts
+4 -4
View File
@@ -131,7 +131,7 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript
const time = bladeburner.getActionTimeNetscriptFn(player, type, name);
if (typeof time === "string") {
const errorLogText = `Invalid action: type='${type}' name='${name}'`;
ctx.log(() => errorLogText);
helpers.log(ctx, () => errorLogText);
return -1;
} else {
return time;
@@ -165,7 +165,7 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript
const chance = bladeburner.getActionEstimatedSuccessChanceNetscriptFn(player, type, name);
if (typeof chance === "string") {
const errorLogText = `Invalid action: type='${type}' name='${name}'`;
ctx.log(() => errorLogText);
helpers.log(ctx, () => errorLogText);
return [-1, -1];
} else {
return chance;
@@ -410,11 +410,11 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript
player.skills.agility >= 100
) {
player.bladeburner = new Bladeburner(player);
ctx.log(() => "You have been accepted into the Bladeburner division");
helpers.log(ctx, () => "You have been accepted into the Bladeburner division");
return true;
} else {
ctx.log(() => "You do not meet the requirements for joining the Bladeburner division");
helpers.log(ctx, () => "You do not meet the requirements for joining the Bladeburner division");
return false;
}
}
src/NetscriptFunctions/CodingContract.ts
+4 -3
View File
@@ -55,16 +55,17 @@ export function NetscriptCodingContract(player: IPlayer, workerScript: WorkerScr
const serv = helpers.getServer(ctx, hostname);
if (contract.isSolution(answerStr)) {
const reward = player.gainCodingContractReward(creward, contract.getDifficulty());
ctx.log(() => `Successfully completed Coding Contract '${filename}'. Reward: ${reward}`);
helpers.log(ctx, () => `Successfully completed Coding Contract '${filename}'. Reward: ${reward}`);
serv.removeContract(filename);
return returnReward ? reward : true;
} else {
++contract.tries;
if (contract.tries >= contract.getMaxNumTries()) {
ctx.log(() => `Coding Contract attempt '${filename}' failed. Contract is now self-destructing`);
helpers.log(ctx, () => `Coding Contract attempt '${filename}' failed. Contract is now self-destructing`);
serv.removeContract(filename);
} else {
ctx.log(
helpers.log(
ctx,
() =>
`Coding Contract attempt '${filename}' failed. ${
contract.getMaxNumTries() - contract.tries
src/NetscriptFunctions/Grafting.ts
+4 -4
View File
@@ -61,7 +61,7 @@ export function NetscriptGrafting(player: IPlayer): InternalAPI<IGrafting> {
throw helpers.makeRuntimeErrorMsg(ctx, "You must be in New Tokyo to begin grafting an Augmentation.");
}
if (!getGraftingAvailableAugs(player).includes(augName) || !StaticAugmentations.hasOwnProperty(augName)) {
ctx.log(() => `Invalid aug: ${augName}`);
helpers.log(ctx, () => `Invalid aug: ${augName}`);
return false;
}
@@ -69,12 +69,12 @@ export function NetscriptGrafting(player: IPlayer): InternalAPI<IGrafting> {
const craftableAug = new GraftableAugmentation(StaticAugmentations[augName]);
if (player.money < craftableAug.cost) {
ctx.log(() => `You don't have enough money to craft ${augName}`);
helpers.log(ctx, () => `You don't have enough money to craft ${augName}`);
return false;
}
if (!hasAugmentationPrereqs(craftableAug.augmentation)) {
ctx.log(() => `You don't have the pre-requisites for ${augName}`);
helpers.log(ctx, () => `You don't have the pre-requisites for ${augName}`);
return false;
}
@@ -94,7 +94,7 @@ export function NetscriptGrafting(player: IPlayer): InternalAPI<IGrafting> {
Router.toTerminal();
}
ctx.log(() => `Began grafting Augmentation ${augName}.`);
helpers.log(ctx, () => `Began grafting Augmentation ${augName}.`);
return true;
},
};
src/NetscriptFunctions/Singularity.ts
+105 -81
View File
@@ -185,12 +185,12 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const augs = getFactionAugmentationsFiltered(player, fac);
if (!player.factions.includes(fac.name)) {
ctx.log(() => `You can't purchase augmentations from '${facName}' because you aren't a member`);
helpers.log(ctx, () => `You can't purchase augmentations from '${facName}' because you aren't a member`);
return false;
}
if (!augs.includes(augName)) {
ctx.log(() => `Faction '${facName}' does not have the '${augName}' augmentation.`);
helpers.log(ctx, () => `Faction '${facName}' does not have the '${augName}' augmentation.`);
return false;
}
@@ -198,25 +198,25 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
if (!isNeuroflux) {
for (let j = 0; j < player.queuedAugmentations.length; ++j) {
if (player.queuedAugmentations[j].name === aug.name) {
ctx.log(() => `You already have the '${augName}' augmentation.`);
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) {
ctx.log(() => `You already have the '${augName}' augmentation.`);
helpers.log(ctx, () => `You already have the '${augName}' augmentation.`);
return false;
}
}
}
if (fac.playerReputation < aug.getCost(player).repCost) {
ctx.log(() => `You do not have enough reputation with '${fac.name}'.`);
helpers.log(ctx, () => `You do not have enough reputation with '${fac.name}'.`);
return false;
}
const res = purchaseAugmentation(aug, fac, true);
ctx.log(() => res);
helpers.log(ctx, () => res);
if (isString(res) && res.startsWith("You purchased")) {
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
return true;
@@ -229,7 +229,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
helpers.checkSingularityAccess(ctx);
const cbScript = helpers.string(ctx, "cbScript", _cbScript);
ctx.log(() => "Soft resetting. This will cause this script to be killed");
helpers.log(ctx, () => "Soft resetting. This will cause this script to be killed");
setTimeout(() => {
installAugmentations(true);
runAfterReset(cbScript);
@@ -245,11 +245,11 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const cbScript = helpers.string(ctx, "cbScript", _cbScript);
if (player.queuedAugmentations.length === 0) {
ctx.log(() => "You do not have any Augmentations to be installed.");
helpers.log(ctx, () => "You do not have any Augmentations to be installed.");
return false;
}
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
ctx.log(() => "Installing Augmentations. This will cause this script to be killed");
helpers.log(ctx, () => "Installing Augmentations. This will cause this script to be killed");
setTimeout(() => {
installAugmentations();
runAfterReset(cbScript);
@@ -266,11 +266,11 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const locationName = helpers.string(ctx, "locationName", _locationName);
const location = Object.values(Locations).find((l) => l.name === locationName);
if (!location) {
ctx.log(() => `No location named ${locationName}`);
helpers.log(ctx, () => `No location named ${locationName}`);
return false;
}
if (location.city && player.city !== location.city) {
ctx.log(() => `No location named ${locationName} in ${player.city}`);
helpers.log(ctx, () => `No location named ${locationName} in ${player.city}`);
return false;
}
if (location.name === LocationName.TravelAgency) {
@@ -294,21 +294,28 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
switch (universityName.toLowerCase()) {
case LocationName.AevumSummitUniversity.toLowerCase():
if (player.city != CityName.Aevum) {
ctx.log(() => `You cannot study at 'Summit University' because you are not in '${CityName.Aevum}'.`);
helpers.log(
ctx,
() => `You cannot study at 'Summit University' because you are not in '${CityName.Aevum}'.`,
);
return false;
}
player.gotoLocation(LocationName.AevumSummitUniversity);
break;
case LocationName.Sector12RothmanUniversity.toLowerCase():
if (player.city != CityName.Sector12) {
ctx.log(() => `You cannot study at 'Rothman University' because you are not in '${CityName.Sector12}'.`);
helpers.log(
ctx,
() => `You cannot study at 'Rothman University' because you are not in '${CityName.Sector12}'.`,
);
return false;
}
player.location = LocationName.Sector12RothmanUniversity;
break;
case LocationName.VolhavenZBInstituteOfTechnology.toLowerCase():
if (player.city != CityName.Volhaven) {
ctx.log(
helpers.log(
ctx,
() => `You cannot study at 'ZB Institute of Technology' because you are not in '${CityName.Volhaven}'.`,
);
return false;
@@ -316,7 +323,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.location = LocationName.VolhavenZBInstituteOfTechnology;
break;
default:
ctx.log(() => `Invalid university name: '${universityName}'.`);
helpers.log(ctx, () => `Invalid university name: '${universityName}'.`);
return false;
}
@@ -341,7 +348,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
task = ClassType.Leadership;
break;
default:
ctx.log(() => `Invalid class name: ${className}.`);
helpers.log(ctx, () => `Invalid class name: ${className}.`);
return false;
}
player.startWork(
@@ -358,7 +365,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.stopFocusing();
Router.toTerminal();
}
ctx.log(() => `Started ${task} at ${universityName}`);
helpers.log(ctx, () => `Started ${task} at ${universityName}`);
return true;
},
@@ -373,7 +380,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
switch (gymName.toLowerCase()) {
case LocationName.AevumCrushFitnessGym.toLowerCase():
if (player.city != CityName.Aevum) {
ctx.log(
helpers.log(
ctx,
() =>
`You cannot workout at '${LocationName.AevumCrushFitnessGym}' because you are not in '${CityName.Aevum}'.`,
);
@@ -383,7 +391,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
break;
case LocationName.AevumSnapFitnessGym.toLowerCase():
if (player.city != CityName.Aevum) {
ctx.log(
helpers.log(
ctx,
() =>
`You cannot workout at '${LocationName.AevumSnapFitnessGym}' because you are not in '${CityName.Aevum}'.`,
);
@@ -393,7 +402,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
break;
case LocationName.Sector12IronGym.toLowerCase():
if (player.city != CityName.Sector12) {
ctx.log(
helpers.log(
ctx,
() =>
`You cannot workout at '${LocationName.Sector12IronGym}' because you are not in '${CityName.Sector12}'.`,
);
@@ -403,7 +413,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
break;
case LocationName.Sector12PowerhouseGym.toLowerCase():
if (player.city != CityName.Sector12) {
ctx.log(
helpers.log(
ctx,
() =>
`You cannot workout at '${LocationName.Sector12PowerhouseGym}' because you are not in '${CityName.Sector12}'.`,
);
@@ -413,7 +424,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
break;
case LocationName.VolhavenMilleniumFitnessGym.toLowerCase():
if (player.city != CityName.Volhaven) {
ctx.log(
helpers.log(
ctx,
() =>
`You cannot workout at '${LocationName.VolhavenMilleniumFitnessGym}' because you are not in '${CityName.Volhaven}'.`,
);
@@ -422,7 +434,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.location = LocationName.VolhavenMilleniumFitnessGym;
break;
default:
ctx.log(() => `Invalid gym name: ${gymName}. gymWorkout() failed`);
helpers.log(ctx, () => `Invalid gym name: ${gymName}. gymWorkout() failed`);
return false;
}
@@ -452,7 +464,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
);
break;
default:
ctx.log(() => `Invalid stat: ${stat}.`);
helpers.log(ctx, () => `Invalid stat: ${stat}.`);
return false;
}
if (focus) {
@@ -462,7 +474,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.stopFocusing();
Router.toTerminal();
}
ctx.log(() => `Started training ${stat} at ${gymName}`);
helpers.log(ctx, () => `Started training ${stat} at ${gymName}`);
return true;
},
@@ -479,12 +491,12 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
case CityName.Ishima:
case CityName.Volhaven:
if (player.money < CONSTANTS.TravelCost) {
ctx.log(() => "Not enough money to travel.");
helpers.log(ctx, () => "Not enough money to travel.");
return false;
}
player.loseMoney(CONSTANTS.TravelCost, "other");
player.city = cityName;
ctx.log(() => `Traveled to ${cityName}`);
helpers.log(ctx, () => `Traveled to ${cityName}`);
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000);
return true;
default:
@@ -497,12 +509,12 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
helpers.checkSingularityAccess(ctx);
if (player.hasTorRouter()) {
ctx.log(() => "You already have a TOR router!");
helpers.log(ctx, () => "You already have a TOR router!");
return true;
}
if (player.money < CONSTANTS.TorRouterCost) {
ctx.log(() => "You cannot afford to purchase a Tor router.");
helpers.log(ctx, () => "You cannot afford to purchase a Tor router.");
return false;
}
player.loseMoney(CONSTANTS.TorRouterCost, "other");
@@ -513,7 +525,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.getHomeComputer().serversOnNetwork.push(darkweb.hostname);
darkweb.serversOnNetwork.push(player.getHomeComputer().hostname);
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 500);
ctx.log(() => "You have purchased a Tor router!");
helpers.log(ctx, () => "You have purchased a Tor router!");
return true;
},
purchaseProgram: (ctx: NetscriptContext) =>
@@ -522,25 +534,26 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const programName = helpers.string(ctx, "programName", _programName).toLowerCase();
if (!player.hasTorRouter()) {
ctx.log(() => "You do not have the TOR router.");
helpers.log(ctx, () => "You do not have the TOR router.");
return false;
}
const item = Object.values(DarkWebItems).find((i) => i.program.toLowerCase() === programName);
if (item == null) {
ctx.log(() => `Invalid program name: '${programName}.`);
helpers.log(ctx, () => `Invalid program name: '${programName}.`);
return false;
}
if (player.money < item.price) {
ctx.log(
helpers.log(
ctx,
() => `Not enough money to purchase '${item.program}'. Need ${numeralWrapper.formatMoney(item.price)}`,
);
return false;
}
if (player.hasProgram(item.program)) {
ctx.log(() => `You already have the '${item.program}' program`);
helpers.log(ctx, () => `You already have the '${item.program}' program`);
return true;
}
@@ -551,7 +564,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
}
player.loseMoney(item.price, "other");
ctx.log(
helpers.log(
ctx,
() => `You have purchased the '${item.program}' program. The new program can be found on your home computer.`,
);
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 5000);
@@ -621,7 +635,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
helpers.checkSingularityAccess(ctx);
const baseserver = player.getCurrentServer();
if (!(baseserver instanceof Server)) {
ctx.log(() => "cannot backdoor this kind of server");
helpers.log(ctx, () => "cannot backdoor this kind of server");
return Promise.resolve();
}
const server = baseserver;
@@ -633,12 +647,13 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
throw helpers.makeRuntimeErrorMsg(ctx, canHack.msg || "");
}
ctx.log(
helpers.log(
ctx,
() => `Installing backdoor on '${server.hostname}' in ${convertTimeMsToTimeElapsedString(installTime, true)}`,
);
return helpers.netscriptDelay(ctx, installTime).then(function () {
ctx.log(() => `Successfully installed backdoor on '${server.hostname}'`);
helpers.log(ctx, () => `Successfully installed backdoor on '${server.hostname}'`);
server.backdoorInstalled = true;
@@ -676,7 +691,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
function (): void {
helpers.checkSingularityAccess(ctx);
if (player.currentWork || Router.page() === Page.Infiltration || Router.page() === Page.BitVerse) {
ctx.log(() => "Cannot go to the hospital because the player is busy.");
helpers.log(ctx, () => "Cannot go to the hospital because the player is busy.");
return;
}
player.hospitalize();
@@ -700,13 +715,13 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
// Check if we're at max cores
const homeComputer = player.getHomeComputer();
if (homeComputer.cpuCores >= 8) {
ctx.log(() => `Your home computer is at max cores.`);
helpers.log(ctx, () => `Your home computer is at max cores.`);
return false;
}
const cost = player.getUpgradeHomeCoresCost();
if (player.money < cost) {
ctx.log(() => `You don't have enough money. Need ${numeralWrapper.formatMoney(cost)}`);
helpers.log(ctx, () => `You don't have enough money. Need ${numeralWrapper.formatMoney(cost)}`);
return false;
}
@@ -714,7 +729,10 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.loseMoney(cost, "servers");
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 2);
ctx.log(() => `Purchased an additional core for home computer! It now has ${homeComputer.cpuCores} cores.`);
helpers.log(
ctx,
() => `Purchased an additional core for home computer! It now has ${homeComputer.cpuCores} cores.`,
);
return true;
},
getUpgradeHomeCoresCost: (ctx: NetscriptContext) =>
@@ -730,13 +748,13 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
// Check if we're at max RAM
const homeComputer = player.getHomeComputer();
if (homeComputer.maxRam >= CONSTANTS.HomeComputerMaxRam) {
ctx.log(() => `Your home computer is at max RAM.`);
helpers.log(ctx, () => `Your home computer is at max RAM.`);
return false;
}
const cost = player.getUpgradeHomeRamCost();
if (player.money < cost) {
ctx.log(() => `You don't have enough money. Need ${numeralWrapper.formatMoney(cost)}`);
helpers.log(ctx, () => `You don't have enough money. Need ${numeralWrapper.formatMoney(cost)}`);
return false;
}
@@ -744,7 +762,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.loseMoney(cost, "servers");
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 2);
ctx.log(
helpers.log(
ctx,
() =>
`Purchased additional RAM for home computer! It now has ${numeralWrapper.formatRAM(
homeComputer.maxRam,
@@ -766,13 +785,13 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
// Make sure its a valid company
if (companyName == null || companyName === "" || !(Companies[companyName] instanceof Company)) {
ctx.log(() => `Invalid company: '${companyName}'`);
helpers.log(ctx, () => `Invalid company: '${companyName}'`);
return false;
}
// Make sure player is actually employed at the comapny
if (!Object.keys(player.jobs).includes(companyName)) {
ctx.log(() => `You do not have a job at '${companyName}'`);
helpers.log(ctx, () => `You do not have a job at '${companyName}'`);
return false;
}
@@ -780,7 +799,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const companyPositionName = player.jobs[companyName];
const companyPosition = CompanyPositions[companyPositionName];
if (companyPositionName === "" || !(companyPosition instanceof CompanyPosition)) {
ctx.log(() => "You do not have a job");
helpers.log(ctx, () => "You do not have a job");
return false;
}
@@ -799,7 +818,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.stopFocusing();
Router.toTerminal();
}
ctx.log(() => `Began working at '${companyName}' as a '${companyPositionName}'`);
helpers.log(ctx, () => `Began working at '${companyName}' as a '${companyPositionName}'`);
return true;
},
applyToCompany: (ctx: NetscriptContext) =>
@@ -852,19 +871,19 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
res = player.applyForPartTimeWaiterJob(true);
break;
default:
ctx.log(() => `Invalid job: '${field}'.`);
helpers.log(ctx, () => `Invalid job: '${field}'.`);
return false;
}
// TODO https://github.com/danielyxie/bitburner/issues/1378
// The player object's applyForJob function can return string with special error messages
// if (isString(res)) {
// ctx.log("applyToCompany",()=> res);
// helpers.log(ctx,"applyToCompany",()=> res);
// return false;
// }
if (res) {
ctx.log(() => `You were offered a new job at '${companyName}' as a '${player.jobs[companyName]}'`);
helpers.log(ctx, () => `You were offered a new job at '${companyName}' as a '${player.jobs[companyName]}'`);
} else {
ctx.log(() => `You failed to get a new job/promotion at '${companyName}' in the '${field}' field.`);
helpers.log(ctx, () => `You failed to get a new job/promotion at '${companyName}' in the '${field}' field.`);
}
return res;
},
@@ -908,7 +927,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
getFaction(ctx, facName);
if (!player.factionInvitations.includes(facName)) {
ctx.log(() => `You have not been invited by faction '${facName}'`);
helpers.log(ctx, () => `You have not been invited by faction '${facName}'`);
return false;
}
const fac = Factions[facName];
@@ -922,7 +941,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
}
}
player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 5);
ctx.log(() => `Joined the '${facName}' faction.`);
helpers.log(ctx, () => `Joined the '${facName}' faction.`);
return true;
},
workForFaction: (ctx: NetscriptContext) =>
@@ -935,12 +954,12 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
// if the player is in a gang and the target faction is any of the gang faction, fail
if (player.inGang() && faction.name === player.getGangFaction().name) {
ctx.log(() => `You can't work for '${facName}' because youre managing a gang for it`);
helpers.log(ctx, () => `You can't work for '${facName}' because youre managing a gang for it`);
return false;
}
if (!player.factions.includes(facName)) {
ctx.log(() => `You are not a member of '${facName}'`);
helpers.log(ctx, () => `You are not a member of '${facName}'`);
return false;
}
@@ -951,7 +970,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
case "hacking contracts":
case "hackingcontracts":
if (!FactionInfos[faction.name].offerHackingWork) {
ctx.log(() => `Faction '${faction.name}' do not need help with hacking contracts.`);
helpers.log(ctx, () => `Faction '${faction.name}' do not need help with hacking contracts.`);
return false;
}
player.startWork(
@@ -968,13 +987,13 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.stopFocusing();
Router.toTerminal();
}
ctx.log(() => `Started carrying out hacking contracts for '${faction.name}'`);
helpers.log(ctx, () => `Started carrying out hacking contracts for '${faction.name}'`);
return true;
case "field":
case "fieldwork":
case "field work":
if (!FactionInfos[faction.name].offerFieldWork) {
ctx.log(() => `Faction '${faction.name}' do not need help with field missions.`);
helpers.log(ctx, () => `Faction '${faction.name}' do not need help with field missions.`);
return false;
}
player.startWork(
@@ -991,13 +1010,13 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.stopFocusing();
Router.toTerminal();
}
ctx.log(() => `Started carrying out field missions for '${faction.name}'`);
helpers.log(ctx, () => `Started carrying out field missions for '${faction.name}'`);
return true;
case "security":
case "securitywork":
case "security work":
if (!FactionInfos[faction.name].offerSecurityWork) {
ctx.log(() => `Faction '${faction.name}' do not need help with security work.`);
helpers.log(ctx, () => `Faction '${faction.name}' do not need help with security work.`);
return false;
}
player.startWork(
@@ -1014,10 +1033,10 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.stopFocusing();
Router.toTerminal();
}
ctx.log(() => `Started carrying out security work for '${faction.name}'`);
helpers.log(ctx, () => `Started carrying out security work for '${faction.name}'`);
return true;
default:
ctx.log(() => `Invalid work type: '${type}`);
helpers.log(ctx, () => `Invalid work type: '${type}`);
return false;
}
},
@@ -1049,28 +1068,32 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const amt = helpers.number(ctx, "amt", _amt);
const faction = getFaction(ctx, facName);
if (!player.factions.includes(faction.name)) {
ctx.log(() => `You can't donate to '${facName}' because you aren't a member`);
helpers.log(ctx, () => `You can't donate to '${facName}' because you aren't a member`);
return false;
}
if (player.inGang() && faction.name === player.getGangFaction().name) {
ctx.log(() => `You can't donate to '${facName}' because youre managing a gang for it`);
helpers.log(ctx, () => `You can't donate to '${facName}' because youre managing a gang for it`);
return false;
}
if (faction.name === FactionNames.ChurchOfTheMachineGod || faction.name === FactionNames.Bladeburners) {
ctx.log(() => `You can't donate to '${facName}' because they do not accept donations`);
helpers.log(ctx, () => `You can't donate to '${facName}' because they do not accept donations`);
return false;
}
if (typeof amt !== "number" || amt <= 0 || isNaN(amt)) {
ctx.log(() => `Invalid donation amount: '${amt}'.`);
helpers.log(ctx, () => `Invalid donation amount: '${amt}'.`);
return false;
}
if (player.money < amt) {
ctx.log(() => `You do not have enough money to donate ${numeralWrapper.formatMoney(amt)} to '${facName}'`);
helpers.log(
ctx,
() => `You do not have enough money to donate ${numeralWrapper.formatMoney(amt)} to '${facName}'`,
);
return false;
}
const repNeededToDonate = Math.floor(CONSTANTS.BaseFavorToDonate * BitNodeMultipliers.RepToDonateToFaction);
if (faction.favor < repNeededToDonate) {
ctx.log(
helpers.log(
ctx,
() =>
`You do not have enough favor to donate to this faction. Have ${faction.favor}, need ${repNeededToDonate}`,
);
@@ -1079,7 +1102,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const repGain = (amt / CONSTANTS.DonateMoneyToRepDivisor) * player.mults.faction_rep;
faction.playerReputation += repGain;
player.loseMoney(amt, "other");
ctx.log(
helpers.log(
ctx,
() =>
`${numeralWrapper.formatMoney(amt)} donated to '${facName}' for ${numeralWrapper.formatReputation(
repGain,
@@ -1098,23 +1122,23 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
const p = Object.values(Programs).find((p) => p.name.toLowerCase() === programName);
if (p == null) {
ctx.log(() => `The specified program does not exist: '${programName}`);
helpers.log(ctx, () => `The specified program does not exist: '${programName}`);
return false;
}
if (player.hasProgram(p.name)) {
ctx.log(() => `You already have the '${p.name}' program`);
helpers.log(ctx, () => `You already have the '${p.name}' program`);
return false;
}
const create = p.create;
if (create === null) {
ctx.log(() => `You cannot create the '${p.name}' program`);
helpers.log(ctx, () => `You cannot create the '${p.name}' program`);
return false;
}
if (!create.req(player)) {
ctx.log(() => `Hacking level is too low to create '${p.name}' (level ${create.level} req)`);
helpers.log(ctx, () => `Hacking level is too low to create '${p.name}' (level ${create.level} req)`);
return false;
}
@@ -1132,7 +1156,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
player.stopFocusing();
Router.toTerminal();
}
ctx.log(() => `Began creating program: '${programName}'`);
helpers.log(ctx, () => `Began creating program: '${programName}'`);
return true;
},
commitCrime: (ctx: NetscriptContext) =>
@@ -1154,7 +1178,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
// couldn't find crime
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: '${crimeRoughName}'`);
}
ctx.log(() => `Attempting to commit ${crime.name}...`);
helpers.log(ctx, () => `Attempting to commit ${crime.name}...`);
const crimeTime = crime.commit(player, 1, workerScript);
if (focus) {
player.startFocusing();
@@ -1195,7 +1219,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
// If we don't have Tor, log it and return [] (empty list)
if (!player.hasTorRouter()) {
ctx.log(() => "You do not have the TOR router.");
helpers.log(ctx, () => "You do not have the TOR router.");
return [];
}
return Object.values(DarkWebItems).map((p) => p.program);
@@ -1207,7 +1231,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
// If we don't have Tor, log it and return -1
if (!player.hasTorRouter()) {
ctx.log(() => "You do not have the TOR router.");
helpers.log(ctx, () => "You do not have the TOR router.");
// returning -1 rather than throwing an error to be consistent with purchaseProgram
// which returns false if tor has
return -1;
@@ -1228,7 +1252,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
}
if (player.hasProgram(item.program)) {
ctx.log(() => `You already have the '${item.program}' program`);
helpers.log(ctx, () => `You already have the '${item.program}' program`);
return 0;
}
return item.price;
@@ -1269,7 +1293,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript
};
if (!hackingRequirements() && !bladeburnerRequirements()) {
ctx.log(() => "Requirements not met to destroy the world daemon");
helpers.log(ctx, () => "Requirements not met to destroy the world daemon");
return;
}
src/NetscriptFunctions/Sleeve.ts
+1 -1
View File
@@ -32,7 +32,7 @@ export function NetscriptSleeve(player: IPlayer): InternalAPI<ISleeve> {
const checkSleeveNumber = function (ctx: NetscriptContext, sleeveNumber: number): void {
if (sleeveNumber >= player.sleeves.length || sleeveNumber < 0) {
const msg = `Invalid sleeve number: ${sleeveNumber}`;
ctx.log(() => msg);
helpers.log(ctx, () => msg);
throw helpers.makeRuntimeErrorMsg(ctx, msg);
}
};
src/NetscriptFunctions/Stanek.ts
+6 -5
View File
@@ -55,20 +55,20 @@ export function NetscriptStanek(player: IPlayer, workerScript: WorkerScript): In
const time = staneksGift.inBonus() ? 200 : 1000;
return helpers.netscriptDelay(ctx, time).then(function () {
staneksGift.charge(player, fragment, workerScript.scriptRef.threads);
ctx.log(() => `Charged fragment with ${ctx.workerScript.scriptRef.threads} threads.`);
helpers.log(ctx, () => `Charged fragment with ${ctx.workerScript.scriptRef.threads} threads.`);
return Promise.resolve();
});
},
fragmentDefinitions: (ctx: NetscriptContext) =>
function (): IFragment[] {
checkStanekAPIAccess(ctx);
ctx.log(() => `Returned ${Fragments.length} fragments`);
helpers.log(ctx, () => `Returned ${Fragments.length} fragments`);
return Fragments.map((f) => f.copy());
},
activeFragments: (ctx: NetscriptContext) =>
function (): IActiveFragment[] {
checkStanekAPIAccess(ctx);
ctx.log(() => `Returned ${staneksGift.fragments.length} fragments`);
helpers.log(ctx, () => `Returned ${staneksGift.fragments.length} fragments`);
return staneksGift.fragments.map((af) => {
return { ...af.copy(), ...af.fragment().copy() };
});
@@ -76,7 +76,7 @@ export function NetscriptStanek(player: IPlayer, workerScript: WorkerScript): In
clearGift: (ctx: NetscriptContext) =>
function (): void {
checkStanekAPIAccess(ctx);
ctx.log(() => `Cleared Stanek's Gift.`);
helpers.log(ctx, () => `Cleared Stanek's Gift.`);
staneksGift.clear();
},
canPlaceFragment: (ctx: NetscriptContext) =>
@@ -134,7 +134,8 @@ export function NetscriptStanek(player: IPlayer, workerScript: WorkerScript): In
!player.queuedAugmentations.some((a) => a.name === AugmentationNames.StaneksGift1)
) {
applyAugmentation({ name: AugmentationNames.StaneksGift1, level: 1 });
ctx.log(
helpers.log(
ctx,
() => `'${FactionNames.ChurchOfTheMachineGod}' joined and '${AugmentationNames.StaneksGift1}' installed.`,
);
}
src/NetscriptFunctions/StockMarket.ts
+12 -12
View File
@@ -371,69 +371,69 @@ export function NetscriptStockMarket(player: IPlayer, workerScript: WorkerScript
},
purchase4SMarketData: (ctx: NetscriptContext) => (): boolean => {
if (player.has4SData) {
ctx.log(() => "Already purchased 4S Market Data.");
helpers.log(ctx, () => "Already purchased 4S Market Data.");
return true;
}
if (player.money < getStockMarket4SDataCost()) {
ctx.log(() => "Not enough money to purchase 4S Market Data.");
helpers.log(ctx, () => "Not enough money to purchase 4S Market Data.");
return false;
}
player.has4SData = true;
player.loseMoney(getStockMarket4SDataCost(), "stock");
ctx.log(() => "Purchased 4S Market Data");
helpers.log(ctx, () => "Purchased 4S Market Data");
return true;
},
purchase4SMarketDataTixApi: (ctx: NetscriptContext) => (): boolean => {
checkTixApiAccess(ctx);
if (player.has4SDataTixApi) {
ctx.log(() => "Already purchased 4S Market Data TIX API");
helpers.log(ctx, () => "Already purchased 4S Market Data TIX API");
return true;
}
if (player.money < getStockMarket4STixApiCost()) {
ctx.log(() => "Not enough money to purchase 4S Market Data TIX API");
helpers.log(ctx, () => "Not enough money to purchase 4S Market Data TIX API");
return false;
}
player.has4SDataTixApi = true;
player.loseMoney(getStockMarket4STixApiCost(), "stock");
ctx.log(() => "Purchased 4S Market Data TIX API");
helpers.log(ctx, () => "Purchased 4S Market Data TIX API");
return true;
},
purchaseWseAccount: (ctx: NetscriptContext) => (): boolean => {
if (player.hasWseAccount) {
ctx.log(() => "Already purchased WSE Account");
helpers.log(ctx, () => "Already purchased WSE Account");
return true;
}
if (player.money < getStockMarketWseCost()) {
ctx.log(() => "Not enough money to purchase WSE Account Access");
helpers.log(ctx, () => "Not enough money to purchase WSE Account Access");
return false;
}
player.hasWseAccount = true;
initStockMarketFn();
player.loseMoney(getStockMarketWseCost(), "stock");
ctx.log(() => "Purchased WSE Account Access");
helpers.log(ctx, () => "Purchased WSE Account Access");
return true;
},
purchaseTixApi: (ctx: NetscriptContext) => (): boolean => {
if (player.hasTixApiAccess) {
ctx.log(() => "Already purchased TIX API");
helpers.log(ctx, () => "Already purchased TIX API");
return true;
}
if (player.money < getStockMarketTixApiCost()) {
ctx.log(() => "Not enough money to purchase TIX API Access");
helpers.log(ctx, () => "Not enough money to purchase TIX API Access");
return false;
}
player.hasTixApiAccess = true;
player.loseMoney(getStockMarketTixApiCost(), "stock");
ctx.log(() => "Purchased TIX API");
helpers.log(ctx, () => "Purchased TIX API");
return true;
},
};
src/NetscriptFunctions/UserInterface.ts
+8 -7
View File
@@ -12,6 +12,7 @@ import { CONSTANTS } from "../Constants";
import { hash } from "../hash/hash";
import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
import { Terminal } from "../../src/Terminal";
import { helpers } from "../Netscript/NetscriptHelpers";
export function NetscriptUserInterface(): InternalAPI<IUserInterface> {
return {
@@ -43,9 +44,9 @@ export function NetscriptUserInterface(): InternalAPI<IUserInterface> {
if (errors.length === 0) {
Object.assign(Settings.theme, currentTheme);
ThemeEvents.emit();
ctx.log(() => `Successfully set theme`);
helpers.log(ctx, () => `Successfully set theme`);
} else {
ctx.log(() => `Failed to set theme. Errors: ${errors.join(", ")}`);
helpers.log(ctx, () => `Failed to set theme. Errors: ${errors.join(", ")}`);
}
},
@@ -66,22 +67,22 @@ export function NetscriptUserInterface(): InternalAPI<IUserInterface> {
if (errors.length === 0) {
Object.assign(Settings.styles, currentStyles);
ThemeEvents.emit();
ctx.log(() => `Successfully set styles`);
helpers.log(ctx, () => `Successfully set styles`);
} else {
ctx.log(() => `Failed to set styles. Errors: ${errors.join(", ")}`);
helpers.log(ctx, () => `Failed to set styles. Errors: ${errors.join(", ")}`);
}
},
resetTheme: (ctx: NetscriptContext) => (): void => {
Settings.theme = { ...defaultTheme };
ThemeEvents.emit();
ctx.log(() => `Reinitialized theme to default`);
helpers.log(ctx, () => `Reinitialized theme to default`);
},
resetStyles: (ctx: NetscriptContext) => (): void => {
Settings.styles = { ...defaultStyles };
ThemeEvents.emit();
ctx.log(() => `Reinitialized styles to default`);
helpers.log(ctx, () => `Reinitialized styles to default`);
},
getGameInfo: () => (): GameInfo => {
@@ -99,7 +100,7 @@ export function NetscriptUserInterface(): InternalAPI<IUserInterface> {
},
clearTerminal: (ctx: NetscriptContext) => (): void => {
ctx.log(() => `Clearing terminal`);
helpers.log(ctx, () => `Clearing terminal`);
Terminal.clear();
},
};