diff --git a/js/003-data/slaveSummaryData.js b/js/003-data/slaveSummaryData.js index 101f6c44f96001136b47fa9606c262a18ccca3a7..61dc7a1bf53a06392e6b06b74c90b803363c5ab0 100644 --- a/js/003-data/slaveSummaryData.js +++ b/js/003-data/slaveSummaryData.js @@ -502,20 +502,6 @@ App.Data.SlaveSummary = { 7: "Milk Based with Cum.", 8: "Cum and Milk Based." }, - race: { - "white": "Caucasian", - "asian": "Asian", - "indo-aryan": "Indo-aryan", - "latina": "Latina", - "middle eastern": "Middle Eastern", - "black": "Black", - "pacific islander": "Pacific Islander", - "malay": "Malay", - "amerindian": "Amerindian", - "semitic": "Semitic", - "southern european": "Southern European", - "mixed race": "Mixed race", - }, hormoneBalance: { // rating is hormoneBalance value + 500 100: "Overwhelmingly masculine", 200: "Extremely masculine", diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 80c2ef83d6e2e26b62397319f9e1cc831472f429..5d3b69f6b7cced65d6f0c21b5b9ac96ba83fc9f5 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -708,10 +708,7 @@ App.UI.SlaveSummaryRenderers = function() { * @returns {void} */ race: function(slave, c) { - let raceStr = App.Data.SlaveSummary.long.race[slave.race]; - if (!raceStr) { - raceStr = capFirstChar(slave.race); - } + const raceStr = App.Data.misc.filterRaces.get(slave.race) || capFirstChar(slave.race); helpers.makeSpan(c, raceStr + '.', "tan"); }, diff --git a/src/npc/infants/infantSummary.js b/src/npc/infants/infantSummary.js index 5d8ca1723224f1dc1dda03744cf4a9f887dd1fcd..1f56f377878c21b52a9e9fcbe385579d0ae681e0 100644 --- a/src/npc/infants/infantSummary.js +++ b/src/npc/infants/infantSummary.js @@ -108,7 +108,7 @@ App.Facilities.Nursery.InfantSummary = function(child) { if (abbreviate.race === 1) { r += shortRace(); } else if (abbreviate.race === 2) { - r += longRace(); + r += App.Data.misc.filterRaces.get(child.race) || `${child.race.charAt(0).toUpperCase() + child.race.slice(1)}. `; } r += `</span> `; } @@ -303,54 +303,6 @@ App.Facilities.Nursery.InfantSummary = function(child) { return r; } - function longRace() { - let r = ``; - - switch (child.race) { - case "white": - r += `Caucasian. `; - break; - case "asian": - r += `Asian. `; - break; - case "indo-aryan": - r += `Indo-aryan. `; - break; - case "latina": - r += `Latina. `; - break; - case "middle eastern": - r += `Middle Eastern. `; - break; - case "black": - r += `Black. `; - break; - case "pacific islander": - r += `Pacific Islander. `; - break; - case "malay": - r += `Malay. `; - break; - case "amerindian": - r += `Amerindian. `; - break; - case "semitic": - r += `Semitic. `; - break; - case "southern european": - r += `Southern European. `; - break; - case "mixed race": - r += `Mixed race. `; - break; - default: - r += `${child.race.charAt(0).toUpperCase() + child.race.slice(1)}. `; - break; - } - - return r; - } - function shortNationality() { let r = `<span class="tan">`;