From ea7c2c498196150542fab6bd4c19eea2559c2ea5 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Tue, 9 Aug 2022 18:25:02 -0400 Subject: [PATCH] fixing other commits after rebase --- src/Infiltration/ui/BribeGame.tsx | 2 +- src/Netscript/RamCostGenerator.ts | 5 ++++ src/NetscriptFunctions/Corporation.ts | 30 ++++++++-------------- src/ScriptEditor/NetscriptDefinitions.d.ts | 10 ++++---- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/Infiltration/ui/BribeGame.tsx b/src/Infiltration/ui/BribeGame.tsx index b1633050d..2a550aeef 100644 --- a/src/Infiltration/ui/BribeGame.tsx +++ b/src/Infiltration/ui/BribeGame.tsx @@ -151,7 +151,7 @@ const positive = [ "patient", "dynamic", "loyal", - "straightforward" + "straightforward", ]; const negative = [ diff --git a/src/Netscript/RamCostGenerator.ts b/src/Netscript/RamCostGenerator.ts index 46a1226ae..43c1b9498 100644 --- a/src/Netscript/RamCostGenerator.ts +++ b/src/Netscript/RamCostGenerator.ts @@ -346,6 +346,11 @@ const grafting = { }; const corporation = { + getMaterialNames: 0, + getIndustryTypes: 0, + getUnlockables: 0, + getUpgradeNames: 0, + getResearchNames: 0, createCorporation: 0, hasUnlockUpgrade: 0, getUnlockUpgradeCost: 0, diff --git a/src/NetscriptFunctions/Corporation.ts b/src/NetscriptFunctions/Corporation.ts index 3df04bf8b..1b495484f 100644 --- a/src/NetscriptFunctions/Corporation.ts +++ b/src/NetscriptFunctions/Corporation.ts @@ -873,31 +873,21 @@ export function NetscriptCorporation(): InternalAPI { return { ...warehouseAPI, ...officeAPI, - getMaterialNames: - (ctx: NetscriptContext) => - (): string[] =>{ + getMaterialNames: () => (): string[] => { return CorporationConstants.AllMaterials; - }, - getIndustryTypes: - (ctx: NetscriptContext) => - (): string[] =>{ + }, + getIndustryTypes: () => (): string[] => { return CorporationConstants.AllIndustryTypes; - }, - getUnlockables: - (ctx: NetscriptContext) => - (): string[] =>{ + }, + getUnlockables: () => (): string[] => { return CorporationConstants.AllUnlocks; - }, - getUpgradeNames: - (ctx: NetscriptContext) => - (): string[] =>{ + }, + getUpgradeNames: () => (): string[] => { return CorporationConstants.AllUpgrades; - }, - getResarchNames: - (ctx: NetscriptContext) => - (): string[] =>{ + }, + getResearchNames: () => (): string[] => { return CorporationConstants.AllResearch; - }, + }, expandIndustry: (ctx: NetscriptContext) => (_industryName: unknown, _divisionName: unknown): void => { diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index 45525b50e..b20415c1c 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -6924,27 +6924,27 @@ export interface Corporation extends WarehouseAPI, OfficeAPI { * Get list of materials * @returns material names */ - getMaterialNames():string[]; + getMaterialNames(): string[]; /** * Get list of industry types * @returns industry names */ - getIndustryTypes():string[]; + getIndustryTypes(): string[]; /** * Get list of one-time unlockable upgrades * @returns unlockable upgrades names */ - getUnlockables():string[]; + getUnlockables(): string[]; /** * Get list of upgrade names * @returns upgrade names */ - getUpgradeNames():string[]; + getUpgradeNames(): string[]; /** * Get list of research names * @returns research names */ - getResarchNames():string[]; + getResearchNames(): string[]; /** * Accept investment based on you companies current valuation * @remarks