From 3d7ad3b4cf7c7b8df80ab90759dd35f8dd67fd30 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 5 Aug 2020 22:49:23 +0200
Subject: [PATCH] add temporary toggle for new bodyguard event
---
js/003-data/gameVariableData.js | 1 +
src/gui/options/options.tw | 3 +++
src/uncategorized/nonRandomEvent.tw | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 10aa02f036d..0cb449c0fc3 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1475,6 +1475,7 @@ App.Data.resetOnNGPlus = {
menialDrug: 0,
slave: 0 /* { type: string, company: string */
},
+ tempEventToggle: 0,
};
App.Data.ignoreGameStateVariables = [
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
index 8a642e8a005..ffbeac3eb39 100644
--- a/src/gui/options/options.tw
+++ b/src/gui/options/options.tw
@@ -738,5 +738,8 @@
.addComment("This will enable a controversial but very broken event. Warning: Snuff, cannibalism.")>>
<</if>>
+ <<run _options.addOption("New event", "tempEventToggle")
+ .addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
+
<<includeDOM _options.render()>>
</div>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index e2fdc643843..573fa262fc2 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -181,7 +181,7 @@
<<goto "secExpSmilingMan">>
<<elseif ($rivalOwner == 0) && ($seeFCNN == 1) && ($FCNNstation == 0) && ($week > 95) && ($cash > 200000) && ($rep > 7500)>>
<<goto "SE FCNN Station">>
-<<elseif _effectiveWeek >= $murderAttemptWeek>>
+<<elseif _effectiveWeek >= $murderAttemptWeek && $tempEventToggle>>
<<goto "Murder Attempt">>
<<elseif $illegalDeals.slave !== 0>>
<<goto "MA Slave Trade">>
--
GitLab