From eb07952055df35fbf977e76bc5670b10f639b397 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 20 Aug 2018 21:49:32 -0500
Subject: [PATCH] Redundancies
---
src/uncategorized/pRivalryHostage.tw | 23 +++--------------------
src/uncategorized/pUndergroundRailroad.tw | 13 ++++++-------
2 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index 78f65d9b1fb..60a10689967 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -4,43 +4,26 @@
<<set $hostageAnnounced = 1, $activeSlave = $hostage>>
+<<set $oneTimeDisableDisability = 1>>
+<<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>>
+<<include "Generate XX Slave">>
<<set $activeSlave.origin = "You were acquainted with her before you were an arcology owner; your rival tried to use her to manipulate you, but you rescued her.">>
<<set $activeSlave.height += random(-5,5)>>
<<set $activeSlave.boobs = 400>>
<<set $activeSlave.butt = 3>>
<<set $activeSlave.muscles = 0>>
-<<set $activeSlave.amp = 0>>
-<<set $activeSlave.heels = 0>>
<<set $activeSlave.behavioralFlaw = "none">>
<<set $activeSlave.sexualFlaw = "none">>
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "none">>
-<<set $activeSlave.ovaries = 1>>
-<<set $activeSlave.dick = 0>>
-<<set $activeSlave.balls = 0>>
-<<set $activeSlave.scrotum = 0>>
-<<set $activeSlave.prostate = 0>>
<<set $activeSlave.waist = Math.clamp($activeSlave.waist,-55,15)>>
<<set $activeSlave.hips = 0>>
<<set $activeSlave.shoulders = -1>>
<<if $activeSlave.vagina <= 0>><<set $activeSlave.vagina = 1>><</if>>
<<if $activeSlave.anus == 0>><<set $activeSlave.anus = 1>><</if>>
-<<set $activeSlave.burst = 0>>
-<<set $activeSlave.relation = 0>>
-<<set $activeSlave.relationTarget = 0>>
<<set $activeSlave.canRecruit = 0>>
-<<set $activeSlave.mother = 0>>
-<<set $activeSlave.father = 0>>
-<<set $activeSlave.sisters = 0>>
-<<set $activeSlave.daughters = 0>>
-<<set $activeSlave.customDesc = "">>
-<<set $activeSlave.customTat = "">>
-<<set $activeSlave.customLabel = "">>
<<if $activeSlave.voice < 2>><<set $activeSlave.voice = 2>><</if>>
<<if $activeSlave.faceShape == "masculine">><<set $activeSlave.faceShape = "cute">><</if>>
-<<if $arcologies[0].FSSupremacistRace != 0>><<set $activeSlave.race = $arcologies[0].FSSupremacistRace>><</if>>
-<<run nationalityToName($activeSlave)>>
-<<set $activeSlave.inducedNCS = 0, $activeSlave.NCSyouthening = 0>>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.slaveSurname = $activeSlave.birthSurname>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index be92069e8ab..6e1de607c17 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -88,10 +88,10 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<br><br>
<span id="result">
-<<link "Free her">> /* do not set $nextLink to AS Dump for this option because we call Remove activeSlave */
+<<link "Free $him">> /* do not set $nextLink to AS Dump for this option because we call Remove activeSlave */
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
- You calmly inform her that she's free to go. She almost collapses with shock, but turns and hurries out of the arcology, tears streaming from her eyes. She wanders down through the arcology, attracting little notice. One moment the monitors have her struggling through a dense-packed crowd, and the next, they don't.
+ You calmly inform $him that $he's free to go. $He almost collapses with shock, but turns and hurries out of the arcology, tears streaming from her eyes. $He wanders down through the arcology, attracting little notice. One moment the monitors have her struggling through a dense-packed crowd, and the next, they don't.
<<if $activeSlave.relationship > 0>>
<<set $i = $slaveIndices[$activeSlave.relationshipTarget]>>
<<set $activeSlave.relationshipTarget = 0, $activeSlave.relationship = 0>>
@@ -151,7 +151,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<include "Remove activeSlave">>
<</replace>>
<</link>>
-<br><<link "Tell her to ignore the Daughters in the future">>
+<br><<link "Tell $him to ignore the Daughters in the future">>
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
$activeSlave.slaveName almost @@.mediumorchid;faints with relief@@ when it becomes apparent you aren't going to punish her for speaking of freedom. All attempts to use your monitoring systems to find the citizens who contacted her fail; it seems their ability to corrupt your systems is considerable. @@.mediumorchid;Whispers of freedom@@ run like wildfire amongst your slaves.
@@ -159,14 +159,14 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<run $slaves.forEach(function(s) { s.devotion -= 10; })>>
<</replace>>
<</link>>
-<br><<link "Publicly flog her for treasonous conversation">>
+<br><<link "Publicly flog $him for treasonous conversation">>
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
You announce that a treasonous slave will be publicly flogged. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and secured to a post. You do your duty; the one that passes the sentence should swing the lash. The ordeal is long and bloody. The populace understand the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The effect on $activeSlave.slaveName's health @@.red;is serious,@@ and she is @@.gold;terrified of failing you again.@@
<<set $activeSlave.health -= 30, $activeSlave.trust -= 15, $rep -= 500>>
<</replace>>
<</link>>
-<br><<link "Chemically lobotomize her to extirpate any record of the incident">>
+<br><<link "Chemically lobotomize $him to extirpate any record of the incident">>
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
You inform $activeSlave.slaveName that she is to return to her duties, which she does, mystified. Later in the day she finds herself scheduled for surgery, and meekly goes. As she feels the cool touch of the injector, loaded with powerful chemical lobotomizing agents, she looks up at the camera above the auto-surgery with a hint of resigned apology in her eyes. When she is released from the surgery's care a few hours later, the hint is gone. @@.red;As is everything.@@
@@ -174,7 +174,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<</replace>>
<</link>>
<<if $arcologies[0].FSPaternalist == "unset" && $seeExtreme == 1>>
-<br><<link "Publicly execute her">>
+<br><<link "Publicly execute $him">>
<<set $nextButton = "Continue", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
<<replace "#result">>
You announce that a treasonous slave will be publicly executed. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and <<if $arcologies[0].FSAztecRevivalist !== "unset">>has her heart cut out of her living body<<elseif $arcologies[0].FSEdoRevivalist !== "unset">>is boiled alive<<elseif $arcologies[0].FSRomanRevivalist !== "unset">>is crucified and left hanging until she perishes<<else>>is summarily hanged<</if>>. The populace understands the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The surviving slaves are @@.gold;terrified@@ at the display, but at least you can be sure they will remember the price of failing you.
@@ -185,4 +185,3 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<</link>>
<</if>>
</span>
-
--
GitLab