From a2c4f76ce49993e86a872713045aeb42d94f2095 Mon Sep 17 00:00:00 2001 From: Blank_Alt <> Date: Sun, 14 Feb 2021 00:18:56 +1300 Subject: [PATCH] removeGlobalGoTo --- src/endWeek/nextWeek/resetGlobals.js | 1 - src/uncategorized/randomEventRoll.tw | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/endWeek/nextWeek/resetGlobals.js b/src/endWeek/nextWeek/resetGlobals.js index 3a76eb08271..af8c3741dac 100644 --- a/src/endWeek/nextWeek/resetGlobals.js +++ b/src/endWeek/nextWeek/resetGlobals.js @@ -69,7 +69,6 @@ App.EndWeek.resetGlobals = function() { V.buyer = ""; V.desc = ""; V.event = ""; - V.goto = ""; V.malefactor = ""; // Done with zeroing out, what should be for the most part Temps }; diff --git a/src/uncategorized/randomEventRoll.tw b/src/uncategorized/randomEventRoll.tw index f8816671791..e8af85bc01e 100644 --- a/src/uncategorized/randomEventRoll.tw +++ b/src/uncategorized/randomEventRoll.tw @@ -1,8 +1,8 @@ :: random event roll -<<set $goto = $events.random()>> -<<if $goto.startsWith("JSRE")>> - <<run App.Events.setGlobalEventForPassageTransition($goto)>> - <<set $goto = "JS Random Event">> +<<set _goto = $events.random()>> +<<if _goto.startsWith("JSRE")>> + <<run App.Events.setGlobalEventForPassageTransition(_goto)>> + <<set _goto = "JS Random Event">> <</if>> -<<goto $goto>> +<<goto _goto>> -- GitLab