diff --git a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js b/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js index 196d7bc234e75211e9590a4dc834d1fff6b2d158..e562e2b0ee9b52c40ef61cccb2737d15c3df729d 100644 --- a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js +++ b/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js @@ -1,6 +1,7 @@ App.UI.CustomSlaveTrade = function() { const frag = new DocumentFragment(); let span = document.createElement("span"); + let baseControlsFilter = "all"; App.UI.DOM.appendNewElement("p", frag, `When civilization turned upon itself, some countries readily took to enslaving their own. Others were raided by their neighbors for their desirable, and profitable, citizens. Which nationalities were most affected by the booming slave trade, and thus, likely to appear in your local slave markets?`); App.UI.DOM.appendNewElement("p", frag, `+ to increase pop. – to reduce pop. 0 to remove entirely`, "bold"); @@ -28,7 +29,7 @@ App.UI.CustomSlaveTrade = function() { App.UI.DOM.passageLink( "Confirm customization", destination, - () => delete V.baseControlsFilter + () => delete baseControlsFilter ) ); } @@ -66,7 +67,7 @@ App.UI.CustomSlaveTrade = function() { array = []; for (let i = 0; i < setup.filterRaces.length; i++) { const race = setup.filterRaces[i]; - if (V.baseControlsFilter === race.toLowerCase().replace(/[ -]/g, '')) { + if (baseControlsFilter === race.toLowerCase().replace(/[ -]/g, '')) { array.push( App.UI.DOM.disabledLink( race, @@ -78,7 +79,7 @@ App.UI.CustomSlaveTrade = function() { App.UI.DOM.link( race, () => { - V.baseControlsFilter = setup.filterRaces[i].toLowerCase().replace(/[ -]/g, ''); + baseControlsFilter = setup.filterRaces[i].toLowerCase().replace(/[ -]/g, ''); refresh(); } ) @@ -93,7 +94,7 @@ App.UI.CustomSlaveTrade = function() { array = []; for (let i = 0; i < setup.filterRegions.length; i++) { const region = setup.filterRegions[i]; - if (V.baseControlsFilter === region.toLowerCase().replace(/[ -]/g, '')) { + if (baseControlsFilter === region.toLowerCase().replace(/[ -]/g, '')) { array.push( App.UI.DOM.disabledLink( region, @@ -105,7 +106,7 @@ App.UI.CustomSlaveTrade = function() { App.UI.DOM.link( region, () => { - V.baseControlsFilter = setup.filterRegions[i].toLowerCase().replace(/[ -]/g, ''); + baseControlsFilter = setup.filterRegions[i].toLowerCase().replace(/[ -]/g, ''); refresh(); } ) @@ -124,7 +125,7 @@ App.UI.CustomSlaveTrade = function() { /* Unfiltered pop controls */ list = document.createElement("UL"); list.classList.add("customize-slave-trade-ul"); - if (V.baseControlsFilter === "all") { + if (baseControlsFilter === "all") { for (let i = 0; i < setup.baseNationalities.length; i++) { const nation = setup.baseNationalities[i]; const li = document.createElement("LI"); @@ -226,7 +227,7 @@ App.UI.CustomSlaveTrade = function() { } } else { /* Filtered pop controls */ - const controlsNationality = setup[V.baseControlsFilter + 'Nationalities']; + const controlsNationality = setup[baseControlsFilter + 'Nationalities']; const keys = Object.keys(controlsNationality); for (let i = 0; i < keys.length; i++) { const li = document.createElement("LI"); @@ -290,7 +291,7 @@ App.UI.CustomSlaveTrade = function() { App.UI.DOM.link( "Reset filters", () => { - V.baseControlsFilter = "all"; + baseControlsFilter = "all"; refresh(); } ) diff --git a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw b/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw index 9defded2713b2e73e60f0c9bc7e340893434afce..3d00a9c55e166cb6a97fb6d76e3983fbe98d0aba 100644 --- a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw +++ b/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.tw @@ -3,9 +3,6 @@ <<if ndef $nationalities>> <<set $nationalities = {}>> <</if>> -<<if ndef $baseControlsFilter>> - <<set $baseControlsFilter = "all">> -<</if>> <<if ndef $customWA>> <<set $customWA = 0>> <</if>>