From 25be5c2990692a166efba9c80edf4ad1ed8db9f7 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Tue, 27 Sep 2022 16:20:26 -0400 Subject: [PATCH] Remove unused augmentationStats interface All augmentations have all multipliers --- src/Netscript/killWorkerScript.ts | 2 +- src/PersonObjects/Multipliers.ts | 2 - src/ScriptEditor/NetscriptDefinitions.d.ts | 161 ++++++++------------- 3 files changed, 63 insertions(+), 102 deletions(-) diff --git a/src/Netscript/killWorkerScript.ts b/src/Netscript/killWorkerScript.ts index 658565569..58f46c784 100644 --- a/src/Netscript/killWorkerScript.ts +++ b/src/Netscript/killWorkerScript.ts @@ -63,7 +63,7 @@ function stopAndCleanUpWorkerScript(ws: WorkerScript): void { if (ws.delay) clearTimeout(ws.delay); ws.delayReject?.(new ScriptDeath(ws)); ws.env.runningFn = ""; - + if (typeof ws.atExit === "function") { try { ws.env.stopFlag = false; diff --git a/src/PersonObjects/Multipliers.ts b/src/PersonObjects/Multipliers.ts index 44fd4727b..1976ecb3e 100644 --- a/src/PersonObjects/Multipliers.ts +++ b/src/PersonObjects/Multipliers.ts @@ -1,5 +1,3 @@ -import { AugmentationStats } from "../ScriptEditor/NetscriptDefinitions"; - export interface Multipliers { hacking_chance: number; hacking_speed: number; diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index 5fa815893..903f65400 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -75,37 +75,67 @@ interface Player { /** * @public */ -export interface Multipliers { - hacking_chance: number; - hacking_speed: number; - hacking_money: number; - hacking_grow: number; - hacking: number; - hacking_exp: number; - strength: number; - strength_exp: number; - defense: number; - defense_exp: number; - dexterity: number; - dexterity_exp: number; - agility: number; - agility_exp: number; - charisma: number; - charisma_exp: number; - hacknet_node_money: number; - hacknet_node_purchase_cost: number; - hacknet_node_ram_cost: number; - hacknet_node_core_cost: number; - hacknet_node_level_cost: number; - company_rep: number; - faction_rep: number; - work_money: number; - crime_success: number; - crime_money: number; - bladeburner_max_stamina: number; - bladeburner_stamina_gain: number; - bladeburner_analysis: number; - bladeburner_success_chance: number; + export interface Multipliers { + /** Multiplier to hacking skill */ + hacking?: number; + /** Multiplier to strength skill */ + strength?: number; + /** Multiplier to defense skill */ + defense?: number; + /** Multiplier to dexterity skill */ + dexterity?: number; + /** Multiplier to agility skill */ + agility?: number; + /** Multiplier to charisma skill */ + charisma?: number; + /** Multiplier to hacking experience gain rate */ + hacking_exp?: number; + /** Multiplier to strength experience gain rate */ + strength_exp?: number; + /** Multiplier to defense experience gain rate */ + defense_exp?: number; + /** Multiplier to dexterity experience gain rate */ + dexterity_exp?: number; + /** Multiplier to agility experience gain rate */ + agility_exp?: number; + /** Multiplier to charisma experience gain rate */ + charisma_exp?: number; + /** Multiplier to chance of successfully performing a hack */ + hacking_chance?: number; + /** Multiplier to hacking speed */ + hacking_speed?: number; + /** Multiplier to amount of money the player gains from hacking */ + hacking_money?: number; + /** Multiplier to amount of money injected into servers using grow */ + hacking_grow?: number; + /** Multiplier to amount of reputation gained when working */ + company_rep?: number; + /** Multiplier to amount of reputation gained when working */ + faction_rep?: number; + /** Multiplier to amount of money gained from crimes */ + crime_money?: number; + /** Multiplier to crime success rate */ + crime_success?: number; + /** Multiplier to amount of money gained from working */ + work_money?: number; + /** Multiplier to amount of money produced by Hacknet Nodes */ + hacknet_node_money?: number; + /** Multiplier to cost of purchasing a Hacknet Node */ + hacknet_node_purchase_cost?: number; + /** Multiplier to cost of ram for a Hacknet Node */ + hacknet_node_ram_cost?: number; + /** Multiplier to cost of core for a Hacknet Node */ + hacknet_node_core_cost?: number; + /** Multiplier to cost of leveling up a Hacknet Node */ + hacknet_node_level_cost?: number; + /** Multiplier to Bladeburner max stamina */ + bladeburner_max_stamina?: number; + /** Multiplier to Bladeburner stamina gain rate */ + bladeburner_stamina_gain?: number; + /** Multiplier to effectiveness in Bladeburner Field Analysis */ + bladeburner_analysis?: number; + /** Multiplier to success chance in Bladeburner contracts/operations */ + bladeburner_success_chance?: number; } /** @@ -198,73 +228,6 @@ export interface CrimeStats { intelligence_exp: number; } -/** - * Data representing the internal values of an Augmentation. - * @public - */ -export interface AugmentationStats { - /** Multiplier to hacking skill */ - hacking?: number; - /** Multiplier to strength skill */ - strength?: number; - /** Multiplier to defense skill */ - defense?: number; - /** Multiplier to dexterity skill */ - dexterity?: number; - /** Multiplier to agility skill */ - agility?: number; - /** Multiplier to charisma skill */ - charisma?: number; - /** Multiplier to hacking experience gain rate */ - hacking_exp?: number; - /** Multiplier to strength experience gain rate */ - strength_exp?: number; - /** Multiplier to defense experience gain rate */ - defense_exp?: number; - /** Multiplier to dexterity experience gain rate */ - dexterity_exp?: number; - /** Multiplier to agility experience gain rate */ - agility_exp?: number; - /** Multiplier to charisma experience gain rate */ - charisma_exp?: number; - /** Multiplier to chance of successfully performing a hack */ - hacking_chance?: number; - /** Multiplier to hacking speed */ - hacking_speed?: number; - /** Multiplier to amount of money the player gains from hacking */ - hacking_money?: number; - /** Multiplier to amount of money injected into servers using grow */ - hacking_grow?: number; - /** Multiplier to amount of reputation gained when working */ - company_rep?: number; - /** Multiplier to amount of reputation gained when working */ - faction_rep?: number; - /** Multiplier to amount of money gained from crimes */ - crime_money?: number; - /** Multiplier to crime success rate */ - crime_success?: number; - /** Multiplier to amount of money gained from working */ - work_money?: number; - /** Multiplier to amount of money produced by Hacknet Nodes */ - hacknet_node_money?: number; - /** Multiplier to cost of purchasing a Hacknet Node */ - hacknet_node_purchase_cost?: number; - /** Multiplier to cost of ram for a Hacknet Node */ - hacknet_node_ram_cost?: number; - /** Multiplier to cost of core for a Hacknet Node */ - hacknet_node_core_cost?: number; - /** Multiplier to cost of leveling up a Hacknet Node */ - hacknet_node_level_cost?: number; - /** Multiplier to Bladeburner max stamina */ - bladeburner_max_stamina?: number; - /** Multiplier to Bladeburner stamina gain rate */ - bladeburner_stamina_gain?: number; - /** Multiplier to effectiveness in Bladeburner Field Analysis */ - bladeburner_analysis?: number; - /** Multiplier to success chance in Bladeburner contracts/operations */ - bladeburner_success_chance?: number; -} - /** * Options to affect the behavior of {@link NS.hack | hack}, {@link NS.grow | grow}, and {@link NS.weaken | weaken}. * @public @@ -2175,7 +2138,7 @@ export interface Singularity { * @param name - Name of Augmentation. CASE-SENSITIVE. * @returns Augmentation stats. */ - getAugmentationStats(name: string): AugmentationStats; + getAugmentationStats(name: string): Multipliers; /** * Install your purchased augmentations.