diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 913b7bdcb6ca32cf1a3ac6945826af2f908df507..28b974c136b2ffecb30bf2f58ec279380ed2b2e6 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -303,7 +303,7 @@
You carefully planned the day so that nothing could exit the arcology without being scanned at least three times and poked twice. The Smiling Man has no escape.
<br>After a short walk you are in front of the criminal's lair, a rundown old apartment in a scarcely populated part of the arcology. You give the order to breach and your men rush inside without problems.
After a couple of seconds pass without a single noise coming from the apartment, you begin to worry. Then you hear the captain
-
+
<span id="continue">
<<link "calling you inside.">>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 7d24761c058a62effb25fc4ebf7bc8550e47f382..8a479047dd888f5f88c455f1f61e3e1018aa68ac 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -255,7 +255,7 @@
<<unset $nationalitiescheck>> /* Removes unique nationalities array to avoid var bloat */
<<if ndef $customVariety>> /* If non-custom variety, empties or defines $nationalities */
-<<set $nationalities = {}>>
+ <<set $nationalities = {}>>
<</if>>
<<if $terrain == "oceanic">>
<<if ndef $customVariety>>
@@ -277,34 +277,34 @@
<<set $arcologies[0].FSSubjugationistRace = "black">>
<</if>>
<<if ndef $customVariety>> /* If non-custom variety, adds regional $nationalities */
- <<set hashPush($nationalities, "American", "American", "American", "American", "American", "American")>>
- <<set hashPush($nationalities, "Antiguan")>>
- <<set hashPush($nationalities, "Aruban")>>
- <<set hashPush($nationalities, "Bahamian")>>
- <<set hashPush($nationalities, "Barbadian")>>
- <<set hashPush($nationalities, "Belizean")>>
- <<set hashPush($nationalities, "Bermudian")>>
- <<set hashPush($nationalities, "Canadian", "Canadian")>>
- <<set hashPush($nationalities, "Costa Rican")>>
- <<set hashPush($nationalities, "Cuban", "Cuban")>>
- <<set hashPush($nationalities, "Curaçaoan")>>
- <<set hashPush($nationalities, "Dominican", "Dominican")>>
- <<set hashPush($nationalities, "Dominiquais")>>
- <<set hashPush($nationalities, "Greenlandic")>>
- <<set hashPush($nationalities, "Grenadian")>>
- <<set hashPush($nationalities, "Guatemalan")>>
- <<set hashPush($nationalities, "Haitian", "Haitian")>>
- <<set hashPush($nationalities, "Honduran")>>
- <<set hashPush($nationalities, "Jamaican")>>
- <<set hashPush($nationalities, "Kittitian")>>
- <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican", "Mexican")>>
- <<set hashPush($nationalities, "Nicaraguan", "Nicaraguan")>>
- <<set hashPush($nationalities, "Panamanian")>>
- <<set hashPush($nationalities, "Puerto Rican")>>
- <<set hashPush($nationalities, "Saint Lucian")>>
- <<set hashPush($nationalities, "Salvadoran", "Salvadoran")>>
- <<set hashPush($nationalities, "Trinidadian")>>
- <<set hashPush($nationalities, "Vincentian")>>
+ <<set hashPush($nationalities, "American", "American", "American", "American", "American", "American")>>
+ <<set hashPush($nationalities, "Antiguan")>>
+ <<set hashPush($nationalities, "Aruban")>>
+ <<set hashPush($nationalities, "Bahamian")>>
+ <<set hashPush($nationalities, "Barbadian")>>
+ <<set hashPush($nationalities, "Belizean")>>
+ <<set hashPush($nationalities, "Bermudian")>>
+ <<set hashPush($nationalities, "Canadian", "Canadian")>>
+ <<set hashPush($nationalities, "Costa Rican")>>
+ <<set hashPush($nationalities, "Cuban", "Cuban")>>
+ <<set hashPush($nationalities, "Curaçaoan")>>
+ <<set hashPush($nationalities, "Dominican", "Dominican")>>
+ <<set hashPush($nationalities, "Dominiquais")>>
+ <<set hashPush($nationalities, "Greenlandic")>>
+ <<set hashPush($nationalities, "Grenadian")>>
+ <<set hashPush($nationalities, "Guatemalan")>>
+ <<set hashPush($nationalities, "Haitian", "Haitian")>>
+ <<set hashPush($nationalities, "Honduran")>>
+ <<set hashPush($nationalities, "Jamaican")>>
+ <<set hashPush($nationalities, "Kittitian")>>
+ <<set hashPush($nationalities, "Mexican", "Mexican", "Mexican", "Mexican")>>
+ <<set hashPush($nationalities, "Nicaraguan", "Nicaraguan")>>
+ <<set hashPush($nationalities, "Panamanian")>>
+ <<set hashPush($nationalities, "Puerto Rican")>>
+ <<set hashPush($nationalities, "Saint Lucian")>>
+ <<set hashPush($nationalities, "Salvadoran", "Salvadoran")>>
+ <<set hashPush($nationalities, "Trinidadian")>>
+ <<set hashPush($nationalities, "Vincentian")>>
<</if>>
<<case "South America">>
<<if $targetArcology.type != "Supremacist">>
@@ -314,19 +314,19 @@
<<set $arcologies[0].FSSubjugationistRace = "black">>
<</if>>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian")>>
- <<set hashPush($nationalities, "Bolivian", "Bolivian")>>
- <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
- <<set hashPush($nationalities, "Chilean", "Chilean")>>
- <<set hashPush($nationalities, "Colombian", "Colombian", "Colombian")>>
- <<set hashPush($nationalities, "Ecuadorian")>>
- <<set hashPush($nationalities, "French Guianan")>>
- <<set hashPush($nationalities, "Guyanese")>>
- <<set hashPush($nationalities, "Paraguayan")>>
- <<set hashPush($nationalities, "Peruvian", "Peruvian")>>
- <<set hashPush($nationalities, "Surinamese")>>
- <<set hashPush($nationalities, "Uruguayan")>>
- <<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
+ <<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian")>>
+ <<set hashPush($nationalities, "Bolivian", "Bolivian")>>
+ <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
+ <<set hashPush($nationalities, "Chilean", "Chilean")>>
+ <<set hashPush($nationalities, "Colombian", "Colombian", "Colombian")>>
+ <<set hashPush($nationalities, "Ecuadorian")>>
+ <<set hashPush($nationalities, "French Guianan")>>
+ <<set hashPush($nationalities, "Guyanese")>>
+ <<set hashPush($nationalities, "Paraguayan")>>
+ <<set hashPush($nationalities, "Peruvian", "Peruvian")>>
+ <<set hashPush($nationalities, "Surinamese")>>
+ <<set hashPush($nationalities, "Uruguayan")>>
+ <<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
<</if>>
<<case "Brazil">>
<<if $targetArcology.type != "Supremacist">>
@@ -336,19 +336,19 @@
<<set $arcologies[0].FSSubjugationistRace = "black">>
<</if>>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian", "Argentinian")>>
- <<set hashPush($nationalities, "Bolivian", "Bolivian")>>
- <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
- <<set hashPush($nationalities, "Chilean", "Chilean")>>
- <<set hashPush($nationalities, "Colombian", "Colombian", "Colombian")>>
- <<set hashPush($nationalities, "Ecuadorian")>>
- <<set hashPush($nationalities, "French Guianan")>>
- <<set hashPush($nationalities, "Guyanese")>>
- <<set hashPush($nationalities, "Paraguayan")>>
- <<set hashPush($nationalities, "Peruvian", "Peruvian")>>
- <<set hashPush($nationalities, "Surinamese")>>
- <<set hashPush($nationalities, "Uruguayan", "Uruguayan")>>
- <<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
+ <<set hashPush($nationalities, "Argentinian", "Argentinian", "Argentinian", "Argentinian")>>
+ <<set hashPush($nationalities, "Bolivian", "Bolivian")>>
+ <<set hashPush($nationalities, "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian", "Brazilian")>>
+ <<set hashPush($nationalities, "Chilean", "Chilean")>>
+ <<set hashPush($nationalities, "Colombian", "Colombian", "Colombian")>>
+ <<set hashPush($nationalities, "Ecuadorian")>>
+ <<set hashPush($nationalities, "French Guianan")>>
+ <<set hashPush($nationalities, "Guyanese")>>
+ <<set hashPush($nationalities, "Paraguayan")>>
+ <<set hashPush($nationalities, "Peruvian", "Peruvian")>>
+ <<set hashPush($nationalities, "Surinamese")>>
+ <<set hashPush($nationalities, "Uruguayan", "Uruguayan")>>
+ <<set hashPush($nationalities, "Venezuelan", "Venezuelan", "Venezuelan")>>
<</if>>
<<case "the Middle East">>
<<if $targetArcology.type != "Supremacist">>
@@ -358,28 +358,28 @@
<<set $arcologies[0].FSSubjugationistRace = "asian">>
<</if>>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Afghan", "Afghan")>>
- <<set hashPush($nationalities, "Armenian", "Armenian")>>
- <<set hashPush($nationalities, "Azerbaijani")>>
- <<set hashPush($nationalities, "Bahraini")>>
- <<set hashPush($nationalities, "Cypriot")>>
- <<set hashPush($nationalities, "Egyptian", "Egyptian", "Egyptian")>>
- <<set hashPush($nationalities, "Emirati", "Emirati")>>
- <<set hashPush($nationalities, "Georgian")>>
- <<set hashPush($nationalities, "Iranian", "Iranian", "Iranian")>>
- <<set hashPush($nationalities, "Iraqi", "Iraqi")>>
- <<set hashPush($nationalities, "Israeli", "Israeli")>>
- <<set hashPush($nationalities, "Jordanian", "Jordanian")>>
- <<set hashPush($nationalities, "Kurdish")>>
- <<set hashPush($nationalities, "Kuwaiti")>>
- <<set hashPush($nationalities, "Lebanese", "Lebanese")>>
- <<set hashPush($nationalities, "Omani", "Omani")>>
- <<set hashPush($nationalities, "Palestinian")>>
- <<set hashPush($nationalities, "Qatari")>>
- <<set hashPush($nationalities, "Saudi", "Saudi")>>
- <<set hashPush($nationalities, "Syrian")>>
- <<set hashPush($nationalities, "Turkish", "Turkish", "Turkish")>>
- <<set hashPush($nationalities, "Yemeni", "Yemeni")>>
+ <<set hashPush($nationalities, "Afghan", "Afghan")>>
+ <<set hashPush($nationalities, "Armenian", "Armenian")>>
+ <<set hashPush($nationalities, "Azerbaijani")>>
+ <<set hashPush($nationalities, "Bahraini")>>
+ <<set hashPush($nationalities, "Cypriot")>>
+ <<set hashPush($nationalities, "Egyptian", "Egyptian", "Egyptian")>>
+ <<set hashPush($nationalities, "Emirati", "Emirati")>>
+ <<set hashPush($nationalities, "Georgian")>>
+ <<set hashPush($nationalities, "Iranian", "Iranian", "Iranian")>>
+ <<set hashPush($nationalities, "Iraqi", "Iraqi")>>
+ <<set hashPush($nationalities, "Israeli", "Israeli")>>
+ <<set hashPush($nationalities, "Jordanian", "Jordanian")>>
+ <<set hashPush($nationalities, "Kurdish")>>
+ <<set hashPush($nationalities, "Kuwaiti")>>
+ <<set hashPush($nationalities, "Lebanese", "Lebanese")>>
+ <<set hashPush($nationalities, "Omani", "Omani")>>
+ <<set hashPush($nationalities, "Palestinian")>>
+ <<set hashPush($nationalities, "Qatari")>>
+ <<set hashPush($nationalities, "Saudi", "Saudi")>>
+ <<set hashPush($nationalities, "Syrian")>>
+ <<set hashPush($nationalities, "Turkish", "Turkish", "Turkish")>>
+ <<set hashPush($nationalities, "Yemeni", "Yemeni")>>
<</if>>
<<case "Africa">>
<<if $targetArcology.type != "Supremacist">>
@@ -389,60 +389,60 @@
<<set $arcologies[0].FSSubjugationistRace = "white">>
<</if>>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Algerian", "Algerian", "Algerian")>>
- <<set hashPush($nationalities, "Angolan")>>
- <<set hashPush($nationalities, "Beninese")>>
- <<set hashPush($nationalities, "Bissau-Guinean")>>
- <<set hashPush($nationalities, "Burkinabé")>>
- <<set hashPush($nationalities, "Burundian")>>
- <<set hashPush($nationalities, "Cameroonian")>>
- <<set hashPush($nationalities, "Cape Verdean")>>
- <<set hashPush($nationalities, "Central African")>>
- <<set hashPush($nationalities, "Chadian")>>
- <<set hashPush($nationalities, "Comorian")>>
- <<set hashPush($nationalities, "Congolese")>>
- <<set hashPush($nationalities, "Djiboutian")>>
- <<set hashPush($nationalities, "Equatoguinean")>>
- <<set hashPush($nationalities, "Eritrean")>>
- <<set hashPush($nationalities, "Ethiopian", "Ethiopian", "Ethiopian")>>
- <<set hashPush($nationalities, "Gabonese")>>
- <<set hashPush($nationalities, "Gambian")>>
- <<set hashPush($nationalities, "Ghanan", "Ghanan")>>
- <<set hashPush($nationalities, "Guinean")>>
- <<set hashPush($nationalities, "Ivorian")>>
- <<set hashPush($nationalities, "Kenyan", "Kenyan", "Kenyan")>>
- <<set hashPush($nationalities, "Liberian")>>
- <<set hashPush($nationalities, "Libyan", "Libyan")>>
- <<set hashPush($nationalities, "Malagasy")>>
- <<set hashPush($nationalities, "Malawian")>>
- <<set hashPush($nationalities, "Malian", "Malian")>>
- <<set hashPush($nationalities, "Mauritanian")>>
- <<set hashPush($nationalities, "Mauritian")>>
- <<set hashPush($nationalities, "Moroccan", "Moroccan")>>
- <<set hashPush($nationalities, "Mosotho")>>
- <<set hashPush($nationalities, "Motswana")>>
- <<set hashPush($nationalities, "Mozambican")>>
- <<set hashPush($nationalities, "Namibian")>>
- <<set hashPush($nationalities, "Nigerian", "Nigerian", "Nigerian", "Nigerian")>>
- <<set hashPush($nationalities, "Nigerien", "Nigerien")>>
- <<set hashPush($nationalities, "Rwandan")>>
- <<set hashPush($nationalities, "Sahrawi")>>
- <<set hashPush($nationalities, "São Toméan")>>
- <<set hashPush($nationalities, "Senegalese")>>
- <<set hashPush($nationalities, "Seychellois")>>
- <<set hashPush($nationalities, "Sierra Leonean")>>
- <<set hashPush($nationalities, "Somali")>>
- <<set hashPush($nationalities, "South African", "South African", "South African", "South African")>>
- <<set hashPush($nationalities, "South Sudanese")>>
- <<set hashPush($nationalities, "Sudanese", "Sudanese", "Sudanese")>>
- <<set hashPush($nationalities, "Swazi")>>
- <<set hashPush($nationalities, "Tanzanian", "Tanzanian")>>
- <<set hashPush($nationalities, "Togolese")>>
- <<set hashPush($nationalities, "Tunisian", "Tunisian")>>
- <<set hashPush($nationalities, "Ugandan", "Ugandan")>>
- <<set hashPush($nationalities, "Zairian", "Zairian", "Zairian")>>
- <<set hashPush($nationalities, "Zambian")>>
- <<set hashPush($nationalities, "Zimbabwean", "Zimbabwean")>>
+ <<set hashPush($nationalities, "Algerian", "Algerian", "Algerian")>>
+ <<set hashPush($nationalities, "Angolan")>>
+ <<set hashPush($nationalities, "Beninese")>>
+ <<set hashPush($nationalities, "Bissau-Guinean")>>
+ <<set hashPush($nationalities, "Burkinabé")>>
+ <<set hashPush($nationalities, "Burundian")>>
+ <<set hashPush($nationalities, "Cameroonian")>>
+ <<set hashPush($nationalities, "Cape Verdean")>>
+ <<set hashPush($nationalities, "Central African")>>
+ <<set hashPush($nationalities, "Chadian")>>
+ <<set hashPush($nationalities, "Comorian")>>
+ <<set hashPush($nationalities, "Congolese")>>
+ <<set hashPush($nationalities, "Djiboutian")>>
+ <<set hashPush($nationalities, "Equatoguinean")>>
+ <<set hashPush($nationalities, "Eritrean")>>
+ <<set hashPush($nationalities, "Ethiopian", "Ethiopian", "Ethiopian")>>
+ <<set hashPush($nationalities, "Gabonese")>>
+ <<set hashPush($nationalities, "Gambian")>>
+ <<set hashPush($nationalities, "Ghanan", "Ghanan")>>
+ <<set hashPush($nationalities, "Guinean")>>
+ <<set hashPush($nationalities, "Ivorian")>>
+ <<set hashPush($nationalities, "Kenyan", "Kenyan", "Kenyan")>>
+ <<set hashPush($nationalities, "Liberian")>>
+ <<set hashPush($nationalities, "Libyan", "Libyan")>>
+ <<set hashPush($nationalities, "Malagasy")>>
+ <<set hashPush($nationalities, "Malawian")>>
+ <<set hashPush($nationalities, "Malian", "Malian")>>
+ <<set hashPush($nationalities, "Mauritanian")>>
+ <<set hashPush($nationalities, "Mauritian")>>
+ <<set hashPush($nationalities, "Moroccan", "Moroccan")>>
+ <<set hashPush($nationalities, "Mosotho")>>
+ <<set hashPush($nationalities, "Motswana")>>
+ <<set hashPush($nationalities, "Mozambican")>>
+ <<set hashPush($nationalities, "Namibian")>>
+ <<set hashPush($nationalities, "Nigerian", "Nigerian", "Nigerian", "Nigerian")>>
+ <<set hashPush($nationalities, "Nigerien", "Nigerien")>>
+ <<set hashPush($nationalities, "Rwandan")>>
+ <<set hashPush($nationalities, "Sahrawi")>>
+ <<set hashPush($nationalities, "São Toméan")>>
+ <<set hashPush($nationalities, "Senegalese")>>
+ <<set hashPush($nationalities, "Seychellois")>>
+ <<set hashPush($nationalities, "Sierra Leonean")>>
+ <<set hashPush($nationalities, "Somali")>>
+ <<set hashPush($nationalities, "South African", "South African", "South African", "South African")>>
+ <<set hashPush($nationalities, "South Sudanese")>>
+ <<set hashPush($nationalities, "Sudanese", "Sudanese", "Sudanese")>>
+ <<set hashPush($nationalities, "Swazi")>>
+ <<set hashPush($nationalities, "Tanzanian", "Tanzanian")>>
+ <<set hashPush($nationalities, "Togolese")>>
+ <<set hashPush($nationalities, "Tunisian", "Tunisian")>>
+ <<set hashPush($nationalities, "Ugandan", "Ugandan")>>
+ <<set hashPush($nationalities, "Zairian", "Zairian", "Zairian")>>
+ <<set hashPush($nationalities, "Zambian")>>
+ <<set hashPush($nationalities, "Zimbabwean", "Zimbabwean")>>
<</if>>
<<case "Asia">>
<<if $targetArcology.type != "Supremacist">>
@@ -452,35 +452,35 @@
<<set $arcologies[0].FSSubjugationistRace = "indo-aryan">>
<</if>>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
- <<set hashPush($nationalities, "Bhutanese")>>
- <<set hashPush($nationalities, "Bruneian")>>
- <<set hashPush($nationalities, "Burmese", "Burmese")>>
- <<set hashPush($nationalities, "Cambodian")>>
- <<set hashPush($nationalities, "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese")>>
- <<set hashPush($nationalities, "East Timorese")>>
- <<set hashPush($nationalities, "Filipina", "Filipina", "Filipina")>>
- <<set hashPush($nationalities, "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian")>>
- <<set hashPush($nationalities, "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian")>>
- <<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
- <<set hashPush($nationalities, "Kazakh", "Kazakh")>>
- <<set hashPush($nationalities, "Korean", "Korean")>>
- <<set hashPush($nationalities, "Kyrgyz")>>
- <<set hashPush($nationalities, "Laotian")>>
- <<set hashPush($nationalities, "Malaysian", "Malaysian", "Malaysian")>>
- <<set hashPush($nationalities, "Maldivian")>>
- <<set hashPush($nationalities, "Mongolian")>>
- <<set hashPush($nationalities, "Nepalese", "Nepalese")>>
- <<set hashPush($nationalities, "Pakistani", "Pakistani", "Pakistani")>>
- <<set hashPush($nationalities, "Singaporean")>>
- <<set hashPush($nationalities, "Sri Lankan")>>
- <<set hashPush($nationalities, "Taiwanese")>>
- <<set hashPush($nationalities, "Tajik")>>
- <<set hashPush($nationalities, "Thai", "Thai", "Thai")>>
- <<set hashPush($nationalities, "Tibetan")>>
- <<set hashPush($nationalities, "Turkmen")>>
- <<set hashPush($nationalities, "Uzbek", "Uzbek")>>
- <<set hashPush($nationalities, "Vietnamese", "Vietnamese", "Vietnamese")>>
+ <<set hashPush($nationalities, "Bangladeshi", "Bangladeshi", "Bangladeshi", "Bangladeshi")>>
+ <<set hashPush($nationalities, "Bhutanese")>>
+ <<set hashPush($nationalities, "Bruneian")>>
+ <<set hashPush($nationalities, "Burmese", "Burmese")>>
+ <<set hashPush($nationalities, "Cambodian")>>
+ <<set hashPush($nationalities, "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese", "Chinese")>>
+ <<set hashPush($nationalities, "East Timorese")>>
+ <<set hashPush($nationalities, "Filipina", "Filipina", "Filipina")>>
+ <<set hashPush($nationalities, "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian", "Indian")>>
+ <<set hashPush($nationalities, "Indonesian", "Indonesian", "Indonesian", "Indonesian", "Indonesian")>>
+ <<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
+ <<set hashPush($nationalities, "Kazakh", "Kazakh")>>
+ <<set hashPush($nationalities, "Korean", "Korean")>>
+ <<set hashPush($nationalities, "Kyrgyz")>>
+ <<set hashPush($nationalities, "Laotian")>>
+ <<set hashPush($nationalities, "Malaysian", "Malaysian", "Malaysian")>>
+ <<set hashPush($nationalities, "Maldivian")>>
+ <<set hashPush($nationalities, "Mongolian")>>
+ <<set hashPush($nationalities, "Nepalese", "Nepalese")>>
+ <<set hashPush($nationalities, "Pakistani", "Pakistani", "Pakistani")>>
+ <<set hashPush($nationalities, "Singaporean")>>
+ <<set hashPush($nationalities, "Sri Lankan")>>
+ <<set hashPush($nationalities, "Taiwanese")>>
+ <<set hashPush($nationalities, "Tajik")>>
+ <<set hashPush($nationalities, "Thai", "Thai", "Thai")>>
+ <<set hashPush($nationalities, "Tibetan")>>
+ <<set hashPush($nationalities, "Turkmen")>>
+ <<set hashPush($nationalities, "Uzbek", "Uzbek")>>
+ <<set hashPush($nationalities, "Vietnamese", "Vietnamese", "Vietnamese")>>
<</if>>
<<case "Europe">>
<<if $targetArcology.type != "Supremacist">>
@@ -490,53 +490,53 @@
<<set $arcologies[0].FSSubjugationistRace = "middle eastern">>
<</if>>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Albanian")>>
- <<set hashPush($nationalities, "Andorran")>>
- <<set hashPush($nationalities, "Austrian", "Austrian")>>
- <<set hashPush($nationalities, "Belarusian", "Belarusian")>>
- <<set hashPush($nationalities, "Belgian", "Belgian")>>
- <<set hashPush($nationalities, "Bosnian")>>
- <<set hashPush($nationalities, "British", "British", "British")>>
- <<set hashPush($nationalities, "Bulgarian", "Bulgarian")>>
- <<set hashPush($nationalities, "Catalan")>>
- <<set hashPush($nationalities, "Croatian")>>
- <<set hashPush($nationalities, "Czech", "Czech")>>
- <<set hashPush($nationalities, "Danish", "Danish")>>
- <<set hashPush($nationalities, "Dutch", "Dutch")>>
- <<set hashPush($nationalities, "Estonian", "Estonian")>>
- <<set hashPush($nationalities, "Finnish", "Finnish")>>
- <<set hashPush($nationalities, "French", "French", "French")>>
- <<set hashPush($nationalities, "German", "German", "German")>>
- <<set hashPush($nationalities, "Greek", "Greek")>>
- <<set hashPush($nationalities, "Hungarian", "Hungarian")>>
- <<set hashPush($nationalities, "Icelandic", "Icelandic")>>
- <<set hashPush($nationalities, "Irish", "Irish")>>
- <<set hashPush($nationalities, "Italian", "Italian", "Italian")>>
- <<set hashPush($nationalities, "Kosovan")>>
- <<set hashPush($nationalities, "Latvian")>>
- <<set hashPush($nationalities, "a Liechtensteiner")>>
- <<set hashPush($nationalities, "Lithuanian", "Lithuanian")>>
- <<set hashPush($nationalities, "Luxembourgian")>>
- <<set hashPush($nationalities, "Macedonian")>>
- <<set hashPush($nationalities, "Maltese")>>
- <<set hashPush($nationalities, "Moldovan")>>
- <<set hashPush($nationalities, "Monégasque")>>
- <<set hashPush($nationalities, "Montenegrin")>>
- <<set hashPush($nationalities, "Norwegian", "Norwegian")>>
- <<set hashPush($nationalities, "Polish", "Polish", "Polish")>>
- <<set hashPush($nationalities, "Portuguese", "Portuguese")>>
- <<set hashPush($nationalities, "Romanian", "Romanian")>>
- <<set hashPush($nationalities, "Russian", "Russian", "Russian", "Russian")>>
- <<set hashPush($nationalities, "Sammarinese")>>
- <<set hashPush($nationalities, "Scottish")>>
- <<set hashPush($nationalities, "Serbian", "Serbian")>>
- <<set hashPush($nationalities, "Slovak", "Slovak")>>
- <<set hashPush($nationalities, "Slovene")>>
- <<set hashPush($nationalities, "Spanish", "Spanish", "Spanish")>>
- <<set hashPush($nationalities, "Swedish", "Swedish")>>
- <<set hashPush($nationalities, "Swiss", "Swiss")>>
- <<set hashPush($nationalities, "Ukrainian", "Ukrainian", "Ukrainian")>>
- <<set hashPush($nationalities, "Vatican")>>
+ <<set hashPush($nationalities, "Albanian")>>
+ <<set hashPush($nationalities, "Andorran")>>
+ <<set hashPush($nationalities, "Austrian", "Austrian")>>
+ <<set hashPush($nationalities, "Belarusian", "Belarusian")>>
+ <<set hashPush($nationalities, "Belgian", "Belgian")>>
+ <<set hashPush($nationalities, "Bosnian")>>
+ <<set hashPush($nationalities, "British", "British", "British")>>
+ <<set hashPush($nationalities, "Bulgarian", "Bulgarian")>>
+ <<set hashPush($nationalities, "Catalan")>>
+ <<set hashPush($nationalities, "Croatian")>>
+ <<set hashPush($nationalities, "Czech", "Czech")>>
+ <<set hashPush($nationalities, "Danish", "Danish")>>
+ <<set hashPush($nationalities, "Dutch", "Dutch")>>
+ <<set hashPush($nationalities, "Estonian", "Estonian")>>
+ <<set hashPush($nationalities, "Finnish", "Finnish")>>
+ <<set hashPush($nationalities, "French", "French", "French")>>
+ <<set hashPush($nationalities, "German", "German", "German")>>
+ <<set hashPush($nationalities, "Greek", "Greek")>>
+ <<set hashPush($nationalities, "Hungarian", "Hungarian")>>
+ <<set hashPush($nationalities, "Icelandic", "Icelandic")>>
+ <<set hashPush($nationalities, "Irish", "Irish")>>
+ <<set hashPush($nationalities, "Italian", "Italian", "Italian")>>
+ <<set hashPush($nationalities, "Kosovan")>>
+ <<set hashPush($nationalities, "Latvian")>>
+ <<set hashPush($nationalities, "a Liechtensteiner")>>
+ <<set hashPush($nationalities, "Lithuanian", "Lithuanian")>>
+ <<set hashPush($nationalities, "Luxembourgian")>>
+ <<set hashPush($nationalities, "Macedonian")>>
+ <<set hashPush($nationalities, "Maltese")>>
+ <<set hashPush($nationalities, "Moldovan")>>
+ <<set hashPush($nationalities, "Monégasque")>>
+ <<set hashPush($nationalities, "Montenegrin")>>
+ <<set hashPush($nationalities, "Norwegian", "Norwegian")>>
+ <<set hashPush($nationalities, "Polish", "Polish", "Polish")>>
+ <<set hashPush($nationalities, "Portuguese", "Portuguese")>>
+ <<set hashPush($nationalities, "Romanian", "Romanian")>>
+ <<set hashPush($nationalities, "Russian", "Russian", "Russian", "Russian")>>
+ <<set hashPush($nationalities, "Sammarinese")>>
+ <<set hashPush($nationalities, "Scottish")>>
+ <<set hashPush($nationalities, "Serbian", "Serbian")>>
+ <<set hashPush($nationalities, "Slovak", "Slovak")>>
+ <<set hashPush($nationalities, "Slovene")>>
+ <<set hashPush($nationalities, "Spanish", "Spanish", "Spanish")>>
+ <<set hashPush($nationalities, "Swedish", "Swedish")>>
+ <<set hashPush($nationalities, "Swiss", "Swiss")>>
+ <<set hashPush($nationalities, "Ukrainian", "Ukrainian", "Ukrainian")>>
+ <<set hashPush($nationalities, "Vatican")>>
<</if>>
<<case "Australia">>
<<if $targetArcology.type != "Supremacist">>
@@ -545,25 +545,27 @@
<<if $targetArcology.type != "Subjugationist">>
<<set $arcologies[0].FSSubjugationistRace = "asian">>
<</if>>
- <<set hashPush($nationalities, "Australian", "Australian", "Australian")>>
- <<set hashPush($nationalities, "a Cook Islander")>>
- <<set hashPush($nationalities, "Fijian")>>
- <<set hashPush($nationalities, "French Polynesian")>>
- <<set hashPush($nationalities, "Guamanian")>>
- <<set hashPush($nationalities, "I-Kiribati")>>
- <<set hashPush($nationalities, "Marshallese")>>
- <<set hashPush($nationalities, "Micronesian")>>
- <<set hashPush($nationalities, "Nauruan")>>
- <<set hashPush($nationalities, "New Caledonian")>>
- <<set hashPush($nationalities, "a New Zealander", "a New Zealander")>>
- <<set hashPush($nationalities, "Ni-Vanuatu")>>
- <<set hashPush($nationalities, "Niuean")>>
- <<set hashPush($nationalities, "Palauan")>>
- <<set hashPush($nationalities, "Papua New Guinean")>>
- <<set hashPush($nationalities, "Samoan")>>
- <<set hashPush($nationalities, "a Solomon Islander")>>
- <<set hashPush($nationalities, "Tongan")>>
- <<set hashPush($nationalities, "Tuvaluan")>>
+ <<if ndef $customVariety>>
+ <<set hashPush($nationalities, "Australian", "Australian", "Australian")>>
+ <<set hashPush($nationalities, "a Cook Islander")>>
+ <<set hashPush($nationalities, "Fijian")>>
+ <<set hashPush($nationalities, "French Polynesian")>>
+ <<set hashPush($nationalities, "Guamanian")>>
+ <<set hashPush($nationalities, "I-Kiribati")>>
+ <<set hashPush($nationalities, "Marshallese")>>
+ <<set hashPush($nationalities, "Micronesian")>>
+ <<set hashPush($nationalities, "Nauruan")>>
+ <<set hashPush($nationalities, "New Caledonian")>>
+ <<set hashPush($nationalities, "a New Zealander", "a New Zealander")>>
+ <<set hashPush($nationalities, "Ni-Vanuatu")>>
+ <<set hashPush($nationalities, "Niuean")>>
+ <<set hashPush($nationalities, "Palauan")>>
+ <<set hashPush($nationalities, "Papua New Guinean")>>
+ <<set hashPush($nationalities, "Samoan")>>
+ <<set hashPush($nationalities, "a Solomon Islander")>>
+ <<set hashPush($nationalities, "Tongan")>>
+ <<set hashPush($nationalities, "Tuvaluan")>>
+ <</if>>
<<case "Japan">>
<<if $targetArcology.type != "Supremacist">>
<<set $arcologies[0].FSSupremacistRace = "asian">>
@@ -572,7 +574,7 @@
<<set $arcologies[0].FSSubjugationistRace = "asian">>
<</if>>
<<if ndef $customVariety>>
- <<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
+ <<set hashPush($nationalities, "Japanese", "Japanese", "Japanese")>>
<</if>>
<</switch>>
<</if>>
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index e2441ada2830fcc426dee198b91abc5f0caed38b..7b441043d74772a5d0fd6ffb5c66387956818da4 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -519,7 +519,7 @@ window.getEnvironmentCosts = function(cost) {
};
window.getSFCosts = function() {
- var costs = 0;
+ var costs = 0;
if(State.variables.SF.Toggle && State.variables.SF.Active >= 1 && State.variables.SF.Subsidy !== undefined) {
Count(); costs += Math.ceil(State.temporary.SFSubsidy);
}
@@ -1160,7 +1160,7 @@ window.repX = function(rep, what, who) {
V.lastWeeksRepErrors += `Expected a finite number for ${what}, but got ${rep}<br>`;
return 0;
}
-
+
//round the change
rep = Math.trunc(rep);
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 891048297c2955b86886c76c17091c70fd2b31c7..05a81bc1a43bef40768c330bb222f59aadaf8d4f 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -24,45 +24,45 @@
<br> Fetal development week: $activeSlave.preg
<<if $incubator + $nursery > 0>>
- <br><br>
- <<if $incubator > 0>>
- <<if _incubatorReservations > 0>>
- <<link "Remove all of $his children from $incubatorName" "Analyze Pregnancy">>
- <<run WombChangeReserveType($activeSlave, "incubator", "")>>
- <<set $reservedChildren -= _incubatorReservations>>
- <</link>> |
- <</if>>
- <<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= $freeTanks)>>
- <<link "Keep all of $his children in $incubatorName" "Analyze Pregnancy">>
- <<run WombChangeReserveType($activeSlave, "nursery", "incubator")>>
- <<run WombChangeReserveType($activeSlave, "", "incubator")>>
- <<set $reservedChildrenNursery -= _nurseryReservations>>
- <<set $reservedChildren += _WL - _incubatorReservations>>
- <</link>>
- <<elseif _incubatorReservations < _WL>>
- There is not enough free space in $incubatorName for the rest of $his children.
- <</if>>
- <</if>>
- <br>
- <<if $nursery > 0>>
- <<if _nurseryReservations > 0>>
- <<link "Remove all of $his children from $nurseryName" "Analyze Pregnancy">>
- <<run WombChangeReserveType($activeSlave, "nursery", "")>>
- <<set $reservedChildrenNursery -= _nurseryReservations>>
- <</link>> |
+ <br><br>
+ <<if $incubator > 0>>
+ <<if _incubatorReservations > 0>>
+ <<link "Remove all of $his children from $incubatorName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($activeSlave, "incubator", "")>>
+ <<set $reservedChildren -= _incubatorReservations>>
+ <</link>> |
+ <</if>>
+ <<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= $freeTanks)>>
+ <<link "Keep all of $his children in $incubatorName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($activeSlave, "nursery", "incubator")>>
+ <<run WombChangeReserveType($activeSlave, "", "incubator")>>
+ <<set $reservedChildrenNursery -= _nurseryReservations>>
+ <<set $reservedChildren += _WL - _incubatorReservations>>
+ <</link>>
+ <<elseif _incubatorReservations < _WL>>
+ There is not enough free space in $incubatorName for the rest of $his children.
+ <</if>>
<</if>>
- <<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= $freeCribs)>>
- <<link "Keep all of $his children in $nurseryName" "Analyze Pregnancy">>
- <<run WombChangeReserveType($activeSlave, "incubator", "nursery")>>
- <<run WombChangeReserveType($activeSlave, "", "nursery")>>
- <<set $reservedChildren -= _incubatorReservations>>
- <<set $reservedChildrenNursery += _WL - _nurseryReservations>>
- <</link>>
- <<elseif _nurseryReservations < _WL>>
- There is not enough free space in $nurseryName for the rest of $his children.
+ <br>
+ <<if $nursery > 0>>
+ <<if _nurseryReservations > 0>>
+ <<link "Remove all of $his children from $nurseryName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($activeSlave, "nursery", "")>>
+ <<set $reservedChildrenNursery -= _nurseryReservations>>
+ <</link>> |
+ <</if>>
+ <<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= $freeCribs)>>
+ <<link "Keep all of $his children in $nurseryName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($activeSlave, "incubator", "nursery")>>
+ <<run WombChangeReserveType($activeSlave, "", "nursery")>>
+ <<set $reservedChildren -= _incubatorReservations>>
+ <<set $reservedChildrenNursery += _WL - _nurseryReservations>>
+ <</link>>
+ <<elseif _nurseryReservations < _WL>>
+ There is not enough free space in $nurseryName for the rest of $his children.
+ <</if>>
<</if>>
<</if>>
- <</if>>
<br><br>
Deep scan:
diff --git a/src/pregmod/basenationalitiesControls.tw b/src/pregmod/basenationalitiesControls.tw
index c2bc54130fed19119db266f9ae0180c4e457bcf7..e090c5ba894608cd26a53442bf767fc1d8d13ec4 100644
--- a/src/pregmod/basenationalitiesControls.tw
+++ b/src/pregmod/basenationalitiesControls.tw
@@ -48,7 +48,7 @@ Filter by Race:
">>
<</if>>
<<if _i < setup.filterRaces.length-1>>
- |
+ |
<</if>>
<</for>>
<br>
@@ -66,7 +66,7 @@ Filter by Region:
">>
<</if>>
<<if _i < setup.filterRegions.length-1>>
- |
+ |
<</if>>
<</for>>
<br style="clear:both" /><hr style="margin:0">
@@ -84,27 +84,27 @@ Filter by Region:
<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
<</link>>@@
">>
- <<if def $nationalitiescheck[_nation]>>
- <<print "
- @@.minusButton;<<link '–'>>
- <<set $nationalities[setup.baseNationalities["+_i+"]] -= 1>>
- <<if $nationalities[setup.baseNationalities["+_i+"]] <= 0>>
+ <<if def $nationalitiescheck[_nation]>>
+ <<print "
+ @@.minusButton;<<link '–'>>
+ <<set $nationalities[setup.baseNationalities["+_i+"]] -= 1>>
+ <<if $nationalities[setup.baseNationalities["+_i+"]] <= 0>>
+ <<set delete $nationalities[setup.baseNationalities["+_i+"]]>>
+ <</if>>
+ <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
+ <</link>>@@
+ ">>
+ <</if>>
+ <<if $nationalities[_nation] > 1 >>
+ <<print "
+ @@.zeroButton;<<link '0'>>
<<set delete $nationalities[setup.baseNationalities["+_i+"]]>>
- <</if>>
- <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
- <</link>>@@
- ">>
+ <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
+ <</link>>@@
+ ">>
<</if>>
- <<if $nationalities[_nation] > 1 >>
- <<print "
- @@.zeroButton;<<link '0'>>
- <<set delete $nationalities[setup.baseNationalities["+_i+"]]>>
- <<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
- <</link>>@@
- ">>
- <</if>>
- <<if _i < setup.baseNationalities.length-1>>| <</if>>
- </div>
+ <<if _i < setup.baseNationalities.length-1>>| <</if>>
+ </div>
<</for>>
<div style="clear: both;">By dominant race/ethnicity (hover over the name to see the nationalities affected):</div>
<<foreach _race of setup.filterRaces>>
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index d5cfd69be60e9a894cbda0377727e6cfbfbe2344..e3638da4bb35d81235c1b3756a5491762eb7323f 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -355,33 +355,33 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.preg > 0>>
She pokes your belly. "You're pregnant. What did I tell you?"
<<else>>
-<<if $PC.dick == 1 && $PC.vagina == 1>>
- You have working @@.orange;male and female reproductive organs@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
- <br>
- [[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, cashX(25000, "PCmedical"), $surgeryType = "herm2female"]] |
- [[Remove your female half|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), cashX(25000, "PCmedical"), $surgeryType = "herm2male"]]
- <<if $PC.title > 0>>
- | [[Remove your male half completely|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $PC.title = 0, generatePlayerPronouns($PC), cashX(25000, "PCmedical"), $surgeryType = "herm2truefemale"]]
+ <<if $PC.dick == 1 && $PC.vagina == 1>>
+ You have working @@.orange;male and female reproductive organs@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
+ <br>
+ [[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, cashX(25000, "PCmedical"), $surgeryType = "herm2female"]] |
+ [[Remove your female half|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), cashX(25000, "PCmedical"), $surgeryType = "herm2male"]]
+ <<if $PC.title > 0>>
+ | [[Remove your male half completely|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $PC.title = 0, generatePlayerPronouns($PC), cashX(25000, "PCmedical"), $surgeryType = "herm2truefemale"]]
+ <<else>>
+ | [[Remove your female half completely|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $PC.title = 1, generatePlayerPronouns($PC), cashX(25000, "PCmedical"), $surgeryType = "herm2truemale"]]
+ <</if>>
+ <<elseif $PC.dick == 1>>
+ You have @@.orange;male genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
+ <br>
+ [[Have your male organs replaced with female ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.vagina = 1, $PC.newVag = 1, cashX(50000, "PCmedical"), $surgeryType = "male2female"]] |
+ [[Add a female reproductive tract|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), cashX(150000, "PCmedical"), $surgeryType = "male2herm"]]
+ <<if $PC.title > 0>>
+ | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, $PC.title = 0, generatePlayerPronouns($PC), cashX(50000, "PCmedical"), $surgeryType = "male2truefemale"]]
+ | [[Become a hermaphrodite girl|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $PC.title = 0, generatePlayerPronouns($PC), cashX(150000, "PCmedical"), $surgeryType = "male2hermfemale"]]
+ <</if>>
<<else>>
- | [[Remove your female half completely|PC Surgery Degradation][$PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, $PC.title = 1, generatePlayerPronouns($PC), cashX(25000, "PCmedical"), $surgeryType = "herm2truemale"]]
- <</if>>
-<<elseif $PC.dick == 1>>
- You have @@.orange;male genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
- <br>
- [[Have your male organs replaced with female ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.vagina = 1, $PC.newVag = 1, cashX(50000, "PCmedical"), $surgeryType = "male2female"]] |
- [[Add a female reproductive tract|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), cashX(150000, "PCmedical"), $surgeryType = "male2herm"]]
- <<if $PC.title > 0>>
- | [[Become a woman|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 0, $PC.storedCum += 10, $PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, $PC.title = 0, generatePlayerPronouns($PC), cashX(50000, "PCmedical"), $surgeryType = "male2truefemale"]]
- | [[Become a hermaphrodite girl|PC Surgery Degradation][$PC.vagina = 1, $PC.newVag = 1, $PC.preg = 0, WombFlush($PC), $PC.title = 0, generatePlayerPronouns($PC), cashX(150000, "PCmedical"), $surgeryType = "male2hermfemale"]]
+ You have @@.orange;female genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@
+ <br>
+ [[Have your female organs replaced with male ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.vagina = 0, cashX(50000, "PCmedical"), $surgeryType = "female2male"]] |
+ [[Add a male reproductive tract|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, cashX(150000, "PCmedical"), $surgeryType = "female2herm"]]
+ <<if $PC.title == 0>>
+ | [[Become a man|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.title = 1, generatePlayerPronouns($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, cashX(50000, "PCmedical"), $surgeryType = "female2truemale"]]
+ | [[Become a hermaphrodite boy|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.title = 1, generatePlayerPronouns($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, cashX(150000, "PCmedical"), $surgeryType = "female2hermmale"]]
+ <</if>>
<</if>>
-<<else>>
- You have @@.orange;female genitalia@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@
- <br>
- [[Have your female organs replaced with male ones|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.vagina = 0, cashX(50000, "PCmedical"), $surgeryType = "female2male"]] |
- [[Add a male reproductive tract|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, cashX(150000, "PCmedical"), $surgeryType = "female2herm"]]
- <<if $PC.title == 0>>
- | [[Become a man|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.vagina = 0, $PC.preg = 0, WombFlush($PC), $PC.title = 1, generatePlayerPronouns($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, cashX(50000, "PCmedical"), $surgeryType = "female2truemale"]]
- | [[Become a hermaphrodite boy|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.dick = 1, $PC.title = 1, generatePlayerPronouns($PC), $PC.boobs = 0, $PC.boobsBonus = 0, $PC.boobsImplant = 0, cashX(150000, "PCmedical"), $surgeryType = "female2hermmale"]]
- <</if>>
-<</if>>
<</if>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 721f3f7f33754af278ff2d5b0a7a812de61c22ac..8129092b978f25b710722cd0cfb638e054f38f1d 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -126,7 +126,7 @@ Around back;
<</if>>
<</if>>
-/* yes, I am aware this looks horrendeous - if you can find a way to clean this up, by all means */
+/* yes, I am aware this looks horrendous - if you can find a way to clean this up, by all means */
You have a wedding planned for this weekend; you are <<if $weddingPlanned == 1>>marrying<<elseif $weddingPlanned == 2>>sharing<<elseif $weddingPlanned == 3>>knocking up<</if>> <<print "[[SlaveFullName(_slave1)|Slave Interact][$activeSlave = _slave1]]">><<if _ML > 2>>, <<elseif _ML == 2>> and <<print "[[SlaveFullName(_slave2)|Slave Interact][$activeSlave = _slave2]]">><</if>><<if _ML > 2>><<print "[[SlaveFullName(_slave2)|Slave Interact][$activeSlave = _slave2]]">><<if _ML == 3>> and <<else>>, <</if>><<print "[[SlaveFullName(_slave3)|Slave Interact][$activeSlave = _slave3]]">><<if _ML == 4>> and <<print "[[SlaveFullName(_slave4)|Slave Interact][$activeSlave = _slave4]]">><</if>> <<if $weddingPlanned == 2>>with your honored guests<</if>><</if>>.
[[Cancel it|Manage Personal Affairs][$weddingPlanned = -1, $marrying = []]]
<</if>>
@@ -404,31 +404,31 @@ __Contraceptives and Fertility__
In total, you have given birth to:
<<if $PC.birthElite > 0>>
-<br><<print $PC.birthElite>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
+ <br><<print $PC.birthElite>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
<</if>>
<<if $PC.birthMaster > 0>>
-<br><<print $PC.birthMaster>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
+ <br><<print $PC.birthMaster>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
<</if>>
<<if $PC.birthClient > 0>>
-<br><<print $PC.birthClient>> bab<<if $PC.birthClient > 1>>ies<<else>>y<</if>> from clients you've slept with.
+ <br><<print $PC.birthClient>> bab<<if $PC.birthClient > 1>>ies<<else>>y<</if>> from clients you've slept with.
<</if>>
<<if $PC.birthDegenerate > 0>>
-<br><<print $PC.birthDegenerate>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
+ <br><<print $PC.birthDegenerate>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
<</if>>
<<if $PC.birthArcOwner > 0>>
-<br><<print $PC.birthArcOwner>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
+ <br><<print $PC.birthArcOwner>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
<</if>>
<<if $PC.birthCitizen > 0>>
-<br><<print $PC.birthCitizen>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
+ <br><<print $PC.birthCitizen>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
<</if>>
<<if $PC.birthOther > 0>>
-<br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
+ <br><<print $PC.birthOther>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
<</if>>
<<if $PC.birthSelf > 0>>
-<br><<print $PC.birthSelf>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that <<if $PC.birthSelf > 1>>are<<else>>is<</if>> literally all you.
+ <br><<print $PC.birthSelf>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that <<if $PC.birthSelf > 1>>are<<else>>is<</if>> literally all you.
<</if>>
<<if $PC.birthLab > 0>>
-<br><<print $PC.birthLab>> bab<<if $PC.birthLab > 1>>ies<<else>>y<</if>> specially designed in the lab.
+ <br><<print $PC.birthLab>> bab<<if $PC.birthLab > 1>>ies<<else>>y<</if>> specially designed in the lab.
<</if>>
<</if>>
<<if $PC.slavesKnockedUp > 0>>
@@ -536,28 +536,28 @@ In total, you have given birth to:
<br><br>
Before your sex change, you had given birth to:
<<if $PC.birthElite > 0>>
- <br><<print commaNum($PC.birthElite)>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
+ <br><<print commaNum($PC.birthElite)>> bab<<if $PC.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
<</if>>
<<if $PC.birthMaster > 0>>
- <br><<print commaNum($PC.birthMaster)>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
+ <br><<print commaNum($PC.birthMaster)>> bab<<if $PC.birthMaster > 1>>ies<<else>>y<</if>> for your former master.
<</if>>
<<if $PC.birthClient > 0>>
- <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
+ <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from clients you've slept with.
<</if>>
<<if $PC.birthDegenerate > 0>>
- <br><<print commaNum($PC.birthDegenerate)>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
+ <br><<print commaNum($PC.birthDegenerate)>> bastard<<if $PC.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
<</if>>
<<if $PC.birthArcOwner > 0>>
- <br><<print commaNum($PC.birthArcOwner)>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
+ <br><<print commaNum($PC.birthArcOwner)>> bab<<if $PC.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with that male arcology owner.
<</if>>
<<if $PC.birthCitizen > 0>>
- <br><<print commaNum($PC.birthCitizen)>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
+ <br><<print commaNum($PC.birthCitizen)>> bab<<if $PC.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
<</if>>
<<if $PC.birthOther > 0>>
- <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
+ <br><<print commaNum($PC.birthOther)>> bab<<if $PC.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
<</if>>
<<if $PC.birthSelf > 0>>
- <br><<print commaNum($PC.birthSelf)>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you.
+ <br><<print commaNum($PC.birthSelf)>> bab<<if $PC.birthSelf > 1>>ies<<else>>y<</if>> that were literally all you.
<</if>>
<</if>>
<<if $PC.slavesKnockedUp > 0>>
@@ -598,9 +598,9 @@ __Drugs__
<br><br>
__Other Personal Business__
<<if $rep >= 10000>>
-<br> [[Visit the Black Market|The Black Market]]
+ <br> [[Visit the Black Market|The Black Market]]
<<elseif $rep > 7500>>
-<br> You lack the reputation to be invited to the underground Black Market.
+ <br> You lack the reputation to be invited to the underground Black Market.
<</if>>
<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 992a664b8897f75e1feefcbd57c98d104536ee0d..59ab8dcea55209bf11d75222b5b1b6ab5bd8b60b 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -617,7 +617,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Abort $his child">>
<<replace "#introResult">>
- You loudly place an innocuous-looking drug injector on your desk, and let $him think about it for a long moment. Then, you declare exactly what made that sound, abortifacients. After a moment of comprehension, $his mood instantly improves. $He pledges to @@.hotpink;submit to you,@@ <<if $PC.dick == 1 && $PC.vagina == 1>>suck your cock, take it in $his pussy, take it up $his ass, eat you out<<elseif $PC.dick == 1>>suck your cock, take it in $his pussy, take it up $his ass<<else>>eat you out, worship you with $his pussy, serve you with $his ass<</if>>, anything, as long as you @@.mediumaquamarine;remove $his rape baby.@@ You observe that $he'll do all of those things, regardless of what you decide to do about $his pregnancy, but for now, you'll let $him terminate it; $he needs all the nutrients for $himself right now. $He thanks you through $his tears.
+ You loudly place an innocuous-looking drug injector on your desk, and let $him think about it for a long moment. Then, you declare exactly what made that sound: abortifacients. After a moment of comprehension, $his mood instantly improves. $He pledges to @@.hotpink;submit to you,@@ <<if $PC.dick == 1 && $PC.vagina == 1>>suck your cock, take it in $his pussy, take it up $his ass, eat you out<<elseif $PC.dick == 1>>suck your cock, take it in $his pussy, take it up $his ass<<else>>eat you out, worship you with $his pussy, serve you with $his ass<</if>>, anything, as long as you @@.mediumaquamarine;remove $his rape baby.@@ You observe that $he'll do all of those things, regardless of what you decide to do about $his pregnancy, but for now, you'll let $him terminate it; $he needs all the nutrients for $himself right now. $He thanks you through $his tears.
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 3>>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index b3a2bc3ca7c669c9d39af21ca4a639e38fdc6ca6..bb99a3cd0cf031894035dcacf8c4f610294f7ca7 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -758,7 +758,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<else>>
<<switch _animal.type>>
<<case "canine" "feline">>
- _loser.slaveName doesn't stand a chance, and $he knows it. $He comes in with a furious overhead slash, which the _animal.species dodges with ease. It also dodges the next few slashes before coming to a standstill. With a furious growl, it runs around $him, just out of reach of $his sword, before jumping at the wall of $pitName and launching itself off. Its <<if _animal.type == "canine">>teeth<<else>>claws<</if>> connect with _loser.slaveName's throat, completely severing $his windpipe. $He falls to his knees, eyes wide and clutching $his throat, before completely collapsing.
+ _loser.slaveName doesn't stand a chance, and $he knows it. $He comes in with a furious overhead slash, which the _animal.species dodges with ease. It also dodges the next few slashes before coming to a standstill. With a furious growl, it runs around $him, just out of reach of $his sword, before jumping at the wall of $pitName and launching itself off. Its <<if _animal.type == "canine">>teeth<<else>>claws<</if>> connect with _loser.slaveName's throat, completely severing $his windpipe. $He falls to $his knees, eyes wide and clutching $his throat, before completely collapsing.
<<case "hooved">>
The _animal.species paws at the ground for a few seconds before launching itself at $activeSlave.slaveName. $He just barely manages to get out of the way, and the _animal.species has to backpedal to avoid smashing into the wall. $activeSlave.slaveName isn't out of danger just yet, though — $he is still standing directly behind the _animal.species. $He realizes this too late, as both of the its hooves connect with $his jaw. With a sickening //crunch//, $he flies backwards, $his body slamming into the other wall of $pitName.
<</switch>>