diff --git a/devNotes/Slave Generation Widgets.txt b/devNotes/Slave Generation Widgets.txt
deleted file mode 100644
index 242279d61582591e4c7f784e0381e420d4d00901..0000000000000000000000000000000000000000
--- a/devNotes/Slave Generation Widgets.txt
+++ /dev/null
@@ -1,910 +0,0 @@
-:: slave generation widgets [nobr]
-
-<<widget "NationalityToRace">>
-
-<<if $fixedRace == 0>>
-
-<<if ($activeSlave.nationality is "American")>>
- <<set $activeSlave.race to either("black", "middle eastern", "white", "white", "white", "latina", "latina", "asian", "amerindian", "mixed race")>>
-<<elseif ($activeSlave.nationality is "Canadian")>>
- <<set $activeSlave.race to either("white", "white", "white", "white", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Puerto Rican")>>
- <<set $activeSlave.race to either("latina")>>
-<<elseif ($activeSlave.nationality is "Cuban")>>
- <<set $activeSlave.race to either("latina", "black")>>
-<<elseif ($activeSlave.nationality is "Haitian")>>
- <<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Jamaican")>>
- <<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Mexican")>>
- <<set $activeSlave.race to either("latina", "latina", "latina", "latina", "latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Dominican")>>
- <<set $activeSlave.race to either("mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "white", "white", "black")>>
-<<elseif ($activeSlave.nationality is "Peruvian")>>
- <<set $activeSlave.race to either("latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Venezuelan")>>
- <<set $activeSlave.race to either("latina")>>
-<<elseif ($activeSlave.nationality is "Bolivian")>>
- <<set $activeSlave.race to either("latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Guatemalan")>>
- <<set $activeSlave.race to either("latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Brazilian")>>
- <<set $activeSlave.race to either("black", "latina", "mixed race", "mixed race", "amerindian", "white")>>
-<<elseif ($activeSlave.nationality is "Argentinian")>>
- <<set $activeSlave.race to either("white", "latina", "latina")>>
-<<elseif ($activeSlave.nationality is "Chilean")>>
- <<set $activeSlave.race to either("white", "latina", "latina", "latina")>>
-<<elseif ($activeSlave.nationality is "Colombian")>>
- <<set $activeSlave.race to either("latina")>>
-<<elseif ($activeSlave.nationality is "Egyptian")>>
- <<set $activeSlave.race to either("black", "middle eastern", "middle eastern", "middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Turkish")>>
- <<set $activeSlave.race to either("middle eastern", "middle eastern", "middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Iranian")>>
- <<set $activeSlave.race to either("indo-aryan", "indo-aryan", "indo-aryan", "semitic")>>
-<<elseif ($activeSlave.nationality is "Armenian")>>
- <<set $activeSlave.race to either("indo-aryan", "semitic")>>
-<<elseif ($activeSlave.nationality is "Israeli")>>
- <<set $activeSlave.race to either("white", "middle eastern", "semitic", "semitic")>>
-<<elseif ($activeSlave.nationality is "Saudi")>>
- <<set $activeSlave.race to either("black", "asian", "middle eastern", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Moroccan")>>
- <<set $activeSlave.race to either("middle eastern", "middle eastern", "black")>>
-<<elseif ($activeSlave.nationality is "Nigerian")>>
- <<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Kenyan")>>
- <<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Zimbabwean")>>
- <<set $activeSlave.race to either("black", "black", "black", "black", "white")>>
-<<elseif ($activeSlave.nationality is "Ugandan")>>
- <<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Tanzanian")>>
- <<set $activeSlave.race to either("black", "black", "black", "semitic")>>
-<<elseif ($activeSlave.nationality is "Ghanan")>>
- <<set $activeSlave.race to either("black", "black", "black", "semitic")>>
-<<elseif ($activeSlave.nationality is "Congolese")>>
- <<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Ethiopian")>>
- <<set $activeSlave.race to either("black", "black", "black", "middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "South African")>>
- <<set $activeSlave.race to either("black", "black", "black", "white")>>
-<<elseif ($activeSlave.nationality is "Chinese")>>
- <<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Korean")>>
- <<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Japanese")>>
- <<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Thai")>>
- <<set $activeSlave.race to either("asian", "asian", "malay")>>
-<<elseif ($activeSlave.nationality is "Vietnamese")>>
- <<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Indonesian")>>
- <<set $activeSlave.race to either("asian", "malay", "malay", "pacific islander")>>
-<<elseif ($activeSlave.nationality is "Filipina")>>
- <<set $activeSlave.race to either("asian", "malay", "malay", "pacific islander")>>
-<<elseif ($activeSlave.nationality is "Burmese")>>
- <<set $activeSlave.race to either("asian", "asian", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Nepalese")>>
- <<set $activeSlave.race to either("asian", "asian", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Uzbek")>>
- <<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Afghan")>>
- <<set $activeSlave.race to either("indo-aryan", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Algerian")>>
- <<set $activeSlave.race to either("middle eastern")>>
-<<elseif ($activeSlave.nationality is "Libyan")>>
- <<set $activeSlave.race to either("middle eastern")>>
-<<elseif ($activeSlave.nationality is "Tunisian")>>
- <<set $activeSlave.race to either("middle eastern")>>
-<<elseif ($activeSlave.nationality is "Lebanese")>>
- <<set $activeSlave.race to either("middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Jordanian")>>
- <<set $activeSlave.race to either("middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Emirati")>>
- <<set $activeSlave.race to either("middle eastern", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Omani")>>
- <<set $activeSlave.race to either("middle eastern", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Malian")>>
- <<set $activeSlave.race to either("black", "black", "black", "black", "black", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Sudanese")>>
- <<set $activeSlave.race to either("black", "black", "black", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Yemeni")>>
- <<set $activeSlave.race to either("black", "semitic", "middle eastern", "middle eastern", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Iraqi")>>
- <<set $activeSlave.race to either("semitic", "middle eastern", "middle eastern", "middle eastern", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Indian")>>
- <<set $activeSlave.race to either("indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Malaysian")>>
- <<set $activeSlave.race to either("asian", "malay", "malay", "malay")>>
-<<elseif ($activeSlave.nationality is "Kazakh")>>
- <<set $activeSlave.race to either("asian", "asian", "asian", "semitic", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Pakistani")>>
- <<set $activeSlave.race to either("indo-aryan", "indo-aryan", "indo-aryan", "semitic")>>
-<<elseif ($activeSlave.nationality is "Bangladeshi")>>
- <<set $activeSlave.race to either("indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Belarusian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Russian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Ukrainian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Irish")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Icelandic")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Finnish")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Swiss")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Danish")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Norwegian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Austrian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Slovak")>>
- <<set $activeSlave.race to either("white", "white", "white", "white", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Dutch")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Belgian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Czech")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Serbian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Portuguese")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Hungarian")>>
- <<set $activeSlave.race to either("white", "white", "white", "white", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Estonian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Polish")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Lithuanian")>>
- <<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Romanian")>>
- <<set $activeSlave.race to either("semitic", "white", "white", "white", "white", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "German")>>
- <<set $activeSlave.race to either("black", "middle eastern", "white", "white", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Swedish")>>
- <<set $activeSlave.race to either("middle eastern", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "French")>>
- <<set $activeSlave.race to either("black", "middle eastern", "white", "white", "white", "white", "white", "southern European")>>
-<<elseif ($activeSlave.nationality is "Italian")>>
- <<set $activeSlave.race to either("middle eastern", "southern European", "southern European", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Greek")>>
- <<set $activeSlave.race to either("southern European")>>
-<<elseif ($activeSlave.nationality is "Spanish")>>
- <<set $activeSlave.race to either("semitic", "southern European", "southern European")>>
-<<elseif ($activeSlave.nationality is "British")>>
- <<set $activeSlave.race to either("indo-aryan", "white", "white", "white", "white", "white", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Scottish")>>
- <<set $activeSlave.race to either("middle eastern", "indo-aryan", "white", "white", "white", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Australian")>>
- <<set $activeSlave.race to either("white", "white", "black", "asian")>>
-<<elseif ($activeSlave.nationality is "a New Zealander")>>
- <<set $activeSlave.race to either("white", "white", "white", "white", "pacific islander")>>
-<</if>>
-
-/% Begin mixed race rate adjustment. %/
-/% Some countries are extremely ethnically homogeneous and unlikely to change soon. %/
-<<if ($activeSlave.nationality is "Japanese")>>
- <<if random(1,100) > 98>>
- <<set $activeSlave.race to "mixed race">>
- <</if>>
-<<elseif ($activeSlave.nationality is "Korean")>>
- <<if random(1,100) > 95>>
- <<set $activeSlave.race to "mixed race">>
- <</if>>
-<<elseif ($activeSlave.nationality is "Polish") or ($activeSlave.nationality is "Romanian") or ($activeSlave.nationality is "Bulgarian") or ($activeSlave.nationality is "Lithuanian") or ($activeSlave.nationality is "Croatian")>>
- /% Croatia isn't an origin currently but the game might add it in the future. %/
- <<if random(1,100) > 98>>
- <<set $activeSlave.race to "mixed race">>
- <</if>>
-<<elseif random(1,100) > 90>>
- /% Default rate. %/
- <<set $activeSlave.race to "mixed race">>
-<</if>>
-/% End mixed race rate adjustment. %/
-
-<<else>>
-
-<<switch $fixedRace>>
-<<case "white">>
- <<set $activeSlave.nationality to $whiteNationalities.random()>>
-<<case "asian">>
- <<set $activeSlave.nationality to $asianNationalities.random()>>
-<<case "latina">>
- <<set $activeSlave.nationality to $latinaNationalities.random()>>
-<<case "middle eastern">>
- <<set $activeSlave.nationality to $middleEasternNationalities.random()>>
-<<case "black">>
- <<set $activeSlave.nationality to $blackNationalities.random()>>
-<<case "indo-aryan">>
- <<set $activeSlave.nationality to $indoAryan"Nationalities.random()>>
-<<case "pacific islander">>
- <<set $activeSlave.nationality to $pacificIslanderNationalities.random()>>
-<<case "malay">>
- <<set $activeSlave.nationality to $malayNationalities.random()>>
-<<case "amerindian">>
- <<set $activeSlave.nationality to $amerindianNationalities.random()>>
-<<case "southern european">>
- <<set $activeSlave.nationality to $southernEuropean"Nationalities.random()>>
-<<case "semitic">>
- <<set $activeSlave.nationality to $semiticNationalities.random()>>
-<</switch>>
-<<set $activeSlave.race = $fixedRace>>
-
-<</if>>
-
-<<if $arcologies[0].FSSupremacistLawME != 0>>
-<<if $activeSlave.race == $arcologies[0].FSSupremacistRace>>
- <<set $activeSlave.race to "mixed race">>
-<</if>>
-<</if>>
-
-<</widget>>
-
-<<widget "NationalityToName">>
-
-<<if ($activeSlave.nationality is "American")>>
- <<if $activeSlave.race is "black">>
- <<set $activeSlave.birthName to $africanAmericanSlaveNames.random()>>
- <<elseif $activeSlave.race is "latina">>
- <<set $activeSlave.birthName to $latinaSlaveNames.random()>>
- <<elseif $activeSlave.race is "asian">>
- <<set $activeSlave.birthName to $asianAmericanSlaveNames.random()>>
- <<elseif $activeSlave.race is "middle eastern">>
- <<set $activeSlave.birthName to $egyptianSlaveNames.random()>>
- <<else>>
- <<set $activeSlave.birthName to $whiteAmericanSlaveNames.random()>>
- <</if>>
-<<case "Canadian">>
- <<set $activeSlave.birthName to $canadianSlaveNames.random()>>
-<<case "Mexican">>
- <<set $activeSlave.birthName to $mexicanSlaveNames.random()>>
-<<case "Dominican">>
- <<set $activeSlave.birthName to $dominicanSlaveNames.random()>>
-<<case "Puerto Rican">>
- <<set $activeSlave.birthName to $puertoRicanSlaveNames.random()>>
-<<case "Haitian">>
- <<set $activeSlave.birthName to $haitianSlaveNames.random()>>
-<<case "Jamaican">>
- <<set $activeSlave.birthName to $jamaicanSlaveNames.random()>>
-<<case "Cuban">>
- <<set $activeSlave.birthName to $cubanSlaveNames.random()>>
-<<case "Guatemalan">>
- <<set $activeSlave.birthName to $guatemalanSlaveNames.random()>>
-<<case "Chilean">>
- <<set $activeSlave.birthName to $chileanSlaveNames.random()>>
-<<case "Peruvian">>
- <<set $activeSlave.birthName to $peruvianSlaveNames.random()>>
-<<case "Bolivian">>
- <<set $activeSlave.birthName to $bolivianSlaveNames.random()>>
-<<case "Venezuelan">>
- <<set $activeSlave.birthName to $venezuelanSlaveNames.random()>>
-<<case "Belarusian">>
- <<set $activeSlave.birthName to $belarusianSlaveNames.random()>>
-<<case "Russian">>
- <<set $activeSlave.birthName to $russianSlaveNames.random()>>
-<<case "Ukrainian">>
- <<set $activeSlave.birthName to $ukrainianSlaveNames.random()>>
-<<case "Italian">>
- <<set $activeSlave.birthName to $italianSlaveNames.random()>>
-<<case "Spanish">>
- <<set $activeSlave.birthName to $spanishSlaveNames.random()>>
-<<case "British">>
- <<set $activeSlave.birthName to $britishSlaveNames.random()>>
-<<case "Scottish">>
- <<set $activeSlave.birthName to $scottishSlaveNames.random()>>
-<<case "French">>
- <<set $activeSlave.birthName to $frenchSlaveNames.random()>>
-<<case "German">>
- <<set $activeSlave.birthName to $germanSlaveNames.random()>>
-<<case "Lithuanian">>
- <<set $activeSlave.birthName to $lithuanianSlaveNames.random()>>
-<<case "Norwegian">>
- <<set $activeSlave.birthName to $norwegianSlaveNames.random()>>
-<<case "Slovak">>
- <<set $activeSlave.birthName to $slovakSlaveNames.random()>>
-<<case "Danish">>
- <<set $activeSlave.birthName to $danishSlaveNames.random()>>
-<<case "Dutch">>
- <<set $activeSlave.birthName to $dutchSlaveNames.random()>>
-<<case "Austrian">>
- <<set $activeSlave.birthName to $austrianSlaveNames.random()>>
-<<case "Swiss">>
- <<set $activeSlave.birthName to $swissSlaveNames.random()>>
-<<case "Serbian">>
- <<set $activeSlave.birthName to $serbianSlaveNames.random()>>
-<<case "Belgian">>
- <<set $activeSlave.birthName to $belgianSlaveNames.random()>>
-<<case "Czech">>
- <<set $activeSlave.birthName to $czechSlaveNames.random()>>
-<<case "Portuguese">>
- <<set $activeSlave.birthName to $portugueseSlaveNames.random()>>
-<<case "Swedish">>
- <<set $activeSlave.birthName to $swedishSlaveNames.random()>>
-<<case "Romanian">>
- <<set $activeSlave.birthName to $romanianSlaveNames.random()>>
-<<case "Hungarian">>
- <<set $activeSlave.birthName to $hungarianSlaveNames.random()>>
-<<case "Estonian">>
- <<set $activeSlave.birthName to $estonianSlaveNames.random()>>
-<<case "Irish">>
- <<set $activeSlave.birthName to $irishSlaveNames.random()>>
-<<case "Icelandic">>
- <<set $activeSlave.birthName to $icelandicSlaveNames.random()>>
-<<case "Finnish">>
- <<set $activeSlave.birthName to $finnishSlaveNames.random()>>
-<<case "Greek">>
- <<set $activeSlave.birthName to $greekSlaveNames.random()>>
-<<case "Polish">>
- <<set $activeSlave.birthName to $polishSlaveNames.random()>>
-<<case "Brazilian">>
- <<set $activeSlave.birthName to $brazilianSlaveNames.random()>>
-<<case "Egyptian">>
- <<set $activeSlave.birthName to $egyptianSlaveNames.random()>>
-<<case "Colombian">>
- <<set $activeSlave.birthName to $colombianSlaveNames.random()>>
-<<case "Argentinian">>
- <<set $activeSlave.birthName to $argentinianSlaveNames.random()>>
-<<case "Turkish">>
- <<set $activeSlave.birthName to $turkishSlaveNames.random()>>
-<<case "Iranian">>
- <<set $activeSlave.birthName to $iranianSlaveNames.random()>>
-<<case "Armenian">>
- <<set $activeSlave.birthName to $armenianSlaveNames.random()>>
-<<case "Israeli">>
- <<set $activeSlave.birthName to $israeliSlaveNames.random()>>
-<<case "Saudi">>
- <<set $activeSlave.birthName to $saudiSlaveNames.random()>>
-<<case "South African">>
- <<if $activeSlave.race is "black">>
- <<set $activeSlave.birthName to $blackSouthAfricanSlaveNames.random()>>
- <<else>>
- <<set $activeSlave.birthName to $whiteSouthAfricanSlaveNames.random()>>
- <</if>>
-<<case "Nigerian">>
- <<set $activeSlave.birthName to $nigerianSlaveNames.random()>>
-<<case "Congolese">>
- <<set $activeSlave.birthName to $congoleseSlaveNames.random()>>
-<<case "Kenyan">>
- <<set $activeSlave.birthName to $kenyanSlaveNames.random()>>
-<<case "Tanzanian">>
- <<set $activeSlave.birthName to $tanzanianSlaveNames.random()>>
-<<case "Zimbabwean">>
- <<if $activeSlave.race == "white">>
- <<set $activeSlave.birthName to $britishSlaveNames.random()>>
- <<else>>
- <<set $activeSlave.birthName to $zimbabweanSlaveNames.random()>>
- <</if>>
-<<case "Ghanan">>
- <<set $activeSlave.birthName to $ghananSlaveNames.random()>>
-<<case "Ugandan">>
- <<set $activeSlave.birthName to $ugandanSlaveNames.random()>>
-<<case "Ethiopian">>
- <<set $activeSlave.birthName to $ethiopianSlaveNames.random()>>
-<<case "Moroccan">>
- <<set $activeSlave.birthName to $moroccanSlaveNames.random()>>
-<<case "Chinese">>
- <<set $activeSlave.birthName to $chineseSlaveNames.random()>>
-<<case "Korean">>
- <<set $activeSlave.birthName to $koreanSlaveNames.random()>>
-<<case "Thai">>
- <<set $activeSlave.birthName to $thaiSlaveNames.random()>>
-<<case "Vietnamese">>
- <<set $activeSlave.birthName to $vietnameseSlaveNames.random()>>
-<<case "Japanese">>
- <<set $activeSlave.birthName to $japaneseSlaveNames.random()>>
-<<case "Indonesian">>
- <<set $activeSlave.birthName to $indonesianSlaveNames.random()>>
-<<case "Filipina">>
- <<set $activeSlave.birthName to $filipinaSlaveNames.random()>>
-<<case "Bangladeshi">>
- <<set $activeSlave.birthName to $bangladeshiSlaveNames.random()>>
-<<case "Malaysian">>
- <<set $activeSlave.birthName to $malaysianSlaveNames.random()>>
-<<case "Uzbek">>
- <<set $activeSlave.birthName to $uzbekSlaveNames.random()>>
-<<case "Afghan">>
- <<set $activeSlave.birthName to $afghanSlaveNames.random()>>
-<<case "Nepalese">>
- <<set $activeSlave.birthName to $nepaleseSlaveNames.random()>>
-<<case "Burmese">>
- <<set $activeSlave.birthName to $burmeseSlaveNames.random()>>
-<<case "Iraqi">>
- <<set $activeSlave.birthName to $iraqiSlaveNames.random()>>
-<<case "Yemeni">>
- <<set $activeSlave.birthName to $yemeniSlaveNames.random()>>
-<<case "Sudanese">>
- <<set $activeSlave.birthName to $sudaneseSlaveNames.random()>>
-<<case "Algerian">>
- <<set $activeSlave.birthName to $algerianSlaveNames.random()>>
-<<case "Tunisian">>
- <<set $activeSlave.birthName to $tunisianSlaveNames.random()>>
-<<case "Libyan">>
- <<set $activeSlave.birthName to $libyanSlaveNames.random()>>
-<<case "Omani">>
- <<set $activeSlave.birthName to $omaniSlaveNames.random()>>
-<<case "Malian">>
- <<set $activeSlave.birthName to $malianSlaveNames.random()>>
-<<case "Jordanian">>
- <<set $activeSlave.birthName to $jordanianSlaveNames.random()>>
-<<case "Lebanese">>
- <<set $activeSlave.birthName to $lebaneseSlaveNames.random()>>
-<<case "Emirati">>
- <<set $activeSlave.birthName to $emiratiSlaveNames.random()>>
-<<case "Kazakh">>
- <<set $activeSlave.birthName to $kazakhSlaveNames.random()>>
-<<case "Pakistani">>
- <<set $activeSlave.birthName to $pakistaniSlaveNames.random()>>
-<<case "Indian">>
- <<set $activeSlave.birthName to $indianSlaveNames.random()>>
-<<case "Australian">>
- <<set $activeSlave.birthName to $australianSlaveNames.random()>>
-<<case "a New Zealander">>
- <<set $activeSlave.birthName to $newZealanderSlaveNames.random()>>
-<<default>>
- <<set $activeSlave.birthName to $whiteAmericanSlaveNames.random()>>
-<</switch>>
-
-<</widget>>
-
-<<widget "NationalityToAccent">>
-
-<<set $seed to either(0,1,1,2,2,2,3,3,3,3)>>
-
-<<if ($activeSlave.nationality is "American")>>
- <<if $activeSlave.race is "black">>
- <<if $language is "English">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to either(0,1,1,2,2,2,3,3,3,3)>>
- <</if>>
- <<elseif $activeSlave.race is "latina">>
- <<if $language is "English">>
- <<set $activeSlave.accent to 0>>
- <<elseif $language is "Spanish">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
- <<elseif $activeSlave.race is "asian">>
- <<if $language is "English">>
- <<set $activeSlave.accent to 0>>
- <<elseif $language is "Chinese">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
- <<elseif $activeSlave.race is "middle eastern">>
- <<if $language is "English">>
- <<set $activeSlave.accent to 0>>
- <<elseif $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
- <<else>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Canadian")>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Mexican")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Dominican")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Puerto Rican")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Haitian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Jamaican")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Cuban")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Guatemalan")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Chilean")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Peruvian")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Bolivian")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Venezuelan")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Russian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Ukrainian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Italian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Spanish")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "British")>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Scottish")>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 2>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "French")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "German")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Lithuanian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Belarusian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "French")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "German")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Lithuanian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Norwegian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Slovak")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Danish")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Dutch")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Austrian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Swiss")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Serbian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Belgian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Czech")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Portuguese")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Swedish")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Romanian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Hungarian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Estonian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Irish")>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Icelandic")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Finnish")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Greek")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Polish")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Brazilian")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Egyptian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Colombian")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Argentinian")>>
- <<if $language is "Spanish">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Turkish")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Iranian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Armenian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Israeli")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Saudi")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "South African")>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Nigerian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Congolese")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Kenyan")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Tanzanian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Zimbabwean")>>
- <<if $language is "English" && $activeSlave.race == "white">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Ghanan")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Ugandan")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Ethiopian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Moroccan")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Chinese")>>
- <<if $language is "Chinese">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Korean")>>
- <<if $language is "Chinese">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Thai")>>
- <<if $language is "Chinese">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Vietnamese")>>
- <<if $language is "Chinese">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Japanese")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Indonesian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Filipina")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Bangladeshi")>>
- <<if $language is "Indian">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Malaysian")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Uzbek")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Afghan")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Nepalese")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Burmese")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Iraqi")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Yemeni")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Sudanese")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Algerian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Tunisian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Libyan")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Omani")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Malian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Jordanian")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Lebanese")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Emirati")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Kazakh")>>
- <<set $activeSlave.accent to $seed>>
-<<elseif ($activeSlave.nationality is "Pakistani")>>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to either(0,1,2,3)>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Indian")>>
- <<if $language is "Indian">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "Australian")>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif ($activeSlave.nationality is "a New Zealander")>>
- <<if $language is "English">>
- <<set $activeSlave.accent to 1>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif $activeSlave.nationality is "Roman Revivalist">>
- <<if $language is "Latin">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif $activeSlave.nationality is "Ancient Egyptian Revivalist">>
- <<if $language is "Ancient Egyptian">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif $activeSlave.nationality is "Edo Revivalist">>
- <<if $language is "Japanese">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif $activeSlave.nationality is "Arabian Revivalist">>
- <<if $language is "Arabic">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<elseif $activeSlave.nationality is "Ancient Chinese Revivalist">>
- <<if $language is "Chinese">>
- <<set $activeSlave.accent to 0>>
- <<else>>
- <<set $activeSlave.accent to $seed>>
- <</if>>
-<<else>>
- <<set $activeSlave.accent to $seed>>
-<</if>>
-
-<<if $activeSlave.nationality is $language>>
- <<set $activeSlave.accent to 0>>
-<</if>>
-
-<</widget>>
\ No newline at end of file
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 2d1a9c7b49bcf4e2878bcc85edba977de4eaee93..70b1d2c67bf3d492d8c760635b1694b5d5d7a10a 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -287,12 +287,12 @@ Girls will not be able to impregnate others if their age is under <<textbox "$po
<br>
-<<if $loliGrowth == 1>>
+<<if $loliGrow == 1>>
Children ''will not'' grow as they age.
- [[Enable Growth|Intro Summary][$loliGrowth = 0]]
+ [[Enable Growth|Intro Summary][$loliGrow = 0]]
<<else>>
Children ''will'' grow as they age.
- [[Disable Growth|Intro Summary][$loliGrowth = 1]]
+ [[Disable Growth|Intro Summary][$loliGrow = 1]]
<</if>>
<br>
@@ -730,7 +730,7 @@ Hair color: ''$PC.hColor''.
<br>
Preferred refreshment: <<textbox "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
<br>
-Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif $PC.refreshmentType == 1>>Drank<<elseif $PC.refreshmentType == 2>>Eaten<<elseif $PC.refreshmentType == 3>>Snorted<<else>>Injected<</if>>''.
+Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif $PC.refreshmentType == 1>>Drank<<elseif $PC.refreshmentType == 2>>Eaten<<elseif $PC.refreshmentType == 3>>Snorted<<elseif $PC.refreshmentType == 4>>Injected<<elseif $PC.refreshmentType == 5>>Popped<<elseif $PC.refreshmentType == 6>>Dissolved orally<</if>>''.
[[Smoked|Intro Summary][$PC.refreshmentType = 0]] | [[Drank|Intro Summary][$PC.refreshmentType = 1]] | [[Eaten|Intro Summary][$PC.refreshmentType = 2]] | [[Snorted|Intro Summary][$PC.refreshmentType = 3]] | [[Injected|Intro Summary][$PC.refreshmentType = 4]] | [[Popped|Intro Summary][$PC.refreshmentType = 5]] | [[Orally Dissolved|Intro Summary][$PC.refreshmentType = 6]]
<br>
<<if $PC.refreshmentType == 0>>//"Smoke" must fit into the following sentence: "I smoked a $PC.refreshment" to fit events properly
diff --git a/src/events/intro/pcBodyIntro.tw b/src/events/intro/pcBodyIntro.tw
index a8d71b36dfeac059dcf3a297a79924902f946ab8..ef0f085ec87fe010a820606534128641595b60fd 100644
--- a/src/events/intro/pcBodyIntro.tw
+++ b/src/events/intro/pcBodyIntro.tw
@@ -72,7 +72,7 @@ Name your character: <<textbox "$PCName" $PCName "PC Body Intro">>
<br>
Preferred refreshment: <<textbox "$PC.refreshment" $PC.refreshment "PC Body Intro">> [[Cigars|PC Body Intro][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|PC Body Intro][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
<br>
-Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif $PC.refreshmentType == 1>>Drank<<elseif $PC.refreshmentType == 2>>Eaten<<elseif $PC.refreshmentType == 3>>Snorted<<else>>Injected<</if>>''.
+Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif $PC.refreshmentType == 1>>Drank<<elseif $PC.refreshmentType == 2>>Eaten<<elseif $PC.refreshmentType == 3>>Snorted<<elseif $PC.refreshmentType == 4>>Injected<<elseif $PC.refreshmentType == 5>>Popped<<elseif $PC.refreshmentType == 6>>Dissolved orally<</if>>''.
[[Smoked|PC Body Intro][$PC.refreshmentType = 0]] | [[Drank|PC Body Intro][$PC.refreshmentType = 1]] | [[Eaten|PC Body Intro][$PC.refreshmentType = 2]] | [[Snorted|PC Body Intro][$PC.refreshmentType = 3]] | [[Injected|PC Body Intro][$PC.refreshmentType = 4]] | [[Popped|PC Body Intro][$PC.refreshmentType = 5]] | [[Orally Dissolved|PC Body Intro][$PC.refreshmentType = 6]]
<br>
//Flavor only; no mechanical effect. If entering a custom refreshment, please assign proper usage.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index ebe82f0452a7b33417e55d83d8132d5777c8efcd..04e2f6f5d444e8e5b1a63f8ac48ac09c651d643f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1,6 +1,6 @@
:: init [nobr]
-<<set $ver = "0.10.0", $releaseID = 1003>>
+<<set $ver = "0.10.1", $releaseID = 1003>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 4f58a071e9fc661ea7a4c1adee0d9b0f4dc7ce46..f38f43b5a18037c9b696219ab0af9a6d5434d105 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -766,20 +766,20 @@ window.ruleApplied = function(slave, ID) {
};
window.ruleAssignment = function(applyAssignment, assignment) {
+ if (!applyAssignment)
+ return false;
return applyAssignment.includes(assignment);
};
window.ruleFacility = function(applyFacility, facility) {
+ if (!applyFacility)
+ return false;
return applyFacility.includes(facility);
};
window.ruleExcludeSlaveFacility = function(rule, slave) {
- if (!slave) {
- return null;
- }else if (!rule) {
+ if (!slave || !rule || !rule.excludeFacility) {
return null;
- }else if (!rule.excludeFacility) {
- return false;
} else {
for(var d=0; d < rule.excludeFacility.length; ++d){
if(rule.excludeFacility[d] == "hgsuite"){
@@ -867,17 +867,14 @@ window.ruleExcludeSlaveFacility = function(rule, slave) {
return true;
}
}
- }return false;
+ }
+ return false;
}
};
window.ruleAppliedToSlaveFacility = function(rule, slave) {
- if (!slave) {
+ if (!slave || !rule || !rule.facility) {
return null;
- }else if (!rule) {
- return null;
- }else if (!rule.facility) {
- return false;
} else {
for(var d=0; d < rule.facility.length; ++d){
if(rule.facility[d] == "hgsuite"){
@@ -988,11 +985,7 @@ window.ruleSlaveExcluded = function(slave, rule) {
};
window.hasSurgeryRule = function(slave, rules) {
- if (!slave) {
- return false;
- }else if (!rules) {
- return false;
- }else if (!slave.currentRules) {
+ if (!slave || !rules || !slave.currentRules) {
return false;
}else {
for(var d=rules.length-1; d >= 0; --d){
@@ -1008,63 +1001,15 @@ window.hasSurgeryRule = function(slave, rules) {
};
window.hasHColorRule = function(slave, rules) {
- if (!slave) {
- return false;
- }else if (!rules) {
- return false;
- }else if (!slave.currentRules) {
- return false;
- }else {
- for(var d=rules.length-1; d >= 0;--d){
- for(var e=0; e < slave.currentRules.length;++e){
- if(slave.currentRules[e] == rules[d].ID){
- if (rules[d].hColor != "no default setting"){
- return true;
- }
- }
- }
- }return false;
- }
+ return lastRuleFor(slave, rules, "hColor") ? true : false;
};
window.hasHStyleRule = function(slave, rules) {
- if (!slave) {
- return false;
- }else if (!rules) {
- return false;
- }else if (!slave.currentRules) {
- return false;
- }else {
- for(var d=rules.length-1; d >= 0;--d){
- for(var e=0; e < slave.currentRules.length;++e){
- if(slave.currentRules[e] == rules[d].ID){
- if (rules[d].hStyle != "no default setting"){
- return true;
- }
- }
- }
- }return false;
- }
+ return lastRuleFor(slave, rules, "hStyle") ? true : false;
};
window.hasEyeColorRule = function(slave, rules) {
- if (!slave) {
- return false;
- }else if (!rules) {
- return false;
- }else if (!slave.currentRules) {
- return false;
- }else {
- for(var d=rules.length-1; d >= 0;--d){
- for(var e=0; e < slave.currentRules.length;++e){
- if(slave.currentRules[e] == rules[d].ID){
- if (rules[d].hStyle != "no default setting"){
- return true;
- }
- }
- }
- }return false;
- }
+ return lastRuleFor(slave, rules, "eyeColor") ? true : false;
};
window.lastRuleFor = function(slave, rules, what) {
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index 23629ecd0f321e32e2be280ed94d242ed97a027d..2f459720ff1c0d1c56603cfb9f022be98f765298 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -249,11 +249,11 @@
<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls > 0)>>
You ram <<if ($PC.dick == 0)>>the strap-on<<else>>your dick<</if>> into her sissy butt without lubricant. As she flinches you announce that she'll be taking part in giving herself anal pain. She humps into you lamely, so you administer a truly agonizing slap to her balls<<if ($PC.dick == 0)>><<else>> that makes her anal ring stiffen deliciously around your dick<</if>>. To avoid further punishment she fucks herself against you almost hard enough to hurt herself.<<if ($PC.vagina == 1) && ($PC.dick == 1)>> Fortunately for her, this gets you so wet that some of your pussyjuice makes it down onto your shaft and serves as improvised lube.<</if>> You orgasm explosively
<<AnalVCheck>>
- <<set $asspain = 1>>
+ <<set _asspain = 1>>
<<elseif ($activeSlave.dick > 0)>>
You ram <<if ($PC.dick == 0)>>the strap-on<<else>>your dick<</if>> into her gelded butt without lubricant and sodomize her as hard as you can without damaging your property.<<if $PC.vagina == 1>> Fortunately for her, this gets you so wet that some of your pussyjuice makes it down onto your shaft and serves as improvised lube.<</if>> She's such a slut that she shows signs of enjoyment, but you put a stop to that whenever it happens by slapping and flicking her cock. You cum explosively
<<AnalVCheck>>
- <<set $asspain = 1>>
+ <<set _asspain = 1>>
<<else>>
She's got no special physical targets for abuse, so you just rape her hard and fast, raining stinging slaps down on her as you do. She cries and whimpers; you finish
<<BothVCheck>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 58cb39cc7f32b67ef86cc182e2577240991e3441..b887eb45f69e0b18a9e307129cadf95332c34770 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -350,10 +350,19 @@ My favorite part of my body i<<s>>
pu<<ss>>y, <<Master>>," she <<say>>s eagerly. "I can ju<<s>>t imagine your clit again<<s>>t my tongue.
<</if>>
<<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60)>>
- <<if $PC.boobs == 0>>Your <<s>>trong arm<<s>> feel<<s>> <<s>>o good when you hold me down.<</if>>
+ <<if $PC.boobs == 0>>
+ Your <<s>>trong arm<<s>> feel<<s>> <<s>>o good when you hold me down.
+ <<else>>
+ <<if $PC.boobsBonus > 1>>
+ The weight of your boob<<s>> on my back feel<<s>> <<s>>o good when you pin me down.
+ <<else>>
+ Your tit<<s>> feel <<s>>o good on my back when you pin me down.
+ <</if>>
+ <</if>>
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60)>>
<<if $PC.dick == 1>>
Your cum i<<s>> incredible, <<Master>>. I would drink every drop of it, if I could.
+ <<if $PC.ballsImplant > 0>>If only tho<<s>>e lovely ball<<s>> made even more cum for you.<</if>>
<<if $PC.vagina == 1>>Oh, your femcum, too!<</if>>
<</if>>
<<elseif ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishStrength > 60)>>
@@ -364,9 +373,20 @@ My favorite part of my body i<<s>>
<<elseif ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishStrength > 60)>>
<<if $PC.dick == 1>>I love your cock, <<Master>>," she <<say>>s eagerly. "I love it in my backdoor.<</if>>
<<elseif ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60)>>
- <<if $PC.boobs == 1>>You, uh." She looks down, hesitating. "You have really ni<<c>>e breast<<s>>, <<Master>>.<</if>>
+ <<if $PC.preg > 30>>
+ You, uh." She looks down, hesitating. "Your belly i<<s>> <<s>>o big and wonderful, I ju<<s>> want to feel it,
+ <<elseif $PC.preg > 20>>
+ You, uh." She looks down, hesitating. "You have a really lovely belly,
+ <<elseif $PC.boobs == 1>>
+ You, uh." She looks down, hesitating. "You have really ni<<c>>e breast<<s>>,
+ <</if>>
+ <<Master>>.
<<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60)>>
- <<if $PC.boobs == 1>>Your brea<<s>>t<<s>> are incredible, <<Master>>," she <<say>>s eagerly. "I love them.
+ <<if $PC.boobsBonus == 3>>Your brea<<s>>t<<s>> are giant, <<Master>>," she <<say>>s eagerly. "I just want to bury my fa<<c>>e in them.
+ <<else $PC.boobsBonus == 2>>Your brea<<s>>t<<s>> are huge, <<Master>>," she <<say>>s eagerly. "I love them.
+ <<else $PC.boobsBonus == 1>>Your brea<<s>>t<<s>> are so big and lovely, <<Master>>," she <<say>>s eagerly. "I love them.
+ <<elseif $PC.boobs == 1>>Your brea<<s>>t<<s>> are incredible, <<Master>>," she <<say>>s eagerly. "I love them.
+ <</if>>
<<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXX > 80)>>
<<if $PC.boobs == 1>>You're, uh." She looks down, hesitating. "You're really hot, <<Master>>.<</if>>
<<elseif ($activeSlave.attrKnown == 1) && ($activeSlave.attrXY > 80)>>
@@ -853,7 +873,6 @@ My favorite part of my body i<<s>>
I do my be<<s>>t to <<s>>upport your vi<<s>>ion for the future.
<<else>>
I try to conform to your vi<<s>>ion for the future.
- <</if>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist >= 10>>
@@ -952,7 +971,7 @@ My favorite part of my body i<<s>>
I really hope we can <<s>>ave humanity like thi<<s>>.
<<elseif ($activeSlave.preg < 0 || $activeSlave.ovaries == 0)>>
I'm relieved I fit into your vi<<s>>ion of the future.
- <else>>
+ <<else>>
I know I'm not a perfect fit for your vi<<s>>ion of the future, but I'll do my be<<s>>t to be a good girl.
<</if>>
<</if>>
@@ -1017,6 +1036,7 @@ My favorite part of my body i<<s>>
I wish I could make milk for the arcology.
<</if>>
<</if>>
+
<</if>>
<<if ($activeSlave.devotion > 75)>>
diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw
index dc1521686d86d54af8aa57b5a6a3cb083423a8d9..4d86077a66f93c64657ac42e54909ff32caaf427 100644
--- a/src/pregmod/breederProposal.tw
+++ b/src/pregmod/breederProposal.tw
@@ -1,7 +1,5 @@
:: Breeder Proposal [nobr]
-<<set $propPass = 0>>
-
You draft a proposal to the Societal Elite proposing the use of specially tested slaves as breeding stock. If they can pass the tests required to join the societal elite; even as slaves, their bodies can prove valuable to furthering eugenics. They will gain no additional rights, but their wombs will be used to birth elite children; helping stave off potential threats of inbreeding and adding possible missed beneficial traits into the Elite's gene pool.
<br><br>
Within the hour, you are called before The Societal Elite.
diff --git a/src/pregmod/fSlaveSlaveDickConsummate.tw b/src/pregmod/fSlaveSlaveDickConsummate.tw
index 879d932bbeb837b6a53585bd9c0930d6bd8e8254..54a7c48bf784199377715519e35fd34b0c051927 100644
--- a/src/pregmod/fSlaveSlaveDickConsummate.tw
+++ b/src/pregmod/fSlaveSlaveDickConsummate.tw
@@ -1,35 +1,63 @@
:: FSlaveSlaveDick Consummate
-
-/% Needs work. A lot of fucking work %/
-
<<nobr>>
You take a look at the bound toy.
<<if $activeSlave.mother == $slaverapistx.ID>>
- <<if $activeSlave.fetish == "perverted">>
- $activeSlave.slaveName seems paralyzed, looking at her mother standing above her with disbelief, curiosity...and excitement?
+ <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.energy > 60)>>
+ $activeSlave.slaveName is looking up at her mother, fully naked, her pussy visible and captivating. Her breathing is fast and her nipples hard.
+ <<else>>
+ $activeSlave.slaveName seems paralyzed, looking at her mother standing above her with disbelief, curiosity...and excitement?
+ <</if>>
<<else>>
- $activeSlave.slaveName looks with horror at her mother, knowing what will soon happen.
+ $activeSlave.slaveName looks with horror at her mother, knowing what will soon happen.
<</if>>
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
- <<if $activeSlave.fetish == "perverted">>
- $activeSlave.slaveName seems paralyzed, looking at her daughter with a look of disbelief, hesitation... and excitement?
+ <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.energy > 60)>>
+ $activeSlave.slaveName is looking up at her daughter, fully naked, her pussy visible and captivating. Her breathing is fast and her nipples hard.
+ <<else>>
+ $activeSlave.slaveName seems paralyzed, looking at her daughter with a look of disbelief, hesitation... and excitement?
+ <</if>>
+ <<else>>
+ $activeSlave.slaveName looks with horror at her daughter, knowing what will soon happen.
+ <</if>>
+<</if>>
+
+
+<<if (areSisters($activeSlave, $slaverapistx) > 0)>>
+ <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.energy > 60)>>
+ $activeSlave.slaveName seems paralyzed with fear, but her nipples are already hard and her face flushed. Secretly, she may want this.
+ <<else>>
+ $activeSlave.slaveName seems paralyzed, looking at her sister standing above her with disbelief, curiosity...and excitement?
+ <</if>>
<<else>>
- $activeSlave.slaveName looks with horror at her daughter, knowing what will soon happen.
+ $activeSlave.slaveName looks with horror at her sister, knowing what will soon happen.
<</if>>
+
+ <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.energy > 60)>>
+ $slaverapistx.slaveName is looking down at her sisters bound and helpless form with a look of hunger.
+ <<else>>
+ $slaverapistx.slaveName seems paralyzed, looking down at her bound sister with disbelief, curiosity...and excitement?
+ <</if>>
+ <<else>>
+ $slaverapistx.slaveName looks with horror down at her bound sister, knowing what will soon happen.
+ <</if>>
<</if>>
<<set $slaverapistx.vaginalCount += 1>>
<<set $vaginalTotal += 1>>
-<<if ($activeSlave.energy > 50)>>
- <<if ($activeSlave.attrXX > 65)>>
+<<if ($activeSlave.energy > 60)>>
+ <<if ($activeSlave.attrXX > 60)>>
<<if ($activeSlave.fetish == "submissive")>>
- Since $activeSlave.slaveName likes pussy and being dominated, her member becomines rock hard in an instant.
+ Since $activeSlave.slaveName likes pussy and being dominated, and with her good libido her member becomes rock hard in an instant.
<<else>>
Since $activeSlave.slaveName likes pussy, all it takes is a bit of teasing to get her member hard.
<</if>>
@@ -43,7 +71,7 @@ You take a look at the bound toy.
<<if ($activeSlave.devotion > 50)>>
- Since $activeSlave.slaveName is devoted, restrains are more for show than for praactical purpose.
+ Since $activeSlave.slaveName is devoted, restraints are more for show than for practical purpose.
<<elseif ($activeSlave.devotion > 20)>>
$activeSlave.slaveName is obedient, but this might be too much for her, so you restrain her, making sure she can't resist.
<<else>>
@@ -58,16 +86,24 @@ Next, you see to $slaverapistx.slaveName.
<<if $activeSlave.mother == $slaverapistx.ID>>
- <<if $slaverapistx.fetish == "perverted">>
- $slaverapistx.slaveName is well aware that she is about to rape her own daughter, but despite that seems to feel some arousal at the thought.
+ <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.attrXX > 60)>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own daughter, and seems quite eager.
+ <<else>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own daughter, but despite that seems to feel some arousal at the thought.
+ <</if>>
<<else>>
$slaverapistx.slaveName is well aware that she is about to rape her own daughter and is understandingly distrurbed.
<</if>>
<</if>>
<<if $slaverapistx.mother == $activeSlave.ID>>
- <<if $slaverapistx.fetish == "perverted">>
- $activeSlave.slaveName is well aware that she is about to rape her own mother, but despite that seems to feel some arousal at the thought.
+ <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.attrXX > 60)>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own mother, and seems quite eager.
+ <<else>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own mother, but despite that seems to feel some arousal at the thought.
+ <</if>>
<<else>>
$slaverapistx.slaveName is well aware that she is about to rape her own mother and is understandingly distrurbed.
<</if>>
@@ -93,25 +129,25 @@ Next, you see to $slaverapistx.slaveName.
<<set $activeSlave.penetrativeCount += 1>>
<<set $penetrativeTotal += 1>>
-<<if ($slaverapistx.fetish == "dom") && ($slaverapistx.fetishStrength > 60) && ($slaverapistx.fetishKnown == 1) && ($slaverapistx.vagina == 0)>>
- She lowers her virgin pussy onto $activeSlave.slaveName waiting member, impaling herself slowly and teasing her bound victim. This act @@.lime; breaks in her pussy.@@
- <<set $slaverapistx.vagina to 1>>
+<<if ($slaverapistx.fetish == "dominant") && ($slaverapistx.fetishStrength > 20) && (($slaverapistx.vagina == 0)>>
+ She lowers her virgin pussy onto $activeSlave.slaveName waiting member, impaling herself slowly and teasing her bound victim. This act @@color:lime; breaks in her pussy.@@
+ <<set $slaverapistx.vagina = 1>>
<<set $slaverapistx.devotion += 4>>
<<set $slaverapistx.fetishStrength += 1>>
-<<elseif $slaverapistx.devotion > 20 && $activeSlave.vagina == 0>>
- She accepts your orders without comment and lowers her virgin pussy on $slaverapistx.slaveName's ready dick. She gasps in shock when she feels her hot seed. @@.hotpink;She is broken to slavery@@ by this application of her body, which naturally @@.lime;will break in her pussy.@@
- <<set $activeSlave.vagina to 1>>
+<<elseif $slaverapistx.devotion > 20) && (($activeSlave.vagina == 0) >>
+ She accepts your orders without comment and lowers her virgin pussy on $slaverapistx.slaveName's ready dick. She gasps in shock when she feels her hot seed. @@color:hotpink;She is broken to slavery@@ by this application of her body, which naturally @@color:lime;will break in her pussy.@@
+ <<set $activeSlave.vagina = 1>>
<<set $activeSlave.devotion += 10>>
-<<elseif $activeSlave.devotion >= -20 && $activeSlave.vagina == 0>>
- She is clearly unhappy at the idea of losing her pearl of great price to $slaverapistx.slaveName; this probably isn't what she imagined her first real sex would be like. Worse, she knows she's fertile and realizes she'll likely get pregnant. Nevertheless, @@.hotpink;she is broken to slavery@@ by this application of her body, which naturally @@.lime;will break in her pussy.@@
- <<set $activeSlave.vagina to 1>>
+<<elseif ($activeSlave.devotion >= -20) && (($activeSlave.vagina == 0)>>
+ She is clearly unhappy at the idea of losing her pearl of great price to $slaverapistx.slaveName; this probably isn't what she imagined her first real sex would be like. She fears he might get pregnant. Nevertheless, @@color:hotpink;she is broken to slavery@@ by this application of her body, which naturally @@color:lime;will break in her pussy.@@
+ <<set $activeSlave.vagina = 1>>
<<set $activeSlave.devotion += 4>>
-<<elseif $activeSlave.vagina == 0>>
- As you anticipated, she refuses to give $slaverapistx.slaveName her virginity. You restrain her despite her @@.mediumorchid;horrified tears@@ and @@.gold;frightened begging.@@ Naturally, this cruel act @@.lime;will break in her pussy.@@
- <<set $activeSlave.devotion -= 5>>
- <<set $activeSlave.trust -= 5>>
- <<set $activeSlave.vagina to 1>>
+<<elseif (($activeSlave.vagina == 0)>>
+ As you anticipated, she refuses to give $slaverapistx.slaveName her virginity. However, since she is restrained her resistance amounts to @@color:mediumorchid;horrified tears@@ and @@color:gold;frightened begging.@@ Naturally, this cruel act @@color:lime;will break in her pussy.@@
+ <<set $activeSlave.devotion -= 5>>
+ <<set $activeSlave.trust -= 5>>
+ <<set $activeSlave.vagina = 1>>
<<elseif ($activeSlave.amp == 1)>>
@@ -131,7 +167,7 @@ Next, you see to $slaverapistx.slaveName.
<br><br>
<<if ($activeSlave.devotion < -20) && ($slaverapistx.devotion < -20)>>
- Since you have two restrained slaves, it's up to you to do all the work. Since $activeSlave.slaveName is already lying on the bed, you maneuver $slaverapistx.slaveName's pussy into place. The two slaves make no further moves until you deal $slaverapistx.slaveName a terrific swat across the ass and promise to give her more of the same until she gets going. $slaverapistx.slaveName starts lowering herself very slowly, pulling back every time $activeSlave.slaveName's dick prodding her womanhood. After watching the sad display for a while, you use your own weight to suddely push her onto $activeSlave.slaveName, hilting her in one, scream-enducing move. $slaverapistx.slaveName seems more cooperative after that and you only have to occasionaly prod them with an electrial jolt to keep them going at a faster pace. Both slaves @@.mediumorchid;resent@@ what you made them do and @@.gold;fear you@@ as a result.
+ Since you have two restrained slaves, it's up to you to do all the work. Since $activeSlave.slaveName is already lying on the bed, you maneuver $slaverapistx.slaveName's pussy into place. The two slaves make no further moves until you deal $slaverapistx.slaveName a terrific swat across the ass and promise to give her more of the same until she gets going. $slaverapistx.slaveName starts lowering herself very slowly, pulling back every time $activeSlave.slaveName's dick prods her womanhood. After watching the sad display for a while, you use your own weight to suddely push her onto $activeSlave.slaveName, hilting her in one, scream-enducing move. $slaverapistx.slaveName seems more cooperative after that and you only have to occasionaly prod them with an electrial jolt to keep them going at a faster pace. Both slaves @@color:mediumorchid;resent@@ what you made them do and @@color:gold;fear you@@ as a result.
<<set $activeSlave.devotion -= 5>>
<<set $slaverapistx.devotion -= 5>>
<<set $activeSlave.trust -= 5>>
@@ -139,28 +175,29 @@ Next, you see to $slaverapistx.slaveName.
<<elseif ($slaverapistx.devotion < -20)>>
- Since your dick slave is restrained, you order $slaverapistx.slaveName to kneel on the bed on top of $activeSlave.slaveName, and then maneuver her pussy into place. $slaverapistx.slaveName is uncooperative, so you push her down yourself and prod and slap her untill she starts to ride the cock with urgency. It doesn't take long for $activeSlave.slaveName to orgasm. She @@.mediumorchid;resents@@ what you made her do and @@.gold;fears you@@ as a result.
+ Since your dick slave is restrained, you order $slaverapistx.slaveName to kneel on the bed on top of $activeSlave.slaveName, and then maneuver her pussy into place. $slaverapistx.slaveName is uncooperative, so you push her down yourself and prod and slap her untill she starts to ride the cock with urgency. It doesn't take long for $activeSlave.slaveName to orgasm. She @@color:mediumorchid;resents@@ what you made her do and @@color:gold;fears you@@ as a result.
<<set $slaverapistx.devotion -= 5>>
<<set $slaverapistx.trust -= 5>>
-<<elseif ($slaverapistx.fetish == "dominant") && ($slaverapistx.fetishStrength > 60) && ($slaverapistx.devotion > 20)>>
- You tie $activeSlave.slaveName on the bed with her dick defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave for her pleasure. She begins playing with her immediately, fondling, pinching and licking while bouncing on the meaty shaft. Occasionaly she stops, denying $activeSlave.slaveName the immediate orgasm and teasing her, fully enjoying her dominant role. By the end of the day $activeSlave.slaveName's abused, pent-up penis has shot a massive load, to her @@.gold;horror@@ and @@.mediumorchid;resentment,@@ while $slaverapistx.slaveName is lying next to her on the bed in a state of obvious @@.hotpink;satiation and bliss.@@
+<<elseif ($slaverapistx.fetish is "dominant") && ($slaverapistx.fetishStrength > 20) && ($slaverapistx.devotion > 20)>>
+ You tie $activeSlave.slaveName on the bed with her dick defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave for her pleasure. She begins playing with her immediately, fondling, pinching and licking while bouncing on the meaty shaft. Occasionaly she stops, denying $activeSlave.slaveName the immediate orgasm and teasing her, fully enjoying her dominant role. By the end of the day $activeSlave.slaveName's abused, pent-up penis has shot a massive load, to her @@color:gold;horror@@ and @@color:mediumorchid;resentment,@@ while $slaverapistx.slaveName is lying next to her on the bed in a state of obvious @@color:hotpink;satiation and bliss.@@
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 5>>
<<set $slaverapistx.devotion += 4>>
-<<elseif ($slaverapistx.fetish == "sadist") && ($slaverapistx.fetishStrength > 60) && ($slaverapistx.devotion > 20) && ($activeSlave.devotion < -20)>>
- You tie $activeSlave.slaveName on the bed with her dick defenseless and available, and then tell the grinning $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to hurt and rape another slave for her pleasure. She begins playing with her immediately, slapping, pinching and licking her boobs while bouncing on the meaty shaft. Occasionaly she stops, denying $activeSlave.slaveName the immediate orgasm by painfully sqeezing and smacking the sensitive shaft. By the end of the day $activeSlave.slaveName's abused, pent-up penis has shot several massive and painfull loads, leaving her lying on the bed, @@.lime;shaking@@ in @@.gold;horror@@ and @@.red;utter exhaustion,@@ while $slaverapistx.slaveName is lying next to her on the bed in a state of obvious @@.hotpink;satiation and bliss.@@
+<<elseif ($slaverapistx.fetish is "sadist") && ($slaverapistx.fetishStrength > 20) && ($slaverapistx.devotion > 20) && ($activeSlave.devotion < -20)>>
+ You tie $activeSlave.slaveName on the bed with her dick defenseless and available, and then tell the grinning $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to hurt and rape another slave for her pleasure. She begins playing with her immediately, slapping, pinching and licking her boobs while bouncing on the meaty shaft. Occasionaly she stops, denying $activeSlave.slaveName the immediate orgasm by painfully sqeezing and smacking the sensitive shaft. By the end of the day $activeSlave.slaveName's abused, pent-up penis has shot several massive and painfull loads, leaving her lying on the bed, @@color:lime;shaking@@ in @@color:gold;horror@@ and @@color:red;utter exhaustion,@@ while $slaverapistx.slaveName is lying next to her on the bed in a state of obvious @@color:hotpink;satiation and bliss.@@
<<set $activeSlave.health -= 10>>
- <<set $activeSlave.energy += 5>>
+ <<set $activeSlave.energy += 2>>
<<set $activeSlave.trust -= 8>>
<<set $slaverapistx.devotion += 5>>
-<<elseif ($slaverapistx.energy > 95) && ($slaverapistx.devotion > 20) && ($activeSlave.devotion < -20)>>
- You arrange $activeSlave.slaveName on the bed with her cock defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave, just for the perverted novelty of the act. She rides the hepless cock trough seveal orgasms. By the end of the day $slaverapistx.slaveName's cunt is dripping cum, to her obvious @@.hotpink;satiation and bliss.@@ $activeSlave.slaveName is lying next to her on the bed in a state of @@.mediumorchid;resentment,@@ and @@.red;fatigue,@@
+<<elseif ($slaverapistx.energy > 95) && ($slaverapistx.devotion > 20)>>
+ You arrange $activeSlave.slaveName on the bed with her cock defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave, just for the perverted novelty of the act. She rides the hepless $activeSlave.slaveName trough seveal ejaculating orgasms. In the short breaks between them, she testes her pussy. By the end of the day $slaverapistx.slaveName's cunt is dripping cum, to her obvious @@color:hotpink;satiation and bliss.@@ $activeSlave.slaveName is lying next to her on the bed in a state of @@color:mediumorchid;resentment,@@and @@color:red;fatigue,@@, the entire experience having an @@color:lime;impact on her libido.@@
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.health -= 5>>
<<set $slaverapistx.devotion += 4>>
+ <<set $activeSlave.energy += 5>>
<<elseif ($activeSlave.devotion <= 20) || ($slaverapistx.devotion <= 20)>>
You tie $activeSlave.slaveName onto the bed and tell $slaverapistx.slaveName to get on with it. They fuck mechanically, gazing with roiling emotions into each others' eyes. They do seem to come to some sort of a nonverbal understanding on the necessity of getting it done, and there is no real unhappiness in either of them when they finish and disentangle themselves. As they clean themelves and exit, you notice $slaverapistx.slaveName's looking a little more longignly at $activeSlave.slaveName.
@@ -170,11 +207,11 @@ Next, you see to $slaverapistx.slaveName.
<<else>>
- The two slaves turn eagerly to the business of sex. $slaverapistx.slaveName is happily riding $activeSlave.slaveName, who ocassionlay trusts her hips up. After a little while, when $slaverapistx.slaveName bends down to engage in passionate kissing, you come over and penetrate $activeSlave.slaveName's free vagina with your <<if $PC.dick ==1>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated while restrained, she comes indecently hard. The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
- <<set $activeSlave.devotion += 8>>
- <<set $slaverapistx.devotion += 4>>
- <<set $activeSlave.energy += 2>>
- <<set $slaverapistx.energy += 2>>
+ The two slaves turn eagerly to the business of sex. $slaverapistx.slaveName is happily riding $activeSlave.slaveName, who ocassionlay trusts her hips up. After a little while, when $slaverapistx.slaveName bends down to engage in passionate kissing, you come over and penetrate $activeSlave.slaveName's free vagina with your <<if $PC.dick ==1>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated while restrained, she comes indecently hard. The two of them collapse into an exhausted, @@color:hotpink;happy@@ pile of slave flesh.
+ <<set $activeSlave.devotion += 8>>
+ <<set $slaverapistx.devotion += 4>>
+ <<set $activeSlave.energy += 2>>
+ <<set $slaverapistx.energy += 2>>
<</if>>
@@ -184,7 +221,7 @@ Throughout the week, you keep $activeSlave.slaveName's dick intimate with $slave
/% pregnancy test? %/
-<<if canGetPregnant($slaverapistx)>>
+<<if canImpreg($slaverapistx, $activeSlave)>>
<<if (Random(1,100) >= 75)>>
<<set $slaverapistx.preg = 1>>
<<set $slaverapistx.pregSource = $activeSlave.ID>>
diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw
index 0e690dcf4584cbac128484ed655103e77f6f47fc..8640cee9da6e2f94de8bfb74e56467d7677139b5 100644
--- a/src/pregmod/fSlaveSlaveVagConsummate.tw
+++ b/src/pregmod/fSlaveSlaveVagConsummate.tw
@@ -1,86 +1,187 @@
:: FSlaveSlaveVag Consummate
-
+
+<<if $slaverapistx.dick == 1>>
+ <<set $dicksize = "pathetic">>
+<<elseif ($slaverapistx.dick == 2)>>
+ <<set $dicksize = "tiny">>
+<<elseif ($slaverapistx.dick = 3)>>
+ <<set $dicksize = "average">>
+<<elseif ($slaverapistx.dick == 4)>>
+ <<set $dicksize = "big">>
+<<elseif ($slaverapistx.dick == 5)>>
+ <<set $dicksize = "huge">>
+<<elseif ($slaverapistx.dick == 6)>>
+ <<set $dicksize = "gigantic">>
+<<elseif ($slaverapistx.dick == 7)>>
+ <<set $dicksize = "titanic">>
+<<elseif ($slaverapistx.dick == 8)>>
+ <<set $dicksize = "absurd">>
+<<elseif ($slaverapistx.dick == 9)>>
+ <<set $dicksize = "inhuman">>
+<<else>>
+ <<set $dicksize = "obscene">>
+<</if>>
+
<<nobr>>
-The first necessary step is to prepare the slave doing the act.
+You take a look at the slave you selected.
+
+
+<<if $activeSlave.mother == $slaverapistx.ID>>
+ <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.energy > 60)>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own daughter, but despite that seems eager to do it.
+ <<else>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own daughter, but despite that seems to feel some arousal at the thought.
+ <</if>>
+ <<else>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own daughter and is understandingly distrurbed.
+ <</if>>
+<</if>>
+
+<<if $slaverapistx.mother == $activeSlave.ID>>
+ <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.energy > 60)>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own mother, but despite that seems eager to do it.
+ <<else>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own mother, but despite that seems to feel some arousal at the thought.
+ <</if>>
+ <<else>>
+ $slaverapistx.slaveName is well aware that she is about to rape her own mother and is understandingly distrurbed.
+ <</if>>
+<</if>>
+
+<<if (areSisters($activeSlave, $slaverapistx) > 0)>>
+ <<if ($slaverapistx.fetish == "perverted")>>
+ <<if ($slaverapistx.energy > 60)>>
+ $slaverapistx.slaveName is looking down at her sisters helpless form and inviting pussy with a look of hunger.
+ <<else>>
+ $slaverapistx.slaveName seems paralyzed, looking down at her bound sister with disbelief, curiosity...and excitement?
+ <</if>>
+ <<else>>
+ $slaverapistx.slaveName looks with horror down at her bound sister, knowing what will soon happen.
+ <</if>>
+<</if>>
<<set $activeSlave.penetrativeCount += 1>>
<<set $penetrativeTotal += 1>>
-<<if ($slaverapistx.fetish is "pregnancy") && ($slaverapistx.fetishKnown == 1) && ($slaverapistx.fetishStrength > 60) && ($slaverapistx.devotion >= -20)>>
- This is very easy, since $slaverapistx.slaveName has an impregnation fetish and loves the pure act of vaginal sex.
+
+
+<<if ($slaverapistx.fetish == "dominant") && ($slaverapistx.fetishStrength > 20) && ($slaverapistx.devotion >= -20)>>
+ Since $slaverapistx.slaveName loves to dominate others it's not hard to get her <<if $slaverapistx.dick > 0>>$dicksize dick ready.<else>>to don her strap-on.<</if>>
<<set $slaverapistx.devotion += 4>>
- <<if ($slaverapistx.preg is -3)>>Her member remains limp despite the prospect of getting another slave pregnant, but a direct injection of vasodilators quickly fixes that for this special occasion.
- <<else>>Her member springs instantly to attention at the prospect of getting another slave pregnant.
- <</if>>
+ <<if ($slaverapistx.attrXX > 65)>>With her high libido and love for girls, she becomes aroused indicently fast.
+ <<else>>
+ <<if $slaverapistx.dick > 0>>Her $dicksize member springs instantly to attention<else>>She becomes wet and flushed<</if>>
+ at the prospect of forcing herself on another slave.
+ <</if>>
-<<elseif ($slaverapistx.attrXX > 65) && ($slaverapistx.attrKnown == 1) && ($slaverapistx.devotion >= -20)>>
- Since $slaverapistx.slaveName likes sticking her cock in girls, she doesn't take much convincing.
- <<if ($slaverapistx.preg is -3)>>Her member remains limp despite the prospect of <<if $activeSlave.mpreg == 1>>ass<<else>>pussy<</if>>, but a direct injection of vasodilators quickly fixes that for this special occasion.
- <<else>>Her member springs instantly to attention at the prospect of pussy.
- <</if>>
+<<elseif ($slaverapistx.attrXX > 65) && ($slaverapistx.devotion >= -20)>>
+ Since $slaverapistx.slaveName likes sticking her <<if $slaverapistx.dick > 0>>$dicksize dick<else>>strap-on<</if>> in girls, she doesn't take much convincing.
<<elseif ($slaverapistx.devotion > 50)>>
Since $slaverapistx.slaveName is devoted to you, she'll eagerly fuck anything you tell her to fuck.
- <<if ($slaverapistx.preg is -3)>>She accepts a direct injection of vasodilators to counteract the hormones keeping her soft,
- <<else>>She quickly gets herself hard,
+ <<if ($slaverapistx.fetish == "sadist")>>She gleefully accepts any opportunity to torture another salve,
+ <<else>>She quickly gets herself ready,
<</if>>
- only a certain confusion in her look betraying that she realizes how special an occasion this is.
+ eying $activeSlave.slaveName with an expression you can't exactly decypher.
<<elseif ($slaverapistx.devotion > 20)>>
Since $slaverapistx.slaveName is obedient, she'll fuck anything you tell her to fuck.
- <<if ($slaverapistx.preg is -3)>>She accepts a direct injection of vasodilators to counteract the hormones keeping her soft,
- <<else>>She hurriedly gets herself hard,
- <</if>>
- only a slight hesitation betraying her realization that this is a special occasion.
+
<<elseif ($slaverapistx.devotion >= -20)>>
Since $slaverapistx.slaveName does not resist your will, she should comply reasonably well.
- <<if ($slaverapistx.preg is -3)>>She accepts a direct injection of vasodilators to counteract the hormones keeping her soft,
+ <<if (if $slaverapistx.dick > 0)>>She dons a strap-on and applies lube in a mechanical, detached fashion,
<<else>>She has to work to get herself hard despite her doubts,
<</if>>
fear and disgust showing on her face as she absorbs the perversion of the natural order of things she's about to experience.
<<else>>
- Since $slaverapistx.slaveName is unlikely to comply willingly, you simply restrain her and administer a massive dose of vasodilators, directly where they will do the most good. $slaverapistx.slaveName writhes with the pain of the injection, which is compounded as she springs agonizingly erect.
+ <<if $slaverapistx.dick > 0>>
+ Since $slaverapistx.slaveName is unlikely to comply willingly, you simply restrain her and administer a massive dose of vasodilators, directly where they will do the most good. $slaverapistx.slaveName writhes with the pain of the injection, which is compounded as her $dicksize penis springs agonizingly erect.
+ <else>>
+ Since $slaverapistx.slaveName is unlikely to comply willingly, you tie her up, put a strap-on with a clit vibrator on her and administer strong aphrodisiacs. She writes with discomfort and confusion.
+ <</if>>
+
<</if>>
+
<</nobr>>
<<nobr>>
Next, you see to $activeSlave.slaveName.
+<<if $activeSlave.mother == $slaverapistx.ID>>
+ <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.energy > 60)>>
+ $activeSlave.slaveName is looking up at her mother, fully naked, her <<if $slaverapistx.dick > 0>>$dicksize penis<else>>strap-on<</if>> standing firm despite her rapid breathing. She is flused and her pussy moist.
+ <<else>>
+ $activeSlave.slaveName seems paralyzed, looking at her mothers <<if $slaverapistx.dick > 0>>$dicksize member<else>>strap-on<</if>> with fascination and disbelief.
+ <</if>>
+ <<else>>
+ $activeSlave.slaveName looks with horror at her mothers <<if $slaverapistx.dick > 0>>$dicksize member<else>>strap-on<</if>>, knowing what will soon happen.
+ <</if>>
+<</if>>
+
+<<if $slaverapistx.mother == $activeSlave.ID>>
+ <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.energy > 60)>>
+ $activeSlave.slaveName is looking up at her daughter, fully naked, her <<if $slaverapistx.dick > 0>>$dicksize penis<else>>strap-on<</if>> standing firm despite her rapid breathing. She is flused and her pussy moist.
+ <<else>>
+ $activeSlave.slaveName seems paralyzed, looking at her daughters <<if $slaverapistx.dick > 0>>$dicksize cock<else>>strap-on<</if>> swaying above her with disbelief, hesitation... and excitement?
+ <</if>>
+ <<else>>
+ $activeSlave.slaveName looks with horror at her daughters <<if $slaverapistx.dick > 0>>$dicksize dick<else>>strap-on<</if>>, knowing what will soon happen.
+ <</if>>
+<</if>>
+
+<<if (areSisters($activeSlave, $slaverapistx) > 0)>>
+ <<if ($activeSlave.fetish == "perverted")>>
+ <<if ($activeSlave.energy > 60)>>
+ $activeSlave.slaveName seems paralyzed with fear, but her nipples are already hard and her face flushed. Her eyes are fixed on the <<if $slaverapistx.dick > 0>>$dicksize dick<else>>strap-on<</if>> above her.
+ <<else>>
+ $activeSlave.slaveName seems paralyzed, looking at her sister <<if $slaverapistx.dick > 0>>$dicksize cock<else>>strap-on<</if>> above her with disbelief, curiosity...and excitement?
+ <</if>>
+ <<else>>
+ $activeSlave.slaveName looks with horror at her sister's <<if $slaverapistx.dick > 0>>$dicksize dick<else>>strap-on<</if>>, knowing what will soon happen.
+ <</if>>
+<</if>>
+
<<set $activeSlave.vaginalCount += 1>>
<<set $vaginalTotal += 1>>
-<<if ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.vagina == 0)>>
- She presents her virgin pussy to $slaverapistx.slaveName without protest. This act @@.lime; breaks in her pussy.@@
- <<set $activeSlave.vagina to 1>>
+
+<<if ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && (($activeSlave.vagina == 0)>>
+ She presents her virgin pussy to $slaverapistx.slaveName without protest. This act @@color:lime; breaks in her pussy.@@
+ <<set $activeSlave.vagina = 1>>
<<set $activeSlave.devotion += 4>>
- <<set $activeSlave.fetishStrength += 1>>
+ <<set $activeSlave.fetishStrength += 1>>
<<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- She smiles and presents her pussy to $slaverapistx.slaveName. @@.hotpink;She is grateful@@ for this fulfillment of her fondest wish.
+ She smiles and presents her pussy to $slaverapistx.slaveName. @@color:hotpink;She enjoys@@ submitting to a dominant slave.
<<set $activeSlave.devotion += 4>>
-<<elseif ($activeSlave.devotion > 20) && ($activeSlave.vagina == 0) >>
- She accepts your orders without comment and presents her virgin pussy to $slaverapistx.slaveName for fertilization. She gasps in shock when she feels her hot seed. @@.hotpink;She is broken to slavery@@ by this application of her body, which naturally @@.lime;will break in her pussy.@@
- <<set $activeSlave.vagina to 1>>
+<<elseif ($activeSlave.devotion > 20) && (($activeSlave.vagina == 0) >>
+ She accepts your orders without comment and presents her virgin pussy to $slaverapistx.slaveName. She gasps in shock when she feels the <<if $slaverapistx.dick > 0>>$dicksize dick<else>>strap-on<</if>> eneter her. @@color:hotpink;She is broken to slavery@@ by this application of her body, which naturally @@color:lime;will break in her pussy.@@
+ <<set $activeSlave.vagina = 1>>
<<set $activeSlave.devotion += 10>>
-<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.vagina == 0)>>
- She is clearly unhappy at the idea of losing her pearl of great price to $slaverapistx.slaveName; this probably isn't what she imagined her first real sex would be like. Worse, she knows she's fertile and realizes she'll likely get pregnant. Nevertheless, @@.hotpink;she is broken to slavery@@ by this application of her body, which naturally @@.lime;will break in her pussy.@@
- <<set $activeSlave.vagina to 1>>
+<<elseif ($activeSlave.devotion >= -20) && (($activeSlave.vagina == 0)>>
+ She is clearly unhappy at the idea of losing her pearl of great price to $slaverapistx.slaveName; this probably isn't what she imagined her first real sex would be like. Nevertheless, @@color:hotpink;she is broken to slavery@@ by this application of her body, which naturally @@color:lime;will break in her pussy.@@
+ <<set $activeSlave.vagina = 1>>
<<set $activeSlave.devotion += 4>>
-<<elseif ($activeSlave.vagina == 0)>>
- As you anticipated, she refuses to give $slaverapistx.slaveName her virginity. You restrain her despite her @@.mediumorchid;horrified tears@@ and @@.gold;frightened begging.@@ Naturally, this cruel act @@.lime;will break in her pussy.@@
+<<elseif (($activeSlave.vagina == 0)>>
+ As you anticipated, she refuses to give $slaverapistx.slaveName her virginity. Since she is restrained, her @@color:mediumorchid;horrified tears@@ and @@color:gold;frightened begging@@ are her only signs on rebellion. Naturally, this cruel act @@color:lime;will break in her pussy.@@
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 5>>
- <<set $activeSlave.vagina to 1>>
+ <<set $activeSlave.vagina = 1>>
+<</if>>
-<<elseif ($activeSlave.amp == 1)>>
+<<if ($activeSlave.amp == 1)>>
You set her limbless torso up for $slaverapistx.slaveName.
<<elseif tooBigBreasts($activeSlave)>>
You set her up for $slaverapistx.slaveName, face down so the weight of her tits pins her helplessly in place.
@@ -90,8 +191,8 @@ Next, you see to $activeSlave.slaveName.
You set her up for $slaverapistx.slaveName, face up so she is pinned under the weight of her giant cock.
<<elseif tooBigBalls($activeSlave)>>
You set her up for $slaverapistx.slaveName, face down so the weight of her giant balls anchor her helplessly in place.
-<<elseif ($activeSlave.fetish is "submissive") && ($activeSlave.fetishStrength > 60) and ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
- She is accustomed to submit to you, but as a natural submissive she doesn't have much trouble submitting to $slaverapistx.slaveName's seed instead.
+<<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
+ She is accustomed to submit to you, but as a natural submissive she doesn't have much trouble submitting to $slaverapistx.slaveName.
<<elseif $activeSlave.devotion < -20>>
She tries to refuse, so you restrain her despite her resistance to the idea of being raped by another slave.
<<elseif $activeSlave.devotion <= 20>>
@@ -105,29 +206,43 @@ Next, you see to $activeSlave.slaveName.
<br><br>
<<if ($activeSlave.devotion < -20) && ($slaverapistx.devotion < -20)>>
- Since you have two restrained slaves, it's up to you to do all the work. You put $activeSlave.slaveName on the couch with her pussy available, and then maneuver $slaverapistx.slaveName's dick into place. The two slaves make no further moves until you deal $slaverapistx.slaveName a terrific swat across the ass and promise to give her more of the same until she gets going. $slaverapistx.slaveName starts moving very slowly, barely prodding. After watching them mechanically go at it for a while, you use your own weight to suddely push her deep into $activeSlave.slaveName. You occasionaly prod them with an electrial jolt to keep them going at a faster pace. Both slaves @@.mediumorchid;resent@@ what you made them do and @@.gold;fear you@@ as a result.
+ Since you have two restrained slaves, it's up to you to do all the work. $activeSlave.slaveName is teid up on the bed with her pussy available, so you maneuver $slaverapistx.slaveName's <<if $slaverapistx.dick > 0>>$dicksize dick<else>>strap-on<</if>> into place. The two slaves make no further moves until you deal $slaverapistx.slaveName a terrific swat across the ass and promise to give her more of the same until she gets going. $slaverapistx.slaveName starts moving very slowly, barely prodding. After watching them mechanically go at it for a while, you use your leg to suddely push her deep into $activeSlave.slaveName, fully hilting her in one motion. You occasionaly prod them with an electrial jolt to keep them going at a faster pace. Both slaves @@color:mediumorchid;resent@@ what you made them do and @@color:gold;fear you@@ as a result.
<<set $activeSlave.devotion -= 5>>
<<set $slaverapistx.devotion -= 5>>
<<set $activeSlave.trust -= 5>>
<<set $slaverapistx.trust -= 5>>
-
<<elseif ($slaverapistx.devotion < -20)>>
- Since your dick slave is restrained, you order $activeSlave.slaveName to present herself on the couch, and then maneuver $slaverapistx.slaveName's dick into place. $activeSlave.slaveName does her best to hump herself against the unwilling cock until you deal $slaverapistx.slaveName a terrific swat across the ass and promise to give her more of the same until she gets going. She is still unenthusiastic, so you have her lie down and have $activeSlave.slaveName ride her to orgasm. She @@.mediumorchid;resents@@ what you made her do and @@.gold;fears you@@ as a result.. Though $activeSlave.slaveName accepts the situation, she looks into $slaverapistx.slaveName's eyes with obvious apology.
+ Since your dick slave is restrained, you order $activeSlave.slaveName to present herself on the bed, and then maneuver $slaverapistx.slaveName's <<if $slaverapistx.dick > 0>>$dicksize dick<else>>strap-on<</if>> into place. $activeSlave.slaveName does her best to hump herself against the unwilling cock until you deal $slaverapistx.slaveName a terrific swat across the ass and promise to give her more of the same until she gets going. She is still unenthusiastic, so you have her lie down and have $activeSlave.slaveName ride hersef to orgasm. She @@color:mediumorchid;resents@@ what you made her do and @@color:gold;fears you@@ as a result.. Though $activeSlave.slaveName accepts the situation, she looks into $slaverapistx.slaveName's eyes with obvious apology.
<<set $slaverapistx.devotion -= 5>>
<<set $slaverapistx.trust -= 5>>
-<<elseif ($slaverapistx.fetish == "dom") && ($slaverapistx.fetishStrength > 60) && ($slaverapistx.devotion > 20) && ($activeSlave.devotion < -20)>>
- You arrange $activeSlave.slaveName on the couch with her pussy defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave for her pleasure. She penetrates her immediately, fondling, pinching and licking while pistoning away, fully enjoying her dominant role. By the end of the day $activeSlave.slaveName's abused cunt is dripping cum, to her @@.gold;horror@@ and @@.mediumorchid;resentment,@@ while $slaverapistx.slaveName is lying next to her on the couch in a state of obvious @@.hotpink;satiation and bliss.@@
- <<set $activeSlave.devotion -= 5>>
- <<set $activeSlave.trust -= 5>>
+<<elseif ($slaverapistx.fetish == "dominant") && ($slaverapistx.fetishStrength > 20) && ($slaverapistx.devotion > 20) && ($activeSlave.devotion < -20)>>
+ You arrange $activeSlave.slaveName on the bed with her pussy defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave for her pleasure. She penetrates her immediately, fondling, pinching and licking while pistoning away, fully enjoying her dominant role, edging her poor toy again and again and making her beg for release.
<<set $slaverapistx.devotion += 4>>
+ <<set $slaverapistx.energy += 1>>
+ <<set $slaverapistx.trust += 2>>
+ <<if ($activeSlave.fetish == "dominant")>>
+ By the end of the day $activeSlave.slaveName's @@color:lime;abused cunt@@ is <<if $slaverapistx.dick > 0>>$dripping with cum<else>>overflowing with juices<</if>>, leaving her @@color:gold;horrified@@ and @@color:mediumorchid;disgusted at her lack of control@@.
+ <<set $activeSlave.trust -= 5>>
+ <<set $activeSlave.energy -= 1>>
+ <<set $activeSlave.devotion -= 3>>
+ <<elseif ($activeSlave.fetish == "submissive")>>
+ By the end of the day $activeSlave.slaveName's @@color:lime;abused cunt@@ is <<if $slaverapistx.dick > 0>>$dripping with cum<else>>overflowing with juices<</if>>, leaving her @@color:gold;horrified@@ but @@color:hotpink;surprisingly sexually satisfied@@.
+ <<set $activeSlave.trust -= 5>>
+ <<set $activeSlave.energy += 3>>
+ <<set $activeSlave.devotion = 1>>
+ <</if>>
+ $slaverapistx.slaveName is lying next to her on the bed in a state of obvious @@color:hotpink;satiation@@ and @@color:teal;bliss.@@
+
<<elseif ($slaverapistx.energy > 95) && ($slaverapistx.devotion > 20) && ($activeSlave.devotion < -20)>>
- You arrange $activeSlave.slaveName on the couch with her pussy defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave, just for the perverted novelty of the act. She blows her load with indecent speed and looks crushed until you tell her to take her time and be thorough. By the end of the day $activeSlave.slaveName's cunt is dripping cum, to her @@.gold;horror@@ and @@.mediumorchid;resentment,@@ while $slaverapistx.slaveName is lying next to her on the couch in a state of obvious @@.hotpink;satiation and bliss.@@
- <<set $activeSlave.devotion -= 5>>
- <<set $activeSlave.trust -= 5>>
- <<set $slaverapistx.devotion += 4>>
+ You arrange $activeSlave.slaveName on the bed with her pussy defenseless and available, and then tell the randy $slaverapistx.slaveName that it's all hers. The slave life has so affected $slaverapistx.slaveName that she is quite eager to rape another slave, just for the perverted novelty of the act. Her high libido keeps her going for a long time, brining the helpless toy to one forced orgasm after another. By the end of the day $activeSlave.slaveName is lying on the bed @@color:lime;all worn out@@, her cunt <<if $slaverapistx.dick > 0>>$dripping with cum<else>>overflowing with juices<</if>>, to her @@color:gold;horror@@ and @@color:mediumorchid;resentment,@@ while $slaverapistx.slaveName is sleeping next to her in a state of obvious @@color:hotpink;satiation and bliss.@@
+ <<set $activeSlave.devotion -= 3>>
+ <<set $activeSlave.trust -= 3>>
+ <<set $activeSlave.energy += 3>>
+ <<set $slaverapistx.devotion += 3>>
+ <<set $slaverapistx.trust += 3>>
<<elseif ($activeSlave.devotion <= 20) || ($slaverapistx.devotion <= 20)>>
You order $activeSlave.slaveName onto the couch and tell $slaverapistx.slaveName to get on with it. They fuck mechanically, gazing with roiling emotions into each others' eyes. They do seem to come to some sort of a nonverbal understanding on the necessity of getting it done, and there is no real unhappiness in either of them when they finish and disentangle themselves. As they clean themelves and exit, you notice $slaverapistx.slaveName's looking a little more longignly at $activeSlave.slaveName.
@@ -137,7 +252,7 @@ Next, you see to $activeSlave.slaveName.
<<else>>
- The two slaves embrace happily and turn eagerly to the business of vanilla sex. They take their time, humping slowly and gazing into each others' eyes, chaning position often. After a little while, while in doggy position, $activeSlave.slaveName looks over $slaverapistx.slaveName's shoulder to where you're sitting, the invitation clear in her eyes. You come over and penetrate $slaverapistx.slaveName with your <<if $PC.dick ==1>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated, she comes indecently hard. The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh.
+ The two slaves happily and eagerly to the business sex. They take their time with foreplay, humping slowly and gazing into each others' eyes, exchanging kisses almost constantly. After a little while, $activeSlave.slaveName looks over $slaverapistx.slaveName's shoulder to where you're sitting, the invitation clear in her eyes. You come over and penetrate $slaverapistx.slaveName with your <<if $PC.dick > 0>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated, she comes indecently hard. The two of them collapse into an exhausted, @@color:hotpink;happy@@ pile of slave flesh.
<<set $activeSlave.devotion += 4>>
<<set $slaverapistx.devotion += 8>>
@@ -147,6 +262,13 @@ Next, you see to $activeSlave.slaveName.
Throughout the week, you keep $activeSlave.slaveName's pussy intimate with $slaverapistx.slaveName's cock. In the end, you are certain they got closer.
+<<if canImpreg($activeSlave, $slaverapistx)>>
+ <<if (Random(1,100) >= 75)>>
+ <<set $activeSlave.preg = 1>>
+ <<set $activeSlave.pregSource = $slaverapistx.ID>>
+ <</if>>
+<</if>>
+
<</nobr>>
diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw
index 061528165210d9a1cf512aa9b3bf3cd9044344af..0a7bd20a65a8d8f5c4baf97df5d690510e8dad38 100644
--- a/src/pregmod/huskSlaveSwapWorkaround.tw
+++ b/src/pregmod/huskSlaveSwapWorkaround.tw
@@ -15,7 +15,7 @@
__Select an eligible slave:__
<<for _i = 0; _i < $slaves.length; _i++>>\
- <<if $cybermod == 0 || $slaves[_i].PLimb == 0 || ($slaves[_i].PLimb == 1 && $slaves[_i].amp == 1)>>
+ <<if $slaves[_i].PLimb == 0 || ($slaves[_i].PLimb == 1 && $slaves[_i].amp == 1)>>
<<if ($slaves[_i].indenture == 0)>>\
<<if ($slaves[_i].breedingMark == 0)>>\
<<if ($slaves[_i].reservedChildren == 0)>>\
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index f7133ed56d2ed0b80e337eb6647f74587e346b00..3f989ecf76893c749feec6bc80dbacfb7dfc557a 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -211,7 +211,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
<<case "Slimness Enthusiast">>
lean muscles, a smooth waist, trim hips and a cute little ass, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.preg >= 20>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
<<case "Asset Expansionist">>
- an inhumanly enormous ass to counterbalance those enormous balls and a semihard cock, unable to become fully erect. You have to struggle to get him him onto your bed. You tease him as you remove your evening dress, crawl over him and
+ an inhumanly enormous ass to counterbalance those enormous balls and a semihard cock, unable to become fully erect. You have to struggle to get him onto your bed. You tease him as you remove your evening dress, crawl over him and
<<if $PC.newVag == 1>>
impale yourself on his monster shaft as far as you can, quivering in joy at its girth filling you.
<<elseif $PC.career == "escort">>
@@ -276,7 +276,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
<</if>><</if>>
<<elseif _FS != "Youth Preferentialist">>
<<if $Concubine != 0>><<if $Concubine.amp != 1>>
- The <<if canSee($concubine)>>view of your bouncing tits<<else>>the sound of lusty sex<</if>> is too much for $Concubine.slaveName to resist and crawls over to kiss and carress you as your lover finishes.
+ The <<if canSee($Concubine)>>view of your bouncing tits<<else>>the sound of lusty sex<</if>> is too much for $Concubine.slaveName to resist and crawls over to kiss and carress you as your lover finishes.
<</if>><</if>>
<</if>>
Sometimes society overlooks that you are a woman and have certain needs, but your lover tonight knows exactly how to treat you. When your guest <<if _FS != "Youth Preferentialist">>is finally spent<<else>>wakes up from against your body<</if>>, he showers, dresses, and leaves discreetly, offering you a proper thank you. This is the kind of thing that @@.green;builds a lasting reputation@@ in the Free Cities.
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index d8a7a74d9e597398ff40db96acb46ff1f64b014d..a51d6fea017e319c4008ca752a99b6b177890d30 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -77,7 +77,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if $badBirth > random(1,100)>> /* shits going wrong */
<<if $Nurse != 0>>
You keep pushing and pushing, but your child is not coming out.<<if $Concubine != 0>> $Concubine.slaveName shifts to massaging your gravid middle, while whispering words of encouragement into your ear. Until $Nurse.slaveName shoos her away so she can take over and get this baby out of you.<</if>> $Nurse.slaveName was prepared for this possibility, adjusts your position and timings, and before long is holding your @@.lime;new baby <<if $babyGender == 1>>girl<<else>>boy<</if>>@@ in her arms.
- <<elseif $BodyGuard != 0>>
+ <<elseif $Bodyguard != 0>>
You keep pushing and pushing, but your child is not coming out.<<if $Concubine != 0>> $Concubine.slaveName shifts to massaging your gravid middle, while whispering words of encouragement into your ear. She begins to worry as her lover weakens in front of her. $Bodyguard.slaveName quickly pulls her away from you, fearing the worst.<</if>> $Bodyguard.slaveName read about this possibility and tries everything she can to coax your child out. As time passes, she notices your consciousness begin to fade as exhaustion kicks in. Fearing for your lives, and desperate to save you, she draws her sword from its sheath, hands unsteady from what she is about to do. Carefully, she slits your lower abdomen, allowing your baby-filled womb to pop out through the incision. Doing her best, she cuts open your uterus, pulls your child from you and severs the umbilical cord.
<br>
<br>
diff --git a/src/pregmod/slaveAgeIntro.tw b/src/pregmod/slaveAgeIntro.tw
index 26dac426f006be40ed23d2d79dba9fe2b42a6d2a..e5ab636004bc11ecb210fe720c599a295c3349b8 100644
--- a/src/pregmod/slaveAgeIntro.tw
+++ b/src/pregmod/slaveAgeIntro.tw
@@ -5,5 +5,5 @@ Do you want to see content involving girls younger than 18 in this game?
[[No.|PC Body Intro][$minimumSlaveAge = 18, $pedo_mode = 0]] //All slaves will be at least 18 years old, and slavery of children will be illegal in the Free Cities.//
Yes, I wish to see girls as young as <<textbox "$minimumSlaveAge" $minimumSlaveAge "PC Body Intro">> [[Continue|PC Body Intro][$pedo_mode = 0]]
[[I just want lots of lolis.|PC Body Intro][$minimumSlaveAge = 3, $pedo_mode = 1]] //Nearly all randomly generated slaves will be under the age of 18, although custom slaves and slaves related to specific events may be older.//
-[[I wish to see them grow up and become fertile.|PC Body Intro][$minimumSlaveAge = 3, $pedo_mode = 0, $precociousPuberty = 1, $fertilityAge = 10, $potencyAge = 12, $seeAge = 1]] //Preset. Slaves' age will be random from minimal possible age. They can be made fertile yonger than normal puberty age (10) in some cases, and grow up naturally.//
+[[I wish to see them grow up and become fertile.|PC Body Intro][$minimumSlaveAge = 3, $pedo_mode = 0, $precociousPuberty = 1, $loliGrow = 1, $fertilityAge = 10, $potencyAge = 12, $seeAge = 1]] //Preset. Slaves' age will be random from minimal possible age. They can be made fertile yonger than normal puberty age (10) in some cases, and grow up naturally.//
diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw
index 42f67eeff215af492a5cede52c28880357f254d1..1462df5ca052079e77df0f776a0d8a93d65a0cc3 100644
--- a/src/pregmod/widgets/deathWidgets.tw
+++ b/src/pregmod/widgets/deathWidgets.tw
@@ -21,7 +21,7 @@ As $slaves[$i].slaveName is going about her business with her overfilled $slaves
<<SlavePronouns $slaves[$i]>>
<<if $slaves[$i].assignment == "be confined in the arcade">>
You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$slaves[$i].slaveName@@'', the fucktoy encased in it, died naturally of old age despite $possessive living conditions. $pronounCap was a good unit; logs show $pronoun was taking dick up until the very end.
- <<elseif $slaves[$i].assignment == "work in the dairy" && $dairyRestraints > 1>>
+ <<elseif $slaves[$i].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>>
You are notified by $dairyName staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem ''@@.pink;$slaves[$i].slaveName@@'', the cow restrained in it, died naturally of old age despite $possessive living conditions. $pronounCap was a good cow; $pronoun gave milk up until $possessive death.
<<elseif $slaves[$i].fuckdoll > 0>>
One of your fuckdoll's monitoring systems alerts you that the slave contained within has died. It would seem ''@@.pink;$slaves[$i].slaveName@@'' has died naturally of old age despite $possessive living conditions. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 83347387ceb9e045fde54ddd1fd99d0728f5b760..fe6cc08c6c82256e352e4a4282f6e05412c28183 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -39,6 +39,66 @@
<<set $fixedRace = 0>>
<</if>>
+<<if ndef $arcologyUpgrade>>
+ <<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}>>
+ <<set $arcologyUpgrade.drones = ($AProsperityCap > 60) ? 1 : 0>>
+ <<set $arcologyUpgrade.hydro = ($AProsperityCap > 80) ? 1 : 0>>
+ <<set $arcologyUpgrade.apron = ($AProsperityCap > 100) ? 1 : 0>>
+ <<set $arcologyUpgrade.grid = ($AProsperityCap > 120) ? 1 : 0>>
+ <<set $arcologyUpgrade.spire = ($AProsperityCap > 240) ? 1 : 0>>
+<</if>>
+
+<<if def $AHelots>>
+ <<set $ASlaves += Math.trunc($AHelots / 2)>>
+ <<unset $AHelots>>
+<</if>>
+
+<<if ndef $seeBuilding>>
+ <<set $seeBuilding = $seeArcology>>
+<</if>>
+
+<<if ndef $sectors>>
+ <<set $sectors = []>>
+ <<set $AS = {type: "Penthouse", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Empty", ownership: 0}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Shops", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Shops", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Shops", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Apartments", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Markets", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Manufacturing", ownership: 1}>><<set $sectors.push($AS)>>
+ <<set $AS = {type: "Barracks", ownership: 1}>><<set $sectors.push($AS)>>
+ <<for _i = 0; _i < 12; _i++>>
+ <<set _j = random(5,28)>>
+ <<if $sectors[_j].ownership == 1>>
+ <<set $sectors[_j].ownership = 0>>
+ <<else>>
+ <<set _i-->>
+ <</if>>
+ <</for>>
+<</if>>
+
<<for _i = 0; _i < $defaultRules.length; _i++>>
<<if ndef $defaultRules[_i].standardReward>>
<<set $defaultRules[_i].standardReward = "no default setting">>
@@ -1169,7 +1229,7 @@ Setting missing slave variables:
<<set _Slave.faceShape to "normal">>
<</if>>
-<<if $releaseID > 1000>><<else>>
+<<if $releaseID < 1000>>
<<if _Slave.face == -3>>
<<set _Slave.face = -100>>
<<elseif _Slave.face == -2>>
@@ -1725,3 +1785,6 @@ Setting missing slave variables:
<<if ndef $slavesOriginal>>
<<set $slavesOriginal = $slaves>>
<</if>>
+
+Done!
+
diff --git a/src/uncategorized/apartments.tw b/src/uncategorized/apartments.tw
index c43a8bc8de95e354c662ede5538ba45bbd6f1e1e..dc13f6b047dd64b36ae2a25179d1f42e808a78ab 100644
--- a/src/uncategorized/apartments.tw
+++ b/src/uncategorized/apartments.tw
@@ -25,7 +25,7 @@ You control this part of the arcology and all these tenants pay you rent.
<<if $sectors[$AS].type != "LuxuryApartments">>
<br>
- [[Improve this sector of apartments occupancy by the Free Cities' wealthiest citizens|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $sectors[$AS].type = "LuxuryApartments"]]
+ [[Improve this sector of apartments for occupancy by the Free Cities' wealthiest citizens|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $sectors[$AS].type = "LuxuryApartments"]]
//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
<</if>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 9ba495898cd85ea74c0db4105de71de06a988134..54e63874e019f249b1c3c43f74ea3af5b1ae3a95 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -66,7 +66,7 @@ $arcadeNameCaps
<<set $arcade = 0, $arcadeUpgradeInjectors = 0, $arcadeUpgradeFuckdolls = 0, $arcadeUpgradeCollectors = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Arcade">>
- <<set $sectors[_i].type == "Markets">><<break>>
+ <<set $sectors[_i].type = "Markets">><<break>>
<</if>>
<</for>>
<<goto "Main">>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index 2a7d1907ef94668e43ae55d37c749c6b4bd8206b..376c51c2a6903b57d3ca2d939a9d85590335e74c 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -255,7 +255,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<else>>
sucking dick and taking anal, and the ones that have pussies are being fucked there, too.
<</if>>
- <<if ($brothelAdsXX == 1) && ($brothelAdsImplants == 1) && ($brothelAdsStacked == 1)>>
+ <<if ($brothelAdsXX == 1) && ($brothelAdsImplanted == 1) && ($brothelAdsStacked == 1)>>
As a result, the brothel is known as the place to go if you want to rent a<<if $brothelAdsPreg == 1>>pregnant<</if>> bimbo's pussy.
<<elseif ($brothelAdsXX == 1) && ($brothelAdsOld == 1)>>
As a result, the brothel is known as the place to go if you want to rent a<<if $brothelAdsPreg == 1>>pregnant<</if>> MILF's tits.
@@ -320,7 +320,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
their holes.
<</if>>
The music videos are very popular.
- <<if ($clubAdsXX == 1) && ($clubAdsImplants == 1) && ($clubAdsStacked == 1)>>
+ <<if ($clubAdsXX == 1) && ($clubAdsImplanted == 1) && ($clubAdsStacked == 1)>>
As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> bimbos.
<<elseif ($clubAdsXX == 1) && ($clubAdsOld == 1)>>
As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> MILFs.
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 6c79ea15c3d4766fbe6a319cbd1a071c3662e08a..ebe4a95139605294a7a10f07beb69a20fddf34f8 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -107,7 +107,7 @@ $brothelNameCaps
sucking dick and taking anal, and the ones that have pussies are being fucked there, too.
<</if>>
The ads are shown on media across $arcologies[0].name.
- <<if ($brothelAdsXX == 1) && ($brothelAdsImplants == 1) && ($brothelAdsStacked == 1)>>
+ <<if ($brothelAdsXX == 1) && ($brothelAdsImplanted == 1) && ($brothelAdsStacked == 1)>>
As a result, $brothelName is known as the place to go if you want to rent a<<if ($brothelAdsPreg == 1)>>pregnant<</if>> bimbo's pussy.
<<elseif ($brothelAdsXX == 1) && ($brothelAdsOld == 1)>>
As a result, $brothelName is known as the place to go if you want to rent a<<if ($brothelAdsPreg == 1)>>pregnant<</if>> MILF's tits.
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 1aba1edd73fd9863570c108a974a7f996ac80e9e..86ee43059c6943950236a2e788ff33d4046dffe0 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -102,7 +102,7 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
<<if $schoolroom>>[[Schoolroom]]<</if>>
<<if $cellblock>>[[Cellblock]]<</if>>
<<if $incubator>>[[Incubator]]<</if>>
- <<if $HGSuite>>[HG Suite|Head Girl Suite]]<</if>>
+ <<if $HGSuite>>[[HG Suite|Head Girl Suite]]<</if>>
<</if>>
</td>
<td></td>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 9e47a347bfcda3a6c1bdbc0ce76ba6507785a233..1236ce5deb4ea6b72ca577b9443b409b07cc975f 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -107,7 +107,7 @@ $clubNameCaps
their holes.
<</if>>
The ads are shown across the arcology.
- <<if ($clubAdsXX == 1) && ($clubAdsImplants == 1) && ($clubAdsStacked == 1)>>
+ <<if ($clubAdsXX == 1) && ($clubAdsImplanted == 1) && ($clubAdsStacked == 1)>>
As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> bimbos.
<<elseif ($clubAdsXX == 1) && ($clubAdsOld == 1)>>
As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> MILFs.
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 137113fd59e91829f407f4196a0dadd22bb58753..2f1752bae05044042df899d20d2bdfafae4863a3 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -101,7 +101,7 @@
<<if $pregAccessibility != 1>>
<<if ($slaves[$i].preg > 30 && $slaves[$i].pregType >= 2) || ($slaves[$i].preg > 20 && $slaves[$i].pregType >= 10) || ($slaves[$i].preg > 10 && $slaves[$i].pregType >= 20) || $slaves[$i].bellyImplant >= 10000>>
<<if ($slaves[$i].assignment != "labor in the production line")>>
- <<set $Costs += 100>>
+ <<set $costs += 100>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 6efa4390562e679fd1944d73642ba4172471fc60..ac3c1981fea380083bc92876f8855a43d0daa2f4 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -298,7 +298,7 @@ $dairyNameCaps
<<else>>
$dairyNameCaps is empty and desolate.
<<link "Decommission the dairy">>
- <<set $dairy = 0, $dairyFeedersUpgrade = 0, $dairyPregUpgrade = 0, $dairyStimulatorsUpgrade = 0, $dairyDecoration = "standard", $dairyFeedersSetting = 0, $dairyPregSetting = 0, $dairyStimulatorsSetting = 0, $dairyHyperPregRemodel = 0, $cumPipeline = 0, $dairyPipeline = 0>>
+ <<set $dairy = 0, $dairyFeedersUpgrade = 0, $dairyPregUpgrade = 0, $dairyStimulatorsUpgrade = 0, $dairyDecoration = "standard", $dairyFeedersSetting = 0, $dairyPregSetting = 0, $dairyStimulatorsSetting = 0, $dairyHyperPregRemodel = 0, $cumPipeline = 0, $milkPipeline = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Dairy">>
<<set $sectors[_i].type == "Manufacturing">><<break>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 66b27a89e9758bc98ec8158517aaf72cb8cfbc21..efd8c180442bb3d2122fe3a07a3ad916d5c42dde 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -121,7 +121,7 @@
<<set $PC.preg++>>
<</if>>
-<<set $HGEnergy = 0, $HGCum = 0, $HGSlaveSuccess = 0, $HeadGirl = 0, $HGBalls = 0, $HGRelease = 1, $Recruiter = 0, $Madam = 0, $madamCashBonus = 0, $DJ = 0, $DJRepBonus = 0, $Milkmaid = 0, $Collectrix = 0, $Stewardess = 0, $Schoolteacher = 0, $Wardeness = 0, $Concubine = 0, $Attendant = 0, $Nurse = 0, $Bodyguard = 0, $bedSlaves = 0, $fuckSlaves = 0, $freeSexualEnergy = 0, $publicServants = 0, $cumSlaves = 0, $averageDick = 0, $slavesWithWorkingDicks = 0>>
+<<set $HGEnergy = 0, $HGCum = 0, $HGSlaveSuccess = 0, $HeadGirl = 0, $HGBalls = 0, $HGRelease = 1, $Recruiter = 0, $Madam = 0, $madamCashBonus = 0, $DJ = 0, $DJRepBonus = 0, $Milkmaid = 0, $Collectrix = 0, $Stewardess = 0, $Schoolteacher = 0, $Wardeness = 0, $Concubine = 0, $Attendant = 0, $Nurse = 0, $Bodyguard = 0, $bedSlaveOne = 0, $bedSlaveTwo = 0, $bedSlaveThree = 0, $bedSlaveFour = 0, $fuckSlaves = 0, $freeSexualEnergy = 0, $publicServants = 0, $cumSlaves = 0, $averageDick = 0, $slavesWithWorkingDicks = 0>>
/* GAMEOVERS */
<<if $slaves.length < 1>>
diff --git a/src/uncategorized/importRule.tw b/src/uncategorized/importRule.tw
index 9f359ed200a0d720b7436560b45086a439f76ce3..3b9fdf20056f202810c0506a7b26dbeabf0b1d24 100644
--- a/src/uncategorized/importRule.tw
+++ b/src/uncategorized/importRule.tw
@@ -16,10 +16,15 @@
<<set $defaultRules.push($tempRule)>>
- /* renumber rule IDs */
+ /* renumber rule IDs and update slaves' assigned rule IDs if needed */
<<for $r = 0; $r < $defaultRules.length; $r++>>
<<set $defaultRules[$r].ID = $r + 1>>
<</for>>
+ <<for _i = 0; _i < $slaves.length; _i++>>
+ <<silently>>
+ <<CheckAutoRulesActivate $slaves[_i]>>
+ <</silently>>
+ <</for>>
<<replace #import>>
''Rule imported successfully!''
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index e17300e5c5c26db3c5e46d5c53baa866aec0da5d..61027bda076f434eb383dff812838a47bfd40cff 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -249,7 +249,7 @@ Filter by assignment: |
<<if (_BG > -1) && ($slaves[_BG].assignment == "guard you")>>
<<set $i = _BG>>
- <<set $GO = "idiot ball">>
+ <<set _GO = "idiot ball">>
<br><<include "Use Guard">>
<br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
| <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
@@ -266,7 +266,7 @@ Filter by assignment: |
<<if canDoAnal($slaves[_BG])>>
| <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+_BG+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<</if>>
- | <<print "[[Abuse her|Gameover][$gameover = $GO]]">>
+ | <<print "[[Abuse her|Gameover][$gameover = _GO]]">>
<</if>>
<<set $activeSlave = Array.random($slaves)>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 694c15316d167217585fab1d6b0524263051b6aa..5caf999cfdb6c9a41962d3a1f7704d0594654f8f 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -353,7 +353,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<set $arcologies[$i].prosperity -= 1>>
<<if $arcologies[$i].direction != 0>>
<<if $rivalSet == 0>>
- <<if $rivalFS != 0>>
+ <<if $rivalryFS != 0>>
<<set $arcologies[$i].rival = 1>>
<<set $rivalSet = 1>>
<</if>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 2637133b117ee16436b6d93d29dd4b1573dbfa4a..d684e6a81fc9805f3d42e005c0591ff94582fe3d 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -5,6 +5,9 @@
This save was created using FC version $ver build $releaseID.
+<br><br>
+[[Apply Backwards Compatibility Update|Backwards Compatibility]]
+
<br><br>
Genetics array test:
<<link "Run Test">><<goto "test genetics">><</link>>
diff --git a/src/uncategorized/pCoupAftermath.tw b/src/uncategorized/pCoupAftermath.tw
index 8668ba37b2544e07d76a01c998425a0e40eed1be..c413f1e9ec6c4cb72e4aea2becea5b223587594a 100644
--- a/src/uncategorized/pCoupAftermath.tw
+++ b/src/uncategorized/pCoupAftermath.tw
@@ -15,7 +15,7 @@
<<if $mercenaries == 0>>Your security drones<<elseif $mercenaries <= 3>>Your mercenaries<<else>>Your $mercenariesTitle<</if>> perform the grisly task of disposing of the bodies of the Daughters killed in the assault. They strip them of anything that might be of use in cleaning up after the attempted coup - communication devices, PDAs, computers, even handwritten notes. The raw intel is scanned and passed to $assistantName. Most of it is rubbish.
<br><br>
-Some of it is not. There is evidence of payments from a <<if $rivalset == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistantName finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if $assistant > 0>>"This," she says in a tone of satisfaction, "is the <<if _num < $seeDicks>>bastard<<elseif (_num-25) < $seeDicks>>bitch<<else>>cunt<</if>> you want, <<if $PC.title == 0>>Ma'am<<else>>Sir<</if>>."<<else>>"This," it says neutrally, "is the culprit, <<if $PC.title == 0>>Ma'am<<else>>Sir<</if>>."<</if>>
+Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistantName finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if $assistant > 0>>"This," she says in a tone of satisfaction, "is the <<if _num < $seeDicks>>bastard<<elseif (_num-25) < $seeDicks>>bitch<<else>>cunt<</if>> you want, <<if $PC.title == 0>>Ma'am<<else>>Sir<</if>>."<<else>>"This," it says neutrally, "is the culprit, <<if $PC.title == 0>>Ma'am<<else>>Sir<</if>>."<</if>>
The face is vigorous, determined, <<if _num < $seeDicks>>and masculine. The very stereotype of the male arcology owner.<<elseif (_num-50 < $seeDicks)>>and androgynous. The very stereotype of the dissolute arcology owner.<<else>>and feminine. The very stereotype of the female arcology owner.<</if>>
<<if $rivalSet != 0>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 51426f1d209133280a1a7119e199e9242a1a12a6..765f503dcce19aa2ac4ea2dd106116c2481895ff 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -1596,7 +1596,7 @@
<<if ($eventSlave.pregType < 50)>>
<<if ($eventSlave.births > 10)>>
<<if ($eventSlave.assignment == "whore") || ($eventSlave.assignment =="serve the public")>>
-<<if ($eventslave.amp != 1)>>
+<<if ($eventSlave.amp != 1)>>
<<if ($eventSlave.prestige == 0)>>
<<set $events.push("RE legendary womb")>>
<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 7da2dda01ed1e6a21bd2e7f69a1d1c16fda8801d..7eba906640800e458b30b803db09f1825466fb1c 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -410,7 +410,7 @@
<<set $PESSevent.push("headgirl dickgirl")>>
<</if>>
<</if>>
- <<if ($universalRuleImpregnation == "HG")>>
+ <<if ($universalRulesImpregnation == "HG")>>
<<if ($HeadGirl.devotion > 95)>>
<<if ($HeadGirl.balls > 0)>>
<<set $PESSevent.push("worshipful impregnatrix")>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 2f7e973f42a102b529a5a006784998631c45dac8..8c190575aa1178fe8d7d27064cafcff0992eed76 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1766,7 +1766,7 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
[["Surgically remove " + $possessive + " ability to grow hair"|Surgery Degradation][$cash -= $surgeryCost,$activeSlave.bald = 1,$surgeryType = "hair removal"]]
<</if>>
-<<if $activeSlave.underArmHStyle != "bald" && $activeSlave.underArmHStyle != "hairless" && $activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless">>
+<<if ($activeSlave.underArmHStyle != "bald" && $activeSlave.underArmHStyle != "hairless") || ($activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless")>>
<br>
$pronounCap <<if $activeSlave.physicalAge >= 12>>naturally grows<<else>>will someday grow<</if>> $activeSlave.origHColor body hair.
[["Surgically remove " + $possessive + " ability to grow body hair"|Surgery Degradation][$cash -= $surgeryCost,$surgeryType = "body hair removal"]]
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index a412dc787d5ca23c3f8bf51c252b0c6da104b6d9..a421cf6aa56af416baa99259ff6e03215f38c8f5 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -1071,7 +1071,7 @@ Vaginal accessories for other slaves: ''$currentRule.vaginalAccessory.''
<<RAChangeApply>>
<</link>>
-
+<<if $seeDicks != 0 || $makeDicks != 0>>
<br>
<span id = "avdaccessory">
Dick accessories for anal virgins: ''$currentRule.aVirginDickAccessory.''
@@ -1150,7 +1150,7 @@ Dick accessories for other slaves: ''$currentRule.dickAccessory.''
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-
+<</if>>
<br>
@@ -1729,7 +1729,7 @@ Slave diets:
<<RAChangeApply>>
<</link>>
<</if>>
-<</if>>
+<</if>> /* closes $feeder == 1 */
<span id = "dietsupport">
<<if $currentRule.diet !== "no default setting">>
@@ -2788,10 +2788,9 @@ Relationship rules: ''$currentRule.relationshipRules.''
<</if>> /* closes if _length > 0 */
-<br>
+<br><br>
<<if _length < 10>>
- <br>
<<link "Add a new rule">>
@@ -2800,20 +2799,25 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<set _activeRule.name = "Rule " + (_length+1)>>
<<set $defaultRules.push(_activeRule)>>
- /* renumber rule IDs */
+ /* renumber rule IDs and update slaves' assigned rule IDs if needed */
<<for $r = 0; $r < $defaultRules.length; $r++>>
<<set $defaultRules[$r].ID = $r + 1>>
<</for>>
+ <<for _i = 0; _i < $slaves.length; _i++>>
+ <<silently>>
+ <<CheckAutoRulesActivate $slaves[_i]>>
+ <</silently>>
+ <</for>>
<<set $currentRule = $defaultRules[_length]>>
<<goto "Rules Assistant">>
- <</link>>
+ <</link>> |
<</if>>
<<if _length > 0>>
- | <span id="apply">
+ <span id="apply">
<span id="applied"></span>
<span id="applyresult"></span>
</span>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index d8a78e452270d14be8818bc8a5b7625e0321feee..6fa30779c2512b2efad6e8f31db93d4724abc532 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5071,7 +5071,7 @@
<<if $slaves[$i].physicalAge >= 18>>
<<if ($slaves[$i].boobs > 9000+($slaves[$i].muscles*100))>>
<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if ($slaves[$i].drugs != "breast injections" && $FSAssetExpansionistResearch == 0)>>
+ <<if ($slaves[$i].drugs != "breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
<<if ($slaves[$i].boobs > 9000+($slaves[$i].muscles*100))>>
Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
<<set $slaves[$i].boobs to Math.clamp($slaves[$i].boobs-25, 9000+($slaves[$i].muscles*100), 25000)>>
@@ -5110,7 +5110,7 @@
<<elseif $slaves[$i].physicalAge <= 3>>
<<if ($slaves[$i].boobs > 5100+($slaves[$i].muscles*10))>>
<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) or $arcologies[0].FSAssetExpansionistResearch == 0>>
- <<if ($slaves[$i].drugs != "breast injections" && $FSAssetExpansionistResearch == 0)>>
+ <<if ($slaves[$i].drugs != "breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>>
<<if ($slaves[$i].boobs > 5100+($slaves[$i].muscles*10))>>
Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
<<set $slaves[$i].boobs to Math.clamp($slaves[$i].boobs-25, 5100+($slaves[$i].muscles*10), 25000)>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index fc190579e78967d22092f6637c3cb442561e5173..a030e00eb0b76af2fde81a8e7fa60b547c69508b 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -646,7 +646,7 @@ Childbirth has @@.lime;greatly stretched out $possessive ass.@@
<<elseif ($slaves[$i].anus == 2)>>
Childbirth has @@.lime;stretched out $possessive ass.@@
<<elseif ($slaves[$i].anus == 3)>>
-$possessiveCaps ass was loose enough to not be stretched by childbirth.
+$possessiveCap ass was loose enough to not be stretched by childbirth.
<<elseif ($slaves[$i].anus < 10)>>
Childbirth stood no chance of stretching $possessive gaping ass.
<<elseif ($slaves[$i].anus == 10)>>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 15216fd79e2536c73bf9e49737fb72ef4c899b0b..557f41b3be535f08aa51cf6cd60f6a5905396c91 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -45,7 +45,7 @@
<<set $args[0].assignment = "work in the dairy", $args[0].assignmentVisible = 0, $dairySlaves++, $DairyiIDs.push({ID: _wID, Index: _wi})>>
<<if $dairyPregSetting > 0>>
<<set $reservedChildren -= $args[0].reservedChildren>>
- <<set $$args[0].reservedChildren = 0>>
+ <<set $args[0].reservedChildren = 0>>
<</if>>
<<case "hgsuite" "head girl suite" "live with your head girl">>
<<set $args[0].assignment = "live with your Head Girl", $args[0].assignmentVisible = 0, $HGSuiteSlaves++, $HGSuiteiIDs.push({ID: _wID, Index: _wi})>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 945343b0ec5e361fb01a14a12fa6282d0998aea2..3e4f7392ef2d478156837e843c192da9526e6118 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -3477,7 +3477,7 @@ $pronounCap's got a
$pronounCap cannot get to $possessive feet unaided, and prefers to remain seated so $possessive enormous balls don't weigh $object down as much.
<</if>>
<<elseif $activeSlave.balls >= 100>>
- $possessiveCap testicles each dwarf $oject, making $object almost entirely testicle.
+ $possessiveCap testicles each dwarf $object, making $object almost entirely testicle.
<<else>>
$possessiveCap testicles each dwarf $possessive torso, making $object almost entirely testicle.
<</if>>
@@ -3692,7 +3692,7 @@ $pronounCap's got a
$pronounCap cannot get to $possessive feet unaided, and prefers to remain seated so $possessive enormous balls don't weigh $object down as much.
<</if>>
<<elseif $activeSlave.balls >= 100>>
- $possessiveCap testicles each dwarf $oject, making $object almost entirely testicle.
+ $possessiveCap testicles each dwarf $object, making $object almost entirely testicle.
<<else>>
$possessiveCap testicles each dwarf $possessive torso, making $object almost entirely testicle.
<</if>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index deafa263c1dff117158319ae8dfee118555085e7..7f8f30d04d632e8f2a3900be31dcd8a509fa36bc 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -696,7 +696,7 @@
<<else>>
''$HGSuiteNameCaps''
<<link Stop>>
- <<set _facility.delete("hgsuite")>>
+ <<set $currentRule.facility.delete("hgsuite")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -720,7 +720,7 @@
<<else>>
''$brothelNameCaps''
<<link Stop>>
- <<set _facility.delete("brothel")>>
+ <<set $currentRule.facility.delete("brothel")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -744,7 +744,7 @@
<<else>>
''$clubNameCaps''
<<link Stop>>
- <<set _facility.delete("club")>>
+ <<set $currentRule.facility.delete("club")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -768,7 +768,7 @@
<<else>>
''$arcadeNameCaps''
<<link Stop>>
- <<set _facility.delete("arcade")>>
+ <<set $currentRule.facility.delete("arcade")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -792,7 +792,7 @@
<<else>>
''$dairyNameCaps''
<<link Stop>>
- <<set _facility.delete("dairy")>>
+ <<set $currentRule.facility.delete("dairy")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -816,7 +816,7 @@
<<else>>
''$servantsQuartersNameCaps''
<<link Stop>>
- <<set _facility.delete("servantsquarters")>>
+ <<set $currentRule.facility.delete("servantsquarters")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -840,7 +840,7 @@
<<else>>
''$masterSuiteNameCaps''
<<link Stop>>
- <<set _facility.delete("mastersuite")>>
+ <<set $currentRule.facility.delete("mastersuite")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -864,7 +864,7 @@
<<else>>
''$schoolroomNameCaps''
<<link Stop>>
- <<set _facility.delete("schoolroom")>>
+ <<set $currentRule.facility.delete("schoolroom")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -888,7 +888,7 @@
<<else>>
''$spaNameCaps''
<<link Stop>>
- <<set _facility.delete("spa")>>
+ <<set $currentRule.facility.delete("spa")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -912,7 +912,7 @@
<<else>>
''$clinicNameCaps''
<<link Stop>>
- <<set _facility.delete("clinic")>>
+ <<set $currentRule.facility.delete("clinic")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -936,7 +936,7 @@
<<else>>
''$cellblockNameCaps''
<<link Stop>>
- <<set _facility.delete("cellblock")>>
+ <<set $currentRule.facility.delete("cellblock")>>
<<RAChangeApplyFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -957,8 +957,11 @@
Applying to all facilities except:
<<link "None">>
<<set $currentRule.excludeFacility = []>>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
<<RAChangeApplyFacility>>
<<RAChangeExcludeFacility>>
+ <<RAChangeAssignFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
@@ -986,7 +989,12 @@
<<else>>
''$HGSuiteNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("hgsuite")>>
+ <<set $currentRule.excludeFacility.delete("hgsuite")>>
+ <<if $currentRule.assignFacility == "hgsuite">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1010,7 +1018,12 @@
<<else>>
''$brothelNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("brothel")>>
+ <<set $currentRule.excludeFacility.delete("brothel")>>
+ <<if $currentRule.assignFacility == "brothel">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1034,7 +1047,12 @@
<<else>>
''$clubNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("club")>>
+ <<set $currentRule.excludeFacility.delete("club")>>
+ <<if $currentRule.assignFacility == "club">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1058,7 +1076,12 @@
<<else>>
''$arcadeNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("arcade")>>
+ <<set $currentRule.excludeFacility.delete("arcade")>>
+ <<if $currentRule.assignFacility == "arcade">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1082,7 +1105,12 @@
<<else>>
''$dairyNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("dairy")>>
+ <<set $currentRule.excludeFacility.delete("dairy")>>
+ <<if $currentRule.assignFacility == "dairy">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1106,7 +1134,12 @@
<<else>>
''$servantsQuartersNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("servantsquarters")>>
+ <<set $currentRule.excludeFacility.delete("servantsquarters")>>
+ <<if $currentRule.assignFacility == "servantsquarters">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1130,7 +1163,12 @@
<<else>>
''$masterSuiteNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("mastersuite")>>
+ <<set $currentRule.excludeFacility.delete("mastersuite")>>
+ <<if $currentRule.assignFacility == "mastersuite">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1154,7 +1192,12 @@
<<else>>
''$schoolroomNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("schoolroom")>>
+ <<set $currentRule.excludeFacility.delete("schoolroom")>>
+ <<if $currentRule.assignFacility == "schoolroom">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1178,7 +1221,12 @@
<<else>>
''$spaNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("spa")>>
+ <<set $currentRule.excludeFacility.delete("spa")>>
+ <<if $currentRule.assignFacility == "spa">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1202,7 +1250,12 @@
<<else>>
''$clinicNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("clinic")>>
+ <<set $currentRule.excludeFacility.delete("clinic")>>
+ <<if $currentRule.assignFacility == "clinic">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1226,7 +1279,12 @@
<<else>>
''$cellblockNameCaps''
<<link Stop>>
- <<set _excludeFacility.delete("cellblock")>>
+ <<set $currentRule.excludeFacility.delete("cellblock")>>
+ <<if $currentRule.assignFacility == "cellblock">>
+ <<set $currentRule.assignFacility = "none">>
+ <<set $currentRule.facilityRemove = false>>
+ <<RAChangeAssignFacility>>
+ <</if>>
<<RAChangeExcludeFacility>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1259,6 +1317,7 @@
|
<<if ($currentRule.setAssignment != "rest")>>
<<link "Rest">>
+ <<set $currentRule.assignment.delete("rest")>>
<<set $currentRule.setAssignment = "rest">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1274,6 +1333,7 @@
|
<<if ($currentRule.setAssignment != "please you")>>
<<link "Fucktoy">>
+ <<set $currentRule.assignment.delete("please you")>>
<<set $currentRule.setAssignment = "please you">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1289,6 +1349,7 @@
|
<<if ($currentRule.setAssignment != "be a servant")>>
<<link "House Servant">>
+ <<set $currentRule.assignment.delete("be a servant")>>
<<set $currentRule.setAssignment = "be a servant">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1304,6 +1365,7 @@
|
<<if ($currentRule.setAssignment != "stay confined")>>
<<link "Confined">>
+ <<set $currentRule.assignment.delete("stay confined")>>
<<set $currentRule.setAssignment = "stay confined">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1319,6 +1381,7 @@
|
<<if ($currentRule.setAssignment != "whore")>>
<<link "Whore">>
+ <<set $currentRule.assignment.delete("whore")>>
<<set $currentRule.setAssignment = "whore">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1334,6 +1397,7 @@
|
<<if ($currentRule.setAssignment != "serve the public")>>
<<link "Public Servant">>
+ <<set $currentRule.assignment.delete("serve the public")>>
<<set $currentRule.setAssignment = "serve the public">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1349,6 +1413,7 @@
|
<<if ($currentRule.setAssignment != "get milked")>>
<<link "Milking">>
+ <<set $currentRule.assignment.delete("get milked")>>
<<set $currentRule.setAssignment = "get milked">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1364,6 +1429,7 @@
|
<<if ($currentRule.setAssignment != "work a glory hole")>>
<<link "Gloryhole">>
+ <<set $currentRule.assignment.delete("work a glory hole")>>
<<set $currentRule.setAssignment = "work a glory hole">>
<<set $currentRule.assignFacility = "none">>
<<set $currentRule.facilityRemove = false>>
@@ -1406,6 +1472,7 @@
<<link $HGSuiteNameCaps>>
<<set $currentRule.assignFacility = "hgsuite">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("hgsuite")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("hgsuite")>>
<<RAChangeExcludeFacility>>
@@ -1426,6 +1493,7 @@
<<link $brothelNameCaps>>
<<set $currentRule.assignFacility = "brothel">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("brothel")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("brothel")>>
<<RAChangeExcludeFacility>>
@@ -1446,6 +1514,7 @@
<<link $clubNameCaps>>
<<set $currentRule.assignFacility = "club">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("club")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("club")>>
<<RAChangeExcludeFacility>>
@@ -1466,6 +1535,7 @@
<<link $arcadeNameCaps>>
<<set $currentRule.assignFacility = "arcade">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("arcade")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("arcade")>>
<<RAChangeExcludeFacility>>
@@ -1486,6 +1556,7 @@
<<link $dairyNameCaps>>
<<set $currentRule.assignFacility = "dairy">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("dairy")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("dairy")>>
<<RAChangeExcludeFacility>>
@@ -1506,6 +1577,7 @@
<<link $servantsQuartersNameCaps>>
<<set $currentRule.assignFacility = "servantsquarters">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("servantsquarters")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("servantsquarters")>>
<<RAChangeExcludeFacility>>
@@ -1526,6 +1598,7 @@
<<link $masterSuiteNameCaps>>
<<set $currentRule.assignFacility = "mastersuite">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("mastersuite")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("mastersuite")>>
<<RAChangeExcludeFacility>>
@@ -1546,6 +1619,7 @@
<<link $schoolroomNameCaps>>
<<set $currentRule.assignFacility = "schoolroom">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("schoolroom")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("schoolroom")>>
<<RAChangeExcludeFacility>>
@@ -1566,6 +1640,7 @@
<<link $spaNameCaps>>
<<set $currentRule.assignFacility = "spa">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("spa")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("spa")>>
<<RAChangeExcludeFacility>>
@@ -1586,6 +1661,7 @@
<<link $clinicNameCaps>>
<<set $currentRule.assignFacility = "clinic">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("clinic")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("clinic")>>
<<RAChangeExcludeFacility>>
@@ -1606,6 +1682,7 @@
<<link $cellblockNameCaps>>
<<set $currentRule.assignFacility = "cellblock">>
<<set $currentRule.setAssignment = "none">>
+ <<set $currentRule.facility.delete("cellblock")>>
<<if $currentRule.facility.length == 0>>
<<set $currentRule.excludeFacility.push("cellblock")>>
<<RAChangeExcludeFacility>>
@@ -2302,7 +2379,6 @@ Relationship rules: ''$currentRule.relationshipRules.''
<</script>>
<</if>>
<<if State.variables._parseFailed == false>>
- //Rule $r saved//
<<for _t = 0; _t < $defaultRules.length; _t++>>
<<if $currentRule.ID == $defaultRules[_t].ID>>
<<if $currentRule.thresholdLower != "none">>
@@ -2312,6 +2388,7 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<set $currentRule.thresholdUpper = Number($currentRule.thresholdUpper)>>
<</if>>
<<set $defaultRules[_t] = $currentRule>>
+ //Rule $r saved//
<<break>>
<</if>>
<</for>>
@@ -2337,7 +2414,6 @@ Relationship rules: ''$currentRule.relationshipRules.''
<</script>>
<</if>>
<<if State.variables._parseFailed == false>>
- //Rule $r saved//
<<for _t = 0; _t < $defaultRules.length; _t++>>
<<if $currentRule.ID == $defaultRules[_t].ID>>
<<if $currentRule.thresholdLower != "none">>
@@ -2347,6 +2423,7 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<set $currentRule.thresholdUpper = Number($currentRule.thresholdUpper)>>
<</if>>
<<set $defaultRules[_t] = $currentRule>>
+ //Rule $r saved//
<<break>>
<</if>>
<</for>>
@@ -4545,7 +4622,7 @@ consequences.
<<if !_exclude>>
<<switch _currentRule.assignFacility>>
<<case "hgsuite">>
- <<if ($args[0].indentureRestrictions <= 0) && ($args[0].assignment != "live with your Head Girl")>>
+ <<if ($HGSuiteSlaves == 0) && ($args[0].indentureRestrictions <= 0) && ($args[0].assignment != "live with your Head Girl")>>
<br>$args[0].slaveName has been automatically assigned to live in your Head Girl's private suite.
<<if ($personalAttention == $args[0].ID)>>
$args[0].slaveName no longer has your personal attention; you plan to focus on business.