From 5b614843deffc4590e35fa4c935a794ba2489dc1 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 28 Dec 2017 06:48:35 -0500 Subject: [PATCH] Fixes. --- src/events/gameover.tw | 2 -- src/pregmod/eliteTakeOver.tw | 5 +++++ src/pregmod/eliteTakeOverResult.tw | 2 +- src/uncategorized/nonRandomEvent.tw | 2 ++ src/uncategorized/reputation.tw | 2 -- src/uncategorized/storyCaption.tw | 20 ++++---------------- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/events/gameover.tw b/src/events/gameover.tw index f2b21b5515e..d1d913201fa 100644 --- a/src/events/gameover.tw +++ b/src/events/gameover.tw @@ -45,8 +45,6 @@ <br><br> ''GAME OVER'' -<<elseif $gameover == "you failed">> - <<goto "eliteTakeOver">> <<elseif $gameover == "major battle defeat">> <<set $ui = "start">> diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw index 419e0e416ec..9a3dff57378 100644 --- a/src/pregmod/eliteTakeOver.tw +++ b/src/pregmod/eliteTakeOver.tw @@ -1,5 +1,7 @@ :: eliteTakeOver [nobr] +<<set $nextButton = " ">> + <<set _pregSurrender = 0>> /* preg/lobotomization check */ You knew this day would come. Surrounding yourself with powerful people has its boons, but also poses a distinct threat. You've heard them murmuring when you enter the room, you've seen them excuse themselves from your presence, and lately they've been overtly hostile. The Societal Elite have turned on you. @@ -30,6 +32,9 @@ You look up from your desk as the locked door to your office unseals, and a doze <br> You'll spend the rest of your life a breeder to the Societal Elite; blinded and muted. More than a slave, but still less than your master. Life isn't so bad, your two most devoted slaves were taken along to keep you happy, and you are treated quite well, possibilities considered. Though once your eggs dry up, odds are your little remaining usefulness will be at an end. Best not to think to much into it. <<set _pregSurrender = 1>> + <<set $ui = "start">> + <br><br> + ''GAME OVER'' <<elseif $PC.pregSource != -1>> The leader reaches into his jacket and extracts a syringe, you recognize it as a powerful drug used in lobotomies, and places it to your left. From his hip he pulls a revolver, six-chambered, and loads five bullets, spins the chamber, and places it to your right. <br> diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw index cc2c8e55fa8..e63b8cdecf4 100644 --- a/src/pregmod/eliteTakeOverResult.tw +++ b/src/pregmod/eliteTakeOverResult.tw @@ -1,6 +1,6 @@ :: eliteTakeOverResult [nobr] -<<set $nextButton = "Continue", $nextLink = "Scheduled Event">> +<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ <<switch $eliteFate>> <<case 0>> diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index d254400975e..f8ca11f8ebe 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -92,6 +92,8 @@ <</if>> <<elseif (_effectiveWeek == 72)>> <<goto "P coup aftermath">> +<<elseif $failedElite > 300>> + <<goto "eliteTakeOver">> <<elseif (_effectiveWeek > 5) && ($rep > 3000) && ($FSAnnounced == 0)>> <<goto "P FS Announcement">> <<elseif (_effectiveWeek > 18) && ($assistant > 0) && ($assistantOptions == 0)>> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index 690b4d0e5d2..6947164c1ea 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -718,8 +718,6 @@ On formal occasions, you are announced as $PCTitle. <<if $arcologies[0].FSRestartDecoration == 100>> <<if $failedElite > 300>> The Societal Elite @@.red;are plotting your demise@@. - <<set $gameover to "you failed">> - <<goto "Gameover">> <<elseif $failedElite > 250>> The Societal Elite @@.red;are openly discussing about your failures@@. It would be in your best interests to appease them. <<elseif $failedElite > 200>> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index dd4b80b855b..6f4c141b8b5 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -391,15 +391,14 @@ <<if $newModelUI == 0>> <<if ($HGSuite)>> <br>[[$HGSuiteNameCaps|Head Girl Suite]] - <<if $abbreviateSidebar == 2>> - <<if $HeadGirl == 1>>(HG) - <<elseif $HeadGirl == 1 && $HGSuiteSlaves == 1>>(HG and roommate) - <</if>> + <<if $abbreviateSidebar == 2>> + <<if $HeadGirl == 1>>(HG) + <<elseif $HeadGirl == 1 && $HGSuiteSlaves == 1>>(HG and roommate) <</if>> <</if>> <</if>> <<if ($dojo)>> - <br>[[BG Dojo|BG Select]] + <br>[[Armory|BG Select]] <<if $Bodyguard != 0>> (BG) <</if>> @@ -606,15 +605,4 @@ <<link "Bug Report">><<bugreport>><</link>> <</if>> -<<if $HGSuiteSlaves > 0>> -<<if $HeadGirl == 1>> Your head girl <<elseif $HGSuiteSlaves == 2>> and her roommate<</if>> -<<if $HGSuite == 1>> has a little luxurious room in the penthouse with everything <<if $HeadGirl == 1>> she needs <<elseif $HGSuiteSlaves == 2>> they need<</if>> to be a proper Head Girl. -<<else>> As there is no little luxurious room in the penthouse dedicated to being a headgirl, <<if $HeadGirl == 1>> she <<elseif $HGSuiteSlaves == 2>> they<</if>> live with the rest of your slaves in the dormitory. -<</if>> -<</if>> - -<<if $bodyguard != 0>> -<<if $dojo>> Your bodyguard has a comfortable room in the armory to call her own. <<else>> As your bodyguard doesn't have a comfortable room in the armory to call her own she lives with the rest of your slaves in the dormitory.<</if>> -<</if>> - <</nobr>> -- GitLab