diff --git a/src/Corporation/manageCorporation.js b/src/Corporation/manageCorporation.js index 7f70e185b6e1728a6496f660c9f1d49581769c6b..9735544ef960b6f0aa666c9531ff79dad555e7de 100644 --- a/src/Corporation/manageCorporation.js +++ b/src/Corporation/manageCorporation.js @@ -1,10 +1,10 @@ App.Corporate.corpRaces = function() { const el = new DocumentFragment(); App.UI.DOM.appendNewElement("div", el, `The corporation enslaves people of the following race${V.corp.SpecRaces.length === 1 ? ``:`s`}:`); - for (const [race, raceCap] of App.Data.misc.filterRaces) { + for (const [race, capRace] of App.Data.misc.filterRaces) { const r = []; if (V.corp.SpecRaces.includes(race)) { - r.push(raceCap); + r.push(capRace); if (!(V.arcologies[0].FSSubjugationist !== "unset" && V.arcologies[0].FSSubjugationistRace !== race)) { if (V.corp.SpecRaces.length > 1 && V.corp.SpecTimer === 0) { const needsToken = (V.corp.SpecRaces.length === 4 || V.corp.SpecRaces.length === 8); @@ -34,7 +34,7 @@ App.Corporate.corpRaces = function() { } } } else { - r.push(App.UI.DOM.makeElement("span", capFirstChar(raceCap), "strikethrough")); + r.push(App.UI.DOM.makeElement("span", capFirstChar(capRace), "strikethrough")); if (V.corp.SpecTimer === 0) { r.push( App.UI.DOM.link( diff --git a/src/events/intro/customizeSlaveTrade.js b/src/events/intro/customizeSlaveTrade.js index 36f486b5ae8fd05a74fdf30b29534a386c7623cc..d8891f6ddd0bbe70591b3bcd8c755b47d6985928 100644 --- a/src/events/intro/customizeSlaveTrade.js +++ b/src/events/intro/customizeSlaveTrade.js @@ -50,18 +50,18 @@ App.Intro.CustomSlaveTrade = function() { div = document.createElement("div"); App.UI.DOM.appendNewElement("span", div, `Filter by Race: `); array = []; - for (const [race, raceCap] of setup.filterRaces) { + for (const [race, capRace] of setup.filterRaces) { if (baseControlsFilter === race) { array.push( App.UI.DOM.disabledLink( - raceCap, + capRace, ["currently selected race"] ) ); } else { array.push( App.UI.DOM.link( - raceCap, + capRace, () => { baseControlsFilter = race; refresh(); diff --git a/src/facilities/surgery/surgeryPassageExotic.js b/src/facilities/surgery/surgeryPassageExotic.js index 9187e1e12ef53a1919dbf357e5a32712cf1555f0..d35d7da0bd8d70178418dce8ab9009d034daa8e2 100644 --- a/src/facilities/surgery/surgeryPassageExotic.js +++ b/src/facilities/surgery/surgeryPassageExotic.js @@ -34,13 +34,13 @@ App.UI.surgeryPassageExotic = function(slave, cheat = false) { if (slave.indentureRestrictions > 1) { App.UI.DOM.appendNewElement("div", el, `${His} indenture forbids elective surgery`, ["choices", "note"]); } else { - for (const [race, raceCap] of App.Data.misc.filterRaces) { + for (const [race, capRace] of App.Data.misc.filterRaces) { if (slave.race === race) { continue; } linkArray.push( makeLink( - raceCap, + capRace, "race", () => { slave.race = race; diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 132c5a6bb4b4040dbeee66ee90103ea36583a3dc..b3ed4fc569dfd5f2310193c436585474bffdecc0 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -2454,8 +2454,8 @@ App.RA.options = (function() { if (V.pregnancyMonitoringUpgrade === 1 && V.geneticMappingUpgrade >= 1) { pairs.push(["boys", "male"]); pairs.push(["girls", "female"]); - for (const [race, raceCap] of setup.filterRaces) { - pairs.push([raceCap, "race:" + race]); + for (const [race, capRace] of setup.filterRaces) { + pairs.push([capRace, "race:" + race]); } } super("Pregnancy termination", pairs); diff --git a/src/markets/specificMarkets/customSlaveMarket.js b/src/markets/specificMarkets/customSlaveMarket.js index d21524a14a975a7fe4df72dfe09d5c4e80708a09..efc9f096b23d292f3c27b1fc234c96162910638f 100644 --- a/src/markets/specificMarkets/customSlaveMarket.js +++ b/src/markets/specificMarkets/customSlaveMarket.js @@ -301,8 +301,8 @@ App.Markets["Custom Slave"] = function() { const choices = new Map([ ["ethnicity is unimportant", "Ethnicity is unimportant"], ]); - for (const [race, raceCap] of App.Data.misc.filterRaces) { - choices.set(race, raceCap); + for (const [race, capRace] of App.Data.misc.filterRaces) { + choices.set(race, capRace); } createDescription(el, description, slaveProperty); diff --git a/src/markets/specificMarkets/huskSlave.js b/src/markets/specificMarkets/huskSlave.js index ee9a9d18b79f40f1efdd768f237c06c29d050b6c..95b115916527d866a9f82986c725dbacd51acf4d 100644 --- a/src/markets/specificMarkets/huskSlave.js +++ b/src/markets/specificMarkets/huskSlave.js @@ -100,18 +100,18 @@ App.Markets["Husk Slave"] = function() { const linkArray = []; const race = new Map(App.Data.misc.filterRaces); race.set("Not Important", "not important"); - for (const [race, raceCap] of setup.filterRaces) { + for (const [race, capRace] of setup.filterRaces) { if (V.huskSlave.race === race) { linkArray.push( App.UI.DOM.disabledLink( - raceCap, + capRace, ["current selection"] ) ); } else { linkArray.push( App.UI.DOM.link( - raceCap, + capRace, () => { V.huskSlave.race = race; refresh();