Merge branch 'dev' into bugfix/fix-tests

src/NetscriptFunctions/Bladeburner.ts

@@ -350,7 +350,8 @@ export function NetscriptBladeburner(
       checkBladeburnerCity("switchCity", cityName);
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
-      return bladeburner.city === cityName;
+      bladeburner.city = cityName;
+      return true;
     },
     getStamina: function (): [number, number] {
       updateRam("getStamina");

src/NetscriptFunctions/Formulas.ts

@@ -37,6 +37,7 @@ import {
   calculateAscensionMult,
   calculateAscensionPointsGain,
 } from "../Gang/formulas/formulas";
+import { favorToRep as calculateFavorToRep, repToFavor as calculateRepToFavor } from "../Faction/formulas/favor";
 
 export function NetscriptFormulas(player: IPlayer, workerScript: WorkerScript, helper: INetscriptHelper): IFormulas {
   const checkFormulasAccess = function (func: string): void {
@@ -45,6 +46,18 @@ export function NetscriptFormulas(player: IPlayer, workerScript: WorkerScript, h
     }
   };
   return {
+    reputation: {
+      calculateFavorToRep: function (_favor: unknown): number {
+        const favor = helper.number("calculateFavorToRep", "favor", _favor);
+        checkFormulasAccess("reputation.calculateFavorToRep");
+        return calculateFavorToRep(favor);
+      },
+      calculateRepToFavor: function (_rep: unknown): number {
+        const rep = helper.number("calculateRepToFavor", "rep", _rep);
+        checkFormulasAccess("reputation.calculateRepToFavor");
+        return calculateRepToFavor(rep);
+      },
+    },
     skills: {
       calculateSkill: function (_exp: unknown, _mult: unknown = 1): number {
         const exp = helper.number("calculateSkill", "exp", _exp);

src/NetscriptFunctions/INetscriptHelper.ts

@@ -3,7 +3,7 @@ import { BaseServer } from "../Server/BaseServer";
 
 export interface INetscriptHelper {
   updateDynamicRam(functionName: string, ram: number): void;
-  makeRuntimeErrorMsg(functionName: string, message: string): void;
+  makeRuntimeErrorMsg(functionName: string, message: string): string;
   string(funcName: string, argName: string, v: unknown): string;
   number(funcName: string, argName: string, v: unknown): number;
   city(funcName: string, argName: string, v: unknown): CityName;

src/NetscriptFunctions/Singularity.ts

@@ -1106,6 +1106,7 @@ export function NetscriptSingularity(
           return true;
         default:
           workerScript.log("workForFaction", () => `Invalid work type: '${type}`);
+          return false;
       }
       return true;
     },

src/NetscriptFunctions/Sleeve.ts

@@ -125,7 +125,11 @@ export function NetscriptSleeve(player: IPlayer, workerScript: WorkerScript, hel
 
       return player.sleeves[sleeveNumber].workForCompany(player, companyName);
     },
-    setToFactionWork: function (_sleeveNumber: unknown, _factionName: unknown, _workType: unknown): boolean {
+    setToFactionWork: function (
+      _sleeveNumber: unknown,
+      _factionName: unknown,
+      _workType: unknown,
+    ): boolean | undefined {
       updateRam("setToFactionWork");
       const sleeveNumber = helper.number("setToFactionWork", "sleeveNumber", _sleeveNumber);
       const factionName = helper.string("setToUniversityCourse", "factionName", _factionName);
@@ -147,6 +151,13 @@ export function NetscriptSleeve(player: IPlayer, workerScript: WorkerScript, hel
         }
       }
 
+      if (player.gang && player.gang.facName == factionName) {
+        throw helper.makeRuntimeErrorMsg(
+          "sleeve.setToFactionWork",
+          `Sleeve ${sleeveNumber} cannot work for faction ${factionName} because you have started a gang with them.`,
+        );
+      }
+
       return player.sleeves[sleeveNumber].workForFaction(player, factionName, workType);
     },
     setToGymWorkout: function (_sleeveNumber: unknown, _gymName: unknown, _stat: unknown): boolean {