From 0c831ed6beb0a8dc9eb49957ac60132ecb1bfd73 Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Sat, 12 Oct 2019 21:16:25 -0400 Subject: [PATCH] hostage simplification --- src/init/storyInit.tw | 1 - src/npc/startingGirls/commitStartingGirl.tw | 4 ---- src/uncategorized/BackwardsCompatibility.tw | 4 ++++ src/uncategorized/nonRandomEvent.tw | 2 +- src/uncategorized/pRivalryHostage.tw | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 168cd5787b3..f9715e6579a 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1037,7 +1037,6 @@ You should have received a copy of the GNU General Public License along with thi <<set $hackerSupport = 0>> <<set $hostage = 0>> <<set $hostageAnnounced = 0>> -<<set $hostageCost = 0>> <<set $hostageRescued = 0>> <<set $hostageGiveIn = 0>> <<set $rivalSet = 0>> diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw index cee4345240a..67b1d6537a8 100644 --- a/src/npc/startingGirls/commitStartingGirl.tw +++ b/src/npc/startingGirls/commitStartingGirl.tw @@ -22,10 +22,6 @@ <<set $showStartingGirlsExplanation = 0>> -<<if $createRelatedSlave == 0 && (($hostage == 0) || ($slaveCost > $hostageCost))>> - <<set $hostage = $slaveWithoutBonuses, $hostageCost = $slaveCost, $hostageAnnounced = -1>> -<</if>> - <<= SlaveFullName($activeSlave)>> has been added to your starting stable of slaves. You now have <<print cashFormat($cash)>> remaining. <br> <<if $cash >= $minimumSlaveCost>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 2ca53b71006..b95a1ae0c5c 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -48,6 +48,10 @@ <<unset $nurserySlaves>> <</if>> +<<if def $hostageCost>> + <<unset $hostageCost>> +<</if>> + <<if def $youngCareers>> <<unset $youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $matronCareers, $milkmaidCareers, $farmerCareers, $stewardessCareers, $schoolteacherCareers>> diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index cf39be4bca6..af321d54b07 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -149,7 +149,7 @@ <<elseif ($cash > 120000) && ($rep > 4000) && ($corpAnnounced == 0)>> <<goto "P Corp Announcement">> <<elseif ($rivalOwner > 0)>> - <<if $hostageAnnounced == -1 && $rivalSet != 0>> + <<if $hostageAnnounced == 0 && $rivalSet != 0>> <<goto "P rivalry hostage">> <<elseif ($rivalOwner-$rivalryPower+10)/$arcologies[0].prosperity < 0.5>> <<goto "P rivalry victory">> diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw index df27bdea9c0..413cdb08037 100644 --- a/src/uncategorized/pRivalryHostage.tw +++ b/src/uncategorized/pRivalryHostage.tw @@ -2,7 +2,7 @@ <<set $nextButton = "Continue", $nextLink = "Nonrandom Event">> -<<set $hostageAnnounced = 1, $activeSlave = $hostage>> +<<set $hostageAnnounced = 1>> <<set $oneTimeDisableDisability = 1>> <<if $arcologies[0].FSSupremacistLawME == 1>> -- GitLab