Merge branch 'dev' into contractFix

src/ScriptEditor/NetscriptDefinitions.d.ts

@@ -3855,6 +3855,31 @@ interface SkillsFormulas {
   calculateExp(skill: number, skillMult?: number): number;
 }
 
+/**
+ * @public
+ */
+export interface WorkStats {
+  money: number;
+  reputation: number;
+  hackExp: number;
+  strExp: number;
+  defExp: number;
+  dexExp: number;
+  agiExp: number;
+  chaExp: number;
+  intExp: number;
+}
+
+/**
+ * Work formulas
+ * @public
+ */
+interface WorkFormulas {
+  crimeGains(crimeType: string): WorkStats;
+  classGains(player: Player, classType: string, locationName: string): WorkStats;
+  factionGains(player: Player, workType: string, favor: number): WorkStats;
+}
+
 /**
  * Reputation formulas
  * @public
@@ -4136,6 +4161,8 @@ export interface Formulas {
   hacknetServers: HacknetServersFormulas;
   /** Gang formulas */
   gang: GangFormulas;
+  /** Work formulas */
+  work: WorkFormulas;
 }
 
 /**
@@ -4286,7 +4313,7 @@ export interface InfiltrationReward {
  * @public
  */
 export interface ILocation {
-  city: CityName | null;
+  city: string;
   name: string;
 }
 
@@ -5156,8 +5183,7 @@ export interface NS {
    * PID stands for Process ID. The PID is a unique identifier for each script.
    * The PID will always be a positive integer.
    *
-   * Running this function with a numThreads argument of 0 will return 0 without running the script.
-   * However, running this function with a negative numThreads argument will cause a runtime error.
+   * Running this function with a numThreads argument of 0 or less will cause a runtime error.
    *
    * @example
    * ```ts
@@ -5204,7 +5230,7 @@ export interface NS {
    * PID stands for Process ID. The PID is a unique identifier for each script.
    * The PID will always be a positive integer.
    *
-   * Running this function with 0 or a negative numThreads argument will cause a runtime error.
+   * Running this function with a numThreads argument of 0 or less will cause a runtime error.
    *
    * @example
    * ```ts
@@ -5250,6 +5276,8 @@ export interface NS {
    *
    * Because this function immediately terminates the script, it does not have a return value.
    *
+   * Running this function with a numThreads argument of 0 or less will cause a runtime error.
+   *
    * @example
    * ```ts
    * // NS1:
@@ -6925,6 +6953,31 @@ export interface Corporation extends WarehouseAPI, OfficeAPI {
    * @returns An offer of investment
    */
   getInvestmentOffer(): InvestmentOffer;
+  /**
+   * Get list of materials
+   * @returns material names
+   */
+  getMaterialNames(): string[];
+  /**
+   * Get list of industry types
+   * @returns industry names
+   */
+  getIndustryTypes(): string[];
+  /**
+   * Get list of one-time unlockable upgrades
+   * @returns unlockable upgrades names
+   */
+  getUnlockables(): string[];
+  /**
+   * Get list of upgrade names
+   * @returns upgrade names
+   */
+  getUpgradeNames(): string[];
+  /**
+   * Get list of research names
+   * @returns research names
+   */
+  getResearchNames(): string[];
   /**
    * Accept investment based on you companies current valuation
    * @remarks