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

Touch up REroyalblood.tw tweaks

See merge request pregmodfan/fc-pregmod!8937

src/uncategorized/REroyalblood.tw

@@ -7,60 +7,58 @@
 	<<set _nationality = setup.royalNationalities.random()>>
 	<<if _nationality == "Japanese">>
 		<<set _race = "asian">>
-	<<elseif __nationality == "Luxembourgian">>
+	<<elseif _nationality == "Luxembourgian">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Belgian">>
+	<<elseif _nationality == "Belgian">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Danish">>
+	<<elseif _nationality == "Danish">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Dutch">>
+	<<elseif _nationality == "Dutch">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Swedish">>
+	<<elseif _nationality == "Swedish">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Spanish">>
+	<<elseif _nationality == "Spanish">>
 		<<set _race = "southern european">>
-	<<elseif __nationality == "Norwegian">>
+	<<elseif _nationality == "Norwegian">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Cambodian">>
+	<<elseif _nationality == "Cambodian">>
 		<<set _race = "asian">>
-	<<elseif __nationality == "Moroccan">>
+	<<elseif _nationality == "Moroccan">>
 		<<set _race = "middle eastern">>
-	<<elseif __nationality == "Omani">>
+	<<elseif _nationality == "Omani">>
 		<<set _race = "middle eastern">>
-	<<elseif __nationality == "Jordanian">>
+	<<elseif _nationality == "Jordanian">>
 		<<set _race = "middle eastern">>
-	<<elseif __nationality == "Bruneian">>
+	<<elseif _nationality == "Bruneian">>
 		<<set _race = "malay">>
-	<<elseif __nationality == "Emirati">>
+	<<elseif _nationality == "Emirati">>
 		<<set _race = "indo-aryan">>
-	<<elseif __nationality == "Bahraini">>
+	<<elseif _nationality == "Bahraini">>
 		<<set _race = "middle eastern">>
-	<<elseif __nationality == "Kuwaiti">>
+	<<elseif _nationality == "Kuwaiti">>
 		<<set _race = "middle eastern">>
-	<<elseif __nationality == "Malaysian">>
+	<<elseif _nationality == "Malaysian">>
 		<<set _race = "malay">>
-	<<elseif __nationality == "Qatari">>
+	<<elseif _nationality == "Qatari">>
 		<<set _race = "middle eastern">>
-	<<elseif __nationality == "Saudi">>
+	<<elseif _nationality == "Saudi">>
 		<<set _race = "middle eastern">>
-	<<elseif __nationality == "Tongan">>
+	<<elseif _nationality == "Tongan">>
 		<<set _race = "pacific islander">>
-	<<elseif __nationality == "Swazi">>
+	<<elseif _nationality == "Swazi">>
 		<<set _race = "black">>
-	<<elseif __nationality == "Mosotho">>
+	<<elseif _nationality == "Mosotho">>
 		<<set _race = "black">>
-	<<elseif __nationality == "British">>
+	<<elseif _nationality == "British">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Monégasque">>
+	<<elseif _nationality == "Monégasque">>
 		<<set _race = "white">>
-	<<elseif __nationality == "Bhutanese">>
+	<<elseif _nationality == "Bhutanese">>
 		<<set _race = "asian">>
-	<<elseif __nationality == "Thai">>
+	<<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)>>
+	<<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1, nationality: _nationality, race: _race})>>
 <<else>>
 	<<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1})>>
 <</if>>
@@ -149,8 +147,6 @@
 		<<set _princess.birthSurname = "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>>