diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 76105b5f5248b929736e897466927be4f17202a9..45fdd0dff995417b0bd0a6137630d3ab1f688160 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -558,20 +558,48 @@
<br>North America<br>
<<NOptions "American" >>
<<print " | ">>
+ <<NOptions "Bahamian" >>
+ <<print " | ">>
+ <<NOptions "Barbadian" >>
+ <<print " | ">>
+ <<NOptions "Belizean" >>
+ <<print " | ">>
+ <<NOptions "Bermudian" >>
+ <<print " | ">>
<<NOptions "Canadian" >>
<<print " | ">>
+ <<NOptions "Costa Rican" >>
+ <<print " | ">>
<<NOptions "Cuban" >>
<<print " | ">>
<<NOptions "Dominican" >>
<<print " | ">>
+ <<NOptions "Dominiquais" >>
+ <br>
+ <<NOptions "Greenlandic" >>
+ <<print " | ">>
+ <<NOptions "Grenadian" >>
+ <<print " | ">>
+ <<NOptions "Guatemalan" >>
+ <<print " | ">>
<<NOptions "Haitian" >>
<<print " | ">>
+ <<NOptions "Honduran" >>
+ <<print " | ">>
<<NOptions "Jamaican" >>
<<print " | ">>
<<NOptions "Mexican" >>
<<print " | ">>
+ <<NOptions "Nicaraguan" >>
+ <<print " | ">>
+ <<NOptions "Panamanian" >>
+ <<print " | ">>
<<NOptions "Puerto Rican" >>
<br>
+ <<NOptions "Salvadoran" >>
+ <<print " | ">>
+ <<NOptions "Trinidadian" >>
+ <br>
<br>South America<br>
<<NOptions "Argentinian" >>
@@ -584,22 +612,46 @@
<<print " | ">>
<<NOptions "Colombian" >>
<<print " | ">>
- <<NOptions "Guatemalan" >>
- <<print " | ">>
+ <<NOptions "Ecuadorian" >>
+ <<print " | ">>
+ <<NOptions "French Guianan" >>
+ <<print " | ">>
+ <<NOptions "Guyanese" >>
+ <<print " | ">>
+ <<NOptions "Paraguayan" >>
+ <<print " | ">>
<<NOptions "Peruvian" >>
+ <br>
+ <<NOptions "Peruvian" >>
+ <<print " | ">>
+ <<NOptions "Surinamese" >>
+ <<print " | ">>
+ <<NOptions "Uruguayan" >>
<<print " | ">>
<<NOptions "Venezuelan" >>
<br>
<br>Europe<br>
+ <<NOptions "Albanian" >>
+ <<print " | ">>
+ <<NOptions "Andorran" >>
+ <<print " | ">>
<<NOptions "Austrian" >>
<<print " | ">>
<<NOptions "Belarusian" >>
<<print " | ">>
<<NOptions "Belgian" >>
<<print " | ">>
+ <<NOptions "Bosnian" >>
+ <<print " | ">>
<<NOptions "British" >>
<<print " | ">>
+ <<NOptions "Bulgarian" >>
+ <<print " | ">>
+ <<NOptions "Catalan" >>
+ <<print " | ">>
+ <<NOptions "Croatian" >>
+ <br>
<<NOptions "Czech" >>
<<print " | ">>
<<NOptions "Danish" >>
@@ -611,7 +663,7 @@
<<NOptions "Finnish" >>
<<print " | ">>
<<NOptions "French" >>
- <br>
+ <<print " | ">>
<<NOptions "German" >>
<<print " | ">>
<<NOptions "Greek" >>
@@ -619,29 +671,51 @@
<<NOptions "Hungarian" >>
<<print " | ">>
<<NOptions "Icelandic" >>
- <<print " | ">>
+ <br>
<<NOptions "Irish" >>
<<print " | ">>
<<NOptions "Italian" >>
<<print " | ">>
+ <<NOptions "Kosovan" >>
+ <<print " | ">>
+ <<NOptions "Latvian" >>
+ <<print " | ">>
+ <<NOptions "a Liechtensteiner" >>
+ <<print " | ">>
<<NOptions "Lithuanian" >>
<<print " | ">>
+ <<NOptions "Luxembourgian" >>
+ <<print " | ">>
+ <<NOptions "Macedonian" >>
+ <<print " | ">>
+ <<NOptions "Maltese" >>
+ <<print " | ">>
+ <<NOptions "Moldovan" >>
+ <br>
+ <<NOptions "Monégasque" >>
+ <<print " | ">>
+ <<NOptions "Montenegrin" >>
+ <<print " | ">>
<<NOptions "Norwegian" >>
<<print " | ">>
<<NOptions "Polish" >>
- <br>
+ <<print " | ">>
<<NOptions "Portuguese" >>
<<print " | ">>
<<NOptions "Romanian" >>
<<print " | ">>
<<NOptions "Russian" >>
<<print " | ">>
+ <<NOptions "Sammarinese" >>
+ <<print " | ">>
<<NOptions "Scottish" >>
<<print " | ">>
<<NOptions "Serbian" >>
- <<print " | ">>
+ <br>
<<NOptions "Slovak" >>
<<print " | ">>
+ <<NOptions "Slovene" >>
+ <<print " | ">>
<<NOptions "Spanish" >>
<<print " | ">>
<<NOptions "Swedish" >>
@@ -649,35 +723,65 @@
<<NOptions "Swiss" >>
<<print " | ">>
<<NOptions "Ukrainian" >>
+ <<print " | ">>
+ <<NOptions "Vatican" >>
<br>
<br>Asia<br>
<<NOptions "Bangladeshi" >>
<<print " | ">>
+ <<NOptions "Bhutanese" >>
+ <<print " | ">>
+ <<NOptions "Bruneian" >>
+ <<print " | ">>
<<NOptions "Burmese" >>
<<print " | ">>
+ <<NOptions "Cambodian" >>
+ <<print " | ">>
<<NOptions "Chinese" >>
<<print " | ">>
+ <<NOptions "East Timorese" >>
+ <<print " | ">>
<<NOptions "Filipina" >>
<<print " | ">>
<<NOptions "Indian" >>
<<print " | ">>
<<NOptions "Indonesian" >>
- <<print " | ">>
+ <br>
<<NOptions "Japanese" >>
<<print " | ">>
<<NOptions "Kazakh" >>
- <br>
+ <<print " | ">>
<<NOptions "Korean" >>
<<print " | ">>
+ <<NOptions "Kyrgyz" >>
+ <<print " | ">>
+ <<NOptions "Laotian" >>
+ <<print " | ">>
<<NOptions "Malaysian" >>
<<print " | ">>
+ <<NOptions "Maldivian" >>
+ <<print " | ">>
+ <<NOptions "Mongolian" >>
+ <<print " | ">>
<<NOptions "Nepalese" >>
<<print " | ">>
<<NOptions "Pakistani" >>
+ <br>
+ <<NOptions "Singaporean" >>
+ <<print " | ">>
+ <<NOptions "Sri Lankan" >>
+ <<print " | ">>
+ <<NOptions "Taiwanese" >>
+ <<print " | ">>
+ <<NOptions "Tajik" >>
<<print " | ">>
<<NOptions "Thai" >>
<<print " | ">>
+ <<NOptions "Tibetan" >>
+ <<print " | ">>
+ <<NOptions "Turkmen" >>
+ <<print " | ">>
<<NOptions "Uzbek" >>
<<print " | ">>
<<NOptions "Vietnamese" >>
@@ -688,24 +792,42 @@
<<print " | ">>
<<NOptions "Armenian" >>
<<print " | ">>
+ <<NOptions "Azerbaijani" >>
+ <<print " | ">>
+ <<NOptions "Bahraini" >>
+ <<print " | ">>
+ <<NOptions "Cypriot" >>
+ <<print " | ">>
<<NOptions "Egyptian" >>
<<print " | ">>
<<NOptions "Emirati" >>
<<print " | ">>
+ <<NOptions "Georgian" >>
+ <<print " | ">>
<<NOptions "Iranian" >>
<<print " | ">>
<<NOptions "Iraqi" >>
- <<print " | ">>
+ <br>
<<NOptions "Israeli" >>
<<print " | ">>
<<NOptions "Jordanian" >>
<<print " | ">>
+ <<NOptions "Kurdish" >>
+ <<print " | ">>
+ <<NOptions "Kuwaiti" >>
+ <<print " | ">>
<<NOptions "Lebanese" >>
<<print " | ">>
<<NOptions "Omani" >>
<<print " | ">>
+ <<NOptions "Palestinian" >>
+ <<print " | ">>
+ <<NOptions "Qatari" >>
+ <<print " | ">>
<<NOptions "Saudi" >>
<<print " | ">>
+ <<NOptions "Syrian" >>
+ <br>
<<NOptions "Turkish" >>
<<print " | ">>
<<NOptions "Yemeni" >>
@@ -714,31 +836,107 @@
<br>Africa<br>
<<NOptions "Algerian" >>
<<print " | ">>
+ <<NOptions "Angolan" >>
+ <<print " | ">>
+ <<NOptions "Beninese" >>
+ <<print " | ">>
+ <<NOptions "Bissau-Guinean" >>
+ <<print " | ">>
+ <<NOptions "Burkinabé" >>
+ <<print " | ">>
+ <<NOptions "Burundian" >>
+ <<print " | ">>
+ <<NOptions "Cameroonian" >>
+ <<print " | ">>
+ <<NOptions "Cape Verdean" >>
+ <<print " | ">>
+ <<NOptions "Central African" >>
+ <<print " | ">>
+ <<NOptions "Chadian" >>
+ <br>
+ <<NOptions "Comorian" >>
+ <<print " | ">>
<<NOptions "Congolese" >>
<<print " | ">>
+ <<NOptions "Djiboutian" >>
+ <<print " | ">>
+ <<NOptions "Equatoguinean" >>
+ <<print " | ">>
+ <<NOptions "Eritrean" >>
+ <<print " | ">>
<<NOptions "Ethiopian" >>
<<print " | ">>
+ <<NOptions "Gabonese" >>
+ <<print " | ">>
+ <<NOptions "Gambian" >>
+ <<print " | ">>
<<NOptions "Ghanan" >>
<<print " | ">>
+ <<NOptions "Guinean" >>
+ <br>
+ <<NOptions "Ivorian" >>
+ <<print " | ">>
<<NOptions "Kenyan" >>
<<print " | ">>
+ <<NOptions "Liberian" >>
+ <<print " | ">>
<<NOptions "Libyan" >>
<<print " | ">>
+ <<NOptions "Malagasy" >>
+ <<print " | ">>
+ <<NOptions "Malawian" >>
+ <<print " | ">>
<<NOptions "Malian" >>
<<print " | ">>
+ <<NOptions "Mauritanian" >>
+ <<print " | ">>
+ <<NOptions "Mauritian" >>
+ <<print " | ">>
<<NOptions "Moroccan" >>
<br>
+ <<NOptions "Mosotho" >>
+ <<print " | ">>
+ <<NOptions "Motswana" >>
+ <<print " | ">>
+ <<NOptions "Mozambican" >>
+ <<print " | ">>
+ <<NOptions "Namibian" >>
+ <<print " | ">>
<<NOptions "Nigerian" >>
<<print " | ">>
- <<NOptions "South African" >>
+ <<NOptions "Nigerien" >>
+ <<print " | ">>
+ <<NOptions "Rwandan" >>
+ <<print " | ">>
+ <<NOptions "Sahrawi" >>
+ <<print " | ">>
+ <<NOptions "São Toméan" >>
+ <<print " | ">>
+ <<NOptions "Senegalese" >>
+ <br>
+ <<NOptions "Seychellois" >>
+ <<print " | ">>
+ <<NOptions "Sierra Leonean" >>
+ <<print " | ">>
+ <<NOptions "Somali" >>
+ <<print " | ">>
+ <<NOptions "South Sudanese" >>
<<print " | ">>
<<NOptions "Sudanese" >>
<<print " | ">>
+ <<NOptions "Swazi" >>
+ <<print " | ">>
<<NOptions "Tanzanian" >>
<<print " | ">>
+ <<NOptions "Togolese" >>
+ <<print " | ">>
<<NOptions "Tunisian" >>
<<print " | ">>
<<NOptions "Ugandan" >>
+ <br>
+ <<NOptions "Zairian" >>
+ <<print " | ">>
+ <<NOptions "Zambian" >>
<<print " | ">>
<<NOptions "Zimbabwean" >>
<br>
@@ -746,7 +944,37 @@
<br>Australia<br>
<<NOptions "Australian" >>
<<print " | ">>
+ <<NOptions "a Cook Islander" >>
+ <<print " | ">>
+ <<NOptions "Fijian" >>
+ <<print " | ">>
+ <<NOptions "French Polynesian" >>
+ <<print " | ">>
+ <<NOptions "I-Kiribati" >>
+ <<print " | ">>
+ <<NOptions "Marshallese" >>
+ <<print " | ">>
+ <<NOptions "Micronesian" >>
+ <<print " | ">>
+ <<NOptions "Nauruan" >>
+ <<print " | ">>
<<NOptions "a New Zealander" >>
+ <<print " | ">>
+ <<NOptions "Ni-Vanuatu" >>
+ <br>
+ <<NOptions "Niuean" >>
+ <<print " | ">>
+ <<NOptions "Palauan" >>
+ <<print " | ">>
+ <<NOptions "Papua New Guinean" >>
+ <<print " | ">>
+ <<NOptions "Samoan" >>
+ <<print " | ">>
+ <<NOptions "a Solomon Islander" >>
+ <<print " | ">>
+ <<NOptions "Tongan" >>
+ <<print " | ">>
+ <<NOptions "Tuvaluan" >>
<br>
<</replace>>
<<else>>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index bda92bc8960edba086655227934ddc500fdd0530..21a549baccb095c2501f45f327d0911f30ebccb6 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -1,4 +1,4 @@
-:: init Nationalities [silently]
+:: init Nationalities [silently]
<<set $minimumSlaveAge = variableAsNumber($minimumSlaveAge, 18, 3, 18)>>
<<set $fertilityAge = variableAsNumber($fertilityAge, 13, 3, 18)>>
@@ -122,6 +122,10 @@
<<set hashPush($nationalities, "Salvadoran")>>
<<set hashPush($nationalities, "Nicaraguan")>>
<<set hashPush($nationalities, "Panamanian")>>
+ <<set hashPush($nationalities, "Bahamian")>>
+ <<set hashPush($nationalities, "Barbadian")>>
+ <<set hashPush($nationalities, "Dominiquais")>>
+ <<set hashPush($nationalities, "Trinidadian")>>
<</if>>
<<case "South America">>
<<set $arcologies[0].FSSupremacistRace = "latina">>
@@ -134,7 +138,6 @@
<<set hashPush($nationalities, "Venezuelan")>>
<<set hashPush($nationalities, "Bolivian")>>
<<set hashPush($nationalities, "Chilean")>>
- <<set hashPush($nationalities, "Guatemalan")>>
<<set hashPush($nationalities, "Uruguayan")>>
<<set hashPush($nationalities, "Ecuadorian")>>
<<set hashPush($nationalities, "French Guianan")>>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index cdf24bd7c69194376dd44b6aad6fcf1b9a07b56a..7adffeb4f481e195a0cd4686e43d2de1ae935df1 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1,4 +1,4 @@
-:: setupVars [widget nobr]
+:: setupVars [widget nobr]
/*
* This passage is tagged as widget, so it will be loaded whenever any passage is loaded. The global setup object seems to reset itself to {} (empty object): until we figure out why, this is where we set properties for it.
@@ -15,9 +15,9 @@
<<set setup.broodSizeOneShutDown = [0, 13090, 25340, 36760, 47360, 57160, 66030, 73960, 81060, 87400, 93040, 98040, 102440, 106290, 109620, 112460, 114860, 116850, 118470, 119760, 120760, 121520, 122070, 122460, 122720, 122880, 122980, 123030, 123050, 123060, 123060, 123060, 123060, 123060, 123060, 123060, 123060, 123060]>>
/* START Custom Nationalities region filter */
-<<set setup.northamericaNationalities = ["American", "Belizean", "Bermudian", "Canadian", "Costa Rican", "Cuban", "Dominican", "Greenlandic", "Grenadian", "Guatemalan", "Haitian", "Honduran", "Jamaican", "Mexican", "Nicaraguan", "Panamanian", "Puerto Rican", "Salvadoran"]>>
+<<set setup.northamericaNationalities = ["American", "Bahamian", "Barbadian", "Belizean", "Bermudian", "Canadian", "Costa Rican", "Cuban", "Dominican", "Dominiquais", "Greenlandic", "Grenadian", "Guatemalan", "Haitian", "Honduran", "Jamaican", "Mexican", "Nicaraguan", "Panamanian", "Puerto Rican", "Salvadoran", "Trinidadian"]>>
-<<set setup.southamericaNationalities = ["Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Ecuadorian", "French Guianan", "Guatemalan", "Guyanese", "Paraguayan", "Peruvian", "Surinamese", "Uruguayan", "Venezuelan"]>>
+<<set setup.southamericaNationalities = ["Argentinian", "Bolivian", "Brazilian", "Chilean", "Colombian", "Ecuadorian", "French Guianan", "Guyanese", "Paraguayan", "Peruvian", "Surinamese", "Uruguayan", "Venezuelan"]>>
<<set setup.europeNationalities = ["Albanian", "Andorran", "Austrian", "Belarusian", "Belgian", "Bosnian", "British", "Bulgarian", "Catalan", "Croatian", "Czech", "Danish", "Dutch", "Estonian", "Finnish", "French", "German", "Greek", "Hungarian", "Icelandic", "Irish", "Italian", "Kosovan", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Macedonian", "Maltese", "Moldovan", "Monégasque", "Montenegrin", "Norwegian", "Polish", "Portuguese", "Romanian", "Russian", "Sammarinese", "Scottish", "Serbian", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Ukrainian", "Vatican"]>>
@@ -25,9 +25,9 @@
<<set setup.middleeastNationalities = ["Afghan", "Armenian", "Azerbaijani", "Bahraini", "Cypriot", "Egyptian", "Emirati", "Georgian", "Iranian", "Iraqi", "Israeli", "Jordanian", "Kurdish", "Kuwaiti", "Lebanese", "Omani", "Palestinian", "Qatari", "Saudi", "Syrian", "Turkish", "Yemeni"]>>
-<<set setup.africaNationalities = ["Algerian", "Angolan", "Beninese", "Bissau-Guinean", "Burkinabé", "Burundian", "Cameroonian", "Cape Verdean", "Central African", "Chadian", "Comorian", "Congolese", "Djiboutian", "Equatoguinean", "Eritrean", "Ethiopian", "Gabonese", "Gambian", "Ghanan", "Guinean", "Ivorian", "Kenyan", "Liberian", "Libyan", "Malagasy", "Malawian", "Malian", "Mauritanian", "Mauritian", "Moroccan", "Mosotho", "Motswana", "Mozambican", "Namibian", "Nigerian", "Nigerien", "Rwandan", "Sahrawi", "São Toméan", "Senegalese", "Seychellois", "Sierra Leonean", "Somali", "South African", "South Sudanese", "Sudanese", "Swazi", "Tanzanian", "Togolese", "Tunisian", "Ugandan", "Zambian", "Zimbabwean"]>>
+<<set setup.africaNationalities = ["Algerian", "Angolan", "Beninese", "Bissau-Guinean", "Burkinabé", "Burundian", "Cameroonian", "Cape Verdean", "Central African", "Chadian", "Comorian", "Congolese", "Djiboutian", "Equatoguinean", "Eritrean", "Ethiopian", "Gabonese", "Gambian", "Ghanan", "Guinean", "Ivorian", "Kenyan", "Liberian", "Libyan", "Malagasy", "Malawian", "Malian", "Mauritanian", "Mauritian", "Moroccan", "Mosotho", "Motswana", "Mozambican", "Namibian", "Nigerian", "Nigerien", "Rwandan", "Sahrawi", "São Toméan", "Senegalese", "Seychellois", "Sierra Leonean", "Somali", "South African", "South Sudanese", "Sudanese", "Swazi", "Tanzanian", "Togolese", "Tunisian", "Ugandan", "Zairian", "Zambian", "Zimbabwean"]>>
-<<set setup.australiaNationalities = ["a Cook Islander", "Australian", "Fijian", "French Polynesian", "I-Kiribati", "Marshallese", "Micronesian", "Nauruan", "a New Zealander", "Ni-Vanuatu", "Niuean", "Palauan", "Papua New Guinean", "Samoan", "a Solomon Islander", "Tongan", "Tuvaluan"]>>
+<<set setup.australiaNationalities = ["Australian", "a Cook Islander", "Fijian", "French Polynesian", "I-Kiribati", "Marshallese", "Micronesian", "Nauruan", "a New Zealander", "Ni-Vanuatu", "Niuean", "Palauan", "Papua New Guinean", "Samoan", "a Solomon Islander", "Tongan", "Tuvaluan"]>>
/* Nationalities based on $continent value. Note that $continent can be undefined! */
<<set setup.nationalityPoolSelector = {
@@ -1012,11 +1012,11 @@ Name pool selector based on nationality and race. Use as follows, given some sla
Then pick _namePool.random(), or display those names as possible choices, or do whatever else you do with name pools.
*/
<<set setup.namePoolSelector = {
- "Afghan": setup.afghanSlaveNames,
- "Albanian": setup.albanianSlaveNames,
- "Algerian": setup.algerianSlaveNames,
+ "Afghan": setup.afghanSlaveNames,
+ "Albanian": setup.albanianSlaveNames,
+ "Algerian": setup.algerianSlaveNames,
"Andorran": setup.andorranSlaveNames,
- "Angolan": setup.angolanSlaveNames,
+ "Angolan": setup.angolanSlaveNames,
"Antiguan": setup.antiguanSlaveNames,
"American.black": setup.africanAmericanSlaveNames, "American.latina": setup.latinaSlaveNames, "American.asian": setup.asianAmericanSlaveNames,
"American.middle eastern": setup.egyptianSlaveNames, "American": setup.whiteAmericanSlaveNames,
@@ -1391,7 +1391,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
"São Toméan": setup.saoTomeanSlaveSurnames,
"Saudi": setup.saudiSlaveSurnames,
"Scottish": setup.scottishSlaveSurnames,
- "Senegalese": setup.senegaleseSlaveSurnames,
+ "Senegalese": setup.senegaleseSlaveSurnames,
"Serbian": setup.serbianSlaveSurnames,
"Seychellois": setup.seychelloisSlaveSurnames,
"Sierra Leonean": setup.sierraLeoneanSlaveSurnames,
@@ -1437,49 +1437,49 @@ Then pick _namePool.random(), or display those names as possible choices, or do
}>>
-<<set setup.ArcologyNamesSupremacistWhite = ["The Old Dominion", "Thule"]>>
-<<set setup.ArcologyNamesSupremacistAsian = ["The Celestial Temple", "Shambhala", "Shangri-La"]>>
-<<set setup.ArcologyNamesSupremacistLatina = ["La Sagrada", "Alhambra", "Alcázar de Segovia", "Tenochtitlan", "Aztlan"]>>
-<<set setup.ArcologyNamesSupremacistMiddleEastern = ["The Caliphate", "New Cairo"]>>
-<<set setup.ArcologyNamesSupremacistBlack = ["United Africa", "Benin"]>>
-<<set setup.ArcologyNamesSupremacistIndoAryan = ["Swarga Loka", "New New Delhi"]>>
-<<set setup.ArcologyNamesSupremacistPacificIslander = ["Maui", "Rapa Nui"]>>
-<<set setup.ArcologyNamesSupremacistMalay = ["Brunei", "Patani"]>>
-<<set setup.ArcologyNamesSupremacistAmerindian = ["Cahokia", "The Confederated Tribes"]>>
-<<set setup.ArcologyNamesSupremacistSouthernEuropean = ["New Athens", "Olympus"]>>
-<<set setup.ArcologyNamesSupremacistSemitic = ["The Fifth Temple", "The Promised Land"]>>
-<<set setup.ArcologyNamesSupremacistMixedRace = ["Hybrid Vigor", "Meltingpot"]>>
-<<set setup.ArcologyNamesSubjugationistWhite = ["The World Turned Upside Down", "Anticolonialism One"]>>
-<<set setup.ArcologyNamesSubjugationistAsian = ["The East India Company", "Pearl of the Orient"]>>
-<<set setup.ArcologyNamesSubjugationistLatina = ["Los Conquistados", "Annual", "Fort Veracruz"]>>
-<<set setup.ArcologyNamesSubjugationistMiddleEastern = ["Constantinople", "Vlad's Castle"]>>
-<<set setup.ArcologyNamesSubjugationistBlack = ["Dixie", "The Plantation"]>>
-<<set setup.ArcologyNamesSubjugationistIndoAryan = ["The East India Company", "Trade Fort"]>>
-<<set setup.ArcologyNamesSubjugationistPacificIslander = ["Cargo Cult", "Moro Castle"]>>
-<<set setup.ArcologyNamesSubjugationistMalay = ["Pulo Prabang", "Eastern Emporium"]>>
-<<set setup.ArcologyNamesSubjugationistAmerindian = ["Fort Laramie", "The Rez"]>>
-<<set setup.ArcologyNamesSubjugationistSouthernEuropean = ["Istanbul", "Al-Andalus"]>>
-<<set setup.ArcologyNamesSubjugationistSemitic = ["Solomon's Lament", "New Canaan"]>>
-<<set setup.ArcologyNamesSubjugationistMixedRace = ["Purity", "Bloodlines"]>>
-<<set setup.ArcologyNamesGenderRadicalist = ["Saturnalia", "Bacchanalia", "Gomorrah", "Sodom", "The Rosebud"]>>
+<<set setup.ArcologyNamesSupremacistWhite = ["Avalon", "Hy-Brasil", "The Old Dominion", "Thule"]>>
+<<set setup.ArcologyNamesSupremacistAsian = ["Shambhala", "Shangri-La", "The Celestial Temple", "Tian"]>>
+<<set setup.ArcologyNamesSupremacistLatina = ["Alcázar de Segovia", "Alhambra", "Aztlan", "Ciudad Blanca", "La Sagrada", "Tenochtitlan"]>>
+<<set setup.ArcologyNamesSupremacistMiddleEastern = ["New Cairo", "The Caliphate", "Ubar", "Zerzura"]>>
+<<set setup.ArcologyNamesSupremacistBlack = ["Benin", "The Promised Land", "United Africa"]>>
+<<set setup.ArcologyNamesSupremacistIndoAryan = ["New New Delhi", "Swarga Loka"]>>
+<<set setup.ArcologyNamesSupremacistPacificIslander = ["Hawaiki", "Maui", "Rapa Nui"]>>
+<<set setup.ArcologyNamesSupremacistMalay = ["Brunei", "Patani", "Tanah Melayu"]>>
+<<set setup.ArcologyNamesSupremacistAmerindian = ["Cahokia", "Caral", "The Confederated Tribes"]>>
+<<set setup.ArcologyNamesSupremacistSouthernEuropean = ["New Athens", "Olympus", "Siglo de Oro"]>>
+<<set setup.ArcologyNamesSupremacistSemitic = ["Garden of Eden", "Olam Ha-Ba", "The Fifth Temple", "The Promised Land"]>>
+<<set setup.ArcologyNamesSupremacistMixedRace = ["Fusion", "Hybrid Vigor", "Meltingpot"]>>
+<<set setup.ArcologyNamesSubjugationistWhite = ["Anticolonialism One", "Mayocide", "The World Turned Upside Down"]>>
+<<set setup.ArcologyNamesSubjugationistAsian = ["Diyu", "Pearl of the Orient", "The East India Company"]>>
+<<set setup.ArcologyNamesSubjugationistLatina = ["Annual", "Fort Veracruz", "Los Conquistados", "Porvenir"]>>
+<<set setup.ArcologyNamesSubjugationistMiddleEastern = ["Constantinople", "La Reconquista", "Vlad's Castle"]>>
+<<set setup.ArcologyNamesSubjugationistBlack = ["Dixie", "Rubber Farm", "The Plantation", "The Projects"]>>
+<<set setup.ArcologyNamesSubjugationistIndoAryan = ["The East India Company", "Trade Fort", "UCIL Plant"]>>
+<<set setup.ArcologyNamesSubjugationistPacificIslander = ["Cargo Cult", "Castle Bravo", "Moro Castle"]>>
+<<set setup.ArcologyNamesSubjugationistMalay = ["Bencoolen", "Eastern Emporium", "Pulo Prabang"]>>
+<<set setup.ArcologyNamesSubjugationistAmerindian = ["Fort Laramie", "The Rez", "Wounded Knee"]>>
+<<set setup.ArcologyNamesSubjugationistSouthernEuropean = ["Al-Andalus", "Istanbul", "Parish Prison"]>>
+<<set setup.ArcologyNamesSubjugationistSemitic = ["Exodus", "New Canaan", "Solomon's Lament"]>>
+<<set setup.ArcologyNamesSubjugationistMixedRace = ["Bloodlines", "Purity", "Segregation"]>>
+<<set setup.ArcologyNamesGenderRadicalist = ["Bacchanalia", "Gomorrah", "Saturnalia", "Sodom", "The Rosebud"]>>
<<set setup.ArcologyNamesGenderFundamentalist = ["The Arbor", "The Rose", "The Source"]>>
-<<set setup.ArcologyNamesPaternalist = ["Sanctum", "Asylum", "Sanctuary", "Haven", "New Springfield", "The Sanctuary", "Glory"]>>
-<<set setup.ArcologyNamesDegradationist = ["Hell", "Golgotha", "The Tower"]>>
-<<set setup.ArcologyNamesBodyPurist = ["Walden", "New Eden", "Elysium", "Purity", "The Ark", "The Repository"]>>
-<<set setup.ArcologyNamesTransformationFetishist = ["The Dollhouse", "Silicone Valley", "The Hospital", "Bimboland"]>>
-<<set setup.ArcologyNamesYouthPreferentialist = ["Sunnyside", "Fuck High", "Dick U.", "Sex College"]>>
-<<set setup.ArcologyNamesMaturityPreferentialist = ["Shady Acres", "MILFtown", "MILF Heights", "Park Avenue Tower"]>>
-<<set setup.ArcologyNamesSlimnessEnthusiast = ["The Island", "Upskirt", "Virginland"]>>
-<<set setup.ArcologyNamesAssetExpansionist = ["The Bouncy Castle", "The Mounds", "Twin Peaks", "Boobs Tower"]>>
-<<set setup.ArcologyNamesPastoralist = ["Cornucopia", "Abundance", "Plenty", "Bounty", "Greener Pastures", "God's Country", "The Ranch", "Pasturelands"]>>
-<<set setup.ArcologyNamesPhysicalIdealist = ["Themyscira", "Midgard", "Muscle Beach", "Skid Row"]>>
-<<set setup.ArcologyNamesChattelReligionist = ["Heaven", "The Light", "Heaven on Earth"]>>
-<<set setup.ArcologyNamesRomanRevivalist = ["Elysian Fields", "Carthago Nova", "Nova Roma", "Neapolis", "Capua", "Ostia", "Salernum", "The City of the Seven Hills"]>>
-<<set setup.ArcologyNamesAztecRevivalist = ["The Halls of Montezuma", "Aztlan"]>>
-<<set setup.ArcologyNamesEgyptianRevivalist = ["Thebes", "Memphis", "Alexandria"]>>
-<<set setup.ArcologyNamesEdoRevivalist = ["Onogoro", "Kokyo", "Tengoku", "Takama-ga-hara", "New Kyoto", "The Imperial Palace", "New Tokyo"]>>
-<<set setup.ArcologyNamesArabianRevivalist = ["Jannah", "Madinat al-Salam", "Madinat al-Hareer", "Madinat al-Zahra", "Madinat al-Yasmin", "Bayt al-Hikma", "Baghdad", "Alhambra", "Samarra"]>>
-<<set setup.ArcologyNamesChineseRevivalist = ["Yinfu", "Huangquan", "Jiuquan", "Youming", "Huokang", "Mingfu", "Jin Shan", "Qi Lin", "Xin Hua", "Feng Huang", "The Middle Kingdom", "The Forbidden Palace"]>>
+<<set setup.ArcologyNamesPaternalist = ["Asylum", "Glory", "Haven", "New Springfield", "Sanctuary", "Sanctum", "The Sanctuary"]>>
+<<set setup.ArcologyNamesDegradationist = ["Golgotha", "Hell", "Misery", "The Tower"]>>
+<<set setup.ArcologyNamesBodyPurist = ["Elysium", "New Eden", "Purity", "The Ark", "The Repository", "Walden"]>>
+<<set setup.ArcologyNamesTransformationFetishist = ["Bimboland", "Silicone Valley", "The Dollhouse", "The Hospital"]>>
+<<set setup.ArcologyNamesYouthPreferentialist = ["Dick U.", "Fuck High", "Sex College", "Sorority Row", "Sunnyside"]>>
+<<set setup.ArcologyNamesMaturityPreferentialist = ["Maturity", "MILF Heights", "MILFtown", "Park Avenue Tower", "Shady Acres"]>>
+<<set setup.ArcologyNamesSlimnessEnthusiast = ["Skinny Bop", "Slim City", "The Island", "Upskirt", "Virginland"]>>
+<<set setup.ArcologyNamesAssetExpansionist = ["Boobs Tower", "The Bouncy Castle", "The Expanse", "The Mounds", "Twin Peaks"]>>
+<<set setup.ArcologyNamesPastoralist = ["Abundance", "Bounty", "Cornucopia", "God's Country", "Greener Pastures", "Pasturelands", "Plenty", "The Ranch"]>>
+<<set setup.ArcologyNamesPhysicalIdealist = ["Midgard", "Muscle Beach", "Skid Row", "Themyscira", "Valhalla"]>>
+<<set setup.ArcologyNamesChattelReligionist = ["Eden", "Heaven on Earth", "Heaven", "The Light"]>>
+<<set setup.ArcologyNamesRomanRevivalist = ["Capua", "Carthago Nova", "Elysian Fields", "Neapolis", "Nova Roma", "Ostia", "Salernum", "The City of the Seven Hills"]>>
+<<set setup.ArcologyNamesAztecRevivalist = ["Aztlan", "Chicomoztoc", "Omeyocan", "The Halls of Montezuma"]>>
+<<set setup.ArcologyNamesEgyptianRevivalist = ["Alexandria", "Avaris", "Bubastis", "Heliopolis", "Memphis", "Mendes", "Rosetta", "Sais", "Tanis", "Thebes"]>>
+<<set setup.ArcologyNamesEdoRevivalist = ["Edo", "Kasagiyama", "Kokyo", "New Kyoto", "New Tokyo", "Onogoro", "Takama-ga-hara", "Tengoku", "The Imperial Palace"]>>
+<<set setup.ArcologyNamesArabianRevivalist = ["Alhambra", "Baghdad", "Bayt al-Hikma", "Jannah", "Kufa", "Madinat al-Hareer", "Madinat al-Salam", "Madinat al-Yasmin", "Madinat al-Zahra", "Medina", "Samarra"]>>
+<<set setup.ArcologyNamesChineseRevivalist = ["Feng Huang", "Fusang", "Huangquan", "Huokang", "Jin Shan", "Jiuquan", "Mingfu", "Qi Lin", "The Forbidden Palace", "The Middle Kingdom", "Xin Hua", "Yinfu", "Youdu", "Youming"]>>
/* pregmod FS */
<<set setup.ArcologyNamesEugenics = ["Perfection", "Ascension", "Second Chance"]>>
@@ -1489,9 +1489,9 @@ Then pick _namePool.random(), or display those names as possible choices, or do
<<set setup.ArcologyNamesIncestFetishist = ["Oedipal City", "Oeditropolis", "Sib City", "Incestral Home", "Family Fortunes", "Familial Embrace", "Pure Blood"]>>
-<<set setup.badWords = ["fuck", "shit", "ass", "cock", "piss", "dick", "slut", "cum", "whore", "butt", "boob", "cunt", "cunny", "pussy", "junk", "trash", "slave"]>>
+<<set setup.badWords = ["ass", "bitch", "boob", "butt", "cock", "cum", "cunny", "cunt", "dick", "fuck", "junk", "piss", "pussy", "shit", "slave", "slut", "trash", "whore"]>>
-<<set setup.badNames = ["Dipshit", "Asshole", "Cunt", "Whore", "Dick", "Pussy", "Slaver", "Assfucker", "Sodomite", "Rapist", "Despoiler", "Ruiner", "Ass", "Fucker", "Trash", "Traitor", "Cocksucker", "Dicksucker", "Ass Kisser", "Ass Licker", "Bitch", "Jerk", "Fuckface", "Prick", "Creep", "Retard", "Dumbass", "DumbFuck", "Douchebag"]>>
+<<set setup.badNames = ["Ass Kisser", "Ass Licker", "Ass", "Assfucker", "Asshole", "Bitch", "Cocksucker", "Creep", "Cunt", "Despoiler", "Dick", "Dicksucker", "Dipshit", "Douchebag", "Dumbass", "DumbFuck", "Fucker", "Fuckface", "Fuckhead", "Jerk", "Prick", "Pussy", "Rapist", "Retard", "Ruiner", "Slaver", "Sodomite", "Traitor", "Trash", "Whore"]>>
<<set setup.drugs = [{name: "No default setting", value: "no default setting"}, {name: "None", value: "none"}, {name: "Psychosuppressants", value: "psychosuppressants"}, {name: "Steroids", value: "steroids"}, {name: "Natural hormone enhancers", value: "hormone enhancers"}, {name: "Hormone blockers", value: "hormone blockers"}, {name: "Growth Stimulants", value: "growth stimulants", rs: "growth"}, {name: "Sag-B-gone", value: "sag-B-gone", rs: "nosag"}, {name: "Female hormone injections", value: "female hormone injections", rs: "pubHorm"}, {name: "Male hormone injections", value: "male hormone injections", rs: "pubHorm"}, {name: "Anti-aging cream", value: "anti-aging cream", fs: "youth"}]>>
<<set setup.harshCollars = [{name: "Tight steel", value: "tight steel"}, {name: "Cruel retirement counter", value: "cruel retirement counter", fs: "seeage"}, {name: "Uncomfortable leather", value: "uncomfortable leather"}, {name: "Pregnancy biometrics", value: "preg biometrics"}, {name: "Shock punishment", value: "shock punishment"}, {name: "Dildo gag", value: "dildo gag"}, {name: "Massive dildo gag", value: "massive dildo gag", rs: "buyGag"}, {name: "Ball gag", value: "ball gag"}, {name: "Bit gag", value: "bit gag"}, {name: "Neck corset", value: "neck corset"}]>>
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index 1c31418a24d8ab2f719a36b8d044139a7e5974f4..c8659bd0280eb9222984b8a02cbf01b56fc41cfc 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -1,4 +1,4 @@
-:: Slave Summary Widgets [nobr widget]
+:: Slave Summary Widgets [nobr widget]
/* Try to use cached summary */
<<run setup.summaryCache = {}>>
@@ -1042,75 +1042,75 @@ Release rules: _Slave.releaseRules.
<<case "Tongan">>
Ton
<<case "Catalan">>
- Cat
+ Cat
<<case "Equatoguinean">>
- EG
+ EG
<<case "French Polynesian">>
- FP
+ FP
<<case "Kurdish">>
- Kur
+ Kur
<<case "Tibetan">>
- Tib
+ Tib
<<case "Bissau-Guinean">>
- GB
+ GB
<<case "Chadian">>
- Cha
+ Cha
<<case "Comorian">>
- Com
+ Com
<<case "Ivorian">>
- IC
+ IC
<<case "Mauritanian">>
- Mta
+ Mta
<<case "Mauritian">>
- Mts
+ Mts
<<case "Mosotho">>
- Les
+ Les
<<case "Sierra Leonean">>
- Sie
+ Sie
<<case "Swazi">>
- Swa
+ Swa
<<case "Angolan">>
- Ang"
+ Ang"
<<case "Sahrawi">>
- Sah
+ Sah
<<case "Burkinabé">>
- BF
+ BF
<<case "Cape Verdean">>
- CV
+ CV
<<case "Motswana">>
- Bot
+ Bot
<<case "Somali">>
- Som
+ Som
<<case "Rwandan">>
- Rwa
+ Rwa
<<case "São Toméan">>
- STP
+ STP
<<case "Beninese">>
- Ben
+ Ben
<<case "Central African">>
- CAR
+ CAR
<<case "Gambian">>
- Gam
+ Gam
<<case "Senegalese">>
- Sen
+ Sen
<<case "Togolese">>
- Tog
+ Tog
<<case "Eritrean">>
- Eri
+ Eri
<<case "Guinean">>
- Gui
+ Gui
<<case "Malawian">>
- Mwi
+ Mwi
<<case "Zairian">>
- DRC
+ DRC
<<case "Liberian">>
- Lib
+ Lib
<<case "Mozambican">>
- Moz
+ Moz
<<case "Namibian">>
- Nam
+ Nam
<<case "South Sudanese">>
- SS
+ SS
<<case "Ancient Egyptian Revivalist">>
Egy Rev
<<case "Ancient Chinese Revivalist">>