Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1016-3

See merge request !428

src/pregmod/seFCTVinstall.tw

 :: SE FCTV Install [nobr] 
 
 <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV">>
-<<set $receiverAvailable = 1>>
-<<set $showOne = 0>>
-<<set $showTwo = 0>>
-<<set $showThree = 0>>
-<<set $showFour = 0>>
-<<set $showFive = 0>>
-<<set $showSix = 0>>
-<<set $showSeven = 0>>
-<<set $showEight = 0>>
-<<set $showNine = 0>>
-<<set $showTen = 0>>
-<<set $randShow = 0>>
-<<set $lastShow = -1>>
+<<set $receiverAvailable = 1, $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 $arcologyName 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.
+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][$FCTVenable = 1]]
-<br><br>
-[[You've never heard of FCTV.|Scheduled Event][$FCTVenable = 0]] This option will disable FCTV content
-<br><i>While FCTV excludes any extreme, extreme pregnancy, and dick content based on your settings, it may still hint at that content. If you wish to be absolutely sure, disable FCTV.</i>
+<br>[[You've never heard of FCTV.|Scheduled Event][$FCTVenable = 0]] This option will disable FCTV content
+<br><br><i>While FCTV excludes any extreme, extreme pregnancy, and dick content based on your settings, it may still hint at that content. If you wish to be absolutely sure, disable FCTV.</i>

src/pregmod/seFCTVshows.tw

@@ -11,7 +11,7 @@
 <</if>>
 
 Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveName@@<<else>>$assistantName<</if>> to turn on the TV and set FCTV to random show. Your larger-than-life screen flashes on, and is soon playing a random show from the popular streaming service. 
-\* we need to check for pansy no-extreme squick stuff *\
+/* we need to check for pansy no-extreme squick stuff */
 <<if $seeExtreme == 0 && $randShow == 10>>
 	<<set $randShow = either(0,1,2,3,4,5,6,7,8,9)>>
 	There is an audible tone from your screen, which then displays a message: <i>Too much hugging detected, changing program.</i>
@@ -137,7 +137,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
 		<<set $activeSlave.health = 75>>
 		<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
 		<<set $activeSlave.career = "a slave">>
-		<<set $activeSlave.customTat = "She has a small stylized 'A' tattooed on the nape of her neck marking her as the product of the famous breeding program at Arturus Arcology."
+		<<set $activeSlave.customTat = "She has a small stylized 'A' tattooed on the nape of her neck marking her as the product of the famous breeding program at Arturus Arcology.">>
 		a premium virgin named $activeSlave.slaveName. A bright pink "VV" symbol flashes on the corner of the screen. Take a good look, because she is a product of the famous sex slave breeding program at Arturus Arcology. Like all the slaves they sell, she's a premium @@.pink;double virgin.@@ She has excellent breeding potential, and while she isn't that skilled yet, she's got good intelligence and is already well acclimated to the life of a sex slave."
 	<<elseif $randShow == 3 || $randShow == 4>> /* hyperpregnant */
 		<<set $activeSlaveOneTimeMinAge = ($fertilityAge + 3)>>

src/uncategorized/manageArcology.tw

@@ -68,18 +68,15 @@ __Construction__
 
 <br>
 
-<<if ($receiverAvailable == 1) && ($FCTVenable != 0)>>
-    <<if ($FCTVreceiver == 0)>>
-        You have not installed an FCTV receiver. Installing this receiver yourself will cost ¤<<print Math.trunc(25000*$upgradeMultiplierArcology)>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>.
-        <br>
-        [[No subsidy|Manage Arcology][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500]] [[Light subsidy|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week]] [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500]]
-    <<elseif ($FCTVreceiver == 3)>>
-        You have installed the FCTV receiver and have access to the full range of FCTV's programs. High viewership rates amongst your citizens makes it easier to pursue your societal goals.
-    <<elseif ($FCTVreceiver == 2)>>
-        You have installed the FCTV receiver and have access to the full range of FCTV's programs. Decent viewership rates amongst your citizens makes it somewhat easier to pursue your societal goals.   
-    <<elseif ($FCTVreceiver == 1)>>
-        You have installed the FCTV receiver and have access to the full range of FCTV's programs. Low viewership rates amongst your citizens limits the impact of FCTV on your societal goals.
-    <</if>>
+<<if ($receiverAvailable == 1) && ($FCTVenable != 0) && ($FCTVreceiver == 0)>>
+    You have not installed an FCTV receiver. Installing this receiver yourself will cost ¤<<print Math.trunc(25000*$upgradeMultiplierArcology)>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>.
+    [[No subsidy|Manage Arcology][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500]]
+<<elseif ($FCTVreceiver == 3)>>
+    You have installed the FCTV receiver and have access to the full range of FCTV's programs. High viewership rates amongst your citizens makes it easier to pursue your societal goals.
+<<elseif ($FCTVreceiver == 2)>>
+    You have installed the FCTV receiver and have access to the full range of FCTV's programs. Decent viewership rates amongst your citizens makes it somewhat easier to pursue your societal goals.   
+<<elseif ($FCTVreceiver == 1)>>
+    You have installed the FCTV receiver and have access to the full range of FCTV's programs. Low viewership rates amongst your citizens limits the impact of FCTV on your societal goals.
 <</if>>
 
 <br><br>

src/uncategorized/scheduledEvent.tw

@@ -125,7 +125,7 @@
 	<<set $birthed = 0>>
 	<<goto "SE Birth">>
 <<elseif ($FCTVshow == 1)>>
-    <<set $FCTVshow = 0>>
+    <<set $FCTVshow = 0, activeSlave = 0>>
     <<goto "SE FCTV Shows">>
 <<elseif ($recruiterEugenics == 0 and $recruiterProgress >= 13)>>
 	<<goto "SE recruiter success">>