Skip to content
Snippets Groups Projects
Commit 306e49c1 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-dev' into 'pregmod-master'

Make real dynasties more consistent

Closes #2865

See merge request pregmodfan/fc-pregmod!8936
parents 4037e398 b5b205a1
No related branches found
No related tags found
No related merge requests found
......@@ -3,12 +3,68 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
/*princess*/
<<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1})>>
<<set _slave.career = "a princess">>
<<if $realRoyalties == 1>>
<<set _slave.nationality = setup.royalNationalities.random()>>
<<run nationalityToRace(_slave)>>
<<set _nationality = setup.royalNationalities.random()>>
<<if _nationality == "Japanese">>
<<set _race = "asian">>
<<elseif __nationality == "Luxembourgian">>
<<set _race = "white">>
<<elseif __nationality == "Belgian">>
<<set _race = "white">>
<<elseif __nationality == "Danish">>
<<set _race = "white">>
<<elseif __nationality == "Dutch">>
<<set _race = "white">>
<<elseif __nationality == "Swedish">>
<<set _race = "white">>
<<elseif __nationality == "Spanish">>
<<set _race = "southern european">>
<<elseif __nationality == "Norwegian">>
<<set _race = "white">>
<<elseif __nationality == "Cambodian">>
<<set _race = "asian">>
<<elseif __nationality == "Moroccan">>
<<set _race = "middle eastern">>
<<elseif __nationality == "Omani">>
<<set _race = "middle eastern">>
<<elseif __nationality == "Jordanian">>
<<set _race = "middle eastern">>
<<elseif __nationality == "Bruneian">>
<<set _race = "malay">>
<<elseif __nationality == "Emirati">>
<<set _race = "indo-aryan">>
<<elseif __nationality == "Bahraini">>
<<set _race = "middle eastern">>
<<elseif __nationality == "Kuwaiti">>
<<set _race = "middle eastern">>
<<elseif __nationality == "Malaysian">>
<<set _race = "malay">>
<<elseif __nationality == "Qatari">>
<<set _race = "middle eastern">>
<<elseif __nationality == "Saudi">>
<<set _race = "middle eastern">>
<<elseif __nationality == "Tongan">>
<<set _race = "pacific islander">>
<<elseif __nationality == "Swazi">>
<<set _race = "black">>
<<elseif __nationality == "Mosotho">>
<<set _race = "black">>
<<elseif __nationality == "British">>
<<set _race = "white">>
<<elseif __nationality == "Monégasque">>
<<set _race = "white">>
<<elseif __nationality == "Bhutanese">>
<<set _race = "asian">>
<<elseif __nationality == "Thai">>
<<set _race = "asian">>
<</if>>
<<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1, race: _race})>>
<<set _slave.nationality = _nationality>>
<<run nationalityToAccent(_slave)>>
<<else>>
<<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1})>>
<</if>>
<<set _slave.career = "a princess">>
<<set _slave.prestige = 2>>
<<set _slave.prestigeDesc = "$He was the princess of an ancient kingdom.">>
<<set _slave.devotion = random(-80,-60)>>
......@@ -41,83 +97,60 @@
<<if $realRoyalties == 1>>
<<if _princess.nationality == "Japanese">>
<<set _princess.birthSurname = "Yamato">>
<<set _princess.slaveSurname = "Yamato">>
<<elseif _princess.nationality == "Luxembourgian">>
<<set _princess.birthSurname = "Luxembourg-Nassau">>
<<set _princess.slaveSurname = "Luxembourg-Nassau">>
<<elseif _princess.nationality == "Belgian">>
<<set _princess.birthSurname = "Saxe-Coburg and Gotha">>
<<set _princess.slaveSurname = "Saxe-Coburg and Gotha">>
<<elseif _princess.nationality == "Danish">>
<<set _princess.birthSurname = "Glücksburg">>
<<set _princess.slaveSurname = "Glücksburg">>
<<elseif _princess.nationality == "Dutch">>
<<set _princess.birthSurname = "Orange-Nassau">>
<<set _princess.slaveSurname = "Orange-Nassau">>
<<elseif _princess.nationality == "Swedish">>
<<set _princess.birthSurname = "Bernadotte">>
<<set _princess.slaveSurname = "Bernadotte">>
<<elseif _princess.nationality == "Spanish">>
<<set _princess.birthSurname = "Bourbon">>
<<set _princess.slaveSurname = "Bourbon">>
<<elseif _princess.nationality == "Norwegian">>
<<set _princess.birthSurname = "Glücksburg">>
<<set _princess.slaveSurname = "Glücksburg">>
<<elseif _princess.nationality == "Cambodian">>
<<set _princess.birthSurname = "Norodom">>
<<set _princess.slaveSurname = "Norodom">>
<<elseif _princess.nationality == "Moroccan">>
<<set _princess.birthSurname = "Alawi">>
<<set _princess.slaveSurname = "Alawi">>
<<elseif _princess.nationality == "Omani">>
<<set _princess.birthSurname = "Al Said">>
<<set _princess.slaveSurname = "Al Said">>
<<elseif _princess.nationality == "Jordanian">>
<<set _princess.birthSurname = "Hāshim">>
<<set _princess.slaveSurname = "Hāshim">>
<<elseif _princess.nationality == "Bruneian">>
<<set _princess.birthSurname = "Bolkiah">>
<<set _princess.slaveSurname = "Bolkiah">>
<<elseif _princess.nationality == "Emirati">>
<<set _princess.birthSurname = "Al Nahyan">>
<<set _princess.slaveSurname = "Al Nahyan">>
<<elseif _princess.nationality == "Bahraini">>
<<set _princess.birthSurname = "Al Khalifah">>
<<set _princess.slaveSurname = "Al Khalifah">>
<<elseif _princess.nationality == "Kuwaiti">>
<<set _princess.birthSurname = "Al Sabah">>
<<set _princess.slaveSurname = "Al Sabah">>
<<elseif _princess.nationality == "Malaysian">>
<<set _princess.birthSurname = "Pahang">>
<<set _princess.slaveSurname = "Pahang">>
<<elseif _princess.nationality == "Qatari">>
<<set _princess.birthSurname = "Al Thani">>
<<set _princess.slaveSurname = "Al Thani">>
<<elseif _princess.nationality == "Saudi">>
<<set _princess.birthSurname = "Al Saud">>
<<set _princess.slaveSurname = "Al Saud">>
<<elseif _princess.nationality == "Tongan">>
<<set _princess.birthSurname = "Tupou">>
<<set _princess.slaveSurname = "Tupou">>
<<elseif _princess.nationality == "Swazi">>
<<set _princess.birthSurname = "Dlamini">>
<<set _princess.slaveSurname = "Dlamini">>
<<elseif _princess.nationality == "Mosotho">>
<<set _princess.birthSurname = "Moshesh">>
<<set _princess.slaveSurname = "Moshesh">>
<<elseif _princess.nationality == "British">>
<<set _princess.birthSurname = "Windsor">>
<<set _princess.slaveSurname = "Windsor">>
<<elseif _princess.nationality == "Monégasque">>
<<set _princess.birthSurname = "Grimaldi">>
<<set _princess.slaveSurname = "Grimaldi">>
<<elseif _princess.nationality == "Bhutanese">>
<<set _princess.birthSurname = "Wangchuck">>
<<set _princess.slaveSurname = "Wangchuck">>
<<elseif _princess.nationality == "Thai">>
<<set _princess.birthSurname = "Chakri">>
<<set _princess.slaveSurname = "Chakri">>
<</if>>
<<set _princess.slaveSurname = _princess.birthSurname>>
<<set _princess.birthName = generateName(_princess.nationality, _princess.race, "XX")>>
<<set _princess.slaveName = _princess.birthName>>
<</if>>
/*prince*/
<<if $seeDicks > 0>>
......@@ -132,7 +165,12 @@
<<set _slave.physicalAge = _slave.actualAge>>
<<set _slave.ovaryAge = _slave.actualAge>>
<<set _slave.genes = "XY">>
<<run nationalityToName(_slave)>>
<<if $realRoyalties == 1>>
<<set _slave.birthName = generateName(_slave.nationality, _slave.race, "XY")>>
<<set _slave.slaveName = _slave.birthName>>
<<else>>
<<run nationalityToName(_slave)>>
<</if>>
<<set _slave.birthSurname = _princess.birthSurname, _slave.slaveSurname = _princess.birthSurname>>
<<set _slave.career = "a prince">>
<<set _slave.prestige = 2>>
......@@ -181,7 +219,12 @@
<<set _slave.physicalAge = _slave.actualAge>>
<<set _slave.ovaryAge = _slave.actualAge>>
<<set _slave.genes = "XX">>
<<run nationalityToName(_slave)>>
<<if $realRoyalties == 1>>
<<set _slave.birthName = generateName(_slave.nationality, _slave.race, "XX")>>
<<set _slave.slaveName = _slave.birthName>>
<<else>>
<<run nationalityToName(_slave)>>
<</if>>
<<set _slave.birthSurname = _princess.birthSurname, _slave.slaveSurname = _princess.birthSurname>>
<<set _slave.career = "a Queen">>
<<set _slave.prestige = 2>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment