From 67cad86723ac82f24a8465b7d2d9325ef47abc75 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 13 Jun 2018 19:44:15 -0400
Subject: [PATCH] Tweaked !2155 and moved initialized variables around
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++
src/init/storyInit.tw | 84 +++++++++++---------
src/pregmod/eliteTakeOver.tw | 46 ++++++-----
src/pregmod/eliteTakeOverFight.tw | 68 +++++++++++-----
4 files changed, 127 insertions(+), 76 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 0cfd206e645..fdfa2639e19 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@
0.10.7.1-0.3.x
+6/13/2018
+
+ 20
+ -expanded eugenics bad end to cover all player states
+
6/12/2018
19.1
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 21e989a3587..6b6c289d197 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -344,6 +344,51 @@ You should have received a copy of the GNU General Public License along with thi
<<set $useSlaveSummaryTabs = 0>>
<<set $useSlaveSummaryOverviewTab = 0>>
<<set $useSlaveListInPageJSNavigation = 0>>
+
+ /* master suite reporting and alternate descriptions */
+ <<set $verboseDescriptions = 0>>
+ /* Accordion 000-250-006 */
+ <<set $useAccordion = 0>>
+
+ <<set $useTabs = 0>>
+
+ /*onlyintendeddickgirls variables */
+ <<set $makeDicks = 0>>
+
+ /* economy reports variables */
+ <<set $showEconomicDetails = 0>>
+
+ /* Pregmod specific */
+ <<set $economy = 1>>
+ <<set $neighboringArcologies = 3>>
+ <<set $newDescriptions = 0>>
+ <<set $familyTesting = 0>>
+ <<set $inbreeding = 1>>
+ <<set $allowFamilyTitles = 0>>
+
+ /% Begin mod section: toggle whether slaves lisp. %/
+ <<set $disableLisping = 0>>
+ /% End mod section: toggle whether slaves lisp. %/
+
+ <<set $weightAffectsAssets = 1>>
+ <<set $curativeSideEffects = 1>>
+
+ /*non-vanilla shit*/
+ <<set $pedo_mode = 0>>
+ <<set $minimumSlaveAge = 18>>
+ <<set $fertilityAge = 13>>
+ <<silently>>
+ FertilityAge($fertilityAge)
+ <</silently>>
+ <<set $potencyAge = 13>>
+ <<set $AgePenalty = 1>>
+ <<set $precociousPuberty = 0>>
+ <<set $loliGrow = 1>>
+
+ <<set $retirementAge = 45>
+ <<set $customRetirementAge = 45>>
+ <<set $FSCreditCount = 5>>
+ <<set $FSCreditCountString = "five">>
<<include "Init Rules">>
@@ -577,8 +622,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $FSAnnounced = 0>>
<<set $FSCredits = 0>>
-<<set $FSCreditCount = 5>>
-<<set $FSCreditCountString = "five">>
<<set $FSGotRepCredits = 0>>
<<set $FSSingleSlaveRep = 10>>
<<set $FSSpending = 0>>
@@ -634,13 +677,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $shelterAbuse = 0>>
<<set $shelterSlaveGeneratedWeek = 0>>
-/* master suite reporting and alternate descriptions */
-<<set $verboseDescriptions = 0>>
-/* Accordion 000-250-006 */
-<<set $useAccordion = 0>>
-
-<<set $useTabs = 0>>
-
/* alternate clothing access variables */
<<set $clothesBoughtBunny = 0>>
<<set $clothesBoughtConservative = 0>>
@@ -668,20 +704,12 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $assistantPronouns = {pronoun: "she", possessivePronoun: "hers", possessive: "her", object: "her", objectReflexive: "herself", noun: "girl"}>>
-/*onlyintendeddickgirls variables */
-<<set $makeDicks = 0>>
-
-/* economy reports variables */
-<<set $showEconomicDetails = 0>>
-
/*pregmod variables */
-<<set $newDescriptions = 0>>
<<set $specialSlavesPriceOverride = 0>>
<<set $pregAccessibility = 0>>
<<set $dickAccessibility = 0>>
<<set $ballsAccessibility = 0>>
<<set $buttAccessibility = 0>>
-<<set $loliGrow = 1>>
<<set $ageMode = 0>>
<<set $enema = 0>>
<<set $medicalEnema = 0>>
@@ -699,21 +727,18 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $startingPoint = -1>>
<<set $PhysicalRetirementAgePolicy = 0>>
<<set $raped = -1>>
-<<set $familyTesting = 0>>
<<set $children = []>>
<<set $missingParentID = -10000>>
<<set $startingSlaveRelative = 0>>
<<set $mom = 0>>
<<set $animalParts = 0>>
<<set $showBestiality = 0>>
-<<set $inbreeding = 1>>
<<set $originOveride = 0>>
<<set $playerAging = 2>>
<<set $pregSpeedControl = 0>>
<<set $clinicSpeedGestation = 0>>
<<set $playerSurgery = 0>>
<<set $bodyswapAnnounced = 0>>
-<<set $allowFamilyTitles = 0>>
<<set $surnamesForbidden = 0>>
<<set $menstruation = 0>>
<<set $FCTVcount = 0>>
@@ -890,8 +915,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $SPcost = 1000>>
<<set $preOwnedViewed = 0>>
<<set $debtWarned = 0>>
-<<set $economy = 1>>
-<<set $neighboringArcologies = 3>>
<<set $internationalTrade = 1>>
<<set $internationalVariety = 0>>
<<set $slaveCostFactor = 0.95>>
@@ -1016,8 +1039,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $expiree = 0>>
<<set $retiree = 0>>
<<set $birthee = 0>>
-<<set $retirementAge = 45>>
-<<set $customRetirementAge = 45>>
<<set $CustomRetirementAgePolicy = 0>>
<<set $BioreactorRetirement = 0>>
<<set $ArcadeRetirement = 0>>
@@ -1097,18 +1118,10 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>>
/*non-vanilla shit*/
-<<set $pedo_mode = 0>>
+
<<set $one_time_age_overrides_pedo_mode = 0>>
-<<set $minimumSlaveAge = 18>>
-<<set $fertilityAge = 13>>
-<<silently>>
-FertilityAge($fertilityAge)
-<</silently>>
-<<set $potencyAge = 13>>
<<set $activeSlaveOneTimeMinAge = 0>>
<<set $activeSlaveOneTimeMaxAge = 999>>
-<<set $AgePenalty = 1>>
-<<set $precociousPuberty = 0>>
<<set $targetAge = $minimumSlaveAge>>
<<set $pubertyLength = 5>>
<<set $maxGrowthAge = 24>>
@@ -1116,13 +1129,8 @@ FertilityAge($fertilityAge)
/* Job Fulfillment Center */
<<set $JFCOrder = 0, $Role = "">>
-/% Begin mod section: toggle whether slaves lisp. %/
-<<set $disableLisping = 0>>
-/% End mod section: toggle whether slaves lisp. %/
<<set $cheatMode = 0>>
<<set $cheatModeM = 1>>
-<<set $weightAffectsAssets = 1>>
-<<set $curativeSideEffects = 1>>
<<set $fcnn = []>>
<<set $fcnn.push("...coming up at the top of the hour: Catgirl slaves, science fact or science fiction...")>>
diff --git a/src/pregmod/eliteTakeOver.tw b/src/pregmod/eliteTakeOver.tw
index de2f290e28e..407cc98a088 100644
--- a/src/pregmod/eliteTakeOver.tw
+++ b/src/pregmod/eliteTakeOver.tw
@@ -30,11 +30,15 @@ You look up from your desk as the locked door to your office unseals, and a doze
<br>
What was that last thing he said? It's getting hard to think right. The $PC.refreshment... Drugged... You collapse onto your desk, unconscious.
<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 too much into it.
- <<set _pregSurrender = 1>>
- <<set $ui = "start">>
- <br><br>
- ''GAME OVER''
+ <<if $Bodyguard != 0>>
+ A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness $Bodyguard.slaveName valiantly trying to protect you, despite <<if $Bodyguard.amp < 0>>her cybernetics being locked down<<else>>the overwhelming odds<</if>>. As she and the their leader struggle closer to your desk, his revolver and a syringe are dislodged onto your desk. It seems drugging you wasn't their first thought. With $Bodyguard.slaveName's risky gamble, your fate hsa fallen back into your hands.
+ <<else>>
+ 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 too much into it.
+ <<set _pregSurrender = 1>>
+ <<set $ui = "start">>
+ <br><br>
+ ''GAME OVER''
+ <</if>>
<<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>
@@ -50,12 +54,16 @@ You look up from your desk as the locked door to your office unseals, and a doze
<br>
<<if $Bodyguard != 0>>
<br>
- <<link "Attempt to signal $Bodyguard.slaveName, your bodyguard">>
- <<set $finalChoice = "bodyguard">>
- <<replace "#fate">>
- attempt to signal $Bodyguard.slaveName, your bodyguard.
- <</replace>>
- <</link>>
+ <<if $PC.pregSource == -1>>
+ $Bodyguard.slaveName is already doing everything in her power to save you.
+ <<else>>
+ <<link "Attempt to signal $Bodyguard.slaveName, your bodyguard">>
+ <<set $finalChoice = "bodyguard">>
+ <<replace "#fate">>
+ attempt to signal $Bodyguard.slaveName, your bodyguard.
+ <</replace>>
+ <</link>>
+ <</if>>
<</if>>
<<if $mercenaries >= 1>>
<br>
@@ -75,13 +83,15 @@ You look up from your desk as the locked door to your office unseals, and a doze
<</replace>>
<</link>>
<</if>>
- <br>
- <<link "Try and enrage them.">>
- <<set $finalChoice = "enrage">>
- <<replace "#fate">>
- try and enrage them, baiting them into a vulnerable position.
- <</replace>>
- <</link>>
+ <<if $PC.pregSource != -1>>
+ <br>
+ <<link "Try and enrage them.">>
+ <<set $finalChoice = "enrage">>
+ <<replace "#fate">>
+ try and enrage them, baiting them into a vulnerable position.
+ <</replace>>
+ <</link>>
+ <</if>>
<br>
<<link "Make a final stand">>
<<set $finalChoice = "final stand">>
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index 80ac4650eb7..4299092bc6b 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -52,7 +52,7 @@
<</switch>>
<<if $finalChoice == "give in">>
- With a bang! you drop dead.
+ <<if $PC.pregSource == -1>> Screw their plans, you're out of here. <</if>>With a bang! you drop dead.
<<set $ui = "start">>
<br><br>
''GAME OVER''
@@ -71,7 +71,9 @@
<<set $eliteVegetable = 0>>
/* To Hit chance */
- <<if $PC.career == "mercenary" || $PC.warfare == 100>>
+ <<if $PC.pregSource == -1>> /* still woozy */
+ <<set _toHit = 56>>
+ <<elseif $PC.career == "mercenary" || $PC.warfare == 100>>
<<set _toHit = 83>>
<<elseif $PC.warfare >= 60>>
<<set _toHit = 76>>
@@ -107,32 +109,58 @@
/* syringe shot */
<<set $eliteVegetable = 0>>
+ <<set _druggedThrow = 0>>
+
<<if $eliteDead > 0>>
With $eliteDead elite's dead, you pick up the syringe from the desk and aim for the forehead of another.
<<else>>
Having failed to kill them with the revolver, in a desperate move you pick up the syringe from the desk and aim for the forehead of one of the elite.
<</if>>
- <<if $career == "mercenary">>
+ <<if $PC.pregSource == -1>>But there's two of them... Shaking your head, you realize it's the drugs messing with you. You just need to focus.<</if>>
+ <<set _hitRoll = (random(0,100) - _druggedThrow)>>
+ <<if $career == "mercenary" && _hitRoll > 0>>
With your prior history as a mercenary, making the throw is child's play.
<<set _SyringeHeadShot = 1>>
- <<elseif $PC.warfare >= 100 && random(0,100) > 50>>
- As a result of your mastery of warfare you successfully made the throw.
- <<set _SyringeHeadShot = 1>>
- <<elseif $PC.warfare >= 60 && random(0,100) > 60>>
- As a result of your expertness of warfare you successfully made the throw.
- <<set _SyringeHeadShot = 1>>
- <<elseif $PC.warfare >= 30 && random(0,100) > 70>>
- As you have some skill you successfully made the throw.
- <<set _SyringeHeadShot = 1>>
- <<elseif $PC.warfare >= 10 && random(0,100) > 80>>
- Your small amount of skill assisted you in making the throw.
- <<set _SyringeHeadShot = 1>>
- <<elseif $PC.warfare < 10 && random(0,100) > 90>>
+ <<elseif $PC.warfare >= 100>>
+ <<if _hitRoll > 50>>
+ As a result of your mastery of warfare you successfully made the throw.
+ <<set _SyringeHeadShot = 1>>
+ <<else>>
+ Unfortunately you miss the shot.
+ <<set _SyringeHeadShot = 0>>
+ <</if>>
+ <<elseif $PC.warfare >= 60>>
+ <<if _hitRoll > 60>>
+ As a result of your combat expertise you successfully made the throw.
+ <<set _SyringeHeadShot = 1>>
+ <<else>>
+ Unfortunately you miss the shot.
+ <<set _SyringeHeadShot = 0>>
+ <</if>>
+ <<elseif $PC.warfare >= 30>>
+ <<if _hitRoll > 70>>
+ As you have some skill, you successfully made the throw.
+ <<set _SyringeHeadShot = 1>>
+ <<else>>
+ Unfortunately you miss the shot.
+ <<set _SyringeHeadShot = 0>>
+ <</if>>
+ <<elseif $PC.warfare >= 10>>
+ <<if _hitRoll > 80>>
+ Your small amount of skill assisted you in making the throw.
+ <<set _SyringeHeadShot = 1>>
+ <<else>>
+ Unfortunately you miss the shot.
+ <<set _SyringeHeadShot = 0>>
+ <</if>>
+ <<elseif $PC.warfare < 10>>
+ <<if _hitRoll > 90>>
By blind luck you successfully made the throw.
- <<set _SyringeHeadShot = 1>>
- <<else>>
- Unfortunately you miss the shot.
- <<set _SyringeHeadShot = 0>>
+ <<set _SyringeHeadShot = 1>>
+ <<else>>
+ Unfortunately you miss the shot.
+ <<set _SyringeHeadShot = 0>>
+ <</if>>
<</if>>
<<if _SyringeHeadShot == 1>>
<br>
--
GitLab