diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index ad76b9edcae9d463a8122acf8fe59100079a4faf..5b87edcb94b7e09874f81ca03e59cd96815111c3 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -278,30 +278,30 @@
<<set $arcologies[0].FSSubjugationistRace = "black">>
<<if ndef $customVariety>> /* If non-custom variety, adds regional $nationalities */
<<set hashPush($nationalities, "American", "American", "American", "American", "American", "American")>>
- <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican")>>
- <<set hashPush($nationalities, "Canadian", "Canadian")>>
- <<set hashPush($nationalities, "Dominican", "Dominican")>>
<<set hashPush($nationalities, "Antiguan")>>
<<set hashPush($nationalities, "Aruban")>>
<<set hashPush($nationalities, "Bahamian")>>
<<set hashPush($nationalities, "Barbadian")>>
<<set hashPush($nationalities, "Belizean")>>
<<set hashPush($nationalities, "Bermudian")>>
+ <<set hashPush($nationalities, "Canadian", "Canadian")>>
<<set hashPush($nationalities, "Costa Rican")>>
- <<set hashPush($nationalities, "Cuban")>>
+ <<set hashPush($nationalities, "Cuban", "Cuban")>>
+ <<set hashPush($nationalities, "Dominican", "Dominican")>>
<<set hashPush($nationalities, "Dominiquais")>>
<<set hashPush($nationalities, "Greenlandic")>>
<<set hashPush($nationalities, "Grenadian")>>
<<set hashPush($nationalities, "Guatemalan")>>
- <<set hashPush($nationalities, "Haitian")>>
+ <<set hashPush($nationalities, "Haitian", "Haitian")>>
<<set hashPush($nationalities, "Honduran")>>
<<set hashPush($nationalities, "Jamaican")>>
<<set hashPush($nationalities, "Kittitian")>>
- <<set hashPush($nationalities, "Nicaraguan")>>
+ <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican", "Mexican")>>
+ <<set hashPush($nationalities, "Nicaraguan", "Nicaraguan")>>
<<set hashPush($nationalities, "Panamanian")>>
<<set hashPush($nationalities, "Puerto Rican")>>
<<set hashPush($nationalities, "Saint Lucian")>>
- <<set hashPush($nationalities, "Salvadoran")>>
+ <<set hashPush($nationalities, "Salvadoran", "Salvadoran")>>
<<set hashPush($nationalities, "Trinidadian")>>
<<set hashPush($nationalities, "Vincentian")>>
<</if>>
@@ -309,76 +309,70 @@
<<set $arcologies[0].FSSupremacistRace = "latina">>
<<set $arcologies[0].FSSubjugationistRace = "black">>
<<if ndef $customVariety>>
+ <<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian")>>
+ <<set hashPush($nationalities, "Bolivian", "Bolivian")>>
<<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
- <<set hashPush($nationalities, "Argentinian", "Argentinian")>>
- <<set hashPush($nationalities, "Colombian", "Colombian")>>
- <<set hashPush($nationalities, "Bolivian")>>
- <<set hashPush($nationalities, "Chilean")>>
+ <<set hashPush($nationalities, "Chilean", "Chilean")>>
+ <<set hashPush($nationalities, "Colombian", "Colombian", "Colombian")>>
<<set hashPush($nationalities, "Ecuadorian")>>
<<set hashPush($nationalities, "French Guianan")>>
<<set hashPush($nationalities, "Guyanese")>>
<<set hashPush($nationalities, "Paraguayan")>>
- <<set hashPush($nationalities, "Peruvian")>>
+ <<set hashPush($nationalities, "Peruvian", "Peruvian")>>
<<set hashPush($nationalities, "Surinamese")>>
<<set hashPush($nationalities, "Uruguayan")>>
- <<set hashPush($nationalities, "Venezuelan")>>
+ <<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
<</if>>
<<case "Brazil">>
<<set $arcologies[0].FSSupremacistRace = "white">>
<<set $arcologies[0].FSSubjugationistRace = "black">>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
- <<set hashPush($nationalities, "Argentinian", "Argentinian")>>
- <<set hashPush($nationalities, "Colombian", "Colombian")>>
- <<set hashPush($nationalities, "Bolivian")>>
- <<set hashPush($nationalities, "Chilean")>>
+ <<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian", "Argentinian")>>
+ <<set hashPush($nationalities, "Bolivian", "Bolivian")>>
+ <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
+ <<set hashPush($nationalities, "Chilean", "Chilean")>>
+ <<set hashPush($nationalities, "Colombian", "Colombian", "Colombian")>>
<<set hashPush($nationalities, "Ecuadorian")>>
<<set hashPush($nationalities, "French Guianan")>>
<<set hashPush($nationalities, "Guyanese")>>
<<set hashPush($nationalities, "Paraguayan")>>
+ <<set hashPush($nationalities, "Peruvian", "Peruvian")>>
<<set hashPush($nationalities, "Surinamese")>>
- <<set hashPush($nationalities, "Peruvian")>>
- <<set hashPush($nationalities, "Uruguayan")>>
- <<set hashPush($nationalities, "Venezuelan")>>
+ <<set hashPush($nationalities, "Uruguayan", "Uruguayan")>>
+ <<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
<</if>>
<<case "the Middle East">>
<<set $arcologies[0].FSSupremacistRace = "middle eastern">>
<<set $arcologies[0].FSSubjugationistRace = "asian">>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Egyptian", "Egyptian", "Egyptian")>>
- <<set hashPush($nationalities, "Iranian", "Iranian")>>
- <<set hashPush($nationalities, "Saudi", "Saudi")>>
- <<set hashPush($nationalities, "Turkish", "Turkish")>>
- <<set hashPush($nationalities, "Afghan")>>
- <<set hashPush($nationalities, "Armenian")>>
+ <<set hashPush($nationalities, "Afghan", "Afghan")>>
+ <<set hashPush($nationalities, "Armenian", "Armenian")>>
<<set hashPush($nationalities, "Azerbaijani")>>
<<set hashPush($nationalities, "Bahraini")>>
<<set hashPush($nationalities, "Cypriot")>>
- <<set hashPush($nationalities, "Emirati")>>
+ <<set hashPush($nationalities, "Egyptian", "Egyptian", "Egyptian")>>
+ <<set hashPush($nationalities, "Emirati", "Emirati")>>
<<set hashPush($nationalities, "Georgian")>>
- <<set hashPush($nationalities, "Iraqi")>>
- <<set hashPush($nationalities, "Israeli")>>
- <<set hashPush($nationalities, "Jordanian")>>
+ <<set hashPush($nationalities, "Iranian", "Iranian", "Iranian")>>
+ <<set hashPush($nationalities, "Iraqi", "Iraqi")>>
+ <<set hashPush($nationalities, "Israeli", "Israeli")>>
+ <<set hashPush($nationalities, "Jordanian", "Jordanian")>>
<<set hashPush($nationalities, "Kurdish")>>
<<set hashPush($nationalities, "Kuwaiti")>>
- <<set hashPush($nationalities, "Lebanese")>>
- <<set hashPush($nationalities, "Omani")>>
+ <<set hashPush($nationalities, "Lebanese", "Lebanese")>>
+ <<set hashPush($nationalities, "Omani", "Omani")>>
<<set hashPush($nationalities, "Palestinian")>>
<<set hashPush($nationalities, "Qatari")>>
+ <<set hashPush($nationalities, "Saudi", "Saudi")>>
<<set hashPush($nationalities, "Syrian")>>
- <<set hashPush($nationalities, "Yemeni")>>
+ <<set hashPush($nationalities, "Turkish", "Turkish", "Turkish")>>
+ <<set hashPush($nationalities, "Yemeni", "Yemeni")>>
<</if>>
<<case "Africa">>
<<set $arcologies[0].FSSupremacistRace = "black">>
<<set $arcologies[0].FSSubjugationistRace = "white">>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Nigerian", "Nigerian", "Nigerian")>>
- <<set hashPush($nationalities, "South African", "South African", "South African")>>
- <<set hashPush($nationalities, "Algerian", "Algerian")>>
- <<set hashPush($nationalities, "Ethiopian", "Ethiopian")>>
- <<set hashPush($nationalities, "Kenyan", "Kenyan")>>
- <<set hashPush($nationalities, "Sudanese", "Sudanese")>>
- <<set hashPush($nationalities, "Zairian", "Zairian")>>
+ <<set hashPush($nationalities, "Algerian", "Algerian", "Algerian")>>
<<set hashPush($nationalities, "Angolan")>>
<<set hashPush($nationalities, "Beninese")>>
<<set hashPush($nationalities, "Bissau-Guinean")>>
@@ -393,24 +387,27 @@
<<set hashPush($nationalities, "Djiboutian")>>
<<set hashPush($nationalities, "Equatoguinean")>>
<<set hashPush($nationalities, "Eritrean")>>
+ <<set hashPush($nationalities, "Ethiopian", "Ethiopian", "Ethiopian")>>
<<set hashPush($nationalities, "Gabonese")>>
<<set hashPush($nationalities, "Gambian")>>
- <<set hashPush($nationalities, "Ghanan")>>
+ <<set hashPush($nationalities, "Ghanan", "Ghanan")>>
<<set hashPush($nationalities, "Guinean")>>
<<set hashPush($nationalities, "Ivorian")>>
+ <<set hashPush($nationalities, "Kenyan", "Kenyan", "Kenyan")>>
<<set hashPush($nationalities, "Liberian")>>
- <<set hashPush($nationalities, "Libyan")>>
+ <<set hashPush($nationalities, "Libyan", "Libyan")>>
<<set hashPush($nationalities, "Malagasy")>>
<<set hashPush($nationalities, "Malawian")>>
- <<set hashPush($nationalities, "Malian")>>
+ <<set hashPush($nationalities, "Malian", "Malian")>>
<<set hashPush($nationalities, "Mauritanian")>>
<<set hashPush($nationalities, "Mauritian")>>
- <<set hashPush($nationalities, "Moroccan")>>
+ <<set hashPush($nationalities, "Moroccan", "Moroccan")>>
<<set hashPush($nationalities, "Mosotho")>>
<<set hashPush($nationalities, "Motswana")>>
<<set hashPush($nationalities, "Mozambican")>>
<<set hashPush($nationalities, "Namibian")>>
- <<set hashPush($nationalities, "Nigerien")>>
+ <<set hashPush($nationalities, "Nigerian", "Nigerian", "Nigerian", "Nigerian")>>
+ <<set hashPush($nationalities, "Nigerien", "Nigerien")>>
<<set hashPush($nationalities, "Rwandan")>>
<<set hashPush($nationalities, "Sahrawi")>>
<<set hashPush($nationalities, "São Toméan")>>
@@ -418,99 +415,102 @@
<<set hashPush($nationalities, "Seychellois")>>
<<set hashPush($nationalities, "Sierra Leonean")>>
<<set hashPush($nationalities, "Somali")>>
+ <<set hashPush($nationalities, "South African", "South African", "South African", "South African")>>
<<set hashPush($nationalities, "South Sudanese")>>
+ <<set hashPush($nationalities, "Sudanese", "Sudanese", "Sudanese")>>
<<set hashPush($nationalities, "Swazi")>>
- <<set hashPush($nationalities, "Tanzanian")>>
+ <<set hashPush($nationalities, "Tanzanian", "Tanzanian")>>
<<set hashPush($nationalities, "Togolese")>>
- <<set hashPush($nationalities, "Tunisian")>>
- <<set hashPush($nationalities, "Ugandan")>>
+ <<set hashPush($nationalities, "Tunisian", "Tunisian")>>
+ <<set hashPush($nationalities, "Ugandan", "Ugandan")>>
+ <<set hashPush($nationalities, "Zairian", "Zairian", "Zairian")>>
<<set hashPush($nationalities, "Zambian")>>
- <<set hashPush($nationalities, "Zimbabwean")>>
+ <<set hashPush($nationalities, "Zimbabwean", "Zimbabwean")>>
<</if>>
<<case "Asia">>
<<set $arcologies[0].FSSupremacistRace = "asian">>
<<set $arcologies[0].FSSubjugationistRace = "indo-aryan">>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese")>>
- <<set hashPush($nationalities, "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian")>>
- <<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
- <<set hashPush($nationalities, "Indonesian", "Indonesian", "Indonesian")>>
- <<set hashPush($nationalities, "Burmese", "Burmese")>>
- <<set hashPush($nationalities, "Filipina", "Filipina")>>
- <<set hashPush($nationalities, "Japanese", "Japanese")>>
- <<set hashPush($nationalities, "Korean", "Korean")>>
- <<set hashPush($nationalities, "Malaysian", "Malaysian")>>
- <<set hashPush($nationalities, "Pakistani", "Pakistani")>>
- <<set hashPush($nationalities, "Thai", "Thai")>>
- <<set hashPush($nationalities, "Vietnamese", "Vietnamese")>>
+ <<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
<<set hashPush($nationalities, "Bhutanese")>>
<<set hashPush($nationalities, "Bruneian")>>
+ <<set hashPush($nationalities, "Burmese", "Burmese")>>
<<set hashPush($nationalities, "Cambodian")>>
+ <<set hashPush($nationalities, "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese")>>
<<set hashPush($nationalities, "East Timorese")>>
- <<set hashPush($nationalities, "Kazakh")>>
+ <<set hashPush($nationalities, "Filipina", "Filipina", "Filipina")>>
+ <<set hashPush($nationalities, "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian")>>
+ <<set hashPush($nationalities, "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian")>>
+ <<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
+ <<set hashPush($nationalities, "Kazakh", "Kazakh")>>
+ <<set hashPush($nationalities, "Korean", "Korean")>>
<<set hashPush($nationalities, "Kyrgyz")>>
<<set hashPush($nationalities, "Laotian")>>
+ <<set hashPush($nationalities, "Malaysian", "Malaysian", "Malaysian")>>
<<set hashPush($nationalities, "Maldivian")>>
<<set hashPush($nationalities, "Mongolian")>>
- <<set hashPush($nationalities, "Nepalese")>>
+ <<set hashPush($nationalities, "Nepalese", "Nepalese")>>
+ <<set hashPush($nationalities, "Pakistani", "Pakistani", "Pakistani")>>
<<set hashPush($nationalities, "Singaporean")>>
<<set hashPush($nationalities, "Sri Lankan")>>
<<set hashPush($nationalities, "Taiwanese")>>
<<set hashPush($nationalities, "Tajik")>>
+ <<set hashPush($nationalities, "Thai", "Thai", "Thai")>>
<<set hashPush($nationalities, "Tibetan")>>
<<set hashPush($nationalities, "Turkmen")>>
- <<set hashPush($nationalities, "Uzbek")>>
+ <<set hashPush($nationalities, "Uzbek", "Uzbek")>>
+ <<set hashPush($nationalities, "Vietnamese", "Vietnamese", "Vietnamese")>>
<</if>>
<<case "Europe">>
<<set $arcologies[0].FSSupremacistRace = "white">>
<<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Russian", "Russian", "Russian", "Russian")>>
- <<set hashPush($nationalities, "German", "German", "German")>>
- <<set hashPush($nationalities, "Belarusian", "Belarusian")>>
- <<set hashPush($nationalities, "British", "British")>>
- <<set hashPush($nationalities, "French", "French")>>
- <<set hashPush($nationalities, "Italian", "Italian")>>
- <<set hashPush($nationalities, "Polish", "Polish")>>
- <<set hashPush($nationalities, "Spanish", "Spanish")>>
- <<set hashPush($nationalities, "Ukrainian", "Ukrainian")>>
<<set hashPush($nationalities, "Albanian")>>
<<set hashPush($nationalities, "Andorran")>>
- <<set hashPush($nationalities, "Austrian")>>
- <<set hashPush($nationalities, "Belgian")>>
+ <<set hashPush($nationalities, "Austrian", "Austrian")>>
+ <<set hashPush($nationalities, "Belarusian", "Belarusian")>>
+ <<set hashPush($nationalities, "Belgian", "Belgian")>>
<<set hashPush($nationalities, "Bosnian")>>
- <<set hashPush($nationalities, "Bulgarian")>>
+ <<set hashPush($nationalities, "British", "British", "British")>>
+ <<set hashPush($nationalities, "Bulgarian", "Bulgarian")>>
<<set hashPush($nationalities, "Catalan")>>
<<set hashPush($nationalities, "Croatian")>>
- <<set hashPush($nationalities, "Czech")>>
- <<set hashPush($nationalities, "Danish")>>
- <<set hashPush($nationalities, "Dutch")>>
- <<set hashPush($nationalities, "Estonian")>>
- <<set hashPush($nationalities, "Finnish")>>
- <<set hashPush($nationalities, "Greek")>>
- <<set hashPush($nationalities, "Hungarian")>>
- <<set hashPush($nationalities, "Icelandic")>>
- <<set hashPush($nationalities, "Irish")>>
+ <<set hashPush($nationalities, "Czech", "Czech")>>
+ <<set hashPush($nationalities, "Danish", "Danish")>>
+ <<set hashPush($nationalities, "Dutch", "Dutch")>>
+ <<set hashPush($nationalities, "Estonian", "Estonian")>>
+ <<set hashPush($nationalities, "Finnish", "Finnish")>>
+ <<set hashPush($nationalities, "French", "French", "French")>>
+ <<set hashPush($nationalities, "German", "German", "German")>>
+ <<set hashPush($nationalities, "Greek", "Greek")>>
+ <<set hashPush($nationalities, "Hungarian", "Hungarian")>>
+ <<set hashPush($nationalities, "Icelandic", "Icelandic")>>
+ <<set hashPush($nationalities, "Irish", "Irish")>>
+ <<set hashPush($nationalities, "Italian", "Italian", "Italian")>>
<<set hashPush($nationalities, "Kosovan")>>
<<set hashPush($nationalities, "Latvian")>>
<<set hashPush($nationalities, "a Liechtensteiner")>>
- <<set hashPush($nationalities, "Lithuanian")>>
+ <<set hashPush($nationalities, "Lithuanian", "Lithuanian")>>
<<set hashPush($nationalities, "Luxembourgian")>>
<<set hashPush($nationalities, "Macedonian")>>
<<set hashPush($nationalities, "Maltese")>>
<<set hashPush($nationalities, "Moldovan")>>
<<set hashPush($nationalities, "Monégasque")>>
<<set hashPush($nationalities, "Montenegrin")>>
- <<set hashPush($nationalities, "Norwegian")>>
- <<set hashPush($nationalities, "Portuguese")>>
- <<set hashPush($nationalities, "Romanian")>>
+ <<set hashPush($nationalities, "Norwegian", "Norwegian")>>
+ <<set hashPush($nationalities, "Polish", "Polish", "Polish")>>
+ <<set hashPush($nationalities, "Portuguese", "Portuguese")>>
+ <<set hashPush($nationalities, "Romanian", "Romanian")>>
+ <<set hashPush($nationalities, "Russian", "Russian", "Russian", "Russian")>>
<<set hashPush($nationalities, "Sammarinese")>>
<<set hashPush($nationalities, "Scottish")>>
- <<set hashPush($nationalities, "Serbian")>>
- <<set hashPush($nationalities, "Slovak")>>
+ <<set hashPush($nationalities, "Serbian", "Serbian")>>
+ <<set hashPush($nationalities, "Slovak", "Slovak")>>
<<set hashPush($nationalities, "Slovene")>>
- <<set hashPush($nationalities, "Swedish")>>
- <<set hashPush($nationalities, "Swiss")>>
+ <<set hashPush($nationalities, "Spanish", "Spanish", "Spanish")>>
+ <<set hashPush($nationalities, "Swedish", "Swedish")>>
+ <<set hashPush($nationalities, "Swiss", "Swiss")>>
+ <<set hashPush($nationalities, "Ukrainian", "Ukrainian", "Ukrainian")>>
<<set hashPush($nationalities, "Vatican")>>
<</if>>
<<case "Australia">>
@@ -526,7 +526,7 @@
<<set hashPush($nationalities, "Micronesian")>>
<<set hashPush($nationalities, "Nauruan")>>
<<set hashPush($nationalities, "New Caledonian")>>
- <<set hashPush($nationalities, "a New Zealander")>>
+ <<set hashPush($nationalities, "a New Zealander", "a New Zealander")>>
<<set hashPush($nationalities, "Ni-Vanuatu")>>
<<set hashPush($nationalities, "Niuean")>>
<<set hashPush($nationalities, "Palauan")>>
@@ -548,217 +548,217 @@
<<if $internationalTrade != 0>>
<<set $nationalities = arr2obj(setup.baseNationalities)>>
<<if $internationalVariety == 0>>
- <<set hashPush($nationalities, "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese")>>
- <<set hashPush($nationalities, "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian")>>
- <<set hashPush($nationalities, "American", "American", "American", "American")>>
- <<set hashPush($nationalities, "Indonesian", "Indonesian", "Indonesian", "Indonesian")>>
- <<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
- <<set hashPush($nationalities, "Belarusian", "Belarusian", "Belarusian")>>
- <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian")>>
- <<set hashPush($nationalities, "Dominican", "Dominican", "Dominican")>>
- <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican")>>
- <<set hashPush($nationalities, "Nigerian", "Nigerian", "Nigerian")>>
- <<set hashPush($nationalities, "Russian", "Russian", "Russian")>>
- <<set hashPush($nationalities, "South African", "South African", "South African")>>
- <<set hashPush($nationalities, "Algerian", "Algerian")>>
- <<set hashPush($nationalities, "Argentinian", "Argentinian")>>
- <<set hashPush($nationalities, "British", "British")>>
- <<set hashPush($nationalities, "Burmese", "Burmese")>>
- <<set hashPush($nationalities, "Colombian", "Colombian")>>
- <<set hashPush($nationalities, "Egyptian", "Egyptian")>>
- <<set hashPush($nationalities, "Ethiopian", "Ethiopian")>>
- <<set hashPush($nationalities, "Filipina", "Filipina")>>
- <<set hashPush($nationalities, "French", "French")>>
- <<set hashPush($nationalities, "German", "German")>>
- <<set hashPush($nationalities, "Iranian", "Iranian")>>
- <<set hashPush($nationalities, "Italian", "Italian")>>
- <<set hashPush($nationalities, "Japanese", "Japanese")>>
- <<set hashPush($nationalities, "Kenyan", "Kenyan")>>
- <<set hashPush($nationalities, "Korean", "Korean")>>
- <<set hashPush($nationalities, "Malaysian", "Malaysian")>>
- <<set hashPush($nationalities, "Pakistani", "Pakistani")>>
- <<set hashPush($nationalities, "Polish", "Polish")>>
- <<set hashPush($nationalities, "Spanish", "Spanish")>>
- <<set hashPush($nationalities, "Sudanese", "Sudanese")>>
- <<set hashPush($nationalities, "Thai", "Thai")>>
- <<set hashPush($nationalities, "Turkish", "Turkish")>>
- <<set hashPush($nationalities, "Ukrainian", "Ukrainian")>>
- <<set hashPush($nationalities, "Venezuelan", "Venezuelan")>>
- <<set hashPush($nationalities, "Vietnamese", "Vietnamese")>>
- <<set hashPush($nationalities, "Zairian", "Zairian")>>
- <<set hashPush($nationalities, "Afghan")>>
+ <<set hashPush($nationalities, "Afghan", "Afghan")>>
<<set hashPush($nationalities, "Albanian")>>
+ <<set hashPush($nationalities, "Algerian", "Algerian", "Algerian")>>
+ <<set hashPush($nationalities, "American", "American", "American", "American", "American", "American")>>
<<set hashPush($nationalities, "Andorran")>>
<<set hashPush($nationalities, "Angolan")>>
<<set hashPush($nationalities, "Antiguan")>>
- <<set hashPush($nationalities, "Armenian")>>
+ <<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian")>>
+ <<set hashPush($nationalities, "Armenian", "Armenian")>>
<<set hashPush($nationalities, "Aruban")>>
- <<set hashPush($nationalities, "Australian")>>
- <<set hashPush($nationalities, "Austrian")>>
+ <<set hashPush($nationalities, "Australian", "Australian", "Australian")>>
+ <<set hashPush($nationalities, "Austrian", "Austrian")>>
<<set hashPush($nationalities, "Azerbaijani")>>
<<set hashPush($nationalities, "Bahamian")>>
<<set hashPush($nationalities, "Bahraini")>>
+ <<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
<<set hashPush($nationalities, "Barbadian")>>
- <<set hashPush($nationalities, "Belgian")>>
+ <<set hashPush($nationalities, "Belarusian", "Belarusian")>>
+ <<set hashPush($nationalities, "Belgian", "Belgian")>>
<<set hashPush($nationalities, "Belizean")>>
<<set hashPush($nationalities, "Beninese")>>
<<set hashPush($nationalities, "Bermudian")>>
<<set hashPush($nationalities, "Bhutanese")>>
<<set hashPush($nationalities, "Bissau-Guinean")>>
- <<set hashPush($nationalities, "Bolivian")>>
+ <<set hashPush($nationalities, "Bolivian", "Bolivian")>>
<<set hashPush($nationalities, "Bosnian")>>
+ <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
+ <<set hashPush($nationalities, "British", "British", "British")>>
<<set hashPush($nationalities, "Bruneian")>>
- <<set hashPush($nationalities, "Bulgarian")>>
+ <<set hashPush($nationalities, "Bulgarian", "Bulgarian")>>
<<set hashPush($nationalities, "Burkinabé")>>
+ <<set hashPush($nationalities, "Burmese", "Burmese")>>
<<set hashPush($nationalities, "Burundian")>>
<<set hashPush($nationalities, "Cambodian")>>
<<set hashPush($nationalities, "Cameroonian")>>
- <<set hashPush($nationalities, "Canadian")>>
+ <<set hashPush($nationalities, "Canadian", "Canadian")>>
<<set hashPush($nationalities, "Cape Verdean")>>
<<set hashPush($nationalities, "Catalan")>>
<<set hashPush($nationalities, "Central African")>>
<<set hashPush($nationalities, "Chadian")>>
- <<set hashPush($nationalities, "Chilean")>>
+ <<set hashPush($nationalities, "Chilean", "Chilean")>>
+ <<set hashPush($nationalities, "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese")>>
+ <<set hashPush($nationalities, "Colombian", "Colombian", "Colombian")>>
<<set hashPush($nationalities, "Comorian")>>
<<set hashPush($nationalities, "Congolese")>>
<<set hashPush($nationalities, "a Cook Islander")>>
<<set hashPush($nationalities, "Costa Rican")>>
<<set hashPush($nationalities, "Croatian")>>
- <<set hashPush($nationalities, "Cuban")>>
+ <<set hashPush($nationalities, "Cuban", "Cuban")>>
<<set hashPush($nationalities, "Cypriot")>>
- <<set hashPush($nationalities, "Czech")>>
- <<set hashPush($nationalities, "Danish")>>
+ <<set hashPush($nationalities, "Czech", "Czech")>>
+ <<set hashPush($nationalities, "Danish", "Danish")>>
<<set hashPush($nationalities, "Djiboutian")>>
+ <<set hashPush($nationalities, "Dominican", "Dominican")>>
<<set hashPush($nationalities, "Dominiquais")>>
- <<set hashPush($nationalities, "Dutch")>>
+ <<set hashPush($nationalities, "Dutch", "Dutch")>>
<<set hashPush($nationalities, "East Timorese")>>
<<set hashPush($nationalities, "Ecuadorian")>>
- <<set hashPush($nationalities, "Emirati")>>
+ <<set hashPush($nationalities, "Egyptian", "Egyptian", "Egyptian")>>
+ <<set hashPush($nationalities, "Emirati", "Emirati")>>
<<set hashPush($nationalities, "Equatoguinean")>>
<<set hashPush($nationalities, "Eritrean")>>
- <<set hashPush($nationalities, "Estonian")>>
+ <<set hashPush($nationalities, "Estonian", "Estonian")>>
+ <<set hashPush($nationalities, "Ethiopian", "Ethiopian", "Ethiopian")>>
<<set hashPush($nationalities, "Fijian")>>
- <<set hashPush($nationalities, "Finnish")>>
+ <<set hashPush($nationalities, "Filipina", "Filipina", "Filipina")>>
+ <<set hashPush($nationalities, "Finnish", "Finnish")>>
<<set hashPush($nationalities, "French Guianan")>>
<<set hashPush($nationalities, "French Polynesian")>>
+ <<set hashPush($nationalities, "French", "French", "French")>>
<<set hashPush($nationalities, "Gabonese")>>
<<set hashPush($nationalities, "Gambian")>>
<<set hashPush($nationalities, "Georgian")>>
- <<set hashPush($nationalities, "Ghanan")>>
- <<set hashPush($nationalities, "Greek")>>
+ <<set hashPush($nationalities, "German", "German", "German")>>
+ <<set hashPush($nationalities, "Ghanan", "Ghanan")>>
+ <<set hashPush($nationalities, "Greek", "Greek")>>
<<set hashPush($nationalities, "Greenlandic")>>
<<set hashPush($nationalities, "Grenadian")>>
<<set hashPush($nationalities, "Guamanian")>>
<<set hashPush($nationalities, "Guatemalan")>>
<<set hashPush($nationalities, "Guinean")>>
<<set hashPush($nationalities, "Guyanese")>>
- <<set hashPush($nationalities, "Haitian")>>
+ <<set hashPush($nationalities, "Haitian", "Haitian")>>
<<set hashPush($nationalities, "Honduran")>>
- <<set hashPush($nationalities, "Hungarian")>>
+ <<set hashPush($nationalities, "Hungarian", "Hungarian")>>
<<set hashPush($nationalities, "I-Kiribati")>>
- <<set hashPush($nationalities, "Icelandic")>>
- <<set hashPush($nationalities, "Iraqi")>>
- <<set hashPush($nationalities, "Irish")>>
- <<set hashPush($nationalities, "Israeli")>>
+ <<set hashPush($nationalities, "Icelandic", "Icelandic")>>
+ <<set hashPush($nationalities, "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian")>>
+ <<set hashPush($nationalities, "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian")>>
+ <<set hashPush($nationalities, "Iranian", "Iranian", "Iranian")>>
+ <<set hashPush($nationalities, "Iraqi", "Iraqi")>>
+ <<set hashPush($nationalities, "Irish", "Irish")>>
+ <<set hashPush($nationalities, "Israeli", "Israeli")>>
+ <<set hashPush($nationalities, "Italian", "Italian", "Italian")>>
<<set hashPush($nationalities, "Ivorian")>>
<<set hashPush($nationalities, "Jamaican")>>
- <<set hashPush($nationalities, "Jordanian")>>
- <<set hashPush($nationalities, "Kazakh")>>
+ <<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
+ <<set hashPush($nationalities, "Jordanian", "Jordanian")>>
+ <<set hashPush($nationalities, "Kazakh", "Kazakh")>>
+ <<set hashPush($nationalities, "Kenyan", "Kenyan", "Kenyan")>>
<<set hashPush($nationalities, "Kittitian")>>
+ <<set hashPush($nationalities, "Korean", "Korean")>>
<<set hashPush($nationalities, "Kosovan")>>
<<set hashPush($nationalities, "Kurdish")>>
<<set hashPush($nationalities, "Kuwaiti")>>
<<set hashPush($nationalities, "Kyrgyz")>>
<<set hashPush($nationalities, "Laotian")>>
<<set hashPush($nationalities, "Latvian")>>
- <<set hashPush($nationalities, "Lebanese")>>
+ <<set hashPush($nationalities, "Lebanese", "Lebanese")>>
<<set hashPush($nationalities, "Liberian")>>
- <<set hashPush($nationalities, "Libyan")>>
+ <<set hashPush($nationalities, "Libyan", "Libyan")>>
<<set hashPush($nationalities, "a Liechtensteiner")>>
- <<set hashPush($nationalities, "Lithuanian")>>
+ <<set hashPush($nationalities, "Lithuanian", "Lithuanian")>>
<<set hashPush($nationalities, "Luxembourgian")>>
<<set hashPush($nationalities, "Macedonian")>>
<<set hashPush($nationalities, "Malagasy")>>
<<set hashPush($nationalities, "Malawian")>>
+ <<set hashPush($nationalities, "Malaysian", "Malaysian", "Malaysian")>>
<<set hashPush($nationalities, "Maldivian")>>
- <<set hashPush($nationalities, "Malian")>>
+ <<set hashPush($nationalities, "Malian", "Malian")>>
<<set hashPush($nationalities, "Maltese")>>
<<set hashPush($nationalities, "Marshallese")>>
<<set hashPush($nationalities, "Mauritanian")>>
<<set hashPush($nationalities, "Mauritian")>>
+ <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican", "Mexican")>>
<<set hashPush($nationalities, "Micronesian")>>
<<set hashPush($nationalities, "Moldovan")>>
<<set hashPush($nationalities, "Monégasque")>>
<<set hashPush($nationalities, "Mongolian")>>
<<set hashPush($nationalities, "Montenegrin")>>
- <<set hashPush($nationalities, "Moroccan")>>
+ <<set hashPush($nationalities, "Moroccan", "Moroccan")>>
<<set hashPush($nationalities, "Mosotho")>>
<<set hashPush($nationalities, "Motswana")>>
<<set hashPush($nationalities, "Mozambican")>>
<<set hashPush($nationalities, "Namibian")>>
<<set hashPush($nationalities, "Nauruan")>>
- <<set hashPush($nationalities, "Nepalese")>>
+ <<set hashPush($nationalities, "Nepalese", "Nepalese")>>
<<set hashPush($nationalities, "New Caledonian")>>
- <<set hashPush($nationalities, "a New Zealander")>>
+ <<set hashPush($nationalities, "a New Zealander", "a New Zealander")>>
<<set hashPush($nationalities, "Ni-Vanuatu")>>
- <<set hashPush($nationalities, "Nicaraguan")>>
- <<set hashPush($nationalities, "Nigerien")>>
+ <<set hashPush($nationalities, "Nicaraguan", "Nicaraguan")>>
+ <<set hashPush($nationalities, "Nigerian", "Nigerian", "Nigerian", "Nigerian")>>
+ <<set hashPush($nationalities, "Nigerien", "Nigerien")>>
<<set hashPush($nationalities, "Niuean")>>
- <<set hashPush($nationalities, "Norwegian")>>
- <<set hashPush($nationalities, "Omani")>>
+ <<set hashPush($nationalities, "Norwegian", "Norwegian")>>
+ <<set hashPush($nationalities, "Omani", "Omani")>>
+ <<set hashPush($nationalities, "Pakistani", "Pakistani", "Pakistani")>>
<<set hashPush($nationalities, "Palauan")>>
<<set hashPush($nationalities, "Palestinian")>>
<<set hashPush($nationalities, "Panamanian")>>
<<set hashPush($nationalities, "Papua New Guinean")>>
<<set hashPush($nationalities, "Paraguayan")>>
- <<set hashPush($nationalities, "Peruvian")>>
- <<set hashPush($nationalities, "Portuguese")>>
+ <<set hashPush($nationalities, "Peruvian", "Peruvian")>>
+ <<set hashPush($nationalities, "Polish", "Polish", "Polish")>>
+ <<set hashPush($nationalities, "Portuguese", "Portuguese")>>
<<set hashPush($nationalities, "Puerto Rican")>>
<<set hashPush($nationalities, "Qatari")>>
- <<set hashPush($nationalities, "Romanian")>>
+ <<set hashPush($nationalities, "Romanian", "Romanian")>>
+ <<set hashPush($nationalities, "Russian", "Russian", "Russian", "Russian")>>
<<set hashPush($nationalities, "Rwandan")>>
<<set hashPush($nationalities, "Sahrawi")>>
<<set hashPush($nationalities, "Saint Lucian")>>
- <<set hashPush($nationalities, "Salvadoran")>>
+ <<set hashPush($nationalities, "Salvadoran", "Salvadoran")>>
<<set hashPush($nationalities, "Sammarinese")>>
<<set hashPush($nationalities, "Samoan")>>
<<set hashPush($nationalities, "São Toméan")>>
- <<set hashPush($nationalities, "Saudi")>>
+ <<set hashPush($nationalities, "Saudi", "Saudi")>>
<<set hashPush($nationalities, "Scottish")>>
<<set hashPush($nationalities, "Senegalese")>>
- <<set hashPush($nationalities, "Serbian")>>
+ <<set hashPush($nationalities, "Serbian", "Serbian")>>
<<set hashPush($nationalities, "Seychellois")>>
<<set hashPush($nationalities, "Sierra Leonean")>>
<<set hashPush($nationalities, "Singaporean")>>
- <<set hashPush($nationalities, "Slovak")>>
+ <<set hashPush($nationalities, "Slovak", "Slovak")>>
<<set hashPush($nationalities, "Slovene")>>
<<set hashPush($nationalities, "a Solomon Islander")>>
<<set hashPush($nationalities, "Somali")>>
+ <<set hashPush($nationalities, "South African", "South African", "South African", "South African")>>
<<set hashPush($nationalities, "South Sudanese")>>
+ <<set hashPush($nationalities, "Spanish", "Spanish", "Spanish")>>
<<set hashPush($nationalities, "Sri Lankan")>>
+ <<set hashPush($nationalities, "Sudanese", "Sudanese", "Sudanese")>>
<<set hashPush($nationalities, "Surinamese")>>
<<set hashPush($nationalities, "Swazi")>>
- <<set hashPush($nationalities, "Swedish")>>
- <<set hashPush($nationalities, "Swiss")>>
+ <<set hashPush($nationalities, "Swedish", "Swedish")>>
+ <<set hashPush($nationalities, "Swiss", "Swiss")>>
<<set hashPush($nationalities, "Syrian")>>
<<set hashPush($nationalities, "Taiwanese")>>
<<set hashPush($nationalities, "Tajik")>>
- <<set hashPush($nationalities, "Tanzanian")>>
+ <<set hashPush($nationalities, "Tanzanian", "Tanzanian")>>
+ <<set hashPush($nationalities, "Thai", "Thai", "Thai")>>
<<set hashPush($nationalities, "Tibetan")>>
<<set hashPush($nationalities, "Togolese")>>
<<set hashPush($nationalities, "Tongan")>>
<<set hashPush($nationalities, "Trinidadian")>>
- <<set hashPush($nationalities, "Tunisian")>>
+ <<set hashPush($nationalities, "Tunisian", "Tunisian")>>
+ <<set hashPush($nationalities, "Turkish", "Turkish", "Turkish")>>
<<set hashPush($nationalities, "Turkmen")>>
<<set hashPush($nationalities, "Tuvaluan")>>
- <<set hashPush($nationalities, "Ugandan")>>
+ <<set hashPush($nationalities, "Ugandan", "Ugandan")>>
+ <<set hashPush($nationalities, "Ukrainian", "Ukrainian", "Ukrainian")>>
<<set hashPush($nationalities, "Uruguayan")>>
- <<set hashPush($nationalities, "Uzbek")>>
+ <<set hashPush($nationalities, "Uzbek", "Uzbek")>>
<<set hashPush($nationalities, "Vatican")>>
+ <<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
+ <<set hashPush($nationalities, "Vietnamese", "Vietnamese", "Vietnamese")>>
<<set hashPush($nationalities, "Vincentian")>>
- <<set hashPush($nationalities, "Yemeni")>>
+ <<set hashPush($nationalities, "Yemeni", "Yemeni")>>
+ <<set hashPush($nationalities, "Zairian", "Zairian", "Zairian")>>
<<set hashPush($nationalities, "Zambian")>>
- <<set hashPush($nationalities, "Zimbabwean")>>
+ <<set hashPush($nationalities, "Zimbabwean", "Zimbabwean")>>
<</if>>
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/slaveTradePresetWidgets.tw b/src/pregmod/widgets/slaveTradePresetWidgets.tw
index e7977bf4182003687e7d9c3ec1c8d1f5cc4a576f..66cf0edab6172d9d8e1218d497e9ce656f55ac2b 100644
--- a/src/pregmod/widgets/slaveTradePresetWidgets.tw
+++ b/src/pregmod/widgets/slaveTradePresetWidgets.tw
@@ -9,14 +9,14 @@
Afghan: 2,
Albanian: 1,
Algerian: 3,
- American: 5,
+ American: 6,
Andorran: 1,
Angolan: 1,
Antiguan: 1,
- Argentinian: 3,
+ Argentinian: 4,
Armenian: 2,
Aruban: 1,
- Australian: 2,
+ Australian: 3,
Austrian: 2,
Azerbaijani: 1,
Bahamian: 1,
@@ -107,7 +107,7 @@
Kazakh: 2,
Kenyan: 3,
Kittitian: 1,
- Korean: 1,
+ Korean: 2,
Kosovan: 1,
Kurdish: 1,
Kuwaiti: 1,
@@ -117,6 +117,7 @@
Lebanese: 2,
Liberian: 1,
Libyan: 2,
+ "a Liechtensteiner": 1,
Lithuanian: 2,
Luxembourgian: 1,
Macedonian: 1,
@@ -130,9 +131,9 @@
Mauritanian: 1,
Mauritian: 1,
Mexican: 4,
- Monégasque: 1,
Micronesian: 1,
Moldovan: 1,
+ Monégasque: 1,
Mongolian: 1,
Montenegrin: 1,
Moroccan: 2,
@@ -206,7 +207,7 @@
Tuvaluan: 1,
Ugandan: 2,
Ukrainian: 3,
- Uruguayan: 1,
+ Uruguayan: 2,
Uzbek: 2,
Vatican: 1,
Venezuelan: 3,
@@ -227,29 +228,29 @@
<<set $nationalities = {
American: 6,
Antiguan: 1,
- Aruban : 1,
+ Aruban: 1,
Bahamian: 1,
Barbadian: 1,
Belizean: 1,
Bermudian: 1,
Canadian: 2,
"Costa Rican": 1,
- Cuban: 1,
+ Cuban: 2,
Dominican: 2,
Dominiquais: 1,
Greenlandic: 1,
Grenadian: 1,
Guatemalan: 1,
- Haitian: 1,
+ Haitian: 2,
Honduran: 1,
- Jamaican: 1,
+ Jamaican: 2,
Kittitian: 1,
- Mexican: 3,
- Nicaraguan: 1,
+ Mexican: 4,
+ Nicaraguan: 2,
Panamanian: 1,
"Puerto Rican": 1,
"Saint Lucian": 1,
- Salvadoran: 1,
+ Salvadoran: 2,
Trinidadian: 1,
Vincentian: 1
}>>
@@ -261,19 +262,19 @@
<<widget "NationalityPresetVanillaSA">>
<<link "Vanilla South America">>
<<set $nationalities = {
- Argentinian: 2,
- Bolivian: 1,
+ Argentinian: 4,
+ Bolivian: 2,
Brazilian: 4,
- Chilean: 1,
- Colombian: 2,
+ Chilean: 2,
+ Colombian: 3,
Ecuadorian: 1,
"French Guianan": 1,
Guyanese: 1,
Paraguayan: 1,
- Peruvian: 1,
+ Peruvian: 2,
Surinamese: 1,
- Uruguayan: 1,
- Venezuelan: 1
+ Uruguayan: 2,
+ Venezuelan: 3
}>>
<<set _gotoPassage = passage()>>
<<goto _gotoPassage>>
@@ -283,28 +284,28 @@
<<widget "NationalityPresetVanillaME">>
<<link "Vanilla Middle East">>
<<set $nationalities = {
- Afghan: 1,
- Armenian: 1,
+ Afghan: 2,
+ Armenian: 2,
Azerbaijani: 1,
Bahraini: 1,
Cypriot: 1,
Egyptian: 3,
- Emirati: 1,
+ Emirati: 2,
Georgian: 1,
- Iranian: 2,
- Iraqi: 1,
- Israeli: 1,
- Jordanian: 1,
+ Iranian: 3,
+ Iraqi: 2,
+ Israeli: 2,
+ Jordanian: 2,
Kurdish: 1,
Kuwaiti: 1,
- Lebanese: 1,
- Omani: 1,
+ Lebanese: 2,
+ Omani: 2,
Palestinian: 1,
Qatari: 1,
Saudi: 2,
Syrian: 1,
- Turkish: 2,
- Yemeni: 1
+ Turkish: 3,
+ Yemeni: 2
}>>
<<set _gotoPassage = passage()>>
<<goto _gotoPassage>>
@@ -314,7 +315,7 @@
<<widget "NationalityPresetVanillaAfrica">>
<<link "Vanilla Africa">>
<<set $nationalities = {
- Algerian: 2,
+ Algerian: 3,
Angolan: 1,
Beninese: 1,
"Bissau-Guinean": 1,
@@ -329,27 +330,27 @@
Djiboutian: 1,
Equatoguinean: 1,
Eritrean: 1,
- Ethiopian: 2,
+ Ethiopian: 3,
Gabonese: 1,
Gambian: 1,
- Ghanan: 1,
+ Ghanan: 2,
Guinean: 1,
Ivorian: 1,
- Kenyan: 2,
+ Kenyan: 3,
Liberian: 1,
- Libyan: 1,
+ Libyan: 2,
Malagasy: 1,
Malawian: 1,
- Malian: 1,
+ Malian: 2,
Mauritanian: 1,
Mauritian: 1,
- Moroccan: 1,
+ Moroccan: 2,
Mosotho: 1,
Motswana: 1,
Mozambican: 1,
Namibian: 1,
- Nigerian: 3,
- Nigerien: 1,
+ Nigerian: 4,
+ Nigerien: 2,
Rwandan: 1,
Sahrawi: 1,
"São Toméan": 1,
@@ -357,17 +358,17 @@
Seychellois: 1,
"Sierra Leonean": 1,
Somali: 1,
- "South African": 3,
+ "South African": 4,
"South Sudanese": 1,
- Sudanese: 2,
+ Sudanese: 3,
Swazi: 1,
- Tanzanian: 1,
+ Tanzanian: 2,
Togolese: 1,
- Tunisian: 1,
- Ugandan: 1,
- Zairian: 2,
+ Tunisian: 2,
+ Ugandan: 2,
+ Zairian: 3,
Zambian: 1,
- Zimbabwean: 1
+ Zimbabwean: 2
}>>
<<set _gotoPassage = passage()>>
<<goto _gotoPassage>>
@@ -377,34 +378,35 @@
<<widget "NationalityPresetVanillaAsia">>
<<link "Vanilla Asia">>
<<set $nationalities = {
- Bangladeshi: 3,
+ Bangladeshi: 4,
Bhutanese: 1,
Bruneian: 1,
Burmese: 2,
Cambodian: 1,
- Chinese: 14,
+ Chinese: 15,
"East Timorese": 1,
- Filipina: 2,
- Indian: 10,
- Japanese: 2,
- Kazakh: 1,
+ Filipina: 3,
+ Indian: 11,
+ Indonesian: 5,
+ Japanese: 3,
+ Kazakh: 2,
Korean: 2,
Kyrgyz: 1,
Laotian: 1,
- Malaysian: 2,
+ Malaysian: 3,
Maldivian: 1,
Mongolian: 1,
- Nepalese: 1,
- Pakistani: 2,
+ Nepalese: 2,
+ Pakistani: 3,
Singaporean: 1,
"Sri Lankan": 1,
Taiwanese: 1,
Tajik: 1,
- Thai: 2,
+ Thai: 3,
Tibetan: 1,
Turkmen: 1,
- Uzbek: 1,
- Vietnamese: 2
+ Uzbek: 2,
+ Vietnamese: 3
}>>
<<set _gotoPassage = passage()>>
<<goto _gotoPassage>>
@@ -416,50 +418,50 @@
<<set $nationalities = {
Albanian: 1,
Andorran: 1,
- Austrian: 1,
+ Austrian: 2,
Belarusian: 1,
- Belgian: 1,
+ Belgian: 2,
Bosnian: 1,
- British: 2,
- Bulgarian: 1,
+ British: 3,
+ Bulgarian: 2,
Catalan: 1,
Croatian: 1,
- Czech: 1,
- Danish: 1,
- Dutch: 1,
- Estonian: 1,
- Finnish: 1,
- French: 2,
+ Czech: 2,
+ Danish: 2,
+ Dutch: 2,
+ Estonian: 2,
+ Finnish: 2,
+ French: 3,
German: 3,
- Greek: 1,
- Hungarian: 1,
- Icelandic: 1,
- Irish: 1,
- Italian: 2,
+ Greek: 2,
+ Hungarian: 2,
+ Icelandic: 2,
+ Irish: 2,
+ Italian: 3,
Kosovan: 1,
Latvian: 1,
"a Liechtensteiner": 1,
- Lithuanian: 1,
+ Lithuanian: 2,
Luxembourgian: 1,
Macedonian: 1,
Maltese: 1,
Moldovan: 1,
Monégasque: 1,
Montenegrin: 1,
- Norwegian: 1,
- Polish: 2,
- Portuguese: 1,
- Romanian: 1,
+ Norwegian: 2,
+ Polish: 3,
+ Portuguese: 2,
+ Romanian: 2,
Russian: 4,
Sammarinese: 1,
Scottish: 1,
- Serbian: 1,
- Slovak: 1,
+ Serbian: 2,
+ Slovak: 2,
Slovene: 1,
- Spanish: 2,
- Swedish: 1,
- Swiss: 1,
- Ukrainian: 2,
+ Spanish: 3,
+ Swedish: 2,
+ Swiss: 2,
+ Ukrainian: 3,
Vatican: 1
}>>
<<set _gotoPassage = passage()>>
@@ -480,7 +482,7 @@
Micronesian: 1,
Nauruan: 1,
"New Caledonian": 1,
- "a New Zealander": 1,
+ "a New Zealander": 2,
"Ni-Vanuatu": 1,
Niuean: 1,
Palauan: 1,
@@ -495,57 +497,246 @@
<</link>>
<</widget>>
+<<widget "NationalityPresetModNA">>
+<<link "Realism North America">>
+ <<set $nationalities = {
+ American: 36503,
+ Antiguan: 11,
+ Aruban: 10,
+ Bahamian: 45,
+ Barbadian: 28,
+ Belizean: 50,
+ Bermudian: 5,
+ Canadian: 4188,
+ "Costa Rican": 555,
+ Cuban: 1141,
+ Dominican: 1249,
+ Dominiquais: 7,
+ Greenlandic: 5,
+ Grenadian: 11,
+ Guatemalan: 2277,
+ Haitian: 1303,
+ Honduran: 1177,
+ Jamaican: 290,
+ Kittitian: 6,
+ Mexican: 15306,
+ Nicaraguan: 731,
+ Panamanian: 515,
+ "Puerto Rican": 354,
+ "Saint Lucian": 18,
+ Salvadoran: 688,
+ Trinidadian: 136,
+ Vincentian: 11
+ }>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
+<</widget>>
+
+<<widget "NationalityPresetModSA">>
+<<link "Realism South America">>
+ <<set $nationalities = {
+ Argentinian: 5102,
+ Bolivian: 1392,
+ Brazilian: 22920,
+ Chilean: 2005,
+ Colombian: 5105,
+ Ecuadorian: 2055,
+ "French Guianan": 41,
+ Guyanese: 83,
+ Paraguayan: 817,
+ Peruvian: 3829,
+ Surinamese: 63,
+ Uruguayan: 362,
+ Venezuelan: 3826
+ }>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
+<</widget>>
+
+<<widget "NationalityPresetModME">>
+<<link "Realism Middle East">>
+ <<set $nationalities = {
+ Afghan: 5090,
+ Armenian: 286,
+ Azerbaijani: 1086,
+ Bahraini: 212,
+ Cypriot: 131,
+ Egyptian: 12826,
+ Emirati: 1164,
+ Georgian: 366,
+ Iranian: 9047,
+ Iraqi: 5982,
+ Israeli: 1062,
+ Jordanian: 1184,
+ Kurdish: 7258,
+ Kuwaiti: 511,
+ Lebanese: 533,
+ Omani: 612,
+ Palestinian: 746,
+ Qatari: 340,
+ Saudi: 4131,
+ Syrian: 2888,
+ Turkish: 9091,
+ Yemeni: 3996
+ }>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
+<</widget>>
+
+<<widget "NationalityPresetModAfrica">>
+<<link "Realism Africa">>
+ <<set $nationalities = {
+ Algerian: 5107,
+ Angolan: 5166,
+ Beninese: 1756,
+ "Bissau-Guinean": 275,
+ Burkinabé: 3105,
+ Burundian: 1797,
+ Cameroonian: 3688,
+ "Cape Verdean": 66,
+ "Central African": 679,
+ Chadian: 2431,
+ Comorian: 116,
+ Congolese: 827,
+ Djiboutian: 118,
+ Equatoguinean: 210,
+ Eritrean: 742,
+ Ethiopian: 15303,
+ Gabonese: 282,
+ Gambian: 338,
+ Ghanan: 4071,
+ Guinean: 1978,
+ Ivorian: 3741,
+ Kenyan: 7408,
+ Liberian: 727,
+ Libyan: 760,
+ Malagasy: 3989,
+ Malawian: 3010,
+ Malian: 3098,
+ Mauritanian: 676,
+ Mauritian: 128,
+ Moroccan: 4240,
+ Mosotho: 275,
+ Motswana: 297,
+ Mozambican: 4824,
+ Namibian: 352,
+ Nigerian: 29732,
+ Nigerien: 4187,
+ Rwandan: 1754,
+ Sahrawi: 80,
+ "São Toméan": 29,
+ Senegalese: 2486,
+ Seychellois: 9,
+ "Sierra Leonean": 1056,
+ Somali: 2469,
+ "South African": 6688,
+ "South Sudanese": 1918,
+ Sudanese: 6099,
+ Swazi: 177,
+ Tanzanian: 9586,
+ Togolese: 1166,
+ Tunisian: 1316,
+ Ugandan: 7338,
+ Zairian: 13815,
+ Zambian: 2844,
+ Zimbabwean: 2355
+ }>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
+<</widget>>
+
+<<widget "NationalityPresetModAsia">>
+<<link "Realism Asia">>
+ <<set $nationalities = {
+ Bangladeshi: 19160,
+ Bhutanese: 94,
+ Bruneian: 50,
+ Burmese: 6043,
+ Cambodian: 1972,
+ Chinese: 143350,
+ "East Timorese": 187,
+ Filipina: 13266,
+ Indian: 156457,
+ Indonesian: 30475,
+ Japanese: 11849,
+ Kazakh: 2095,
+ Korean: 7977,
+ Kyrgyz: 730,
+ Laotian: 841,
+ Malaysian: 3838,
+ Maldivian: 52,
+ Mongolian: 369,
+ Nepalese: 3456,
+ Pakistani: 26109,
+ Singaporean: 647,
+ "Sri Lankan": 2149,
+ Taiwanese: 2410,
+ Tajik: 1202,
+ Thai: 6919,
+ Tibetan: 435,
+ Turkmen: 707,
+ Uzbek: 3805,
+ Vietnamese: 3255
+ }>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
+<</widget>>
+
/* I need reweighting and possibly country additions */
<<widget "NationalityPresetModEurope">>
-<<link "Europe">>
+<<link "Realism Europe">>
<<set $nationalities = {
- Albanian: 29,
- Andorran: 1,
- Austrian: 87,
- Belarusian: 95,
- Belgian: 114,
- Bosnian: 35,
- British: 662,
- Bulgarian: 71,
- Catalan: 75,
- Croatian: 42,
- Czech: 106,
- Danish: 57,
- Dutch: 170,
- Estonian: 13,
- Finnish: 55,
- French: 650,
- German: 821,
- Greek: 112,
- Hungarian: 97,
- Irish: 48,
- Italian: 594,
- Icelandic: 3,
- Kosovan: 22,
- Latvian: 19,
- "a Liechtensteiner": 1,
- Lithuanian: 29,
- Luxembourgian: 6,
- Macedonian: 21,
- Maltese: 4,
- Moldovan: 41,
- Monégasque: 1,
- Montenegrin: 6,
- Norwegian: 53,
- Polish: 382,
- Portuguese: 103,
- Romanian: 197,
- Russian: 1440,
- Sammarinese: 1,
- Scottish: 54,
- Serbian: 88,
- Slovak: 54,
- Slovene: 21,
- Spanish: 464,
- Swedish: 99,
- Swiss: 85,
- Turkish: 807,
- Ukrainian: 442,
+ Albanian: 289,
+ Andorran: 7,
+ Austrian: 897,
+ Belarusian: 899,
+ Belgian: 1215,
+ Bosnian: 333,
+ British: 7189,
+ Bulgarian: 615,
+ Catalan: 767,
+ Croatian: 379,
+ Czech: 1039,
+ Danish: 611,
+ Dutch: 1769,
+ Estonian: 122,
+ Finnish: 578,
+ French: 6886,
+ German: 8173,
+ Greek: 1062,
+ Hungarian: 900,
+ Icelandic: 37,
+ Irish: 537,
+ Italian: 5753,
+ Kosovan: 193,
+ Latvian: 168,
+ "a Liechtensteiner": 4,
+ Lithuanian: 263,
+ Luxembourgian: 70,
+ Macedonian: 205,
+ Maltese: 43,
+ Moldovan: 372,
+ Monégasque: 4,
+ Montenegrin: 61,
+ Norwegian: 619,
+ Polish: 3569,
+ Portuguese: 969,
+ Romanian: 1797,
+ Russian: 13807,
+ Sammarinese: 3,
+ Scottish: 575,
+ Serbian: 814,
+ Slovak: 530,
+ Slovene: 203,
+ Spanish: 4586,
+ Swedish: 1094,
+ Swiss: 941,
+ Ukrainian: 3989,
Vatican: 1
}>>
<<set _gotoPassage = passage()>>
@@ -553,6 +744,34 @@
<</link>>
<</widget>>
+<<widget "NationalityPresetModAustralia">>
+<<link "Realism Australia">>
+ <<set $nationalities = {
+ Australian: 2952,
+ "a Cook Islander": 1,
+ Fijian: 98,
+ "French Polynesian": 31,
+ Guamanian: 18,
+ "I-Kiribati": 15,
+ Marshallese: 5,
+ Micronesian: 12,
+ Nauruan: 1,
+ "New Caledonian": 33,
+ "a New Zealander": 536,
+ "Ni-Vanuatu": 38,
+ Niuean: 1,
+ Palauan: 2,
+ "Papua New Guinean": 1136,
+ Samoan: 22,
+ "a Solomon Islander": 83,
+ Tongan: 12,
+ Tuvaluan: 1
+ }>>
+ <<set _gotoPassage = passage()>>
+ <<goto _gotoPassage>>
+<</link>>
+<</widget>>
+
<<widget "NationalityPresetModEastAsia">>
<<link "East Asia">>
<<set $nationalities = {Chinese: 21, Japanese: 2, Korean: 1}>>
@@ -601,7 +820,7 @@
/* I need reweighting */
<<widget "NationalityPresetModGlobalRealism">>
-<<link "Global Realism">>
+<<link "Realism Global">>
<<set $nationalities = {
Afghan: 5090,
Albanian: 289,
@@ -730,9 +949,9 @@
Mexican: 15306,
Micronesian: 12,
Moldovan: 372,
+ Monégasque: 4,
Mongolian: 369,
Montenegrin: 61,
- Monégasque: 4,
Moroccan: 4240,
Mosotho: 275,
Motswana: 297,