diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js index f51b5c17c7e3822af12a1cdd97a7fde0b8273650..62e5b3294ffd31972323236daa1108e6cb9be664 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 d0f644c5261697409fb2ef241f8e43f54aa7e6f6..c23e211417a0e22ca8df87f7d6a831622dace12d 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 5a28b3895d209e116d64a6e3e08dee4c489842e3..db31d717d44317bde8a815bd28e0deb7b3476eac 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>>