From cdeae4ef68dfc0eefbf1bad6044674a22599b501 Mon Sep 17 00:00:00 2001 From: Cyn Date: Sun, 23 Jan 2022 22:08:07 -0500 Subject: [PATCH] Make travelToCity throw on invalid city name and return false on no money --- src/NetscriptFunctions/Singularity.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index 5f37b2596..94bbcdc55 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -474,7 +474,8 @@ export function NetscriptSingularity( case CityName.Ishima: case CityName.Volhaven: if (player.money < CONSTANTS.TravelCost) { - throw helper.makeRuntimeErrorMsg("travelToCity", "Not enough money to travel."); + workerScript.log("travelToCity", () => "Not enough money to travel."); + return false } player.loseMoney(CONSTANTS.TravelCost, "other"); player.city = cityname; @@ -482,8 +483,7 @@ export function NetscriptSingularity( player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000); return true; default: - workerScript.log("travelToCity", () => `Invalid city name: '${cityname}'.`); - return false; + throw helper.makeRuntimeErrorMsg("travelToCity", `Invalid city name: '${cityname}'.`); } },