From dbf2411ae1219808ca95a06e8703d871ca37bd6c Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 21 Feb 2021 15:34:11 -0800
Subject: [PATCH] Don't force a reset of $nationalities on NGP. Do force a
reset of $customVariety during the intro. This way, if and only if a player
chooses custom slave distribution in NGP, he'll start with the same
distribution as the original game.
---
js/003-data/gameVariableData.js | 2 +-
src/events/intro/tradeIntro.tw | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 40f9dbb513a..9ab647630b5 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -29,6 +29,7 @@ App.Data.defaultGameStateVariables = {
// Save
saveImported: 0,
+ nationalities: {},
// Other
cheater: 0,
@@ -421,7 +422,6 @@ App.Data.resetOnNGPlus = {
upgradeMultiplierArcology: 0,
upgradeMultiplierMedicine: 0,
upgradeMultiplierTrade: 0,
- nationalities: {},
/** @type {Record<FC.Assignment, Set<number>>} */
JobIDMap: null,
averageTrust: 0,
diff --git a/src/events/intro/tradeIntro.tw b/src/events/intro/tradeIntro.tw
index 46208861b21..c6b6086bb7c 100644
--- a/src/events/intro/tradeIntro.tw
+++ b/src/events/intro/tradeIntro.tw
@@ -8,13 +8,13 @@
</p>
<p>
<div>
- [[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade = 1]]
+ [[They've turned a blind eye, or even been complicit.|Extreme Intro][$internationalTrade = 1, $customVariety = 0]]
<span class="note">
Slaves from all across the world will appear.
</span>
</div>
<div>
- [[They've done what little they can to stop it.|Extreme Intro][$internationalTrade = 0]]
+ [[They've done what little they can to stop it.|Extreme Intro][$internationalTrade = 0, $customVariety = 0]]
<span class="note">
Almost all slaves will be from the continent where the arcology is located.
</span>
--
GitLab