From d319b3f982dff5cd8948297d784a7d8a76e2f7fc Mon Sep 17 00:00:00 2001 From: Ansopedian Date: Mon, 30 May 2022 14:23:06 +0200 Subject: [PATCH] added singularity.goToLocation support for non-city-specific locations --- src/NetscriptFunctions/Singularity.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index 55ebdba68..d97a1c3d6 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -244,11 +244,17 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript _ctx.log(() => `No location named ${locationName}`); return false; } - if (player.city !== location.city) { + if (location.city && player.city !== location.city) { _ctx.log(() => `No location named ${locationName} in ${player.city}`); return false; } - Router.toLocation(location); + if (location.name === LocationName.TravelAgency) { + Router.toTravel(); + } else if (location.name === LocationName.WorldStockExchange) { + Router.toStockMarket(); + } else { + Router.toLocation(location); + } player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000); return true; },