diff --git a/src/events/reRoyalBlood.js b/src/events/reRoyalBlood.js index 1b42be2f46eecadbbf1e966eceb4d932bf9df95a..7cc243ff30bdb76f010c94bc37d3bf379982dfc1 100644 --- a/src/events/reRoyalBlood.js +++ b/src/events/reRoyalBlood.js @@ -1,7 +1,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { eventPrerequisites() { return [ - () => (V.rep-10000 > random(1, 12500) || V.cheatMode) + () => (V.rep - 10000 > random(1, 12500) || V.cheatMode) ]; } @@ -9,8 +9,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { V.nextButton = "Continue"; V.nextLink = "RIE Eligibility Check"; V.returnTo = "RIE Eligibility Check"; - /** @type {FC.Race} */ - let race; const slaveTemplate = generateTemplate(); const queen = generateQueen(clone(slaveTemplate)); // Queen first to get an ID for her children to relate to. @@ -460,60 +458,54 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { function generateTemplate() { let slave; + /** @type {FC.Race} */ + let race; nationalityToRace(setup.royalNationalities.random()); + if (V.realRoyalties === 1) { const nationality = setup.royalNationalities.random(); - if (nationality === "Japanese") { - race = "asian"; - } else if (nationality === "Luxembourgian") { - race = "white"; - } else if (nationality === "Belgian") { - race = "white"; - } else if (nationality === "Danish") { - race = "white"; - } else if (nationality === "Dutch") { - race = "white"; - } else if (nationality === "Swedish") { - race = "white"; - } else if (nationality === "Spanish") { - race = "southern european"; - } else if (nationality === "Norwegian") { - race = "white"; - } else if (nationality === "Cambodian") { - race = "asian"; - } else if (nationality === "Moroccan") { - race = "middle eastern"; - } else if (nationality === "Omani") { - race = "middle eastern"; - } else if (nationality === "Jordanian") { - race = "middle eastern"; - } else if (nationality === "Bruneian") { - race = "malay"; - } else if (nationality === "Emirati") { - race = "indo-aryan"; - } else if (nationality === "Bahraini") { - race = "middle eastern"; - } else if (nationality === "Kuwaiti") { - race = "middle eastern"; - } else if (nationality === "Malaysian") { - race = "malay"; - } else if (nationality === "Qatari") { - race = "middle eastern"; - } else if (nationality === "Saudi") { - race = "middle eastern"; - } else if (nationality === "Tongan") { - race = "pacific islander"; - } else if (nationality === "Swazi") { - race = "black"; - } else if (nationality === "Mosotho") { - race = "black"; - } else if (nationality === "British") { - race = "white"; - } else if (nationality === "Monégasque") { - race = "white"; - } else if (nationality === "Bhutanese") { - race = "asian"; - } else if (nationality === "Thai") { - race = "asian"; + switch (nationality) { + case "Japanese": + case "Cambodian": + case "Bhutanese": + case "Thai": + race = "asian"; + break; + case "Luxembourgian": + case "Belgian": + case "Danish": + case "Dutch": + case "Swedish": + case "Norwegian": + case "British": + case "Monégasque": + race = "white"; + break; + case "Spanish": + race = "southern european"; + break; + case "Moroccan": + case "Omani": + case "Jordanian": + case "Bahraini": + case "Kuwaiti": + case "Qatari": + case "Saudi": + race = "middle eastern"; + break; + case "Bruneian": + case "Malaysian": + race = "malay"; + break; + case "Emirati": + race = "indo-aryan"; + break; + case "Tongan": + race = "pacific islander"; + break; + case "Swazi": + case "Mosotho": + race = "black"; + break; } slave = GenerateNewSlave("XX", { minAge: 16, maxAge: 19, disableDisability: 1, nationality: nationality, race: race