From 67f28c6ad896dbac91f03f8c0cfd815493f74ad2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 3 Nov 2018 15:46:58 -0400
Subject: [PATCH] fixes
---
player variables documentation - Pregmod.txt | 2 +-
src/uncategorized/genericPlotEvents.tw | 8 +--
src/uncategorized/pCoupAttempt.tw | 59 ++++++++++----------
src/uncategorized/pUndergroundRailroad.tw | 27 +++++----
src/uncategorized/reRelativeRecruiter.tw | 1 +
src/uncategorized/saLiveWithHG.tw | 4 +-
src/uncategorized/spaReport.tw | 7 ++-
7 files changed, 57 insertions(+), 51 deletions(-)
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 0172502eff2..a7ce3dab960 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -376,7 +376,7 @@ how many slaves you've gotten pregnant
intelligence:
-3
+100
face:
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index d08f0cc1ad2..f41b90ca756 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -1262,13 +1262,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<replace "#result">>
You send your personal VTOL bird to the shop for some immediate and very expensive modifications to its cargo and passenger area. Since this will take several days, you stall the supplicants.
<<if $PAidTarget == "volleyballTeam">>
- A few of the girls decide to leave, but the sight of them pushed against the wall of a nearby building, toned bodies glistening with sweat and seed as their captors rape them into submission, keep the rest happy to stay on the bus. Those that remained
- <<else>>
- Their situation isn't truly dire yet, and they can wait. They
- <</if>>
- are extremely grateful, though they would be less hopeful if they knew the true nature of the aircraft coming to retrieve them.
- <<if $PAidTarget == "volleyballTeam">>
- A few of the girls decide to leave, but watching them pushed against the wall of a nearby building, toned bodies glistening with sweat and seed as their captors rape them into submission, keep the rest happy to stay on the bus. Those that remained
+ A few of the girls decide to leave, but the sight of them pushed against the wall of a nearby building, toned bodies glistening with sweat and seed as their captors rape them into submission, keep the rest happy to stay on the bus. Those that remained
<<else>>
Their situation isn't truly dire yet, and they can wait. They
<</if>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 88e9dcbca37..56222536143 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -1,39 +1,42 @@
:: P coup attempt [nobr]
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $daughtersVictory = 1>>
-<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
-<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
-<<set WombUpdatePregVars($traitor)>>
-<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
- <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
- <<set WombFlush($traitor)>>
-<<else>>/* still pregnant slave */
- <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
- <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
-<</if>>
-<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
+<<if $traitor != 0>>
+ <<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
+
+ <<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+ <<set WombUpdatePregVars($traitor)>>
+ <<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+ <<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <</if>>
+ <<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
-<<if $traitor.bald != 1>>
- <<if ($traitor.hLength < 150)>>
- <<set $traitor.hLength += _weeks>>
+ <<if $traitor.bald != 1>>
+ <<if ($traitor.hLength < 150)>>
+ <<set $traitor.hLength += _weeks>>
+ <</if>>
<</if>>
-<</if>>
-<<if $seeAge != 0>>
- <<for _weeks > 0>>
- <<set $traitor.birthWeek++>>
- <<if $traitor.birthWeek >= 52>>
- <<set $traitor.birthWeek = 0>>
- <<if $seeAge == 1>>
- <<set $traitor.physicalAge += 1, $traitor.actualAge += 1, $traitor.visualAge += 1>>
- <<set $traitor.ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>>
- <<if $traitor.physicalAge <= 18 && $loliGrow == 0>>
- <<PhysicalDevelopment $traitor>>
+ <<if $seeAge != 0>>
+ <<for _weeks > 0>>
+ <<set $traitor.birthWeek++>>
+ <<if $traitor.birthWeek >= 52>>
+ <<set $traitor.birthWeek = 0>>
+ <<if $seeAge == 1>>
+ <<set $traitor.physicalAge += 1, $traitor.actualAge += 1, $traitor.visualAge += 1>>
+ <<set $traitor.ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>>
+ <<if $traitor.physicalAge <= 18 && $loliGrow == 0>>
+ <<PhysicalDevelopment $traitor>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<set _weeks-->>
- <</for>>
+ <<set _weeks-->>
+ <</for>>
+ <</if>>
<</if>>
You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup. The Daughters of Liberty have more sympathizers in the arcology than even you suspected, and they're well armed and have the element of surprise. <<if $arcologies[0].FSRomanRevivalistLaw == 1>>$arcologies[0].name, however, is home to a society that cannot be surprised, for each and every one of its citizens is armed and trained for instant contribution to the defense of Rome. Even as you do your best to reestablish control, you hear a thunderous, ubiquitous roar from all around you. Your citizens are already getting into the fight.<</if>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index dbcc6953f5a..c843c1aec77 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -2,11 +2,14 @@
<<set $nextButton = " ", $nextLink = "Random Nonindividual Event">> /* hide button until user makes a selection */
-<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.amp != 1 && s.devotion < 75 && canTalk(s) && ["whore", "serve the public", "serve in the club", "work in the brothel"].includes(s.assignment); })>>
+<<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 75 && s.trust < 75 && s.indunture == -1 && canWalk(s) && canTalk(s) && ["whore", "serve the public", "serve in the club", "work in the brothel"].includes(s.assignment); })>>
<<if (ndef $activeSlave)>> /* search again without assignments limitation */
- <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.amp != 1 && s.devotion < 75 && canTalk(s); })>>
- <<if (ndef $activeSlave)>> /* still no match */
- <<set $activeSlave = $slaves.random()>>
+ <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 75 && s.trust < 75 && s.indunture == -1 && canTalk(s); })>>
+ <<if (ndef $activeSlave)>> /* we will find one */
+ <<set $activeSlave = $slaves.find(function(s) { return s.fuckdoll == 0 && s.fetish != "mindbroken" && s.amp != 1 && s.devotion < 20 && canTalk(s); })>>
+ <<if (ndef $activeSlave)>> /* still no match */
+ <<set $activeSlave = $slaves.random()>>
+ <</if>>
<</if>>
<</if>>
@@ -63,7 +66,7 @@ This is disturbing, to say the least. After close investigation, it appears some
<br><br>
<<run Enunciate($activeSlave)>>
-You call $activeSlave.slaveName in and politely inquire as to whether she knows anything about the matter. She nearly flees in terror, but gathers her courage and
+You call $activeSlave.slaveName in and politely inquire as to whether $he knows anything about the matter. $He nearly flees in terror, but gathers $his courage and
<<if !canTalk($activeSlave)>>
gestures meekly
<<elseif ($activeSlave.lips > 70)>>
@@ -73,9 +76,9 @@ You call $activeSlave.slaveName in and politely inquire as to whether she knows
<<else>>
mumbles meekly
<</if>>
-that several nondescript citizens she sees occasionally at work have passed a few messages to her. Apparently, they simply asked whether she wished to be free. Asked whether she does in fact wish to be free, she
+that several nondescript citizens $he sees occasionally at work have passed a few messages to $him. Apparently, they simply asked whether $he wished to be free. Asked whether $he does in fact wish to be free, $he
<<if !canTalk($activeSlave)>>
- shakily gestures an apology, and admits that she does.
+ shakily gestures an apology, and admits that $he does.
<<else>>
<<if SlaveStatsChecker.checkForLisp($activeSlave)>>
lisps faintly,
@@ -91,7 +94,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<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 $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.
+ 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 $his eyes. $He wanders down through the arcology, attracting little notice. One moment the monitors have $him 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>>
@@ -167,7 +170,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<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.
+ $activeSlave.slaveName almost @@.mediumorchid;faints with relief@@ when it becomes apparent you aren't going to punish $him for speaking of freedom. All attempts to use your monitoring systems to find the citizens who contacted $him fail; it seems their ability to corrupt your systems is considerable. @@.mediumorchid;Whispers of freedom@@ run like wildfire amongst your slaves.
<<set $activeSlave.devotion -= 15>>
<<run $slaves.forEach(function(s) { s.devotion -= 10; })>>
<</replace>>
@@ -175,14 +178,14 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<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.@@
+ 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 $he is @@.gold;terrified of failing you again.@@
<<set $activeSlave.health -= 30, $activeSlave.trust -= 15, $rep -= 500>>
<</replace>>
<</link>>
<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.@@
+ You inform $activeSlave.slaveName that $he is to return to $his duties, which $he does, mystified. Later in the day $he finds herself scheduled for surgery, and meekly goes. As $he feels the cool touch of the injector, loaded with powerful chemical lobotomizing agents, $he looks up at the camera above the auto-surgery with a hint of resigned apology in $his eyes. When $he is released from the surgery's care a few hours later, the hint is gone. @@.red;As is everything.@@
<<set $activeSlave.fetish = "mindbroken">>
<</replace>>
<</link>>
@@ -190,7 +193,7 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<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.
+ 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 $his heart cut out of $his living body<<elseif $arcologies[0].FSEdoRevivalist !== "unset">>is boiled alive<<elseif $arcologies[0].FSRomanRevivalist !== "unset">>is crucified and left hanging until $he 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.
<<set $rep -= 500>>
<<run $slaves.forEach(function(s) { s.trust -= 10 + random(10); })>>
<<include "Remove activeSlave">>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 20af77d09a9..cfbd7c3159a 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -415,6 +415,7 @@ She waits anxiously for your decision.
<<case "twin">>
<<set $activeSlave.origin = "She was recruited into your service by her twin sister.">>
<<set $activeSlave.birthWeek = $eventSlave.birthWeek>>
+ <<set $activeSlave.actualAge = $eventSlave.actualAge>>
<</switch>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index b566909bf5c..689de85b23d 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -974,7 +974,7 @@
<<if $showEWD == 0>>
<<silently>>
- <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>
+ /*<<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>>*/
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -984,7 +984,7 @@
<<include "SA devotion">>
<</silently>>
<<else>>
- <<= saChoosesOwnClothes($slaves[$i])>>
+ /*<<= saChoosesOwnClothes($slaves[$i])>>*/
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index fc1051ec06f..1360a445ecb 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -120,7 +120,12 @@
<</if>>
<<switch $slaves[$i].prestigeDesc>>
<<case "She is a famed Free Cities whore, and commands top prices.">>
- She does her best to relax the famous whore, $slaves[$i].slaveName, making sure to pay special attention to her worn holes.
+ She does her best to relax the famous whore, $slaves[$i].slaveName, making sure to
+ <<if $slaves[$i].vagina > 2 || $slaves[$i].anus > 2>>
+ pay special attention to her worn holes.
+ <<else>>
+ get her clean and relaxed for her next usage.
+ <</if>>
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<case "She is a famed Free Cities slut, and can please anyone.">>
She does her best to soothe the famous entertainer, $slaves[$i].slaveName, letting her relax in blissful peace.
--
GitLab