diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index a8d8c69a05c2ae7a1613ab5de0fb2a917d04d1e1..9a3a10284825f73b9344d1dc524172e0505c9d30 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -96,22 +96,22 @@ window.Height = (function(){
"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, "Belarusian": 165, "Bhutanese": 153.4, "Burundian": 157, "a Cook Islander": 162.3, "Cypriot": 163.4,
- "Dominican": 159, "Dominiquais": 157.2, "East Timorese": 149.1, "Ecuadorian": 153.4, "Fijian": 161.8, "French Guianan": 157,
+ "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, "Scottish": 163, "Seychellois": 155.8,
+ "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,
"": 162.5 // default
/* undefined version
"Antiguan": undefined, "Aruban": undefined, "Azerbaijani": 162.4, "Bahamian":undefined, "Bahraini": 154.2,
- "Barbadian": undefined, "Belarusian": undefined, "Bhutanese": undefined, "Burundian": undefined, "a Cook Islander": undefined, "Cypriot": undefined,
- "Dominican": 159, "Dominiquais": undefined, "East Timorese": undefined, "Ecuadorian": undefined, "Fijian": 161.8, "French Guianan": undefined,
+ "Barbadian": undefined, "Bhutanese": undefined, "Burundian": undefined, "a Cook Islander": undefined, "Cypriot": undefined,
+ "Dominiquais": undefined, "East Timorese": undefined, "Ecuadorian": undefined, "Fijian": 161.8, "French Guianan": undefined,
"Georgian": undefined, "Guyanese": undefined, "Kuwaiti": undefined, "Kyrgyz": undefined, "Latvian": 165.7, "a Liechtensteiner": undefined,
"Niuean": undefined, "Palauan": undefined, "Palestinian": undefined, "Papua New Guinean": undefined, "Paraguayan": undefined, "Qatari": undefined,
- "Kittitian": undefined, "Saint Lucian": undefined, "Vincentian": undefined, "Samoan": undefined, "Scottish": undefined, "Seychellois": undefined,
+ "Kittitian": undefined, "Saint Lucian": undefined, "Vincentian": undefined, "Samoan": undefined, "Seychellois": undefined,
"Slovene": 167.4, "a Solomon Islander": undefined, "Sri Lankan": 151.4, "Surinamese": undefined, "Tajik": undefined, "Tongan": undefined,
"Trinidadian": undefined, "Turkmen": undefined, "Ni-Vanuatu": undefined, "Vatican": undefined, */
};
@@ -141,22 +141,22 @@ window.Height = (function(){
"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, "Belarusian": 176.2, "Bhutanese": 167.2, "Burundian": 164.1, "a Cook Islander": 173.4, "Cypriot": 177.2,
- "Dominican": 172.7, "Dominiquais": 168.1, "East Timorese": 161.2, "Ecuadorian": 167.5, "Fijian": 170.4, "French Guianan": 168,
+ "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, "Scottish": 172, "Seychellois": 168.5,
+ "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,
"": 172.5 // defaults
/* undefined version
"Antiguan": undefined, "Aruban": undefined, "Azerbaijani": 171.8, "Bahamian":undefined, "Bahraini": 165.1,
- "Barbadian": undefined, "Belarusian": undefined, "Bhutanese": undefined, "Burundian": undefined, "a Cook Islander": undefined, "Cypriot": undefined,
- "Dominican": 172.7, "Dominiquais": undefined, "East Timorese": undefined, "Ecuadorian": undefined, "Fijian": 170.4, "French Guianan": undefined,
+ "Barbadian": undefined, "Bhutanese": undefined, "Burundian": undefined, "a Cook Islander": undefined, "Cypriot": undefined,
+ "Dominiquais": undefined, "East Timorese": undefined, "Ecuadorian": undefined, "Fijian": 170.4, "French Guianan": undefined,
"Georgian": undefined, "Guyanese": undefined, "Kuwaiti": undefined, "Kyrgyz": undefined, "Latvian": 174.2, "a Liechtensteiner": undefined,
"Niuean": undefined, "Palauan": undefined, "Palestinian": undefined, "Papua New Guinean": undefined, "Paraguayan": undefined, "Qatari": undefined,
- "Kittitian": undefined, "Saint Lucian": undefined, "Vincentian": undefined, "Samoan": undefined, "Scottish": undefined, "Seychellois": undefined,
+ "Kittitian": undefined, "Saint Lucian": undefined, "Vincentian": undefined, "Samoan": undefined, "Seychellois": undefined,
"Slovene": 180.3, "a Solomon Islander": undefined, "Sri Lankan": 163.6, "Surinamese": undefined, "Tajik": undefined, "Tongan": undefined,
"Trinidadian": undefined, "Turkmen": undefined, "Ni-Vanuatu": undefined, "Vatican": undefined, */
};
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 8afb64dec1f701fbbbdc45c2a40229e1a68fd35e..e89196ea3fffb6c4589f4fbea3326cfc31bea808 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -516,7 +516,7 @@
<<set $activeSlave.foreskin = 23>>
<<case "British">>
<<set $activeSlave.foreskin = 21>>
- <<case "Puerto Rican" "Scottish">>
+ <<case "Puerto Rican">>
<<set $activeSlave.foreskin = 20>>
<<case "Montenegrin">>
<<set $activeSlave.foreskin = 19>>
@@ -524,7 +524,7 @@
<<set $activeSlave.foreskin = 15>>
<<case "Jamaican" "French" "Chinese" "Indian">>
<<set $activeSlave.foreskin = 14>>
- <<case "Zambian" "Bulgarian" "Dominican">>
+ <<case "Zambian" "Bulgarian">>
<<set $activeSlave.foreskin = 13>>
<<case "Russian" "French Guianan" "Guyanese">>
<<set $activeSlave.foreskin = 12>>
@@ -552,9 +552,8 @@
<<set $activeSlave.foreskin = 1>>
<<case "Cuban" "Guatemalan" "Chilean" "Bolivian" "Venezuelan" "Lithuanian" "Slovak" "Czech" "Romanian" "Estonian" "Icelandic" "Polish" "Colombian"
"Armenian" "Vietnamese" "Sammarinese" "Marshallese" "Greenlandic" "Belizean" "Costa Rican" "Salvadoran" "Micronesian" "Grenadian" "Honduran"
- "I-Kiribati" "Laotian" "Maltese" "Nicaraguan" "Antiguan" "Bahamian" "Belarusian" "Dominiquais" "Ecuadorian" "Latvian" "Paraguayan" "Kittitian"
- "Saint Lucian" "Vatican"
- >>
+ "I-Kiribati" "Laotian" "Maltese" "Nicaraguan" "Antiguan" "Bahamian" "Dominiquais" "Ecuadorian" "Latvian" "Paraguayan" "Kittitian" "Vatican"
+ "Saint Lucian">>
<<set $activeSlave.foreskin = 0>>
<<default>>
/% Some overlooked country, or possibly stateless. Use global average. %/