From f8f3c099e076d6a1fa1afd2a269705270b07c17d Mon Sep 17 00:00:00 2001 From: Undeemiss Date: Sat, 28 May 2022 21:35:20 -0500 Subject: [PATCH] Formatted/linted (There are some errors, but they aren't mine afaik) --- src/Bladeburner/Bladeburner.tsx | 95 ++--- src/Bladeburner/Skill.ts | 17 +- src/Bladeburner/ui/GeneralActionElem.tsx | 2 +- src/DevMenu/ui/Augmentations.tsx | 2 +- src/DevMenu/ui/CodingContracts.tsx | 2 +- src/DevMenu/ui/Companies.tsx | 2 +- src/DevMenu/ui/Factions.tsx | 2 +- src/DevMenu/ui/Programs.tsx | 2 +- src/DevMenu/ui/Servers.tsx | 2 +- src/Exploits/Unclickable.tsx | 4 +- src/Hacknet/ui/HacknetNodeElem.tsx | 6 +- src/NetscriptFunctions/Bladeburner.ts | 429 +++++++++++------------ src/NetscriptFunctions/Corporation.ts | 10 +- src/ScriptEditor/ui/ScriptEditorRoot.tsx | 2 +- src/StockMarket/Stock.ts | 2 +- src/StockMarket/StockMarket.tsx | 2 +- src/Terminal/commands/mv.ts | 2 +- src/TextFile.ts | 2 +- 18 files changed, 293 insertions(+), 292 deletions(-) diff --git a/src/Bladeburner/Bladeburner.tsx b/src/Bladeburner/Bladeburner.tsx index 658a64641..7db0374ce 100644 --- a/src/Bladeburner/Bladeburner.tsx +++ b/src/Bladeburner/Bladeburner.tsx @@ -671,15 +671,15 @@ export class Bladeburner implements IBladeburner { this.postToConsole("Automation: " + (this.automateEnabled ? "enabled" : "disabled")); this.postToConsole( "When your stamina drops to " + - formatNumber(this.automateThreshLow, 0) + - ", you will automatically switch to " + - this.automateActionLow.name + - ". When your stamina recovers to " + - formatNumber(this.automateThreshHigh, 0) + - ", you will automatically " + - "switch to " + - this.automateActionHigh.name + - ".", + formatNumber(this.automateThreshLow, 0) + + ", you will automatically switch to " + + this.automateActionLow.name + + ". When your stamina recovers to " + + formatNumber(this.automateThreshHigh, 0) + + ", you will automatically " + + "switch to " + + this.automateActionHigh.name + + ".", ); } else if (flag.toLowerCase().includes("en")) { if ( @@ -974,8 +974,8 @@ export class Bladeburner implements IBladeburner { if (this.logging.events) { this.log( "Intelligence indicates that a large number of Synthoids migrated from " + - sourceCityName + - " to some other city", + sourceCityName + + " to some other city", ); } } else if (chance <= 0.7) { @@ -1314,19 +1314,19 @@ export class Bladeburner implements IBladeburner { if (isOperation && this.logging.ops) { this.log( `${person.whoAmI()}: ` + - action.name + - " successfully completed! Gained " + - formatNumber(gain, 3) + - " rank", + action.name + + " successfully completed! Gained " + + formatNumber(gain, 3) + + " rank", ); } else if (!isOperation && this.logging.contracts) { this.log( `${person.whoAmI()}: ` + - action.name + - " contract successfully completed! Gained " + - formatNumber(gain, 3) + - " rank and " + - numeralWrapper.formatMoney(moneyGain), + action.name + + " contract successfully completed! Gained " + + formatNumber(gain, 3) + + " rank and " + + numeralWrapper.formatMoney(moneyGain), ); } } @@ -1432,12 +1432,12 @@ export class Bladeburner implements IBladeburner { if (this.logging.blackops) { this.log( `${person.whoAmI()}: ` + - action.name + - " failed! Lost " + - formatNumber(rankLoss, 1) + - " rank and took " + - formatNumber(damage, 0) + - " damage", + action.name + + " failed! Lost " + + formatNumber(rankLoss, 1) + + " rank and took " + + formatNumber(damage, 0) + + " damage", ); } } @@ -1482,17 +1482,17 @@ export class Bladeburner implements IBladeburner { if (this.logging.general) { this.log( `${person.whoAmI()}: ` + - "Training completed. Gained: " + - formatNumber(strExpGain, 1) + - " str exp, " + - formatNumber(defExpGain, 1) + - " def exp, " + - formatNumber(dexExpGain, 1) + - " dex exp, " + - formatNumber(agiExpGain, 1) + - " agi exp, " + - formatNumber(staminaGain, 3) + - " max stamina", + "Training completed. Gained: " + + formatNumber(strExpGain, 1) + + " str exp, " + + formatNumber(defExpGain, 1) + + " def exp, " + + formatNumber(dexExpGain, 1) + + " dex exp, " + + formatNumber(agiExpGain, 1) + + " agi exp, " + + formatNumber(staminaGain, 3) + + " max stamina", ); } break; @@ -1519,9 +1519,9 @@ export class Bladeburner implements IBladeburner { if (this.logging.general) { this.log( `${person.whoAmI()}: ` + - `Field analysis completed. Gained ${formatNumber(rankGain, 2)} rank, ` + - `${formatNumber(hackingExpGain, 1)} hacking exp, and ` + - `${formatNumber(charismaExpGain, 1)} charisma exp`, + `Field analysis completed. Gained ${formatNumber(rankGain, 2)} rank, ` + + `${formatNumber(hackingExpGain, 1)} hacking exp, and ` + + `${formatNumber(charismaExpGain, 1)} charisma exp`, ); } break; @@ -1536,9 +1536,9 @@ export class Bladeburner implements IBladeburner { if (this.logging.general) { this.log( `${person.whoAmI()}: ` + - "Successfully recruited a team member! Gained " + - formatNumber(expGain, 1) + - " charisma exp", + "Successfully recruited a team member! Gained " + + formatNumber(expGain, 1) + + " charisma exp", ); } } else { @@ -1547,9 +1547,9 @@ export class Bladeburner implements IBladeburner { if (this.logging.general) { this.log( `${person.whoAmI()}: ` + - "Failed to recruit a team member. Gained " + - formatNumber(expGain, 1) + - " charisma exp", + "Failed to recruit a team member. Gained " + + formatNumber(expGain, 1) + + " charisma exp", ); } } @@ -1577,7 +1577,8 @@ export class Bladeburner implements IBladeburner { this.stamina = Math.min(this.maxStamina, this.stamina + staminaGain); if (this.logging.general) { this.log( - `${person.whoAmI()}: Rested in Hyperbolic Regeneration Chamber. Restored ${BladeburnerConstants.HrcHpGain + `${person.whoAmI()}: Rested in Hyperbolic Regeneration Chamber. Restored ${ + BladeburnerConstants.HrcHpGain } HP and gained ${numeralWrapper.formatStamina(staminaGain)} stamina`, ); } diff --git a/src/Bladeburner/Skill.ts b/src/Bladeburner/Skill.ts index cdf5e03e2..802bfd317 100644 --- a/src/Bladeburner/Skill.ts +++ b/src/Bladeburner/Skill.ts @@ -136,20 +136,19 @@ export class Skill { calculateCost(currentLevel: number, count = 1): number { if (count == 1) { return Math.floor((this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost); - } - else if (count < 0 || isNaN(count)) { + } else if (count < 0 || isNaN(count)) { throw new Error(`Attempted to find cost of ${count} BB upgrades`); - } - else if (count < 100) { - const thisUpgrade = Math.floor((this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost); + } else if (count < 100) { + const thisUpgrade = Math.floor( + (this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost, + ); return this.calculateCost(currentLevel + 1, count - 1) + thisUpgrade; - } - else { + } else { //unFloored is roughly equivalent to //(this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost //being repeated for increasing currentLevel - const preMult = count * ((2 * this.baseCost) + this.costInc * (2 * currentLevel + count + 1)) / 2; - const unFloored = (preMult * BitNodeMultipliers.BladeburnerSkillCost) - count / 2; + const preMult = (count * (2 * this.baseCost + this.costInc * (2 * currentLevel + count + 1))) / 2; + const unFloored = preMult * BitNodeMultipliers.BladeburnerSkillCost - count / 2; return Math.floor(unFloored); } } diff --git a/src/Bladeburner/ui/GeneralActionElem.tsx b/src/Bladeburner/ui/GeneralActionElem.tsx index 7cd4b1dcc..b064b298d 100644 --- a/src/Bladeburner/ui/GeneralActionElem.tsx +++ b/src/Bladeburner/ui/GeneralActionElem.tsx @@ -74,7 +74,7 @@ export function GeneralActionElem(props: IProps): React.ReactElement { diff --git a/src/DevMenu/ui/Augmentations.tsx b/src/DevMenu/ui/Augmentations.tsx index 4776264bf..7f129495c 100644 --- a/src/DevMenu/ui/Augmentations.tsx +++ b/src/DevMenu/ui/Augmentations.tsx @@ -22,7 +22,7 @@ export function Augmentations(props: IProps): React.ReactElement { const [augmentation, setAugmentation] = useState("Augmented Targeting I"); function setAugmentationDropdown(event: SelectChangeEvent): void { - setAugmentation(event.target.value ); + setAugmentation(event.target.value); } function queueAug(): void { props.player.queueAugmentation(augmentation); diff --git a/src/DevMenu/ui/CodingContracts.tsx b/src/DevMenu/ui/CodingContracts.tsx index 7ddd96494..3bc166268 100644 --- a/src/DevMenu/ui/CodingContracts.tsx +++ b/src/DevMenu/ui/CodingContracts.tsx @@ -15,7 +15,7 @@ import { CodingContractTypes } from "../../CodingContracts"; export function CodingContracts(): React.ReactElement { const [codingcontract, setCodingcontract] = useState("Find Largest Prime Factor"); function setCodingcontractDropdown(event: SelectChangeEvent): void { - setCodingcontract(event.target.value ); + setCodingcontract(event.target.value); } function specificContract(): void { diff --git a/src/DevMenu/ui/Companies.tsx b/src/DevMenu/ui/Companies.tsx index c1f98dc70..d3d40042a 100644 --- a/src/DevMenu/ui/Companies.tsx +++ b/src/DevMenu/ui/Companies.tsx @@ -18,7 +18,7 @@ const bigNumber = 1e12; export function Companies(): React.ReactElement { const [company, setCompany] = useState(FactionNames.ECorp as string); function setCompanyDropdown(event: SelectChangeEvent): void { - setCompany(event.target.value ); + setCompany(event.target.value); } function resetCompanyRep(): void { AllCompanies[company].playerReputation = 0; diff --git a/src/DevMenu/ui/Factions.tsx b/src/DevMenu/ui/Factions.tsx index 20322822e..6f1453ac1 100644 --- a/src/DevMenu/ui/Factions.tsx +++ b/src/DevMenu/ui/Factions.tsx @@ -29,7 +29,7 @@ export function Factions(props: IProps): React.ReactElement { const [faction, setFaction] = useState(FactionNames.Illuminati as string); function setFactionDropdown(event: SelectChangeEvent): void { - setFaction(event.target.value ); + setFaction(event.target.value); } function receiveInvite(): void { diff --git a/src/DevMenu/ui/Programs.tsx b/src/DevMenu/ui/Programs.tsx index 7b300e81e..830a99b2e 100644 --- a/src/DevMenu/ui/Programs.tsx +++ b/src/DevMenu/ui/Programs.tsx @@ -19,7 +19,7 @@ interface IProps { export function Programs(props: IProps): React.ReactElement { const [program, setProgram] = useState("NUKE.exe"); function setProgramDropdown(event: SelectChangeEvent): void { - setProgram(event.target.value ); + setProgram(event.target.value); } function addProgram(): void { if (!props.player.hasProgram(program)) { diff --git a/src/DevMenu/ui/Servers.tsx b/src/DevMenu/ui/Servers.tsx index b73a935b4..db1f0e53f 100644 --- a/src/DevMenu/ui/Servers.tsx +++ b/src/DevMenu/ui/Servers.tsx @@ -15,7 +15,7 @@ import MenuItem from "@mui/material/MenuItem"; export function Servers(): React.ReactElement { const [server, setServer] = useState("home"); function setServerDropdown(event: SelectChangeEvent): void { - setServer(event.target.value ); + setServer(event.target.value); } function rootServer(): void { const s = GetServer(server); diff --git a/src/Exploits/Unclickable.tsx b/src/Exploits/Unclickable.tsx index fbcfb3c1b..1ab524d9e 100644 --- a/src/Exploits/Unclickable.tsx +++ b/src/Exploits/Unclickable.tsx @@ -8,8 +8,8 @@ export function Unclickable(): React.ReactElement { function unclickable(event: React.MouseEvent): void { if (!event.target || !(event.target instanceof Element)) return; - const display = getComputedStyle(event.target ).display; - const visibility = getComputedStyle(event.target ).visibility; + const display = getComputedStyle(event.target).display; + const visibility = getComputedStyle(event.target).visibility; if (display === "none" && visibility === "hidden" && event.isTrusted) player.giveExploit(Exploit.Unclickable); } diff --git a/src/Hacknet/ui/HacknetNodeElem.tsx b/src/Hacknet/ui/HacknetNodeElem.tsx index b5909027c..c5ce99c10 100644 --- a/src/Hacknet/ui/HacknetNodeElem.tsx +++ b/src/Hacknet/ui/HacknetNodeElem.tsx @@ -54,7 +54,7 @@ export function HacknetNodeElem(props: IProps): React.ReactElement { multiplier = getMaxNumberLevelUpgrades(props.player, node, HacknetNodeConstants.MaxLevel); } else { const levelsToMax = HacknetNodeConstants.MaxLevel - node.level; - multiplier = Math.min(levelsToMax, purchaseMult ); + multiplier = Math.min(levelsToMax, purchaseMult); } const increase = @@ -94,7 +94,7 @@ export function HacknetNodeElem(props: IProps): React.ReactElement { multiplier = getMaxNumberRamUpgrades(props.player, node, HacknetNodeConstants.MaxRam); } else { const levelsToMax = Math.round(Math.log2(HacknetNodeConstants.MaxRam / node.ram)); - multiplier = Math.min(levelsToMax, purchaseMult ); + multiplier = Math.min(levelsToMax, purchaseMult); } const increase = @@ -144,7 +144,7 @@ export function HacknetNodeElem(props: IProps): React.ReactElement { multiplier = getMaxNumberCoreUpgrades(props.player, node, HacknetNodeConstants.MaxCores); } else { const levelsToMax = HacknetNodeConstants.MaxCores - node.cores; - multiplier = Math.min(levelsToMax, purchaseMult ); + multiplier = Math.min(levelsToMax, purchaseMult); } const increase = diff --git a/src/NetscriptFunctions/Bladeburner.ts b/src/NetscriptFunctions/Bladeburner.ts index 6f57dcf8c..e07e340cc 100644 --- a/src/NetscriptFunctions/Bladeburner.ts +++ b/src/NetscriptFunctions/Bladeburner.ts @@ -72,12 +72,12 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript }, getBlackOpRank: (ctx: NetscriptContext) => - (_blackOpName: unknown): number => { - const blackOpName = ctx.helper.string("blackOpName", _blackOpName); - checkBladeburnerAccess(ctx); - const action: any = getBladeburnerActionObject(ctx, "blackops", blackOpName); - return action.reqdRank; - }, + (_blackOpName: unknown): number => { + const blackOpName = ctx.helper.string("blackOpName", _blackOpName); + checkBladeburnerAccess(ctx); + const action: any = getBladeburnerActionObject(ctx, "blackops", blackOpName); + return action.reqdRank; + }, getGeneralActionNames: (ctx: NetscriptContext) => (): string[] => { checkBladeburnerAccess(ctx); const bladeburner = player.bladeburner; @@ -92,18 +92,18 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript }, startAction: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): boolean => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - return bladeburner.startActionNetscriptFn(player, type, name, workerScript); - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); - } - }, + (_type: unknown, _name: unknown): boolean => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + return bladeburner.startActionNetscriptFn(player, type, name, workerScript); + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, stopBladeburnerAction: (ctx: NetscriptContext) => (): void => { checkBladeburnerAccess(ctx); const bladeburner = player.bladeburner; @@ -118,25 +118,25 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript }, getActionTime: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): number => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - const time = bladeburner.getActionTimeNetscriptFn(player, type, name); - if (typeof time === "string") { - const errorLogText = `Invalid action: type='${type}' name='${name}'`; - ctx.log(() => errorLogText); - return -1; - } else { - return time; - } - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); + (_type: unknown, _name: unknown): number => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + const time = bladeburner.getActionTimeNetscriptFn(player, type, name); + if (typeof time === "string") { + const errorLogText = `Invalid action: type='${type}' name='${name}'`; + ctx.log(() => errorLogText); + return -1; + } else { + return time; } - }, + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, getActionCurrentTime: (ctx: NetscriptContext) => (): number => { checkBladeburnerAccess(ctx); const bladeburner = player.bladeburner; @@ -152,106 +152,106 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript }, getActionEstimatedSuccessChance: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): [number, number] => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - const chance = bladeburner.getActionEstimatedSuccessChanceNetscriptFn(player, type, name); - if (typeof chance === "string") { - const errorLogText = `Invalid action: type='${type}' name='${name}'`; - ctx.log(() => errorLogText); - return [-1, -1]; - } else { - return chance; - } - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); + (_type: unknown, _name: unknown): [number, number] => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + const chance = bladeburner.getActionEstimatedSuccessChanceNetscriptFn(player, type, name); + if (typeof chance === "string") { + const errorLogText = `Invalid action: type='${type}' name='${name}'`; + ctx.log(() => errorLogText); + return [-1, -1]; + } else { + return chance; } - }, + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, getActionRepGain: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown, _level: unknown): number => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - const level = ctx.helper.number("level", _level); - checkBladeburnerAccess(ctx); - const action = getBladeburnerActionObject(ctx, type, name); - let rewardMultiplier; - if (level == null || isNaN(level)) { - rewardMultiplier = Math.pow(action.rewardFac, action.level - 1); - } else { - rewardMultiplier = Math.pow(action.rewardFac, level - 1); - } + (_type: unknown, _name: unknown, _level: unknown): number => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + const level = ctx.helper.number("level", _level); + checkBladeburnerAccess(ctx); + const action = getBladeburnerActionObject(ctx, type, name); + let rewardMultiplier; + if (level == null || isNaN(level)) { + rewardMultiplier = Math.pow(action.rewardFac, action.level - 1); + } else { + rewardMultiplier = Math.pow(action.rewardFac, level - 1); + } - return action.rankGain * rewardMultiplier * BitNodeMultipliers.BladeburnerRank; - }, + return action.rankGain * rewardMultiplier * BitNodeMultipliers.BladeburnerRank; + }, getActionCountRemaining: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): number => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - return bladeburner.getActionCountRemainingNetscriptFn(type, name, workerScript); - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); - } - }, + (_type: unknown, _name: unknown): number => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + return bladeburner.getActionCountRemainingNetscriptFn(type, name, workerScript); + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, getActionMaxLevel: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): number => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const action = getBladeburnerActionObject(ctx, type, name); - return action.maxLevel; - }, + (_type: unknown, _name: unknown): number => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const action = getBladeburnerActionObject(ctx, type, name); + return action.maxLevel; + }, getActionCurrentLevel: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): number => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const action = getBladeburnerActionObject(ctx, type, name); - return action.level; - }, + (_type: unknown, _name: unknown): number => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const action = getBladeburnerActionObject(ctx, type, name); + return action.level; + }, getActionAutolevel: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): boolean => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const action = getBladeburnerActionObject(ctx, type, name); - return action.autoLevel; - }, + (_type: unknown, _name: unknown): boolean => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const action = getBladeburnerActionObject(ctx, type, name); + return action.autoLevel; + }, setActionAutolevel: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown, _autoLevel: unknown = true): void => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - const autoLevel = ctx.helper.boolean(_autoLevel); - checkBladeburnerAccess(ctx); - const action = getBladeburnerActionObject(ctx, type, name); - action.autoLevel = autoLevel; - }, + (_type: unknown, _name: unknown, _autoLevel: unknown = true): void => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + const autoLevel = ctx.helper.boolean(_autoLevel); + checkBladeburnerAccess(ctx); + const action = getBladeburnerActionObject(ctx, type, name); + action.autoLevel = autoLevel; + }, setActionLevel: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown, _level: unknown = 1): void => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - const level = ctx.helper.number("level", _level); - checkBladeburnerAccess(ctx); - const action = getBladeburnerActionObject(ctx, type, name); - if (level < 1 || level > action.maxLevel) { - ctx.helper.makeRuntimeErrorMsg(`Level must be between 1 and ${action.maxLevel}, is ${level}`); - } - action.level = level; - }, + (_type: unknown, _name: unknown, _level: unknown = 1): void => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + const level = ctx.helper.number("level", _level); + checkBladeburnerAccess(ctx); + const action = getBladeburnerActionObject(ctx, type, name); + if (level < 1 || level > action.maxLevel) { + ctx.helper.makeRuntimeErrorMsg(`Level must be between 1 and ${action.maxLevel}, is ${level}`); + } + action.level = level; + }, getRank: (ctx: NetscriptContext) => (): number => { checkBladeburnerAccess(ctx); const bladeburner = player.bladeburner; @@ -266,107 +266,106 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript }, getSkillLevel: (ctx: NetscriptContext) => - (_skillName: unknown): number => { - const skillName = ctx.helper.string("skillName", _skillName); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - return bladeburner.getSkillLevelNetscriptFn(skillName, workerScript); - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); - } - }, + (_skillName: unknown): number => { + const skillName = ctx.helper.string("skillName", _skillName); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + return bladeburner.getSkillLevelNetscriptFn(skillName, workerScript); + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, getSkillUpgradeCost: (ctx: NetscriptContext) => - (_skillName: unknown): number => { - const skillName = ctx.helper.string("skillName", _skillName); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - return bladeburner.getSkillUpgradeCostNetscriptFn(skillName, workerScript); - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); - } - }, + (_skillName: unknown): number => { + const skillName = ctx.helper.string("skillName", _skillName); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + return bladeburner.getSkillUpgradeCostNetscriptFn(skillName, workerScript); + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, upgradeSkill: (ctx: NetscriptContext) => - (_skillName: unknown, count = 1): number => { - const skillName = ctx.helper.string("skillName", _skillName); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - if(bladeburner.upgradeSkillNetscriptFn(skillName, count, workerScript)){ - return count; - } - else{ - return 0; - } - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); + (_skillName: unknown, count = 1): number => { + const skillName = ctx.helper.string("skillName", _skillName); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + if (bladeburner.upgradeSkillNetscriptFn(skillName, count, workerScript)) { + return count; + } else { + return 0; } - }, + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, getTeamSize: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown): number => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - return bladeburner.getTeamSizeNetscriptFn(type, name, workerScript); - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); - } - }, + (_type: unknown, _name: unknown): number => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + return bladeburner.getTeamSizeNetscriptFn(type, name, workerScript); + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, setTeamSize: (ctx: NetscriptContext) => - (_type: unknown, _name: unknown, _size: unknown): number => { - const type = ctx.helper.string("type", _type); - const name = ctx.helper.string("name", _name); - const size = ctx.helper.number("size", _size); - checkBladeburnerAccess(ctx); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - try { - return bladeburner.setTeamSizeNetscriptFn(type, name, size, workerScript); - } catch (e: any) { - throw ctx.makeRuntimeErrorMsg(e); - } - }, + (_type: unknown, _name: unknown, _size: unknown): number => { + const type = ctx.helper.string("type", _type); + const name = ctx.helper.string("name", _name); + const size = ctx.helper.number("size", _size); + checkBladeburnerAccess(ctx); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + try { + return bladeburner.setTeamSizeNetscriptFn(type, name, size, workerScript); + } catch (e: any) { + throw ctx.makeRuntimeErrorMsg(e); + } + }, getCityEstimatedPopulation: (ctx: NetscriptContext) => - (_cityName: unknown): number => { - const cityName = ctx.helper.string("cityName", _cityName); - checkBladeburnerAccess(ctx); - checkBladeburnerCity(ctx, cityName); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - return bladeburner.cities[cityName].popEst; - }, + (_cityName: unknown): number => { + const cityName = ctx.helper.string("cityName", _cityName); + checkBladeburnerAccess(ctx); + checkBladeburnerCity(ctx, cityName); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + return bladeburner.cities[cityName].popEst; + }, getCityCommunities: (ctx: NetscriptContext) => - (_cityName: unknown): number => { - const cityName = ctx.helper.string("cityName", _cityName); - checkBladeburnerAccess(ctx); - checkBladeburnerCity(ctx, cityName); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - return bladeburner.cities[cityName].comms; - }, + (_cityName: unknown): number => { + const cityName = ctx.helper.string("cityName", _cityName); + checkBladeburnerAccess(ctx); + checkBladeburnerCity(ctx, cityName); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + return bladeburner.cities[cityName].comms; + }, getCityChaos: (ctx: NetscriptContext) => - (_cityName: unknown): number => { - const cityName = ctx.helper.string("cityName", _cityName); - checkBladeburnerAccess(ctx); - checkBladeburnerCity(ctx, cityName); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - return bladeburner.cities[cityName].chaos; - }, + (_cityName: unknown): number => { + const cityName = ctx.helper.string("cityName", _cityName); + checkBladeburnerAccess(ctx); + checkBladeburnerCity(ctx, cityName); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + return bladeburner.cities[cityName].chaos; + }, getCity: (ctx: NetscriptContext) => (): string => { checkBladeburnerAccess(ctx); const bladeburner = player.bladeburner; @@ -375,15 +374,15 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript }, switchCity: (ctx: NetscriptContext) => - (_cityName: unknown): boolean => { - const cityName = ctx.helper.string("cityName", _cityName); - checkBladeburnerAccess(ctx); - checkBladeburnerCity(ctx, cityName); - const bladeburner = player.bladeburner; - if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); - bladeburner.city = cityName; - return true; - }, + (_cityName: unknown): boolean => { + const cityName = ctx.helper.string("cityName", _cityName); + checkBladeburnerAccess(ctx); + checkBladeburnerCity(ctx, cityName); + const bladeburner = player.bladeburner; + if (bladeburner === null) throw new Error("Should not be called without Bladeburner"); + bladeburner.city = cityName; + return true; + }, getStamina: (ctx: NetscriptContext) => (): [number, number] => { checkBladeburnerAccess(ctx); const bladeburner = player.bladeburner; diff --git a/src/NetscriptFunctions/Corporation.ts b/src/NetscriptFunctions/Corporation.ts index 9ed771625..b6abb18e0 100644 --- a/src/NetscriptFunctions/Corporation.ts +++ b/src/NetscriptFunctions/Corporation.ts @@ -257,7 +257,7 @@ export function NetscriptCorporation(player: IPlayer, workerScript: WorkerScript function getMaterial(divisionName: string, cityName: string, materialName: string): Material { const warehouse = getWarehouse(divisionName, cityName); - const matName = (materialName ).replace(/ /g, ""); + const matName = materialName.replace(/ /g, ""); const material = warehouse.materials[matName]; if (material === undefined) throw new Error(`Invalid material name: '${materialName}'`); return material; @@ -725,9 +725,11 @@ export function NetscriptCorporation(player: IPlayer, workerScript: WorkerScript const employeeName = ctx.helper.string("employeeName", _employeeName); const job = ctx.helper.string("job", _job); const employee = getEmployee(divisionName, cityName, employeeName); - return netscriptDelay(["Training", "Unassigned"].includes(employee.pos) ? 0 : 1000, workerScript).then(function () { - return Promise.resolve(AssignJob(employee, job)); - }); + return netscriptDelay(["Training", "Unassigned"].includes(employee.pos) ? 0 : 1000, workerScript).then( + function () { + return Promise.resolve(AssignJob(employee, job)); + }, + ); }, hireEmployee: (ctx: NetscriptContext) => diff --git a/src/ScriptEditor/ui/ScriptEditorRoot.tsx b/src/ScriptEditor/ui/ScriptEditorRoot.tsx index 24780072a..13c2a43d8 100644 --- a/src/ScriptEditor/ui/ScriptEditorRoot.tsx +++ b/src/ScriptEditor/ui/ScriptEditorRoot.tsx @@ -693,7 +693,7 @@ export function Root(props: IProps): React.ReactElement { if (server === null) throw new Error(`Server '${closingScript.hostname}' should not be null, but it is.`); const serverScriptIndex = server.scripts.findIndex((script) => script.filename === closingScript.fileName); - if (serverScriptIndex === -1 || savedScriptCode !== server.scripts[serverScriptIndex ].code) { + if (serverScriptIndex === -1 || savedScriptCode !== server.scripts[serverScriptIndex].code) { PromptEvent.emit({ txt: `Do you want to save changes to ${closingScript.fileName} on ${closingScript.hostname}?`, resolve: (result: boolean | string) => { diff --git a/src/StockMarket/Stock.ts b/src/StockMarket/Stock.ts index f6e27db31..d001e7e50 100644 --- a/src/StockMarket/Stock.ts +++ b/src/StockMarket/Stock.ts @@ -36,7 +36,7 @@ function toNumber(n: number | IMinMaxRange): number { return n; } case "object": { - const range = n ; + const range = n; value = getRandomInt(range.min, range.max); break; } diff --git a/src/StockMarket/StockMarket.tsx b/src/StockMarket/StockMarket.tsx index 208c6e765..96527f0f2 100644 --- a/src/StockMarket/StockMarket.tsx +++ b/src/StockMarket/StockMarket.tsx @@ -68,7 +68,7 @@ export function placeOrder( // Process to see if it should be executed immediately const processOrderRefs = { - stockMarket: StockMarket , + stockMarket: StockMarket, symbolToStockMap: SymbolToStockMap, }; processOrders(stock, order.type, order.pos, processOrderRefs); diff --git a/src/Terminal/commands/mv.ts b/src/Terminal/commands/mv.ts index 2961aa891..f7f04ad94 100644 --- a/src/Terminal/commands/mv.ts +++ b/src/Terminal/commands/mv.ts @@ -84,7 +84,7 @@ export function mv( script.filename = destPath; } else if (srcFile instanceof TextFile) { - const textFile = srcFile ; + const textFile = srcFile; if (!dest.endsWith(".txt")) { terminal.error(`Source and destination files must have the same type`); return; diff --git a/src/TextFile.ts b/src/TextFile.ts index 8ee024795..91d68c374 100644 --- a/src/TextFile.ts +++ b/src/TextFile.ts @@ -121,7 +121,7 @@ export function getTextFile(fn: string, server: BaseServer): TextFile | null { filename = removeLeadingSlash(filename); } - for (const file of server.textFiles ) { + for (const file of server.textFiles) { if (file.fn === filename) { return file; }