From 4913639f687fbe7390f3b8a6da08b464fe8f3f76 Mon Sep 17 00:00:00 2001
From: pregmodfan <pregmodfan@cock.li>
Date: Wed, 14 Jun 2017 23:17:27 +0300
Subject: [PATCH] Making FCTV actually show up as supposed to (more bugfixes)
---
src/pregmod/seFCTVshows.tw | 5 +++--
src/uncategorized/nextWeek.tw | 2 +-
src/uncategorized/nonRandomEvent.tw | 2 +-
src/uncategorized/options.tw | 13 +++++++------
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 424c9ea58ed..8f0db9e5ba3 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -4,7 +4,7 @@
<<set $randShow = random(0,10)>>
<<set $FCTVshow = 0>>
<<if $randShow == $lastShow>>
- <<$randShow += 1>>
+ <<set $randShow += 1>>
<<if $randShow > 10>>
<<$randShow = 0>>
<</if>>
@@ -30,7 +30,8 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<case 0>>
<<set $showOne += 1, $lastShow = 0>>
It looks like the random function chose the FCNN stream channel, and you've started watching in the middle of a news segment.
- <<set $randShow = random(0,2)+1>> <<if $randShow == 1 && $showOne > 3 || $showOne == 1>>
+ <<set $randShow = random(0,2)+1>>
+ <<if $randShow == 1 && $showOne > 3 || $showOne == 1>>
The segment is being anchored by the middle aged Kirk McMahon, and he's joined by the ever-popular "Anchor Slave", Jules. She's got a nice figure, and the only thing she's wearing to cover her perky breasts are a pair of FCNN pasties. She has on a fine leather collar, the large gold charm hanging from the front seems to be a stylized emblem of a ship's anchor merged with a microphone. The pair seem to be discussing the recent actions and punishment of the reality show slave Slooty.
<br><br>Jules seems to be quite passionate about the subject, the animated way she talks is causing her sizable tits to bounce all over the place. "It doesn't matter how famous or valuable that slut thinks she is, her behavior was just wrong on SO many levels. It makes all of us good slaves look bad. If you ask me, her master's choice of punishment fits the attention whore perfectly!"
<br><br>Kirk's face looks more than a little surprised, but you can't quite tell if it's an act or not. "You won't get any argument from me that she deserves to be punished... but getting chained up with an obedience collar and feeder system in the middle of Times Square, free for public use? A slum like Manhattan, she'll never <<if $seeExtreme == 0>><i>like</i><<else>>survive<</if>> the 10 day sentence!"
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 4170aaeff81..ce6588f49c7 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -110,7 +110,7 @@
<<if $FCTVenable == 1 && $FCTVreceiver != 0>>
<<set $FCTVcount += 1>>
- <<if $FCTVcount >= $FCTVrate && FCTVrate != -1>>
+ <<if $FCTVcount >= $FCTVrate && $FCTVrate != -1>>
<<set $FCTVcount = 0>>
<<set $FCTVshow = 1>>
<</if>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index a2721d266d6..ae75d46dbd6 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -9,7 +9,7 @@
<<if (_effectiveWeek == 4) && ($toSearch.indexOf("Arcology ") != -1)>>
<<set $Event = "arcology naming">>
<<goto "Generic Plot Events">>
-<<elseif (_effectiveWeek == 5 && $FCTVenable != 0 && $receiverAvailable == 0)>>
+<<elseif (_effectiveWeek >= 5 && $FCTVenable != 0 && $receiverAvailable == 0)>>
<<goto "SE FCTV Install">>
<<elseif (_effectiveWeek == 6)>>
<<set $Event = "strip club closing">>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 955b2b1e580..82a972200bc 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -91,16 +91,17 @@ Main menu newsfeed @@.cyan;ENABLED@@. [[Disable|Options][$seeFCNN = 0]]
FCTV content is @@.cyan;ENABLED@@. [[Disable|Options][$FCTVenable = 0]]
<br>
<<if $FCTVreceiver == 0>>
- <i>FCTV Receiver has not yet been built.
- <</if>>
+ <i>FCTV Receiver has not yet been built.</i>
+ <<else>>
<<if $FCTVrate == 1>>
- You will watch FCTV every week. [[Every Other Week|Options][$FCTVrate = 2]] [[Once a Month|Options][$FCTVrate = 4]] [[Never|Options][$FCTVrate = -1]]
+ You will watch FCTV every week. [[Every Other Week|Options][$FCTVrate = 2]] | [[Once a Month|Options][$FCTVrate = 4]] | [[Never|Options][$FCTVrate = -1]]
<<elseif $FCTVrate == 2>>
- You will watch FCTV every other week. [[Every Week|Options][$FCTVrate = 1]] [[Once a Month|Options][$FCTVrate = 4]] [[Never|Options][$FCTVrate = -1]]
+ You will watch FCTV every other week. [[Every Week|Options][$FCTVrate = 1]] | [[Once a Month|Options][$FCTVrate = 4]] | [[Never|Options][$FCTVrate = -1]]
<<elseif $FCTVrate == 4>>
- You will watch FCTV once a month. [[Every Week|Options][$FCTVrate = 1]] [[Every Other Week|Options][$FCTVrate = 2]] [[Never|Options][$FCTVrate = -1]]
+ You will watch FCTV once a month. [[Every Week|Options][$FCTVrate = 1]] | [[Every Other Week|Options][$FCTVrate = 2]] | [[Never|Options][$FCTVrate = -1]]
<<else>>
- You don't currently watch FCTV. [[Every Week|Options][$FCTVrate = 1]] [[Every Other Week|Options][$FCTVrate = 2]] [[Once a Month|Options][$FCTVrate = 4]]
+ You don't currently watch FCTV. [[Every Week|Options][$FCTVrate = 1]] | [[Every Other Week|Options][$FCTVrate = 2]] | [[Once a Month|Options][$FCTVrate = 4]]
+ <</if>>
<</if>>
<</if>>
--
GitLab