Merge branch 'scheduledEvent.tw-tweaking' into 'pregmod-master'

Various Minor tweakings [Ready for merge]

See merge request !7855

src/pregmod/seDeath.tw

 :: SE Death [nobr]
 
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
-
-<<set _killedSlaves = []>>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", _killedSlaves = []>>
 <<for _slave range $slaves>>
 	<<switch _slave.death.toLowerCase()>>
 		<<case "old">>
@@ -25,12 +23,8 @@
 <</for>>
 <<if _killedSlaves.length == 0>>
 	/* if something beats this to the slaves, this should kick the player along instead of leaving them at a blank screen */
-	<<set $slaveDeath = 0>>
 	<<goto "Scheduled Event">>
 <</if>>
 <<for _slave range _killedSlaves>>
 	<<= removeSlave(_slave)>>
-<</for>>
-<<unset _killedSlaves>>
-
-<<set $slaveDeath = 0>>
+<</for>>
\ No newline at end of file

src/uncategorized/scheduledEvent.tw

@@ -20,12 +20,6 @@
 <</if>>
 <<set $retired = 0>>
 
-/* burst scheduled event */
-<<if $burst == 1>>
-	<<set $burstee = 1>>
-<</if>>
-<<set $burst = 0>>
-
 <<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek == $week-1>>
 	<<set $fcnn.push("...Ladies: Do you want dick so much that you want to HAVE a dick? If yes, join the Futanari Sisters today! Learn more at...")>>
 <</if>>
@@ -86,9 +80,7 @@
 
 <<if $rivalOwner == -1>>
 	<<goto "P rival initiation">>
-<<elseif $slaveRebellion == 1 && $secExpEnabled > 0>>
-	<<goto "rebellionOptions">>
-<<elseif $citizenRebellion == 1 && $secExpEnabled > 0>>
+<<elseif ($slaveRebellion === 1 || $citizenRebellion === 1) && $secExpEnabled > 0>>
 	<<goto "rebellionOptions">>
 <<elseif $attackThisWeek == 1 && $secExpEnabled > 0>>
 	<<goto "attackOptions">>
@@ -122,12 +114,12 @@
 <<elseif ($birthee != 0)>>
 	<<goto "SE Birth">>
 <<elseif $FCTV.receiver > 0 && $FCTV.pcViewership.frequency != -1 && $FCTV.pcViewership.count == 0>>
-	<<if $week > 50 && $FCTV.remote < 2>> <<goto "SE FCTV Remote">>
-	<<else>> <<goto "SE FCTV Watch">>
+	<<if $week > 50 && $FCTV.remote < 2>> 
+		<<goto "SE FCTV Remote">>
+	<<else>> 
+		<<goto "SE FCTV Watch">>
 	<</if>>
-<<elseif ($RecruiterID != 0 && $recruiterEugenics == 0 && $recruiterProgress >= 13)>>
-	<<goto "SE recruiter success">>
-<<elseif $RecruiterID != 0 && $recruiterEugenics == 1 && $recruiterProgress >= (13 + (policies.countEugenicsSMRs() * 6))>>
+<<elseif $RecruiterID !== 0 && $recruiterProgress >= (13 + $recruiterEugenics === 1 ? policies.countEugenicsSMRs() * 6 : 0)>>
 	<<goto "SE recruiter success">>
 <<elseif ($customSlaveOrdered == 1 && $customSlaveOrderedReorder != 1)>>
 	<<goto "SE custom slave delivery">>
@@ -140,7 +132,11 @@
 <<elseif $policies.raidingMercenaries == 1 && ($week > ($raided + 6))>>
 	<<goto "SE raiding">>
 <<elseif ((($fighterIDs.length > 1) && ($pitBG == 0)) || (($fighterIDs.length > 0) && ($BodyguardID != 0) && ($pitBG == 1)) || (($pitAnimal > 0) && ($fighterIDs.length > 0)) || ($killChoice == 2)) && ($pitFought == 0)>>
-	<<if $pitLethal == 1>><<goto "SE lethal pit">><<else>><<goto "SE nonlethal pit">><</if>>
+	<<if $pitLethal === 1>>
+		<<goto "SE lethal pit">>
+	<<else>>
+		<<goto "SE nonlethal pit">>
+	<</if>>
 <<elseif ($bioreactorPerfectedID != 0) && ($bioreactorsAnnounced != 1)>>
 	<<goto "P bioreactor perfected">>
 <<elseif ($TSS.schoolPresent == 1) && ($TSS.schoolProsperity <= -10)>>
@@ -163,8 +159,6 @@
 	<<goto "RES Failure">>
 <<elseif ($TFS.schoolPresent == 1) && ($organFarmUpgrade != 0) && ($TFS.farmUpgrade == 0)>>
 	<<goto "TFS Farm Upgrade">>
-
-/* Nicaea */
 <<elseif ($nicaea.held != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaea.announceable == 1) && ($nicaea.announced != 1)>>
 	<<goto "SE nicaea announcement">>
 <<elseif ($nicaea.held != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaea.preparation == 1)>>