From de72db239c0539ee7134bf28f2ae4ad56a3f8af0 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 10 Aug 2020 19:02:29 -0400
Subject: [PATCH] intro global change
---
src/events/intro/initNationalities.js | 2 +-
src/events/intro/introSummary.tw | 6 +++---
src/pregmod/basenationalitiesControls.tw | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js
index f51b5c17c7e..62e5b3294ff 100644
--- a/src/events/intro/initNationalities.js
+++ b/src/events/intro/initNationalities.js
@@ -544,7 +544,7 @@ App.Intro.initNationalities = function() {
/* Nationalities Setup */
- delete V.nationalitiescheck; /* Removes unique nationalities array to avoid var bloat */
+ delete V.nationalitiesCheck; /* Removes unique nationalities array to avoid var bloat */
if (!V.customVariety) {
/* If non-custom variety, empties or defines $nationalities */
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index d0f644c5261..c23e211417a 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -239,14 +239,14 @@ You may review your settings before clicking "Continue" to begin.<br>
.customButton("Adjust the slave trade", () => {V.customWA = 0; V.customVariety = 1}, "Customize Slave Trade")
.customButton("Stop customizing", () => {delete V.customVariety})>>
- <<if ndef $nationalitiescheck>> /* NGP: regenerate $nationalitiescheck from previous game's $nationalities array */
+ <<if ndef $nationalitiesCheck>> /* NGP: regenerate $nationalitiesCheck from previous game's $nationalities array */
<div id="SilentlyButWithStyle" style="display: none;"><<include "Customize Slave Trade">></div>
<</if>>
<<run _options.addOption("").addCustomElement(`
<hr style="margin:0">
- <<set _len = Object.keys($nationalitiescheck).length>>
+ <<set _len = Object.keys($nationalitiesCheck).length>>
<<set _j = 0>>
- <<for _nation, _i range $nationalitiescheck>>
+ <<for _nation, _i range $nationalitiesCheck>>
<<print _nation>> @@.orange;<<print (($nationalities[_nation]/hashSum($nationalities))*100).toFixed(2)>>%@@
<<set _j++>>
<<if _j < _len>> | <</if>>
diff --git a/src/pregmod/basenationalitiesControls.tw b/src/pregmod/basenationalitiesControls.tw
index 5a28b3895d2..db31d717d44 100644
--- a/src/pregmod/basenationalitiesControls.tw
+++ b/src/pregmod/basenationalitiesControls.tw
@@ -15,13 +15,13 @@
<br>
/* Generates cloned array of $nationalities, removing duplicates and then sorting */
-<<set $nationalitiescheck = Object.assign({}, $nationalities)>>
+<<set $nationalitiesCheck = Object.assign({}, $nationalities)>>
-/* Prints distribution of $nationalities, using $nationalitiescheck to render array */
+/* Prints distribution of $nationalities, using $nationalitiesCheck to render array */
<<set _percentPerPoint = 100.0 / hashSum($nationalities)>>
-<<set _len = Object.keys($nationalitiescheck).length>>
+<<set _len = Object.keys($nationalitiesCheck).length>>
<<set _j = 0>>
-<<for _nation, _i range $nationalitiescheck>>
+<<for _nation, _i range $nationalitiesCheck>>
_nation @@.orange;<<= ($nationalities[_nation] * _percentPerPoint).toFixed(2)>>%@@
<<set _j++>>
<<if _j < _len>> | <</if>>
@@ -84,7 +84,7 @@ Filter by Region:
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
<</link>>@@
">>
- <<if def $nationalitiescheck[_nation]>>
+ <<if def $nationalitiesCheck[_nation]>>
<<print "
@@.minusButton;<<link 'ā€“'>>
<<set $nationalities[setup.baseNationalities["+_i+"]] -= 1>>
@@ -141,7 +141,7 @@ Filter by Region:
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
<</link>>@@
">>
- <<if def $nationalitiescheck[_nation]>>
+ <<if def $nationalitiesCheck[_nation]>>
<<print "
@@.minusButton;<<link 'ā€“'>>
<<set $nationalities[_keys["+_i+"]] -= 1>>
--
GitLab