diff --git a/devNotes/twine JS b/devNotes/twine JS
index 6008def79ef054b815ba31833630c01450b4901a..b10e86611da9ec4e9aed1c4a6ed1e71b020fc499 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -3286,85 +3286,56 @@ window.Height = (function(){
/* if you can find an average for an undefined, add it in! */
const xxMeanHeight = {
- "American.white": 165, "American.black": 163.6, "American.latina": 158.9, "American.asian": 158.4, "American": 161.8,
- "Afghan": 163.8, "Algerian": 162, "Argentinian": 159.6, "Armenian": 158.1, "Australian": 161.8, "Austrian": 166,
- "Bangladeshi": 150.6, "Belarusian": 166.8, "Belgian": 168.1, "Bolivian": 142.2, "Brazilian": 158.8,
- "British": 161.9, "Burmese": undefined, "Canadian": 162.3, "Chilean": 157.2, "Chinese": 155.8, "Colombian": 158.7,
- "Zairian": 157.7, "Cuban": 156, "Czech": 167.22, "Danish": 168.7, "Dominican": 156.4, "Dutch": 169, "Egyptian": 158.9,
- "Emirati": 158.9, "Estonian": 165.5, "Ethiopian": 157.6, "Filipina": 151.8, "Finnish": 165.3, "French": 162.5,
- "German": 162.8, "Ghanan": 158.5, "Greek": 165, "Guatemalan": 147.3, "Haitian": 158.6, "Hungarian": 164,
- "Icelandic": 168, "Indian": 151.9, "Indonesian": 147, "Iranian": 157.2, "Iraqi": 155.8, "Irish": 163, "Israeli": 166,
- "Italian": 162.5, "Jamaican": 160.8, "Japanese": 158, "Jordanian": 158.2, "Kazakh": 159.8, "Kenyan": 159.4,
- "Korean": 156.15, "Lebanese": 165, "Libyan": 160.5, "Lithuanian": 167.5, "Malaysian": 154.7, "Malian": 160.4,
- "Mexican": 154, "Moroccan": 158.5, "Nepalese": 150.8, "Nigerian": 163.8, "Norwegian": 157.8, "Omani": undefined,
- "Pakistani": 151.9, "Peruvian": 151, "Polish": 165.1, "Portuguese": 165.1, "Puerto Rican": 158.9, "Romanian": 157,
- "Russian": 164.1, "Saudi": 156.3, "Scottish": 163, "Serbian": 166.8, "Slovak": 165.6, "South African": 159,
- "Spanish": 162.6, "Sudanese": 180.0, "Swedish": 166.8, "Swiss": 162.5, "Tanzanian": 156.6, "Thai": 159,
- "Tunisian": 160, "Turkish": 161.9, "Ugandan": 159.2, "Ukrainian": 164.8, "Uzbek": 159.9, "Venezuelan": 159,
- "Vietnamese": 155.2, "Yemeni": undefined, "a New Zealander": 164, "Zimbabwean": 160.3, "Sammarinese": undefined,
- "Marshallese": undefined, "Syrian": 156.3, "Bermudian": undefined, "Uruguayan": 158.0, "Monégasque": undefined,
- "Montenegrin": 168.4, "Cambodian": 152.4, "Cameroonian": 161.3, "Gabonese": 158.4, "Djiboutian": undefined,
- "Greenlandic": undefined, "Tuvaluan": undefined, "Zambian": 158.5, "Albanian": 161.8, "Bruneian": undefined,
- "Singaporean": 160.0, "Croatian": 166.3, "Bulgarian": 163.2, "Laotian": undefined, "Mongolian": 157.7, "Taiwanese": 160.4,
- "Belizean": undefined, "Grenadian": undefined, "I-Kiribati": undefined, "Malagasy": 154.3, "Maldivian": undefined,
- "Bosnian": 171.1, "Kosovan": undefined, "Macedonian": undefined, "Honduran": 152.0, "Maltese": 159.9,
- "Nauruan": undefined, "Micronesian": undefined, "Costa Rican": undefined, "Salvadoran": 160.3, "Nicaraguan": 153.7,
- "Panamanian": 152.0, "Nigerien": 157.8, "Andorran": undefined, "Bulgarian": 163.2, "Luxembourgian": 164.8,
- "Moldovan": 161.2, "Antiguan": 156.8, "Aruban": 158, "Azerbaijani": 162.4, "Bahamian": 157.1, "Bahraini": 165.2,
- "Barbadian": 158.5, "Bhutanese": 153.4, "Burundian": 157, "a Cook Islander": 162.3, "Cypriot": 163.4,
- "Dominiquais": 157.2, "East Timorese": 149.1, "Ecuadorian": 153.4, "Fijian": 161.8, "French Guianan": 157,
- "Georgian": 160.5, "Guyanese": 157.9, "Kuwaiti": 156.1, "Kyrgyz": 158.6, "Latvian": 165.7, "a Liechtensteiner": 164.3,
- "Niuean": 160.4, "Palauan": 161.4, "Palestinian": 158.2, "Papua New Guinean": 150.7, "Paraguayan": 158.3, "Qatari": 155,
- "Kittitian": 156.9, "Saint Lucian": 157.1, "Vincentian": 156.2, "Samoan": 161, "Seychellois": 155.8,
- "Slovene": 167.4, "a Solomon Islander": 151.8, "Sri Lankan": 151.4, "Surinamese": 155.7, "Tajik": 161.2, "Tongan": 159.5,
- "Trinidadian": 157.4, "Turkmen": 158.2, "Ni-Vanuatu": 149.8, "Vatican": 162.5, "Angolan": undefined, "Beninese": 159.3,
- "Bissau-Guinean": undefined, "Burkinabé": 161.6, "Cape Verdean": undefined, "Catalan": undefined, "Central African": 158.9,
- "Chadian": 162.6, "Comorian": 154.8, "Congolese": 159, "Equatoguinean": undefined, "Eritrean": undefined,
- "French Polynesian": undefined, "Gambian": 157.8, "Guinean": 158.8, "Ivorian": 158.9, "Kurdish": undefined, "Liberian": 157.3,
- "Malawian": 155, "Mauritanian": undefined, "Mauritian": undefined, "Mosotho": 157.6, "Motswana": undefined, "Mozambican": 156,
- "Namibian": 160.7, "Rwandan": 157.7, "Sahrawi": undefined, "São Toméan": undefined, "Senegalese": 163, "Sierra Leonean": undefined,
- "Somali": undefined, "South Sudanese": undefined, "Swazi": 159.1, "Tibetan": undefined, "Togolese": 159,
+ "Afghan": 163.8, "Albanian": 161.8, "Algerian": 162, "American.asian": 158.4, "American.black": 163.6, "American.latina": 158.9, "American.white": 165, "American": 161.8,
+ "Andorran": undefined, "Angolan": undefined, "Antiguan": 156.8, "Argentinian": 159.6, "Armenian": 158.1, "Aruban": 158, "Australian": 161.8, "Austrian": 166, "Azerbaijani": 162.4,
+ "Bahamian": 157.1, "Bahraini": 165.2, "Bangladeshi": 150.6, "Barbadian": 158.5, "Belarusian": 166.8, "Belgian": 168.1, "Belizean": undefined, "Beninese": 159.3, "Bermudian": undefined,
+ "Bhutanese": 153.4, "Bissau-Guinean": undefined, "Bolivian": 142.2, "Bosnian": 171.1, "Brazilian": 158.8, "British": 161.9, "Bruneian": undefined, "Bulgarian": 163.2, "Bulgarian": 163.2,
+ "Burkinabé": 161.6, "Burmese": undefined, "Burundian": 157, "Cambodian": 152.4, "Cameroonian": 161.3, "Canadian": 162.3, "Cape Verdean": undefined, "Catalan": undefined,
+ "Central African": 158.9, "Chadian": 162.6, "Chilean": 157.2, "Chinese": 155.8, "Colombian": 158.7, "Comorian": 154.8, "Congolese": 159, "a Cook Islander": 162.3, "Costa Rican": undefined,
+ "Croatian": 166.3, "Cuban": 156, "Cypriot": 163.4, "Czech": 167.22, "Danish": 168.7, "Djiboutian": undefined, "Dominican": 156.4, "Dominiquais": 157.2, "Dutch": 169, "East Timorese": 149.1,
+ "Ecuadorian": 153.4, "Egyptian": 158.9, "Emirati": 158.9, "Equatoguinean": undefined, "Eritrean": undefined, "Estonian": 165.5, "Ethiopian": 157.6, "Fijian": 161.8, "Filipina": 151.8,
+ "Finnish": 165.3, "French Guianan": 157, "French Polynesian": undefined, "French": 162.5, "Gabonese": 158.4, "Gambian": 157.8, "Georgian": 160.5, "German": 162.8, "Ghanan": 158.5,
+ "Greek": 165, "Greenlandic": undefined, "Grenadian": undefined, "Guatemalan": 147.3, "Guinean": 158.8, "Guyanese": 157.9, "Haitian": 158.6, "Honduran": 152.0, "Hungarian": 164,
+ "I-Kiribati": undefined, "Icelandic": 168, "Indian": 151.9, "Indonesian": 147, "Iranian": 157.2, "Iraqi": 155.8, "Irish": 163, "Israeli": 166, "Italian": 162.5, "Ivorian": 158.9,
+ "Jamaican": 160.8, "Japanese": 158, "Jordanian": 158.2, "Kazakh": 159.8, "Kenyan": 159.4, "Kittitian": 156.9, "Korean": 156.15, "Kosovan": undefined, "Kurdish": undefined, "Kuwaiti": 156.1,
+ "Kyrgyz": 158.6, "Laotian": undefined, "Latvian": 165.7, "Lebanese": 165, "Liberian": 157.3, "Libyan": 160.5, "a Liechtensteiner": 164.3, "Lithuanian": 167.5, "Luxembourgian": 164.8,
+ "Macedonian": undefined, "Malagasy": 154.3, "Malawian": 155, "Malaysian": 154.7, "Maldivian": undefined, "Malian": 160.4, "Maltese": 159.9, "Marshallese": undefined, "Mauritanian": undefined,
+ "Mauritian": undefined, "Mexican": 154, "Micronesian": undefined, "Moldovan": 161.2, "Monégasque": undefined, "Mongolian": 157.7, "Montenegrin": 168.4, "Moroccan": 158.5, "Mosotho": 157.6,
+ "Motswana": undefined, "Mozambican": 156, "Namibian": 160.7, "Nauruan": undefined, "Nepalese": 150.8, "a New Zealander": 164, "Ni-Vanuatu": 149.8, "Nicaraguan": 153.7, "Nigerian": 163.8,
+ "Nigerien": 157.8, "Niuean": 160.4, "Norwegian": 157.8, "Omani": undefined, "Pakistani": 151.9, "Palauan": 161.4, "Palestinian": 158.2, "Panamanian": 152.0, "Papua New Guinean": 150.7,
+ "Paraguayan": 158.3, "Peruvian": 151, "Polish": 165.1, "Portuguese": 165.1, "Puerto Rican": 158.9, "Qatari": 155, "Romanian": 157, "Russian": 164.1, "Rwandan": 157.7, "Sahrawi": undefined,
+ "Saint Lucian": 157.1, "Salvadoran": 160.3, "Sammarinese": undefined, "Samoan": 161, "São Toméan": undefined, "Saudi": 156.3, "Scottish": 163, "Senegalese": 163, "Serbian": 166.8,
+ "Seychellois": 155.8, "Sierra Leonean": undefined, "Singaporean": 160.0, "Slovak": 165.6, "Slovene": 167.4, "a Solomon Islander": 151.8, "Somali": undefined, "South African": 159,
+ "South Sudanese": undefined, "Spanish": 162.6, "Sri Lankan": 151.4, "Sudanese": 180.0, "Surinamese": 155.7, "Swazi": 159.1, "Swedish": 166.8, "Swiss": 162.5, "Syrian": 156.3, "Taiwanese": 160.4,
+ "Tajik": 161.2, "Tanzanian": 156.6, "Thai": 159, "Tibetan": undefined, "Togolese": 159, "Tongan": 159.5, "Trinidadian": 157.4, "Tunisian": 160, "Turkish": 161.9, "Turkmen": 158.2,
+ "Tuvaluan": undefined, "Ugandan": 159.2, "Ukrainian": 164.8, "Uruguayan": 158.0, "Uzbek": 159.9, "Vatican": 162.5, "Venezuelan": 159, "Vietnamese": 155.2, "Vincentian": 156.2, "Yemeni": undefined,
+ "Zairian": 157.7, "Zambian": 158.5, "Zimbabwean": 160.3,
"": 162.5 // default
};
const xyMeanHeight = {
- "American.white": 178.2, "American.black": 177.4, "American.latina": 172.5, "American.asian": 172.5, "American": 176.4,
- "Afghan": undefined, "Algerian": 172.2, "Argentinian": 174.46, "Armenian": undefined, "Australian": 175.6,
- "Austrian": 179, "Bangladeshi": 150.8, "Belarusian": 176.9, "Belgian": 178.7, "Bolivian": 160, "Brazilian": 170.7,
- "British": 175.3, "Burmese": 168.0, "Canadian": 175.1, "Chilean": 169.6, "Chinese": 167.1, "Colombian": 170.6,
- "Zairian": 158.9, "Cuban": 168, "Czech": 180.31, "Danish": 180.4, "Dominican": 168.4, "Dutch": 181, "Egyptian": 170.3,
- "Emirati": 170.3, "Estonian": 179.1, "Ethiopian": undefined, "Filipina": 163.5, "Finnish": 178.9, "French": 175.6,
- "German": 175.4, "Ghanan": 169.5, "Greek": 177, "Guatemalan": 157.5, "Haitian": undefined, "Hungarian": 176,
- "Icelandic": 181, "Indian": 164.7, "Indonesian": 158, "Iranian": 170.3, "Iraqi": 165.4, "Irish": 177, "Israeli": 177,
- "Italian": 176.5, "Jamaican": 171.8, "Japanese": 172, "Jordanian": undefined, "Kazakh": 169, "Kenyan": 170.0,
- "Korean": 168.15, "Lebanese": 176, "Libyan": 171.3, "Lithuanian": 177.2, "Malaysian": 166.3, "Malian": 171.3,
- "Mexican": 167, "Moroccan": 172.7, "Nepalese": 163, "Nigerian": 163.8, "Norwegian": 179.63, "Omani": undefined,
- "Pakistani": 164.7, "Peruvian": 164, "Polish": 178.7, "Portuguese": 173.9, "Puerto Rican": 172.5, "Romanian": 172,
- "Russian": 177.2, "Saudi": 168.9, "Scottish": 177.6, "Serbian": 182, "Slovak": 179.4, "South African": 168,
- "Spanish": 173.1, "Sudanese": 190.0, "Swedish": 181.5, "Swiss": 178.2, "Tanzanian": undefined, "Thai": 170.3,
- "Tunisian": 172.3, "Turkish": 173.6, "Ugandan": undefined, "Ukrainian": 176.5, "Uzbek": 175.4, "Venezuelan": 169,
- "Vietnamese": 165.7, "Yemeni": 159.9, "a New Zealander": 177, "Zimbabwean": undefined, "Sammarinese": undefined,
- "Marshallese": undefined, "Syrian": 173.0, "Bermudian": undefined, "Uruguayan": 170.0, "Monégasque": undefined,
- "Montenegrin": 183.2, "Cambodian": 162.5, "Cameroonian": 170.6, "Gabonese": undefined, "Djiboutian": undefined,
- "Greenlandic": undefined, "Tuvaluan": undefined, "Zambian": undefined, "Albanian": 174.0, "Bruneian": undefined,
- "Singaporean": 170.6, "Andorran": undefined, "Croatian": 180.5, "Bulgarian": 175.2, "Laotian": 160.5,
- "Mongolian": 168.4, "Taiwanese": 171.4, "Belizean": undefined, "Grenadian": undefined, "I-Kiribati": undefined,
- "Malagasy": 161.5, "Maldivian": undefined, "Bosnian": 183.9, "Kosovan": undefined, "Macedonian": undefined,
- "Honduran": undefined, "Maltese": 169.9, "Nauruan": undefined, "Micronesian": undefined, "Costa Rican": undefined,
- "Salvadoran": undefined, "Nicaraguan": undefined, "Panamanian": 165.0, "Nigerien": 163.8, "Luxembourgian": 179.9,
- "Moldovan": undefined, ".white": 177.6, "Antiguan": 164.8, "Aruban": 165.1, "Azerbaijani": 171.8, "Bahamian": 167.2, "Bahraini": 165.1,
- "Barbadian": 169.3, "Bhutanese": 167.2, "Burundian": 164.1, "a Cook Islander": 173.4, "Cypriot": 177.2,
- "Dominiquais": 168.1, "East Timorese": 161.2, "Ecuadorian": 167.5, "Fijian": 170.4, "French Guianan": 168,
- "Georgian": 172.7, "Guyanese": 168.6, "Kuwaiti": 169.2, "Kyrgyz": 170.4, "Latvian": 174.2, "a Liechtensteiner": 175.4,
- "Niuean": 169.7, "Palauan": 174.6, "Palestinian": 169.7, "Papua New Guinean": 163.5, "Paraguayan": 168.8, "Qatari": 166.2,
- "Kittitian": 164.4, "Saint Lucian": 168.3, "Vincentian": 165.4, "Samoan": 173, "Seychellois": 168.5,
- "Slovene": 180.3, "a Solomon Islander": 163.1, "Sri Lankan": 163.6, "Surinamese": 165.2, "Tajik": 175.2, "Tongan": 168.2,
- "Trinidadian": 170.8, "Turkmen": 171.4, "Ni-Vanuatu": 160.5, "Vatican": 176.5, "Angolan": undefined, "Beninese": undefined,
- "Bissau-Guinean": undefined, "Burkinabé": undefined, "Cape Verdean": undefined, "Catalan": undefined, "Central African": undefined,
- "Chadian": undefined, "Comorian": undefined, "Congolese": undefined, "Equatoguinean": undefined, "Eritrean": undefined,
- "French Polynesian": undefined, "Gambian": 168, "Guinean": undefined, "Ivorian": undefined, "Kurdish": undefined, "Liberian": undefined,
- "Malawian": 166, "Mauritanian": undefined, "Mauritian": undefined, "Mosotho": undefined, "Motswana": undefined, "Mozambican": undefined,
- "Namibian": undefined, "Rwandan": undefined, "Sahrawi": undefined, "São Toméan": undefined, "Senegalese": undefined, "Sierra Leonean": undefined,
- "Somali": undefined, "South Sudanese": undefined, "Swazi": undefined, "Tibetan": undefined, "Togolese": undefined,
+ "Afghan": undefined, "Albanian": 174.0, "Algerian": 172.2, "American.asian": 172.5, "American.black": 177.4, "American.latina": 172.5, "American.white": 178.2, "American": 176.4,
+ "Andorran": undefined, "Angolan": undefined, "Antiguan": 164.8, "Argentinian": 174.46, "Armenian": undefined, "Aruban": 165.1, "Australian": 175.6, "Austrian": 179, "Azerbaijani": 171.8,
+ "Bahamian": 167.2, "Bahraini": 165.1, "Bangladeshi": 150.8, "Barbadian": 169.3, "Belarusian": 176.9, "Belgian": 178.7, "Belizean": undefined, "Beninese": undefined, "Bermudian": undefined,
+ "Bhutanese": 167.2, "Bissau-Guinean": undefined, "Bolivian": 160, "Bosnian": 183.9, "Brazilian": 170.7, "British": 175.3, "Bruneian": undefined, "Bulgarian": 175.2, "Burkinabé": undefined,
+ "Burmese": 168.0, "Burundian": 164.1, "Cambodian": 162.5, "Cameroonian": 170.6, "Canadian": 175.1, "Cape Verdean": undefined, "Catalan": undefined, "Central African": undefined,
+ "Chadian": undefined, "Chilean": 169.6, "Chinese": 167.1, "Colombian": 170.6, "Comorian": undefined, "Congolese": undefined, "a Cook Islander": 173.4, "Costa Rican": undefined, "Croatian": 180.5,
+ "Cuban": 168, "Cypriot": 177.2, "Czech": 180.31, "Danish": 180.4, "Djiboutian": undefined, "Dominican": 168.4, "Dominiquais": 168.1, "Dutch": 181, "East Timorese": 161.2, "Ecuadorian": 167.5,
+ "Egyptian": 170.3, "Emirati": 170.3, "Equatoguinean": undefined, "Eritrean": undefined, "Estonian": 179.1, "Ethiopian": undefined, "Fijian": 170.4, "Filipina": 163.5, "Finnish": 178.9,
+ "French Guianan": 168, "French Polynesian": undefined, "French": 175.6, "Gabonese": undefined, "Gambian": 168, "Georgian": 172.7, "German": 175.4, "Ghanan": 169.5, "Greek": 177, "Greenlandic": undefined,
+ "Grenadian": undefined, "Guatemalan": 157.5, "Guinean": undefined, "Guyanese": 168.6, "Haitian": undefined, "Honduran": undefined, "Hungarian": 176, "I-Kiribati": undefined, "Icelandic": 181,
+ "Indian": 164.7, "Indonesian": 158, "Iranian": 170.3, "Iraqi": 165.4, "Irish": 177, "Israeli": 177, "Italian": 176.5, "Ivorian": undefined, "Jamaican": 171.8, "Japanese": 172, "Jordanian": undefined,
+ "Kazakh": 169, "Kenyan": 170.0, "Kittitian": 164.4, "Korean": 168.15, "Kosovan": undefined, "Kurdish": undefined, "Kuwaiti": 169.2, "Kyrgyz": 170.4, "Laotian": 160.5, "Latvian": 174.2, "Lebanese": 176,
+ "Liberian": undefined, "Libyan": 171.3, "a Liechtensteiner": 175.4, "Lithuanian": 177.2, "Luxembourgian": 179.9, "Macedonian": undefined, "Malagasy": 161.5, "Malawian": 166, "Malaysian": 166.3,
+ "Maldivian": undefined, "Malian": 171.3, "Maltese": 169.9, "Marshallese": undefined, "Mauritanian": undefined, "Mauritian": undefined, "Mexican": 167, "Micronesian": undefined, "Moldovan": undefined,
+ "Monégasque": undefined, "Mongolian": 168.4, "Montenegrin": 183.2, "Moroccan": 172.7, "Mosotho": undefined, "Motswana": undefined, "Mozambican": undefined, "Namibian": undefined, "Nauruan": undefined,
+ "Nepalese": 163, "a New Zealander": 177, "Ni-Vanuatu": 160.5, "Nicaraguan": undefined, "Nigerian": 163.8, "Nigerien": 163.8, "Niuean": 169.7, "Norwegian": 179.63, "Omani": undefined, "Pakistani": 164.7,
+ "Palauan": 174.6, "Palestinian": 169.7, "Panamanian": 165.0, "Papua New Guinean": 163.5, "Paraguayan": 168.8, "Peruvian": 164, "Polish": 178.7, "Portuguese": 173.9, "Puerto Rican": 172.5, "Qatari": 166.2,
+ "Romanian": 172, "Russian": 177.2, "Rwandan": undefined, "Sahrawi": undefined, "Saint Lucian": 168.3, "Salvadoran": undefined, "Sammarinese": undefined, "Samoan": 173, "São Toméan": undefined,
+ "Saudi": 168.9, "Scottish": 177.6, "Senegalese": undefined, "Serbian": 182, "Seychellois": 168.5, "Sierra Leonean": undefined, "Singaporean": 170.6, "Slovak": 179.4, "Slovene": 180.3,
+ "a Solomon Islander": 163.1, "Somali": undefined, "South African": 168, "South Sudanese": undefined, "Spanish": 173.1, "Sri Lankan": 163.6, "Sudanese": 190.0, "Surinamese": 165.2, "Swazi": undefined,
+ "Swedish": 181.5, "Swiss": 178.2, "Syrian": 173.0, "Taiwanese": 171.4, "Tajik": 175.2, "Tanzanian": undefined, "Thai": 170.3, "Tibetan": undefined, "Togolese": undefined, "Tongan": 168.2,
+ "Trinidadian": 170.8, "Tunisian": 172.3, "Turkish": 173.6, "Turkmen": 171.4, "Tuvaluan": undefined, "Ugandan": undefined, "Ukrainian": 176.5, "Uruguayan": 170.0, "Uzbek": 175.4, "Vatican": 176.5,
+ "Venezuelan": 169, "Vietnamese": 165.7, "Vincentian": 165.4, "Yemeni": 159.9, "Zairian": 158.9, "Zambian": undefined, "Zimbabwean": undefined,
"": 172.5 // defaults
};
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 53536e70f95e1835ae3db91b46ce447211edc6a8..91caf787a0c769d34717263bf2dee8eed70d2193 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -94,7 +94,7 @@
<<replace "#indstat">>
<br>
''Weeks left (Must be 0 or bigger)''<<textbox "$tempSlave.indenture" $tempSlave.indenture>><br>
- ''Indenture Restriction(0: no protection, 1: some protection, 2: full protection): @@.green;$tempSlave.indentureRestrictions@@<br>
+ ''Indenture Restriction (0: no protection, 1: some protection, 2: full protection): @@.green;$tempSlave.indentureRestrictions@@<br>
<<textbox "$tempSlave.indentureRestrictions" $tempSlave.indentureRestrictions>><br>
<</replace>>
<</link>>
@@ -102,10 +102,10 @@
<br>''She is your Slave since Week @@.yellow;$tempSlave.weekAcquired@@ ''<br>
<<textbox "$tempSlave.weekAcquired" $tempSlave.weekAcquired>>
<br>
- <br>''Birth name:( [first Name] [Surname] 0 for no Surname)''<br>
+ <br>''Birth Name: ( [first Name] [Surname] 0 for no Surname)''<br>
<<textbox "$tempSlave.birthName" $tempSlave.birthName>>
<<textbox "$tempSlave.birthSurname" $tempSlave.birthSurname>><br>
- ''Current Name:( [first Name] [Surname] 0 for no Surname)''<br>
+ ''Current Name: ( [first Name] [Surname] 0 for no Surname)''<br>
<<textbox "$tempSlave.slaveName" $tempSlave.slaveName>>
<<textbox "$tempSlave.slaveSurname" $tempSlave.slaveSurname>>
<br>
@@ -116,7 +116,7 @@
''Active Slaves ID : @@.yellow;$tempSlave.ID@@''
<br><br>
<<if $familyTesting == 1>>
- ''Enter the IDs for this slaves parents(-2 or 0:random and untracked by system, -1:PC, all others are applicable):''
+ ''Enter the IDs for this slaves parents (-2 or 0:random and untracked by system, -1:PC, all others are applicable):''
<br>
''mother ID''
<<textbox "$tempSlave.mother" $tempSlave.mother>>
@@ -558,6 +558,10 @@
<br>North America<br>
<<NOptions "American" >>
<<print " | ">>
+ <<NOptions "Antiguan" >>
+ <<print " | ">>
+ <<NOptions "Aruban" >>
+ <<print " | ">>
<<NOptions "Bahamian" >>
<<print " | ">>
<<NOptions "Barbadian" >>
@@ -571,11 +575,11 @@
<<NOptions "Costa Rican" >>
<<print " | ">>
<<NOptions "Cuban" >>
- <<print " | ">>
+ <br>
<<NOptions "Dominican" >>
<<print " | ">>
<<NOptions "Dominiquais" >>
- <br>
+ <<print " | ">>
<<NOptions "Greenlandic" >>
<<print " | ">>
<<NOptions "Grenadian" >>
@@ -588,17 +592,23 @@
<<print " | ">>
<<NOptions "Jamaican" >>
<<print " | ">>
- <<NOptions "Mexican" >>
+ <<NOptions "Kittitian" >>
<<print " | ">>
+ <<NOptions "Mexican" >>
+ <br>
<<NOptions "Nicaraguan" >>
<<print " | ">>
<<NOptions "Panamanian" >>
<<print " | ">>
<<NOptions "Puerto Rican" >>
<br>
+ <<NOptions "Saint Lucian" >>
+ <<print " | ">>
<<NOptions "Salvadoran" >>
<<print " | ">>
<<NOptions "Trinidadian" >>
+ <<print " | ">>
+ <<NOptions "Vincentian" >>
<br>
<br>South America<br>
@@ -3652,8 +3662,8 @@
/*-------------------------------------------------------------------------------------------------------------------------------*/
<br><<print "@@.yellow;Refresh through selecting a new or the same passage again for Changes to be seen@@" >><br>
<span id="spot"></span><br>
-/* ------------------------------------------------------------------------- Used Variables : ------------------------------------------------------------------------------------------------*/
+/* ------------------------------------------------------------------------- Used Variables: ------------------------------------------------------------------------------------------------*/
/*.visualAge .ageImplant .birthWeek .health .chem .addict .devotion .oldDevotion .trust .oldTrust .face .faceShape .faceImplant .markings .bald .hLength .hStyle .hColor .origHColor */
/*.pubicHColor .pubicHStyle .underArmHColor .underArmHStyle .eyeColor .origEye .eyes .lips .lipsImplant .teeth .voiceImplant .voice .accent .genes .amp .fuckdoll .muscles .weight */
/*.waist .height .heightImplant .shoulders .shouldersImplant .hips .hipsImplant .bellyImplant .bellySag .burst .boobs .boobsImplant .boobsImplantType .lactation .boobShape .nipples .areolae */
-/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .csec .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls */
+/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .csec .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls */
\ No newline at end of file
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index f9015f54b47450447a6b948caf80ef53fa89fcf8..9437b19eccfc0ae2f01c8d9b01cf225325f71938 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -86,85 +86,56 @@ window.Height = (function(){
/* if you can find an average for an undefined, add it in! */
const xxMeanHeight = {
- "American.white": 165, "American.black": 163.6, "American.latina": 158.9, "American.asian": 158.4, "American": 161.8,
- "Afghan": 163.8, "Algerian": 162, "Argentinian": 159.6, "Armenian": 158.1, "Australian": 161.8, "Austrian": 166,
- "Bangladeshi": 150.6, "Belarusian": 166.8, "Belgian": 168.1, "Bolivian": 142.2, "Brazilian": 158.8,
- "British": 161.9, "Burmese": undefined, "Canadian": 162.3, "Chilean": 157.2, "Chinese": 155.8, "Colombian": 158.7,
- "Zairian": 157.7, "Cuban": 156, "Czech": 167.22, "Danish": 168.7, "Dominican": 156.4, "Dutch": 169, "Egyptian": 158.9,
- "Emirati": 158.9, "Estonian": 165.5, "Ethiopian": 157.6, "Filipina": 151.8, "Finnish": 165.3, "French": 162.5,
- "German": 162.8, "Ghanan": 158.5, "Greek": 165, "Guatemalan": 147.3, "Haitian": 158.6, "Hungarian": 164,
- "Icelandic": 168, "Indian": 151.9, "Indonesian": 147, "Iranian": 157.2, "Iraqi": 155.8, "Irish": 163, "Israeli": 166,
- "Italian": 162.5, "Jamaican": 160.8, "Japanese": 158, "Jordanian": 158.2, "Kazakh": 159.8, "Kenyan": 159.4,
- "Korean": 156.15, "Lebanese": 165, "Libyan": 160.5, "Lithuanian": 167.5, "Malaysian": 154.7, "Malian": 160.4,
- "Mexican": 154, "Moroccan": 158.5, "Nepalese": 150.8, "Nigerian": 163.8, "Norwegian": 157.8, "Omani": undefined,
- "Pakistani": 151.9, "Peruvian": 151, "Polish": 165.1, "Portuguese": 165.1, "Puerto Rican": 158.9, "Romanian": 157,
- "Russian": 164.1, "Saudi": 156.3, "Scottish": 163, "Serbian": 166.8, "Slovak": 165.6, "South African": 159,
- "Spanish": 162.6, "Sudanese": 180.0, "Swedish": 166.8, "Swiss": 162.5, "Tanzanian": 156.6, "Thai": 159,
- "Tunisian": 160, "Turkish": 161.9, "Ugandan": 159.2, "Ukrainian": 164.8, "Uzbek": 159.9, "Venezuelan": 159,
- "Vietnamese": 155.2, "Yemeni": undefined, "a New Zealander": 164, "Zimbabwean": 160.3, "Sammarinese": undefined,
- "Marshallese": undefined, "Syrian": 156.3, "Bermudian": undefined, "Uruguayan": 158.0, "Monégasque": undefined,
- "Montenegrin": 168.4, "Cambodian": 152.4, "Cameroonian": 161.3, "Gabonese": 158.4, "Djiboutian": undefined,
- "Greenlandic": undefined, "Tuvaluan": undefined, "Zambian": 158.5, "Albanian": 161.8, "Bruneian": undefined,
- "Singaporean": 160.0, "Croatian": 166.3, "Bulgarian": 163.2, "Laotian": undefined, "Mongolian": 157.7, "Taiwanese": 160.4,
- "Belizean": undefined, "Grenadian": undefined, "I-Kiribati": undefined, "Malagasy": 154.3, "Maldivian": undefined,
- "Bosnian": 171.1, "Kosovan": undefined, "Macedonian": undefined, "Honduran": 152.0, "Maltese": 159.9,
- "Nauruan": undefined, "Micronesian": undefined, "Costa Rican": undefined, "Salvadoran": 160.3, "Nicaraguan": 153.7,
- "Panamanian": 152.0, "Nigerien": 157.8, "Andorran": undefined, "Bulgarian": 163.2, "Luxembourgian": 164.8,
- "Moldovan": 161.2, "Antiguan": 156.8, "Aruban": 158, "Azerbaijani": 162.4, "Bahamian": 157.1, "Bahraini": 165.2,
- "Barbadian": 158.5, "Bhutanese": 153.4, "Burundian": 157, "a Cook Islander": 162.3, "Cypriot": 163.4,
- "Dominiquais": 157.2, "East Timorese": 149.1, "Ecuadorian": 153.4, "Fijian": 161.8, "French Guianan": 157,
- "Georgian": 160.5, "Guyanese": 157.9, "Kuwaiti": 156.1, "Kyrgyz": 158.6, "Latvian": 165.7, "a Liechtensteiner": 164.3,
- "Niuean": 160.4, "Palauan": 161.4, "Palestinian": 158.2, "Papua New Guinean": 150.7, "Paraguayan": 158.3, "Qatari": 155,
- "Kittitian": 156.9, "Saint Lucian": 157.1, "Vincentian": 156.2, "Samoan": 161, "Seychellois": 155.8,
- "Slovene": 167.4, "a Solomon Islander": 151.8, "Sri Lankan": 151.4, "Surinamese": 155.7, "Tajik": 161.2, "Tongan": 159.5,
- "Trinidadian": 157.4, "Turkmen": 158.2, "Ni-Vanuatu": 149.8, "Vatican": 162.5, "Angolan": undefined, "Beninese": 159.3,
- "Bissau-Guinean": undefined, "Burkinabé": 161.6, "Cape Verdean": undefined, "Catalan": undefined, "Central African": 158.9,
- "Chadian": 162.6, "Comorian": 154.8, "Congolese": 159, "Equatoguinean": undefined, "Eritrean": undefined,
- "French Polynesian": undefined, "Gambian": 157.8, "Guinean": 158.8, "Ivorian": 158.9, "Kurdish": undefined, "Liberian": 157.3,
- "Malawian": 155, "Mauritanian": undefined, "Mauritian": undefined, "Mosotho": 157.6, "Motswana": undefined, "Mozambican": 156,
- "Namibian": 160.7, "Rwandan": 157.7, "Sahrawi": undefined, "São Toméan": undefined, "Senegalese": 163, "Sierra Leonean": undefined,
- "Somali": undefined, "South Sudanese": undefined, "Swazi": 159.1, "Tibetan": undefined, "Togolese": 159,
+ "Afghan": 163.8, "Albanian": 161.8, "Algerian": 162, "American.asian": 158.4, "American.black": 163.6, "American.latina": 158.9, "American.white": 165, "American": 161.8,
+ "Andorran": undefined, "Angolan": undefined, "Antiguan": 156.8, "Argentinian": 159.6, "Armenian": 158.1, "Aruban": 158, "Australian": 161.8, "Austrian": 166, "Azerbaijani": 162.4,
+ "Bahamian": 157.1, "Bahraini": 165.2, "Bangladeshi": 150.6, "Barbadian": 158.5, "Belarusian": 166.8, "Belgian": 168.1, "Belizean": undefined, "Beninese": 159.3, "Bermudian": undefined,
+ "Bhutanese": 153.4, "Bissau-Guinean": undefined, "Bolivian": 142.2, "Bosnian": 171.1, "Brazilian": 158.8, "British": 161.9, "Bruneian": undefined, "Bulgarian": 163.2, "Bulgarian": 163.2,
+ "Burkinabé": 161.6, "Burmese": undefined, "Burundian": 157, "Cambodian": 152.4, "Cameroonian": 161.3, "Canadian": 162.3, "Cape Verdean": undefined, "Catalan": undefined,
+ "Central African": 158.9, "Chadian": 162.6, "Chilean": 157.2, "Chinese": 155.8, "Colombian": 158.7, "Comorian": 154.8, "Congolese": 159, "a Cook Islander": 162.3, "Costa Rican": undefined,
+ "Croatian": 166.3, "Cuban": 156, "Cypriot": 163.4, "Czech": 167.22, "Danish": 168.7, "Djiboutian": undefined, "Dominican": 156.4, "Dominiquais": 157.2, "Dutch": 169, "East Timorese": 149.1,
+ "Ecuadorian": 153.4, "Egyptian": 158.9, "Emirati": 158.9, "Equatoguinean": undefined, "Eritrean": undefined, "Estonian": 165.5, "Ethiopian": 157.6, "Fijian": 161.8, "Filipina": 151.8,
+ "Finnish": 165.3, "French Guianan": 157, "French Polynesian": undefined, "French": 162.5, "Gabonese": 158.4, "Gambian": 157.8, "Georgian": 160.5, "German": 162.8, "Ghanan": 158.5,
+ "Greek": 165, "Greenlandic": undefined, "Grenadian": undefined, "Guatemalan": 147.3, "Guinean": 158.8, "Guyanese": 157.9, "Haitian": 158.6, "Honduran": 152.0, "Hungarian": 164,
+ "I-Kiribati": undefined, "Icelandic": 168, "Indian": 151.9, "Indonesian": 147, "Iranian": 157.2, "Iraqi": 155.8, "Irish": 163, "Israeli": 166, "Italian": 162.5, "Ivorian": 158.9,
+ "Jamaican": 160.8, "Japanese": 158, "Jordanian": 158.2, "Kazakh": 159.8, "Kenyan": 159.4, "Kittitian": 156.9, "Korean": 156.15, "Kosovan": undefined, "Kurdish": undefined, "Kuwaiti": 156.1,
+ "Kyrgyz": 158.6, "Laotian": undefined, "Latvian": 165.7, "Lebanese": 165, "Liberian": 157.3, "Libyan": 160.5, "a Liechtensteiner": 164.3, "Lithuanian": 167.5, "Luxembourgian": 164.8,
+ "Macedonian": undefined, "Malagasy": 154.3, "Malawian": 155, "Malaysian": 154.7, "Maldivian": undefined, "Malian": 160.4, "Maltese": 159.9, "Marshallese": undefined, "Mauritanian": undefined,
+ "Mauritian": undefined, "Mexican": 154, "Micronesian": undefined, "Moldovan": 161.2, "Monégasque": undefined, "Mongolian": 157.7, "Montenegrin": 168.4, "Moroccan": 158.5, "Mosotho": 157.6,
+ "Motswana": undefined, "Mozambican": 156, "Namibian": 160.7, "Nauruan": undefined, "Nepalese": 150.8, "a New Zealander": 164, "Ni-Vanuatu": 149.8, "Nicaraguan": 153.7, "Nigerian": 163.8,
+ "Nigerien": 157.8, "Niuean": 160.4, "Norwegian": 157.8, "Omani": undefined, "Pakistani": 151.9, "Palauan": 161.4, "Palestinian": 158.2, "Panamanian": 152.0, "Papua New Guinean": 150.7,
+ "Paraguayan": 158.3, "Peruvian": 151, "Polish": 165.1, "Portuguese": 165.1, "Puerto Rican": 158.9, "Qatari": 155, "Romanian": 157, "Russian": 164.1, "Rwandan": 157.7, "Sahrawi": undefined,
+ "Saint Lucian": 157.1, "Salvadoran": 160.3, "Sammarinese": undefined, "Samoan": 161, "São Toméan": undefined, "Saudi": 156.3, "Scottish": 163, "Senegalese": 163, "Serbian": 166.8,
+ "Seychellois": 155.8, "Sierra Leonean": undefined, "Singaporean": 160.0, "Slovak": 165.6, "Slovene": 167.4, "a Solomon Islander": 151.8, "Somali": undefined, "South African": 159,
+ "South Sudanese": undefined, "Spanish": 162.6, "Sri Lankan": 151.4, "Sudanese": 180.0, "Surinamese": 155.7, "Swazi": 159.1, "Swedish": 166.8, "Swiss": 162.5, "Syrian": 156.3, "Taiwanese": 160.4,
+ "Tajik": 161.2, "Tanzanian": 156.6, "Thai": 159, "Tibetan": undefined, "Togolese": 159, "Tongan": 159.5, "Trinidadian": 157.4, "Tunisian": 160, "Turkish": 161.9, "Turkmen": 158.2,
+ "Tuvaluan": undefined, "Ugandan": 159.2, "Ukrainian": 164.8, "Uruguayan": 158.0, "Uzbek": 159.9, "Vatican": 162.5, "Venezuelan": 159, "Vietnamese": 155.2, "Vincentian": 156.2, "Yemeni": undefined,
+ "Zairian": 157.7, "Zambian": 158.5, "Zimbabwean": 160.3,
"": 162.5 // default
};
const xyMeanHeight = {
- "American.white": 178.2, "American.black": 177.4, "American.latina": 172.5, "American.asian": 172.5, "American": 176.4,
- "Afghan": undefined, "Algerian": 172.2, "Argentinian": 174.46, "Armenian": undefined, "Australian": 175.6,
- "Austrian": 179, "Bangladeshi": 150.8, "Belarusian": 176.9, "Belgian": 178.7, "Bolivian": 160, "Brazilian": 170.7,
- "British": 175.3, "Burmese": 168.0, "Canadian": 175.1, "Chilean": 169.6, "Chinese": 167.1, "Colombian": 170.6,
- "Zairian": 158.9, "Cuban": 168, "Czech": 180.31, "Danish": 180.4, "Dominican": 168.4, "Dutch": 181, "Egyptian": 170.3,
- "Emirati": 170.3, "Estonian": 179.1, "Ethiopian": undefined, "Filipina": 163.5, "Finnish": 178.9, "French": 175.6,
- "German": 175.4, "Ghanan": 169.5, "Greek": 177, "Guatemalan": 157.5, "Haitian": undefined, "Hungarian": 176,
- "Icelandic": 181, "Indian": 164.7, "Indonesian": 158, "Iranian": 170.3, "Iraqi": 165.4, "Irish": 177, "Israeli": 177,
- "Italian": 176.5, "Jamaican": 171.8, "Japanese": 172, "Jordanian": undefined, "Kazakh": 169, "Kenyan": 170.0,
- "Korean": 168.15, "Lebanese": 176, "Libyan": 171.3, "Lithuanian": 177.2, "Malaysian": 166.3, "Malian": 171.3,
- "Mexican": 167, "Moroccan": 172.7, "Nepalese": 163, "Nigerian": 163.8, "Norwegian": 179.63, "Omani": undefined,
- "Pakistani": 164.7, "Peruvian": 164, "Polish": 178.7, "Portuguese": 173.9, "Puerto Rican": 172.5, "Romanian": 172,
- "Russian": 177.2, "Saudi": 168.9, "Scottish": 177.6, "Serbian": 182, "Slovak": 179.4, "South African": 168,
- "Spanish": 173.1, "Sudanese": 190.0, "Swedish": 181.5, "Swiss": 178.2, "Tanzanian": undefined, "Thai": 170.3,
- "Tunisian": 172.3, "Turkish": 173.6, "Ugandan": undefined, "Ukrainian": 176.5, "Uzbek": 175.4, "Venezuelan": 169,
- "Vietnamese": 165.7, "Yemeni": 159.9, "a New Zealander": 177, "Zimbabwean": undefined, "Sammarinese": undefined,
- "Marshallese": undefined, "Syrian": 173.0, "Bermudian": undefined, "Uruguayan": 170.0, "Monégasque": undefined,
- "Montenegrin": 183.2, "Cambodian": 162.5, "Cameroonian": 170.6, "Gabonese": undefined, "Djiboutian": undefined,
- "Greenlandic": undefined, "Tuvaluan": undefined, "Zambian": undefined, "Albanian": 174.0, "Bruneian": undefined,
- "Singaporean": 170.6, "Andorran": undefined, "Croatian": 180.5, "Bulgarian": 175.2, "Laotian": 160.5,
- "Mongolian": 168.4, "Taiwanese": 171.4, "Belizean": undefined, "Grenadian": undefined, "I-Kiribati": undefined,
- "Malagasy": 161.5, "Maldivian": undefined, "Bosnian": 183.9, "Kosovan": undefined, "Macedonian": undefined,
- "Honduran": undefined, "Maltese": 169.9, "Nauruan": undefined, "Micronesian": undefined, "Costa Rican": undefined,
- "Salvadoran": undefined, "Nicaraguan": undefined, "Panamanian": 165.0, "Nigerien": 163.8, "Luxembourgian": 179.9,
- "Moldovan": undefined, ".white": 177.6, "Antiguan": 164.8, "Aruban": 165.1, "Azerbaijani": 171.8, "Bahamian": 167.2, "Bahraini": 165.1,
- "Barbadian": 169.3, "Bhutanese": 167.2, "Burundian": 164.1, "a Cook Islander": 173.4, "Cypriot": 177.2,
- "Dominiquais": 168.1, "East Timorese": 161.2, "Ecuadorian": 167.5, "Fijian": 170.4, "French Guianan": 168,
- "Georgian": 172.7, "Guyanese": 168.6, "Kuwaiti": 169.2, "Kyrgyz": 170.4, "Latvian": 174.2, "a Liechtensteiner": 175.4,
- "Niuean": 169.7, "Palauan": 174.6, "Palestinian": 169.7, "Papua New Guinean": 163.5, "Paraguayan": 168.8, "Qatari": 166.2,
- "Kittitian": 164.4, "Saint Lucian": 168.3, "Vincentian": 165.4, "Samoan": 173, "Seychellois": 168.5,
- "Slovene": 180.3, "a Solomon Islander": 163.1, "Sri Lankan": 163.6, "Surinamese": 165.2, "Tajik": 175.2, "Tongan": 168.2,
- "Trinidadian": 170.8, "Turkmen": 171.4, "Ni-Vanuatu": 160.5, "Vatican": 176.5, "Angolan": undefined, "Beninese": undefined,
- "Bissau-Guinean": undefined, "Burkinabé": undefined, "Cape Verdean": undefined, "Catalan": undefined, "Central African": undefined,
- "Chadian": undefined, "Comorian": undefined, "Congolese": undefined, "Equatoguinean": undefined, "Eritrean": undefined,
- "French Polynesian": undefined, "Gambian": 168, "Guinean": undefined, "Ivorian": undefined, "Kurdish": undefined, "Liberian": undefined,
- "Malawian": 166, "Mauritanian": undefined, "Mauritian": undefined, "Mosotho": undefined, "Motswana": undefined, "Mozambican": undefined,
- "Namibian": undefined, "Rwandan": undefined, "Sahrawi": undefined, "São Toméan": undefined, "Senegalese": undefined, "Sierra Leonean": undefined,
- "Somali": undefined, "South Sudanese": undefined, "Swazi": undefined, "Tibetan": undefined, "Togolese": undefined,
+ "Afghan": undefined, "Albanian": 174.0, "Algerian": 172.2, "American.asian": 172.5, "American.black": 177.4, "American.latina": 172.5, "American.white": 178.2, "American": 176.4,
+ "Andorran": undefined, "Angolan": undefined, "Antiguan": 164.8, "Argentinian": 174.46, "Armenian": undefined, "Aruban": 165.1, "Australian": 175.6, "Austrian": 179, "Azerbaijani": 171.8,
+ "Bahamian": 167.2, "Bahraini": 165.1, "Bangladeshi": 150.8, "Barbadian": 169.3, "Belarusian": 176.9, "Belgian": 178.7, "Belizean": undefined, "Beninese": undefined, "Bermudian": undefined,
+ "Bhutanese": 167.2, "Bissau-Guinean": undefined, "Bolivian": 160, "Bosnian": 183.9, "Brazilian": 170.7, "British": 175.3, "Bruneian": undefined, "Bulgarian": 175.2, "Burkinabé": undefined,
+ "Burmese": 168.0, "Burundian": 164.1, "Cambodian": 162.5, "Cameroonian": 170.6, "Canadian": 175.1, "Cape Verdean": undefined, "Catalan": undefined, "Central African": undefined,
+ "Chadian": undefined, "Chilean": 169.6, "Chinese": 167.1, "Colombian": 170.6, "Comorian": undefined, "Congolese": undefined, "a Cook Islander": 173.4, "Costa Rican": undefined, "Croatian": 180.5,
+ "Cuban": 168, "Cypriot": 177.2, "Czech": 180.31, "Danish": 180.4, "Djiboutian": undefined, "Dominican": 168.4, "Dominiquais": 168.1, "Dutch": 181, "East Timorese": 161.2, "Ecuadorian": 167.5,
+ "Egyptian": 170.3, "Emirati": 170.3, "Equatoguinean": undefined, "Eritrean": undefined, "Estonian": 179.1, "Ethiopian": undefined, "Fijian": 170.4, "Filipina": 163.5, "Finnish": 178.9,
+ "French Guianan": 168, "French Polynesian": undefined, "French": 175.6, "Gabonese": undefined, "Gambian": 168, "Georgian": 172.7, "German": 175.4, "Ghanan": 169.5, "Greek": 177, "Greenlandic": undefined,
+ "Grenadian": undefined, "Guatemalan": 157.5, "Guinean": undefined, "Guyanese": 168.6, "Haitian": undefined, "Honduran": undefined, "Hungarian": 176, "I-Kiribati": undefined, "Icelandic": 181,
+ "Indian": 164.7, "Indonesian": 158, "Iranian": 170.3, "Iraqi": 165.4, "Irish": 177, "Israeli": 177, "Italian": 176.5, "Ivorian": undefined, "Jamaican": 171.8, "Japanese": 172, "Jordanian": undefined,
+ "Kazakh": 169, "Kenyan": 170.0, "Kittitian": 164.4, "Korean": 168.15, "Kosovan": undefined, "Kurdish": undefined, "Kuwaiti": 169.2, "Kyrgyz": 170.4, "Laotian": 160.5, "Latvian": 174.2, "Lebanese": 176,
+ "Liberian": undefined, "Libyan": 171.3, "a Liechtensteiner": 175.4, "Lithuanian": 177.2, "Luxembourgian": 179.9, "Macedonian": undefined, "Malagasy": 161.5, "Malawian": 166, "Malaysian": 166.3,
+ "Maldivian": undefined, "Malian": 171.3, "Maltese": 169.9, "Marshallese": undefined, "Mauritanian": undefined, "Mauritian": undefined, "Mexican": 167, "Micronesian": undefined, "Moldovan": undefined,
+ "Monégasque": undefined, "Mongolian": 168.4, "Montenegrin": 183.2, "Moroccan": 172.7, "Mosotho": undefined, "Motswana": undefined, "Mozambican": undefined, "Namibian": undefined, "Nauruan": undefined,
+ "Nepalese": 163, "a New Zealander": 177, "Ni-Vanuatu": 160.5, "Nicaraguan": undefined, "Nigerian": 163.8, "Nigerien": 163.8, "Niuean": 169.7, "Norwegian": 179.63, "Omani": undefined, "Pakistani": 164.7,
+ "Palauan": 174.6, "Palestinian": 169.7, "Panamanian": 165.0, "Papua New Guinean": 163.5, "Paraguayan": 168.8, "Peruvian": 164, "Polish": 178.7, "Portuguese": 173.9, "Puerto Rican": 172.5, "Qatari": 166.2,
+ "Romanian": 172, "Russian": 177.2, "Rwandan": undefined, "Sahrawi": undefined, "Saint Lucian": 168.3, "Salvadoran": undefined, "Sammarinese": undefined, "Samoan": 173, "São Toméan": undefined,
+ "Saudi": 168.9, "Scottish": 177.6, "Senegalese": undefined, "Serbian": 182, "Seychellois": 168.5, "Sierra Leonean": undefined, "Singaporean": 170.6, "Slovak": 179.4, "Slovene": 180.3,
+ "a Solomon Islander": 163.1, "Somali": undefined, "South African": 168, "South Sudanese": undefined, "Spanish": 173.1, "Sri Lankan": 163.6, "Sudanese": 190.0, "Surinamese": 165.2, "Swazi": undefined,
+ "Swedish": 181.5, "Swiss": 178.2, "Syrian": 173.0, "Taiwanese": 171.4, "Tajik": 175.2, "Tanzanian": undefined, "Thai": 170.3, "Tibetan": undefined, "Togolese": undefined, "Tongan": 168.2,
+ "Trinidadian": 170.8, "Tunisian": 172.3, "Turkish": 173.6, "Turkmen": 171.4, "Tuvaluan": undefined, "Ugandan": undefined, "Ukrainian": 176.5, "Uruguayan": 170.0, "Uzbek": 175.4, "Vatican": 176.5,
+ "Venezuelan": 169, "Vietnamese": 165.7, "Vincentian": 165.4, "Yemeni": 159.9, "Zairian": 158.9, "Zambian": undefined, "Zimbabwean": undefined,
"": 172.5 // defaults
};
diff --git a/src/pregmod/widgets/slaveTradePresetWidgets.tw b/src/pregmod/widgets/slaveTradePresetWidgets.tw
index 1d19775509941195b370d9210f4099571d118f04..e5969b15c799a1aca5caa389382519ea0c6c2d79 100644
--- a/src/pregmod/widgets/slaveTradePresetWidgets.tw
+++ b/src/pregmod/widgets/slaveTradePresetWidgets.tw
@@ -566,17 +566,17 @@
<<widget "NationalityPresetModBrazil">>
<<link Brazil>>
<<set $nationalities = {
- Brazilian: 30,
Argentinian: 4,
- Colombian: 3,
- Peruvian: 2,
- Venezuelan: 2,
Bolivian: 2,
+ Brazilian: 30,
Chilean: 2,
+ Colombian: 3,
+ Ecuadorian: 1,
Guatemalan: 2,
- Uruguayan: 2,
Paraguayan: 1,
- Ecuadorian: 1
+ Peruvian: 2,
+ Uruguayan: 2,
+ Venezuelan: 2
}>>
<<set _gotoPassage = passage()>>
<<goto _gotoPassage>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index fbca16ae8d34dfeee2400e752cd8eb70c40bfe16..05c51c803d24b939c3a6dd66a508e4297927793f 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -114,7 +114,7 @@
<<if (_DL < $schoolroom)>>
<<set _seed = random(1,10)+(($schoolroom-_DL)*(random(150,170)+(_idleBonus*10)))>>
<<set $cash += _seed>>
- <br> Since she doesn't have enough students to occupy all her time, $schoolroomName takes in citizens' slaves on a contract basis and she teaches them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
+ <br> Since she doesn't have enough students to occupy all of her time, $schoolroomName takes in citizens' slaves on a contract basis and she teaches them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<</if>>
<<if (_DL > 0)>><br><br><</if>>
<</if>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index e0b1b6694e9f9f825a6a967d870e41d50bc935ba..7607a04cc99eaacc962e936c595faebdb0e7bf35 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -1592,7 +1592,7 @@ Feeling childbirth approaching, $slaves[$i].slaveName is helped to her prepared
military uniform
<<case "a string bikini">>
string bikini
- <<case "a scalemail bikini">>
+ <<case "a scalemail bikini">>
scalemail bikini
<<case "a kimono">>
kimono
diff --git a/src/utility/slaveGenerationWidgets.tw b/src/utility/slaveGenerationWidgets.tw
index 7722b19414849802cacdf6434d7921bbc7627230..a69afb32b2201ce9fb75b377a4532bbffd52b667 100644
--- a/src/utility/slaveGenerationWidgets.tw
+++ b/src/utility/slaveGenerationWidgets.tw
@@ -143,7 +143,7 @@
<<set $args[0].accent = _naturalAccent>>
<<case "Spanish">>
<<if $language == "Spanish">>
- <<set $args[0].accent = 1>>
+ <<set $args[0].accent = 0>>
<<else>>
<<set $args[0].accent = _naturalAccent>>
<</if>>