From 2d457c393c281f13458a8c1d8919a3c5769432bf Mon Sep 17 00:00:00 2001
From: FCGudder <-@->
Date: Wed, 7 Jun 2017 17:46:32 +0200
Subject: [PATCH] Move setup.namePoolSelector to setupVars

---
 src/init/setupVars.tw                 | 101 ++++++++++++++++++++++++++
 src/pregmod/widgets/pregmodWidgets.tw |  94 ------------------------
 2 files changed, 101 insertions(+), 94 deletions(-)

diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 932a9b32e53..6924667cc6c 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -310,6 +310,107 @@
 
 <<set setup.edoSlaveNames = ["Adakichi", "Aihachi", "Aika", "Aikichi", "Aiko", "Aimatsu", "Akiko", "Ariko", "Asa", "Asakichi", "Asao", "Ayako", "Ayano", "Azuma", "Baicho", "Baisho", "Botan", "Charyoei", "Chieko", "Chikafuku", "Chikafumi", "Chikano", "Chikashizu", "Chikayoshi", "Chikayu", "Chikayuki", "Chisako", "Chiyo", "Chiyoe", "Chiyoha", "Chiyokichi", "Chiyoko", "Chiyoryo", "Chiyoteru", "Chiyotsuru", "Chiyowaka", "Chiyoyakko", "Chizu", "Chizuha", "Chizuru", "Cho", "Chocho", "Dango", "Danji", "Danko", "Dan’ei", "Edagiku", "Emi", "Emicho", "Emigiku", "Emiyo", "Enko", "Eriko", "Fuji", "Fujie", "Fujigiku", "Fujiha", "Fukichiyo", "Fukiha", "Fukimi", "Fukiyo", "Fukizo", "Fuku", "Fukuai", "Fukuaya", "Fukuchiyo", "Fukucho", "Fukudama", "Fukuha", "Fukuhana", "Fukuharu", "Fukuhina", "Fukuhiro", "Fukumi", "Fukumusume", "Fukunae", "Fukusato", "Fukusuke", "Fukusuzu", "Fukuteru", "Fukuya", "Fukuyo", "Fukuyoshi", "Fukuyu", "Fumi", "Fumichiyo", "Fumicho", "Fumihana", "Fumiko", "Fumino", "Fumukazu", "Fusakichi", "Fusako", "Fusao", "Hamako", "Hamayu", "Hanachiyo", "Hanaji", "Hanakichi", "Hanako", "Hanamatsu", "Hanaryo", "Hanayakko", "Harukichi", "Haruko", "Hatsu", "Hatsuko", "Hatsuyo", "Hidechiyo", "Hidecho", "Hideji", "Hidemi", "Hideryu", "Hideyakko", "Hidezuru", "Hinacho", "Hinagiku", "Hinako", "Hinazuru", "Hisa", "Hisacho", "Hisae", "Hisaei", "Hisamomo", "Hisasuzu", "Hisayo", "Hisazuru", "Ichiei", "Ichiemi", "Ichiharu", "Ichiho", "Ichika", "Ichimame", "Ichimomo", "Ichiraku", "Ichiryu", "Ichisayo", "Ichiteru", "Ichitomi", "Ichiume", "Ichiya", "Ichiyakko", "Iku", "Ikumatsu", "Imayoshi", "Ine", "Iroha", "Ishino", "Ishiyakko", "Iso", "Isoei", "Itozuru", "Kameji", "Kameko", "Kaneha", "Kanemi", "Kanoaki", "Kanoemi", "Kanoka", "Kasen", "Katsuchiyo", "Katsue", "Katsuha", "Katsuji", "Katsuna", "Katsune", "Katsuru", "Kayo", "Kichihana", "Kichiyakko", "Kichiyo", "Kichiyu", "Kiku", "Kikuka", "Kikumaru", "Kikumatsu", "Kikuno", "Kikuryo", "Kikutsuru", "Kikuya", "Kikuyakko", "Kikuyu", "Kimiei", "Kimikiku", "Kimina", "Kimitomo", "Kimiyakko", "Kin'ei", "Kin'ichi", "Kinhei", "Kinko", "Kinmatsu", "Kinroku", "Kinryo", "Kinryu", "Kinshi", "Kinsuke", "Kinu", "Kinyo", "Kitanomatsu", "Kiyo", "Koen", "Kofuku", "Kofusa", "Kogiku", "Koi", "Koiku", "Kojako", "Komagiku", "Komaji", "Komako", "Komame", "Komari", "Komaru", "Komasu", "Komomo", "Komume", "Koriki", "Korin", "Koroku", "Kosaki", "Kosaku", "Kosen", "Koshizu", "Kosome", "Kosue", "Kotaka", "Kotama", "Kotatsu", "Koteru", "Kotetsu", "Koto", "Kotobuki", "Kotoei", "Kotogiku", "Kotoha", "Kotoji", "Kotomi", "Kotono", "Kotoyo", "Kotsuma", "Koume", "Koyachiyo", "Koyakko", "Koyana", "Koyei", "Koyo", "Koyone", "Koyoshi", "Koyuka", "Koyuki", "Koyumi", "Kozakura", "Kozuru", "Kuma", "Kumakichi", "Kumano", "Kumayoshi", "Kunigiku", "Kyoka", "Kyoko", "Machi", "Mamefusa", "Mamegiku", "Mamehana", "Mameharu", "Mamehide", "Mamehiro", "Mameka", "Mamekichi", "Mameko", "Mameraku", "Mameriki", "Mameroku", "Mameryo", "Mameyakko", "Mameyo", "Mameyoshi", "Mameyu", "Maru", "Masuwaka", "Matsuko", "Matsuriki", "Matsuyakko", "Miharu", "Mineko", "Mitsu", "Mitsugiku", "Mitsuha", "Mitsuko", "Mitsuyo", "Miyagiku", "Miyo", "Miyoha", "Miyoharu", "Miyoka", "Miyozuru", "Momifuku", "Momiji", "Momochiyo", "Momoko", "Momomaru", "Momoyakko", "Momozuru", "Naka", "Naochiyo", "Naosome", "Naosono", "Narako", "Narayone", "Oimatsu", "Omine", "Omocha", "Onao", "Otomaru", "Otoyu", "Ran", "Ren", "Riki", "Rikigo", "Rikiha", "Rikiharu", "Rikihei", "Rikiji", "Rikiko", "Rikiya", "Royo", "Ryuko", "Sakae", "Sakiko", "Sakyo", "Sana", "Sanae", "Sankatsu", "Sanko", "Sanya", "Sasa", "Sato", "Satochiyo", "Satogiku", "Satoji", "Satoka", "Satokichi", "Satomi", "Satono", "Satotsuya", "Satoyu", "Satoyuki", "Satsuki", "Sayaka", "Sayoko", "Sekka", "Sen", "Shimekichi", "Shimematsu", "Shinneji", "Shizu", "Shizue", "Shizuko", "Shun", "Sodeko", "Somagiku", "Soyo", "Sue", "Sumiko", "Suzu", "Suzuhachi", "Suzuka", "Suzuko", "Takeko", "Takewaka", "Takeyakko", "Tama", "Tamagiku", "Tamakiku", "Tamako", "Tamaryo", "Tamasuke", "Tamaye", "Tamayu", "Tamazuru", "Tamiko", "Tane", "Taneji", "Taneju", "Taneko", "Tatsu", "Tatsuko", "Teruhina", "Teruji", "Teruko", "Teruyo", "Tetsu", "Toba", "Toki", "Tokiko", "Tokimatsu", "Toku", "Tome", "Tomeko", "Tomewaka", "Tomigiku", "Tomiko", "Tomimatsu", "Tomino", "Tomiryo", "Tomitae", "Tomitsuru", "Tomiwaka", "Tomiyakko", "Tomizuru", "Tomogiku", "Tomoko", "Tomoryo", "Tomowaka", "Tomoyuki", "Tonko", "Tora", "Toshifumi", "Toshihana", "Toshiko", "Toye", "Toyochiyo", "Toyofu", "Toyohina", "Toyoji", "Toyoka", "Tsunechiyo", "Tsuneko", "Tsunemomo", "Tsuneyo", "Tsuneyu", "Tsuru", "Tsurue", "Tsuruha", "Tsuruji", "Tsuruka", "Tsurumatsu", "Tsuruyo", "Tsuruyu", "Tsuta", "Tsutaji", "Tsuyachiyo", "Tsuyu", "Ume", "Umechie", "Umechiho", "Umechika", "Umechiyo", "Umegiku", "Umeha", "Umehisa", "Umeji", "Umeko", "Umeko", "Umematsu", "Umeo", "Umeraku", "Umeryo", "Umeryu", "Umesaya", "Umesuke", "Umesuzu", "Umewaka", "Umeyae", "Umeyakko", "Umeyu", "Uno", "Unofuku", "Unoha", "Unohide", "Unoji", "Unoka", "Unokayo", "Unokazu", "Unokiyo", "Unoko", "Unoshizu", "Unowaka", "Uta", "Utachiyo", "Utaji", "Utaka", "Utamatsu", "Utayu", "Wakaba", "Wakacho", "Wakagusa", "Wakai", "Wakaji", "Wakakimi", "Wakako", "Wakakoma", "Wakamurasaki", "Wakaroku", "Wakatsune", "Wakaume", "Wakayakko", "Wakayo", "Wakayone", "Wakazuru", "Wako", "Yachiyoko", "Yae", "Yaemi", "Yaewaka", "Yaezuru", "Yaichi", "Yasohachi", "Yasu", "Yasuku", "Yoi", "Yone", "Yonehachi", "Yoneyakko", "Yuiko", "Yukako", "Yukari", "Yukiryo", "Yukizono"]>>
 
+/*
+Name pool selector based on nationality and race. Use as follows, given some slave _slave:
+<<set _namePool =
+	(setup.namePoolSelector[_slave.nationality + "." + _slave.race]
+	|| setup.namePoolSelector[_slave.nationality]
+	|| setup.whiteAmericanSlaveNames)
+Then pick _namePool.random(), or display those names as possible choices, or do whatever else you do with name pools.
+*/
+<<set setup.namePoolSelector = {
+	"American.black": setup.africanAmericanSlaveNames, "American.latina": setup.latinaSlaveNames, "American.asian": setup.asianAmericanSlaveNames,
+	"American.middle eastern": setup.egyptianSlaveNames, "American": setup.whiteAmericanSlaveNames,
+	"Canadian": setup.canadianSlaveNames,
+	"Mexican": setup.mexicanSlaveNames,
+	"Dominican": setup.dominicanSlaveNames,
+	"Puerto Rican": setup.puertoRicanSlaveNames,
+	"Haitian": setup.haitianSlaveNames,
+	"Jamaican": setup.jamaicanSlaveNames,
+	"Cuban": setup.cubanSlaveNames,
+	"Guatemalan": setup.guatemalanSlaveNames,
+	"Chilean": setup.chileanSlaveNames,
+	"Peruvian": setup.peruvianSlaveNames,
+	"Bolivian": setup.bolivianSlaveNames,
+	"Venezuelan": setup.venezuelanSlaveNames,
+	"Belarusian": setup.belarusianSlaveNames,
+	"Russian": setup.russianSlaveNames,
+	"Ukrainian": setup.ukrainianSlaveNames,
+	"Italian": setup.italianSlaveNames,
+	"Spanish": setup.spanishSlaveNames,
+	"British": setup.britishSlaveNames,
+	"Scottish": setup.scottishSlaveNames,
+	"French": setup.frenchSlaveNames,
+	"German": setup.germanSlaveNames,
+	"Lithuanian": setup.lithuanianSlaveNames,
+	"Norwegian": setup.norwegianSlaveNames,
+	"Slovak": setup.slovakSlaveNames,
+	"Danish": setup.danishSlaveNames,
+	"Dutch": setup.dutchSlaveNames,
+	"Austrian": setup.austrianSlaveNames,
+	"Swiss": setup.swissSlaveNames,
+	"Serbian": setup.serbianSlaveNames,
+	"Belgian": setup.belgianSlaveNames,
+	"Czech": setup.czechSlaveNames,
+	"Portuguese": setup.portugueseSlaveNames,
+	"Swedish": setup.swedishSlaveNames,
+	"Romanian": setup.romanianSlaveNames,
+	"Hungarian": setup.hungarianSlaveNames,
+	"Estonian": setup.estonianSlaveNames,
+	"Irish": setup.irishSlaveNames,
+	"Icelandic": setup.icelandicSlaveNames,
+	"Finnish": setup.finnishSlaveNames,
+	"Greek": setup.greekSlaveNames,
+	"Polish": setup.polishSlaveNames,
+	"Brazilian": setup.brazilianSlaveNames,
+	"Egyptian": setup.egyptianSlaveNames,
+	"Colombian": setup.colombianSlaveNames,
+	"Argentinian": setup.argentinianSlaveNames,
+	"Turkish": setup.turkishSlaveNames,
+	"Iranian": setup.iranianSlaveNames,
+	"Armenian": setup.armenianSlaveNames,
+	"Israeli": setup.israeliSlaveNames,
+	"Saudi": setup.saudiSlaveNames,
+	"South African.black": setup.blackSouthAfricanSlaveNames, "South African": setup.whiteSouthAfricanSlaveNames,
+	"Nigerian": setup.nigerianSlaveNames,
+	"Congolese": setup.congoleseSlaveNames,
+	"Kenyan": setup.kenyanSlaveNames,
+	"Tanzanian": setup.tanzanianSlaveNames,
+	"Zimbabwean.white": setup.britishSlaveNames, "Zimbabwean": setup.zimbabweanSlaveNames,
+	"Ghanan": setup.ghananSlaveNames,
+	"Ugandan": setup.ugandanSlaveNames,
+	"Ethiopian": setup.ethiopianSlaveNames,
+	"Moroccan": setup.moroccanSlaveNames,
+	"Chinese": setup.chineseSlaveNames,
+	"Korean": setup.koreanSlaveNames,
+	"Thai": setup.thaiSlaveNames,
+	"Vietnamese": setup.vietnameseSlaveNames,
+	"Japanese": setup.japaneseSlaveNames,
+	"Indonesian": setup.indonesianSlaveNames,
+	"Filipina": setup.filipinaSlaveNames,
+	"Bangladeshi": setup.bangladeshiSlaveNames,
+	"Malaysian": setup.malaysianSlaveNames,
+	"Uzbek": setup.uzbekSlaveNames,
+	"Afghan": setup.afghanSlaveNames,
+	"Nepalese": setup.nepaleseSlaveNames,
+	"Burmese": setup.burmeseSlaveNames,
+	"Iraqi": setup.iraqiSlaveNames,
+	"Yemeni": setup.yemeniSlaveNames,
+	"Sudanese": setup.sudaneseSlaveNames,
+	"Algerian": setup.algerianSlaveNames,
+	"Tunisian": setup.tunisianSlaveNames,
+	"Libyan": setup.libyanSlaveNames,
+	"Omani": setup.omaniSlaveNames,
+	"Malian": setup.malianSlaveNames,
+	"Jordanian": setup.jordanianSlaveNames,
+	"Lebanese": setup.lebaneseSlaveNames,
+	"Emirati": setup.emiratiSlaveNames,
+	"Kazakh": setup.kazakhSlaveNames,
+	"Pakistani": setup.pakistaniSlaveNames,
+	"Indian": setup.indianSlaveNames,
+	"Australian": setup.australianSlaveNames,
+	"a New Zealander": setup.newZealanderSlaveNames,
+	}>>
 
 
 <<set setup.ArcologyNamesSupremacistWhite = ["The Old Dominion", "Thule"]>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 0df5dd2026c..a871d1db313 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -980,100 +980,6 @@ extremely pale -5
 <</script>>
 <</widget>>
 
-<<set setup.namePoolSelector = {
-	"American.black": setup.africanAmericanSlaveNames, "American.latina": setup.latinaSlaveNames, "American.asian": setup.asianAmericanSlaveNames,
-	"American.middle eastern": setup.egyptianSlaveNames, "American": setup.whiteAmericanSlaveNames,
-	"Canadian": setup.canadianSlaveNames,
-	"Mexican": setup.mexicanSlaveNames,
-	"Dominican": setup.dominicanSlaveNames,
-	"Puerto Rican": setup.puertoRicanSlaveNames,
-	"Haitian": setup.haitianSlaveNames,
-	"Jamaican": setup.jamaicanSlaveNames,
-	"Cuban": setup.cubanSlaveNames,
-	"Guatemalan": setup.guatemalanSlaveNames,
-	"Chilean": setup.chileanSlaveNames,
-	"Peruvian": setup.peruvianSlaveNames,
-	"Bolivian": setup.bolivianSlaveNames,
-	"Venezuelan": setup.venezuelanSlaveNames,
-	"Belarusian": setup.belarusianSlaveNames,
-	"Russian": setup.russianSlaveNames,
-	"Ukrainian": setup.ukrainianSlaveNames,
-	"Italian": setup.italianSlaveNames,
-	"Spanish": setup.spanishSlaveNames,
-	"British": setup.britishSlaveNames,
-	"Scottish": setup.scottishSlaveNames,
-	"French": setup.frenchSlaveNames,
-	"German": setup.germanSlaveNames,
-	"Lithuanian": setup.lithuanianSlaveNames,
-	"Norwegian": setup.norwegianSlaveNames,
-	"Slovak": setup.slovakSlaveNames,
-	"Danish": setup.danishSlaveNames,
-	"Dutch": setup.dutchSlaveNames,
-	"Austrian": setup.austrianSlaveNames,
-	"Swiss": setup.swissSlaveNames,
-	"Serbian": setup.serbianSlaveNames,
-	"Belgian": setup.belgianSlaveNames,
-	"Czech": setup.czechSlaveNames,
-	"Portuguese": setup.portugueseSlaveNames,
-	"Swedish": setup.swedishSlaveNames,
-	"Romanian": setup.romanianSlaveNames,
-	"Hungarian": setup.hungarianSlaveNames,
-	"Estonian": setup.estonianSlaveNames,
-	"Irish": setup.irishSlaveNames,
-	"Icelandic": setup.icelandicSlaveNames,
-	"Finnish": setup.finnishSlaveNames,
-	"Greek": setup.greekSlaveNames,
-	"Polish": setup.polishSlaveNames,
-	"Brazilian": setup.brazilianSlaveNames,
-	"Egyptian": setup.egyptianSlaveNames,
-	"Colombian": setup.colombianSlaveNames,
-	"Argentinian": setup.argentinianSlaveNames,
-	"Turkish": setup.turkishSlaveNames,
-	"Iranian": setup.iranianSlaveNames,
-	"Armenian": setup.armenianSlaveNames,
-	"Israeli": setup.israeliSlaveNames,
-	"Saudi": setup.saudiSlaveNames,
-	"South African.black": setup.blackSouthAfricanSlaveNames, "South African": setup.whiteSouthAfricanSlaveNames,
-	"Nigerian": setup.nigerianSlaveNames,
-	"Congolese": setup.congoleseSlaveNames,
-	"Kenyan": setup.kenyanSlaveNames,
-	"Tanzanian": setup.tanzanianSlaveNames,
-	"Zimbabwean.white": setup.britishSlaveNames, "Zimbabwean": setup.zimbabweanSlaveNames,
-	"Ghanan": setup.ghananSlaveNames,
-	"Ugandan": setup.ugandanSlaveNames,
-	"Ethiopian": setup.ethiopianSlaveNames,
-	"Moroccan": setup.moroccanSlaveNames,
-	"Chinese": setup.chineseSlaveNames,
-	"Korean": setup.koreanSlaveNames,
-	"Thai": setup.thaiSlaveNames,
-	"Vietnamese": setup.vietnameseSlaveNames,
-	"Japanese": setup.japaneseSlaveNames,
-	"Indonesian": setup.indonesianSlaveNames,
-	"Filipina": setup.filipinaSlaveNames,
-	"Bangladeshi": setup.bangladeshiSlaveNames,
-	"Malaysian": setup.malaysianSlaveNames,
-	"Uzbek": setup.uzbekSlaveNames,
-	"Afghan": setup.afghanSlaveNames,
-	"Nepalese": setup.nepaleseSlaveNames,
-	"Burmese": setup.burmeseSlaveNames,
-	"Iraqi": setup.iraqiSlaveNames,
-	"Yemeni": setup.yemeniSlaveNames,
-	"Sudanese": setup.sudaneseSlaveNames,
-	"Algerian": setup.algerianSlaveNames,
-	"Tunisian": setup.tunisianSlaveNames,
-	"Libyan": setup.libyanSlaveNames,
-	"Omani": setup.omaniSlaveNames,
-	"Malian": setup.malianSlaveNames,
-	"Jordanian": setup.jordanianSlaveNames,
-	"Lebanese": setup.lebaneseSlaveNames,
-	"Emirati": setup.emiratiSlaveNames,
-	"Kazakh": setup.kazakhSlaveNames,
-	"Pakistani": setup.pakistaniSlaveNames,
-	"Indian": setup.indianSlaveNames,
-	"Australian": setup.australianSlaveNames,
-	"a New Zealander": setup.newZealanderSlaveNames,
-	}>>
-
 <<widget "ParentNames">>
 <<set _currentSlaveNames = $slaves.map(s => s.slaveName)>>
 <<set _namePool =
-- 
GitLab