From 2e8cdc23d9204f393625afc7b92bda3a0d7b16a7 Mon Sep 17 00:00:00 2001
From: Olivier Gagnon <oli.gagnon4418@gmail.com>
Date: Wed, 27 Oct 2021 23:58:07 -0400
Subject: [PATCH] use NetscriptDefinitions as source of truth

---
 src/NetscriptFunctions.ts                |  3 +-
 src/NetscriptFunctions/Bladeburner.ts    | 38 +-----------------------
 src/ScriptEditor/NetscriptDefinitions.ts |  8 ++---
 3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts
index 2059673c3..10c124a9e 100644
--- a/src/NetscriptFunctions.ts
+++ b/src/NetscriptFunctions.ts
@@ -75,7 +75,8 @@ import { INetscriptGang, NetscriptGang } from "./NetscriptFunctions/Gang";
 import { INetscriptSleeve, NetscriptSleeve } from "./NetscriptFunctions/Sleeve";
 import { INetscriptExtra, NetscriptExtra } from "./NetscriptFunctions/Extra";
 import { INetscriptHacknet, NetscriptHacknet } from "./NetscriptFunctions/Hacknet";
-import { INetscriptBladeburner, NetscriptBladeburner } from "./NetscriptFunctions/Bladeburner";
+import { Bladeburner as INetscriptBladeburner } from "./ScriptEditor/NetscriptDefinitions";
+import { NetscriptBladeburner } from "./NetscriptFunctions/Bladeburner";
 import { INetscriptCodingContract, NetscriptCodingContract } from "./NetscriptFunctions/CodingContract";
 import { INetscriptCorporation, NetscriptCorporation } from "./NetscriptFunctions/Corporation";
 import { INetscriptFormulas, NetscriptFormulas } from "./NetscriptFunctions/Formulas";
diff --git a/src/NetscriptFunctions/Bladeburner.ts b/src/NetscriptFunctions/Bladeburner.ts
index 775174ab5..7422dcbe5 100644
--- a/src/NetscriptFunctions/Bladeburner.ts
+++ b/src/NetscriptFunctions/Bladeburner.ts
@@ -4,43 +4,7 @@ import { IPlayer } from "../PersonObjects/IPlayer";
 import { Bladeburner } from "../Bladeburner/Bladeburner";
 import { getRamCost } from "../Netscript/RamCostGenerator";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
-
-export interface INetscriptBladeburner {
-  getContractNames(): any;
-  getOperationNames(): any;
-  getBlackOpNames(): any;
-  getBlackOpRank(name?: any): any;
-  getGeneralActionNames(): any;
-  getSkillNames(): any;
-  startAction(type?: any, name?: any): any;
-  stopBladeburnerAction(): any;
-  getCurrentAction(): any;
-  getActionTime(type?: any, name?: any): any;
-  getActionEstimatedSuccessChance(type?: any, name?: any): any;
-  getActionRepGain(type?: any, name?: any, level?: any): any;
-  getActionCountRemaining(type?: any, name?: any): any;
-  getActionMaxLevel(type?: any, name?: any): any;
-  getActionCurrentLevel(type?: any, name?: any): any;
-  getActionAutolevel(type?: any, name?: any): any;
-  setActionAutolevel(type?: any, name?: any, autoLevel?: any): any;
-  setActionLevel(type?: any, name?: any, level?: any): any;
-  getRank(): any;
-  getSkillPoints(): any;
-  getSkillLevel(skillName?: any): any;
-  getSkillUpgradeCost(skillName?: any): any;
-  upgradeSkill(skillName: any): any;
-  getTeamSize(type?: any, name?: any): any;
-  setTeamSize(type?: any, name?: any, size?: any): any;
-  getCityEstimatedPopulation(cityName: any): any;
-  getCityCommunities(cityName: any): any;
-  getCityChaos(cityName: any): any;
-  getCity(): any;
-  switchCity(cityName: any): any;
-  getStamina(): any;
-  joinBladeburnerFaction(): any;
-  joinBladeburnerDivision(): any;
-  getBonusTime(): any;
-}
+import { Bladeburner as INetscriptBladeburner } from "../ScriptEditor/NetscriptDefinitions";
 
 export function NetscriptBladeburner(
   player: IPlayer,
diff --git a/src/ScriptEditor/NetscriptDefinitions.ts b/src/ScriptEditor/NetscriptDefinitions.ts
index 0e4aea32e..3e60291b9 100644
--- a/src/ScriptEditor/NetscriptDefinitions.ts
+++ b/src/ScriptEditor/NetscriptDefinitions.ts
@@ -2408,7 +2408,7 @@ interface HackNet {
   spendHashes(upgName: HashUpgrades, upgTarget?: Host): boolean;
 }
 
-interface BladeBurner {
+export interface Bladeburner {
   /**
    * You have to be employed in the Bladeburner division and be in BitNode-7
    * or have Source-File 7 in order to use this function.
@@ -2804,9 +2804,9 @@ interface BladeBurner {
    *
    * @ramCost 4 GB
    * @param {string} cityName Name of city. Case-sensitive
-   * @returns {number} Estimated number of Synthoids communities in the specified city.
+   * @returns {number} Number of Synthoids communities in the specified city.
    */
-  getCityEstimatedCommunities(name: City): number;
+  getCityCommunities(name: City): number;
 
   /**
    * You have to be employed in the Bladeburner division and be in BitNode-7
@@ -3377,7 +3377,7 @@ export interface NS extends Singularity {
   /**
    * @ramCost 0 GB
    */
-  readonly bladeburner: BladeBurner;
+  readonly bladeburner: Bladeburner;
   /**
    * @ramCost 0 GB
    */