diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw index f9d85214daab1a0b768c82555b813de8f3d9d915..89f1264e4d7fb670a79c445814c93a408485a6cd 100644 --- a/src/pregmod/seFCTVinstall.tw +++ b/src/pregmod/seFCTVinstall.tw @@ -1,10 +1,9 @@ :: SE FCTV Install [nobr] -<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV">> +<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $receiverAvailable = 1>> <<set $showOne = 0, $showTwo = 0, $showThree = 0, $showFour = 0, $showFive = 0, $showSix = 0, $showSeven = 0, $showEight = 0, $showNine = 0, $showTen = 0, $randShow = 0, $lastShow = -1>> You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistantName speaks up. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, you have received an approval welcome packet from 8HGG Inc in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet." You nod in acknowledgement. <br><br> -[[You'll look into it.|Scheduled Event][$receiverAvailable = 1]] -<br>[[You've never heard of FCTV.|Scheduled Event][$receiverAvailable = 0]] This option will disable FCTV content -<br><br><i>While FCTV excludes any dick-based, hyperpregnancy, and extreme content based on your settings, it may still hint at that content. If you wish to be absolutely sure, disable FCTV.</i> +[[You'll look into it.|Scheduled Event]] +<br><br><i>While FCTV excludes any dick-based, hyperpregnancy, and extreme content based on your settings, it may still hint at that content. If you wish to be absolutely sure, don't watch FCTV or do not install the receiver.</i> diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw index 113d643d29f2f3714099ecc31ab9bd60a67a52fd..5e53eca05bf3ed48c7c8c296769d08d14cad6c5e 100644 --- a/src/uncategorized/generateXXSlave.tw +++ b/src/uncategorized/generateXXSlave.tw @@ -168,11 +168,10 @@ <<NationalityToRace $activeSlave>> /* Corporate slavegen with race selection */ <<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>> - /* Disabled for now <<if $captureUpgradeRace == "mixed race">> <<set $activeSlave.race = "mixed race">> <<else>> - <<set _capUpgradeCheck = State.variables[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>> + <<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>> <<set _capUpgradeNationalities = []>> <<for _u = 0; _u < _capUpgradeCheck.length; _u++>> <<set _capNation = _capUpgradeCheck[_u]>> @@ -186,7 +185,6 @@ <<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>> <</if>> <</if>> - */ <<if $activeSlave.race != $captureUpgradeRace>> <<set $activeSlave.race = $captureUpgradeRace>> <</if>> diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw index 864dbf4493da4c3aba642b273c67f2beae183b66..2ef07c6b03e459a56aca3ff723bad7b82956e429 100644 --- a/src/uncategorized/generateXYSlave.tw +++ b/src/uncategorized/generateXYSlave.tw @@ -172,11 +172,10 @@ <<NationalityToRace $activeSlave>> /* Corporate slavegen with race selection */ <<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>> - /* Disabled for now <<if $captureUpgradeRace == "mixed race">> <<set $activeSlave.race = "mixed race">> <<else>> - <<set _capUpgradeCheck = State.variables[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>> + <<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>> <<set _capUpgradeNationalities = []>> <<for _u = 0; _u < _capUpgradeCheck.length; _u++>> <<set _capNation = _capUpgradeCheck[_u]>> @@ -190,7 +189,6 @@ <<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>> <</if>> <</if>> - */ <<if $activeSlave.race != $captureUpgradeRace>> <<set $activeSlave.race = $captureUpgradeRace>> <</if>>