diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index 10aa02f036de1d82a3871f46de2718e26ad02792..0cb449c0fc38197186b3aa089f8f125ad5b61143 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 8a642e8a0059a78f6730e7fde9c27ccec89d15d7..ffbeac3eb3930d080d1ed43fd5bb528b8e055cb0 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 e2fdc643843ed2a156cb5bf9e36d7c9d92e19f58..573fa262fc2a85d246ed8c94b5b329bfb6864258 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">>