From 584beb070d3907406b598f81b8dd8252de3a12ea Mon Sep 17 00:00:00 2001 From: klorpa <klorpa@yahoo.com> Date: Sun, 25 Mar 2018 22:56:21 -0400 Subject: [PATCH] Update initNationalities.tw --- src/events/intro/initNationalities.tw | 198 +++++++++++++++++--------- 1 file changed, 134 insertions(+), 64 deletions(-) diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index 335580af22c..bda92bc8960 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -104,10 +104,10 @@ <<set $arcologies[0].FSSupremacistRace = "white">> <<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, "Dominican","Dominican")>> - <<set hashPush($nationalities, "Canadian","Canadian")>> + <<set hashPush($nationalities, "American", "American", "American", "American", "American", "American")>> + <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican")>> + <<set hashPush($nationalities, "Dominican", "Dominican")>> + <<set hashPush($nationalities, "Canadian", "Canadian")>> <<set hashPush($nationalities, "Haitian")>> <<set hashPush($nationalities, "Cuban")>> <<set hashPush($nationalities, "Puerto Rican")>> @@ -127,9 +127,9 @@ <<set $arcologies[0].FSSupremacistRace = "latina">> <<set $arcologies[0].FSSubjugationistRace = "black">> <<if ndef $customVariety>> - <<set hashPush($nationalities, "Brazilian","Brazilian","Brazilian","Brazilian")>> - <<set hashPush($nationalities, "Argentinian","Argentinian")>> - <<set hashPush($nationalities, "Colombian","Colombian")>> + <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian")>> + <<set hashPush($nationalities, "Argentinian", "Argentinian")>> + <<set hashPush($nationalities, "Colombian", "Colombian")>> <<set hashPush($nationalities, "Peruvian")>> <<set hashPush($nationalities, "Venezuelan")>> <<set hashPush($nationalities, "Bolivian")>> @@ -146,9 +146,9 @@ <<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, "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, "Peruvian")>> <<set hashPush($nationalities, "Venezuelan")>> <<set hashPush($nationalities, "Bolivian")>> @@ -186,18 +186,19 @@ <<set hashPush($nationalities, "Kuwaiti")>> <<set hashPush($nationalities, "Qatari")>> <<set hashPush($nationalities, "Palestinian")>> + <<set hashPush($nationalities, "Kurdish")>> <</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, "South African", "South African", "South African")>> <<set hashPush($nationalities, "Kenyan", "Kenyan")>> - <<set hashPush($nationalities, "Congolese", "Congolese")>> + <<set hashPush($nationalities, "Zairian", "Zairian")>> <<set hashPush($nationalities, "Ethiopian", "Ethiopian")>> - <<set hashPush($nationalities, "Algerian","Algerian")>> - <<set hashPush($nationalities, "Sudanese","Sudanese")>> + <<set hashPush($nationalities, "Algerian", "Algerian")>> + <<set hashPush($nationalities, "Sudanese", "Sudanese")>> <<set hashPush($nationalities, "Moroccan")>> <<set hashPush($nationalities, "Ghanan")>> <<set hashPush($nationalities, "Tunisian")>> @@ -214,22 +215,53 @@ <<set hashPush($nationalities, "Nigerien")>> <<set hashPush($nationalities, "Burundian")>> <<set hashPush($nationalities, "Seychellois")>> + <<set hashPush($nationalities, "Equatoguinean")>> + <<set hashPush($nationalities, "Bissau-Guinean")>> + <<set hashPush($nationalities, "Chadian")>> + <<set hashPush($nationalities, "Comorian")>> + <<set hashPush($nationalities, "Ivorian")>> + <<set hashPush($nationalities, "Mauritanian")>> + <<set hashPush($nationalities, "Mauritian")>> + <<set hashPush($nationalities, "Mosotho")>> + <<set hashPush($nationalities, "Sierra Leonean")>> + <<set hashPush($nationalities, "Swazi")>> + <<set hashPush($nationalities, "Angolan")>> + <<set hashPush($nationalities, "Sahrawi")>> + <<set hashPush($nationalities, "Burkinabé")>> + <<set hashPush($nationalities, "Cape Verdean")>> + <<set hashPush($nationalities, "Motswana")>> + <<set hashPush($nationalities, "Somali")>> + <<set hashPush($nationalities, "Rwandan")>> + <<set hashPush($nationalities, "São Toméan")>> + <<set hashPush($nationalities, "Beninese")>> + <<set hashPush($nationalities, "Central African")>> + <<set hashPush($nationalities, "Gambian")>> + <<set hashPush($nationalities, "Senegalese")>> + <<set hashPush($nationalities, "Togolese")>> + <<set hashPush($nationalities, "Eritrean")>> + <<set hashPush($nationalities, "Guinean")>> + <<set hashPush($nationalities, "Malawian")>> + <<set hashPush($nationalities, "Congolese")>> + <<set hashPush($nationalities, "Liberian")>> + <<set hashPush($nationalities, "Mozambican")>> + <<set hashPush($nationalities, "Namibian")>> + <<set hashPush($nationalities, "South Sudanese")>> <</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, "Indonesian","Indonesian","Indonesian")>> - <<set hashPush($nationalities, "Bangladeshi","Bangladeshi","Bangladeshi")>> - <<set hashPush($nationalities, "Thai","Thai")>> - <<set hashPush($nationalities, "Vietnamese","Vietnamese")>> - <<set hashPush($nationalities, "Korean","Korean")>> - <<set hashPush($nationalities, "Pakistani","Pakistani")>> - <<set hashPush($nationalities, "Filipina","Filipina")>> - <<set hashPush($nationalities, "Japanese","Japanese")>> - <<set hashPush($nationalities, "Burmese","Burmese")>> + <<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, "Indonesian", "Indonesian", "Indonesian")>> + <<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi")>> + <<set hashPush($nationalities, "Thai", "Thai")>> + <<set hashPush($nationalities, "Vietnamese", "Vietnamese")>> + <<set hashPush($nationalities, "Korean", "Korean")>> + <<set hashPush($nationalities, "Pakistani", "Pakistani")>> + <<set hashPush($nationalities, "Filipina", "Filipina")>> + <<set hashPush($nationalities, "Japanese", "Japanese")>> + <<set hashPush($nationalities, "Burmese", "Burmese")>> <<set hashPush($nationalities, "Malaysian", "Malaysian")>> <<set hashPush($nationalities, "Uzbek")>> <<set hashPush($nationalities, "Nepalese")>> @@ -247,6 +279,7 @@ <<set hashPush($nationalities, "Sri Lankan")>> <<set hashPush($nationalities, "Tajik")>> <<set hashPush($nationalities, "Turkmen")>> + <<set hashPush($nationalities, "Tibetan")>> <</if>> <<case "Europe">> <<set $arcologies[0].FSSupremacistRace = "white">> @@ -254,7 +287,7 @@ <<if ndef $customVariety>> <<set hashPush($nationalities, "Russian", "Russian", "Russian", "Russian")>> <<set hashPush($nationalities, "German", "German", "German")>> - <<set hashPush($nationalities, "Belarusian","Belarusian")>> + <<set hashPush($nationalities, "Belarusian", "Belarusian")>> <<set hashPush($nationalities, "Ukrainian", "Ukrainian")>> <<set hashPush($nationalities, "French", "French")>> <<set hashPush($nationalities, "Italian", "Italian")>> @@ -299,11 +332,12 @@ <<set hashPush($nationalities, "Belarusian")>> <<set hashPush($nationalities, "Latvian")>> <<set hashPush($nationalities, "Slovene")>> + <<set hashPush($nationalities, "Catalan")>> <</if>> <<case "Australia">> <<set $arcologies[0].FSSupremacistRace = "white">> <<set $arcologies[0].FSSubjugationistRace = "asian">> - <<set hashPush($nationalities, "Australian","Australian","Australian")>> + <<set hashPush($nationalities, "Australian", "Australian", "Australian")>> <<set hashPush($nationalities, "a New Zealander")>> <<set hashPush($nationalities, "Marshallese")>> <<set hashPush($nationalities, "Tuvaluan")>> @@ -319,11 +353,12 @@ <<set hashPush($nationalities, "Samoan")>> <<set hashPush($nationalities, "a Solomon Islander")>> <<set hashPush($nationalities, "Tongan")>> + <<set hashPush($nationalities, "French Polynesian")>> <<case "Japan">> <<set $arcologies[0].FSSupremacistRace = "asian">> <<set $arcologies[0].FSSubjugationistRace = "asian">> <<if ndef $customVariety>> - <<set hashPush($nationalities, "Japanese","Japanese","Japanese")>> + <<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>> <</if>> <</switch>> <</if>> @@ -332,43 +367,43 @@ <<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, "Russian","Russian","Russian")>> - <<set hashPush($nationalities, "Belarusian","Belarusian","Belarusian")>> - <<set hashPush($nationalities, "Nigerian","Nigerian","Nigerian")>> - <<set hashPush($nationalities, "South African","South African","South African")>> - <<set hashPush($nationalities, "Brazilian","Brazilian","Brazilian")>> - <<set hashPush($nationalities, "Mexican","Mexican","Mexican")>> - <<set hashPush($nationalities, "Dominican","Dominican","Dominican")>> - <<set hashPush($nationalities, "Argentinian","Argentinian")>> - <<set hashPush($nationalities, "Egyptian","Egyptian")>> - <<set hashPush($nationalities, "Pakistani","Pakistani")>> - <<set hashPush($nationalities, "Filipina","Filipina")>> - <<set hashPush($nationalities, "Vietnamese","Vietnamese")>> - <<set hashPush($nationalities, "Iranian","Iranian")>> - <<set hashPush($nationalities, "Korean","Korean")>> - <<set hashPush($nationalities, "Japanese","Japanese")>> - <<set hashPush($nationalities, "Thai","Thai")>> - <<set hashPush($nationalities, "Turkish","Turkish")>> - <<set hashPush($nationalities, "Ethiopian","Ethiopian")>> + <<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, "Russian", "Russian", "Russian")>> + <<set hashPush($nationalities, "Belarusian", "Belarusian", "Belarusian")>> + <<set hashPush($nationalities, "Nigerian", "Nigerian", "Nigerian")>> + <<set hashPush($nationalities, "South African", "South African", "South African")>> + <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian")>> + <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican")>> + <<set hashPush($nationalities, "Dominican", "Dominican", "Dominican")>> + <<set hashPush($nationalities, "Argentinian", "Argentinian")>> + <<set hashPush($nationalities, "Egyptian", "Egyptian")>> + <<set hashPush($nationalities, "Pakistani", "Pakistani")>> + <<set hashPush($nationalities, "Filipina", "Filipina")>> + <<set hashPush($nationalities, "Vietnamese", "Vietnamese")>> + <<set hashPush($nationalities, "Iranian", "Iranian")>> + <<set hashPush($nationalities, "Korean", "Korean")>> + <<set hashPush($nationalities, "Japanese", "Japanese")>> + <<set hashPush($nationalities, "Thai", "Thai")>> + <<set hashPush($nationalities, "Turkish", "Turkish")>> + <<set hashPush($nationalities, "Ethiopian", "Ethiopian")>> <<set hashPush($nationalities, "Kenyan", "Kenyan")>> - <<set hashPush($nationalities, "Congolese","Congolese")>> - <<set hashPush($nationalities, "Colombian","Colombian")>> - <<set hashPush($nationalities, "Venezuelan","Venezuelan")>> - <<set hashPush($nationalities, "German","German")>> - <<set hashPush($nationalities, "French","French")>> - <<set hashPush($nationalities, "British","British")>> - <<set hashPush($nationalities, "Italian","Italian")>> - <<set hashPush($nationalities, "Spanish","Spanish")>> - <<set hashPush($nationalities, "Ukrainian","Ukrainian")>> - <<set hashPush($nationalities, "Polish","Polish")>> - <<set hashPush($nationalities, "Burmese","Burmese")>> - <<set hashPush($nationalities, "Algerian","Algerian")>> - <<set hashPush($nationalities, "Sudanese","Sudanese")>> + <<set hashPush($nationalities, "Zairian", "Zairian")>> + <<set hashPush($nationalities, "Colombian", "Colombian")>> + <<set hashPush($nationalities, "Venezuelan", "Venezuelan")>> + <<set hashPush($nationalities, "German", "German")>> + <<set hashPush($nationalities, "French", "French")>> + <<set hashPush($nationalities, "British", "British")>> + <<set hashPush($nationalities, "Italian", "Italian")>> + <<set hashPush($nationalities, "Spanish", "Spanish")>> + <<set hashPush($nationalities, "Ukrainian", "Ukrainian")>> + <<set hashPush($nationalities, "Polish", "Polish")>> + <<set hashPush($nationalities, "Burmese", "Burmese")>> + <<set hashPush($nationalities, "Algerian", "Algerian")>> + <<set hashPush($nationalities, "Sudanese", "Sudanese")>> <<set hashPush($nationalities, "Malaysian", "Malaysian")>> <<set hashPush($nationalities, "Lebanese")>> <<set hashPush($nationalities, "Tunisian")>> @@ -507,6 +542,41 @@ <<set hashPush($nationalities, "Samoan")>> <<set hashPush($nationalities, "a Solomon Islander")>> <<set hashPush($nationalities, "Tongan")>> + <<set hashPush($nationalities, "Catalan")>> + <<set hashPush($nationalities, "Equatoguinean")>> + <<set hashPush($nationalities, "French Polynesian")>> + <<set hashPush($nationalities, "Kurdish")>> + <<set hashPush($nationalities, "Tibetan")>> + <<set hashPush($nationalities, "Bissau-Guinean")>> + <<set hashPush($nationalities, "Chadian")>> + <<set hashPush($nationalities, "Comorian")>> + <<set hashPush($nationalities, "Ivorian")>> + <<set hashPush($nationalities, "Mauritanian")>> + <<set hashPush($nationalities, "Mauritian")>> + <<set hashPush($nationalities, "Mosotho")>> + <<set hashPush($nationalities, "Sierra Leonean")>> + <<set hashPush($nationalities, "Swazi")>> + <<set hashPush($nationalities, "Angolan")>> + <<set hashPush($nationalities, "Sahrawi")>> + <<set hashPush($nationalities, "Burkinabé")>> + <<set hashPush($nationalities, "Cape Verdean")>> + <<set hashPush($nationalities, "Motswana")>> + <<set hashPush($nationalities, "Somali")>> + <<set hashPush($nationalities, "Rwandan")>> + <<set hashPush($nationalities, "São Toméan")>> + <<set hashPush($nationalities, "Beninese")>> + <<set hashPush($nationalities, "Central African")>> + <<set hashPush($nationalities, "Gambian")>> + <<set hashPush($nationalities, "Senegalese")>> + <<set hashPush($nationalities, "Togolese")>> + <<set hashPush($nationalities, "Eritrean")>> + <<set hashPush($nationalities, "Guinean")>> + <<set hashPush($nationalities, "Malawian")>> + <<set hashPush($nationalities, "Congolese")>> + <<set hashPush($nationalities, "Liberian")>> + <<set hashPush($nationalities, "Mozambican")>> + <<set hashPush($nationalities, "Namibian")>> + <<set hashPush($nationalities, "South Sudanese")>> <</if>> <</if>> <</if>> -- GitLab