From f03832416441872e6bf352b378e9af681cd3bc71 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 17 May 2019 15:48:59 -0500
Subject: [PATCH] GirlFixes
---
src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw | 2 ++
src/pregmod/seFCTVremote.tw | 2 +-
src/pregmod/widgets/pregmodBirthWidgets.tw | 2 +-
src/uncategorized/completeCatalog.tw | 2 +-
src/uncategorized/saRules.tw | 6 +++---
src/uncategorized/slaveAssignmentsReport.tw | 4 ++--
src/uncategorized/spaReport.tw | 6 +++---
src/uncategorized/specialSlave.tw | 2 +-
src/utility/birthWidgets.tw | 4 ++--
9 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index f3ca0f74fc5..b4963b908db 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -91,6 +91,8 @@
<<if $tempSlave.amp == 1>>
<<set $tempSlave.legsTat = 0>>
<<set $tempSlave.armsTat = 0>>
+ <<set $tempSlave.missingArms = 3>>
+ <<set $tempSlave.missingLegs = 3>>
<</if>>
<<set $tempSlave.nails = 0>>
<<set $tempSlave.heels = 0>>
diff --git a/src/pregmod/seFCTVremote.tw b/src/pregmod/seFCTVremote.tw
index 9a99b86eab6..11b2a75ffeb 100644
--- a/src/pregmod/seFCTVremote.tw
+++ b/src/pregmod/seFCTVremote.tw
@@ -161,7 +161,7 @@ The customer quietly places a hand on $his shoulder and the tech jumps several i
<br>
The tech slowly lowers $himself to the floor, and as $his modified shirt rides up $his pants ride down, they reveal your second modification: a tramp stamp that read "Shove that upgraded package here." The customer whistles and in an instant grabs a handful of ass. Perfect! The tech tries to stand up and object: "Excuse me <<if _customer.dick > 0>>sir<<else>>ma'am<</if>>, what...!" "Hold on baby," the customer replies and you pick that moment to hit the third button.
<br><br>
-Channel 14 had fascinated you. Thanks to this bumbling tech you hadn't been able to see it very often, but the idea of an aphrodisiac that took effect instantly and then quickly vanished seemed incredibly useful to you. How fortunate that it had arrived in time for this moment. The tech would have felt a fairly large liquid *splurt* from the vibe inside $his ass that would have been difficult to explain. Equally difficult to explain would be the now undeniably raging vibrations. But as $he turns $his head and you can see $his face on the camera, it's clear none of that matters. "Please," the now flushed tech says. "M...mm my ass."
+Channel 14 had fascinated you. Thanks to this bumbling tech you hadn't been able to see it very often, but the idea of an aphrodisiac that took effect instantly and then quickly vanished seemed incredibly useful to you. How fortunate that it had arrived in time for this moment. The tech would have felt a fairly large liquid 'splurt' from the vibe inside $his ass that would have been difficult to explain. Equally difficult to explain would be the now undeniably raging vibrations. But as $he turns $his head and you can see $his face on the camera, it's clear none of that matters. "Please," the now flushed tech says. "M...mm my ass."
<br><br>
<<if _customer.dick == 0>>
"Hmmm, I'm not sure I have the right <i>cable</i>." The _woman2 replies with a lewd smirk. "Let me see what I can do." The titanic plug _he2 produces was clearly purchased from the FCTV shopping network, but from the fact it was still in the box _he2 hadn't worked up the guts to try it $himself and hadn't had any other takers either.
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index b3b236760cf..9519ecf29ce 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -953,7 +953,7 @@
<<if (random(1,20) > $suddenBirth)>>
$Attendant.slaveName waddles to a special pool designed to give birth in. Once $he is safely in the water, $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, something $he has been trained for. $His child is promptly taken and, following a cleaning, $he heads back to the main pool.
<<else>>
- While tending to the girls in the spa, $slaves[$i].slaveName's water breaks. The girls quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
+ While tending to the guests in the spa, $slaves[$i].slaveName's water breaks. The slaves quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
<<set $humiliation = 1>>
<<ClothingBirth>>
$He thanks $his charges for their, less than helpful, efforts and collects <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child for removal. Upon returning, $he strips down and enters the pool, desperate for a break and eager to take the weight off $his still very gravid body.
diff --git a/src/uncategorized/completeCatalog.tw b/src/uncategorized/completeCatalog.tw
index f0f3c9c5a03..ffbccd2138b 100644
--- a/src/uncategorized/completeCatalog.tw
+++ b/src/uncategorized/completeCatalog.tw
@@ -25,7 +25,7 @@
<<switch ($activeSlave.eyeColor)>>
<<case "blind blue">>
<<set $activeSlave.origEye = "deep blue">>
- <<case "milky white" "implant">>
+ <<case "implant" "milky white">>
<<set $activeSlave.origEye = either("blue", "brown", "dark blue", "dark green", "green", "hazel", "light blue", "light green")>>
<<default>>
<<set $activeSlave.origEye = $activeSlave.eyeColor>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 07cfdb0cbee..d21cdfbc8a5 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -734,7 +734,7 @@
<<saRulesPlayerDrugEffects>>
<<elseif (_release == "masturbation")>>
<<if $slaves[$i].sexualFlaw == "attention whore">>
- @@.hotpink;enjoys being allowed to masturbate,@@ especially since its often on stage for $clubName's amusement.
+ @@.hotpink;enjoys being allowed to masturbate,@@ especially since it's often on stage for $clubName's amusement.
<<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
takes solace in $his permission to masturbate rather than being forced to beg for sex, though being forced to do it on a table surrounded by citizens prevents $him from getting complacent; you can never know when they'll want more.
@@ -2033,14 +2033,14 @@
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
<<if $SpaiIDs.length > 2>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole pool of girls for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole pool of slaves for $him to rape.
<<else>>
Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join $him in the pool<<else>>you assign more girls to $spaName to help $him unwind<</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
<<if $SpaiIDs.length > 2>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole pool of girls for $him to dominate.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole pool of slaves for $him to dominate.
<<else>>
Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join $him in the pool<<else>>you assign more girls to $spaName to help $him unwind<</if>>.
<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index edd3a6fbc96..5d6aa59b377 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -742,7 +742,7 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
["Incubator Report", $incubatorNameCaps, $incubator, $incubatorSlaves, -1, -1],
["Master Suite Report", $masterSuiteNameCaps, $masterSuite, $masterSuiteSlaves, $Concubine, "Concubine"],
["Penthouse Report", "The Penthouse", 1, $slavesVisible, -1, -1],
- ["Rules Assistant Report", "Rules Assistant", $rulesAssistantAuto, 1, -1, -1] /** should be last - may reassign slaves **/
+ ["Rules Assistant Report", "Rules Assistant", $rulesAssistantAuto, 1, -1, -1] /** should be last — may reassign slaves **/
]>>
<<for _ii = 0; _ii < _facListArr.length; _ii++>>
@@ -751,7 +751,7 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
<<if _facSubArr[2] > 0>> /** Do we have one of these facilities? */
<<if $useAccordion > 0>> <<set _accText = " accordion", _disTxt = "">> <</if>> /** Is Accordion turned on? */
<<if (_facSubArr[3] == 0) && (_facSubArr[4] <= 0)>> /** Is there anyone inside the facility? */
- ''_facSubArr[1] Report''<hr style="margin:0"> /** No - it's empty, so we display the heading without a button and with a thinner bar under it */
+ ''_facSubArr[1] Report''<hr style="margin:0"> /** No — it's empty, so we display the heading without a button and with a thinner bar under it */
@@.gray;_facSubArr[1] is currently empty.@@
<br><br>
/** Old code: <<= '<div id="button-' + _str + '" class="unStaffed">' + _facSubArr[1] + ' is currently unstaffed</div>'>> */
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 7f980bb7ec2..a334d328a83 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -57,7 +57,7 @@
<<set $slaves[_FLs].skill.attendant += random(1,Math.ceil(($Attendant.intelligence+$Attendant.intelligenceImplant)/15) + 8)>>
<</if>>
<<if ($Attendant.eyes == -2)>>
- $His blindness allows $him to deeply connect with $his girls.
+ $His blindness allows $him to deeply connect with $his charges.
<<set _idleBonus++>>
<</if>>
<<if ($Attendant.fetish == "none")>>
@@ -78,7 +78,7 @@
<<set _idleBonus++>>
<</if>>
<<if isFertile($Attendant) || ($Attendant.bellyPreg >= 1500) || ($Attendant.counter.birthsTotal > 0) || ($Attendant.bellyImplant >= 1500)>>
- $He has a natural mothering instinct and really makes $his girls feel at home.
+ $He has a natural mothering instinct and really makes $his charges feel at home.
<<set _idleBonus++, _healthBonus++>>
<</if>>
<<set _attendantUsedCure = 0>>
@@ -203,7 +203,7 @@
<<if (_DL < $spa)>>
<<set _seed = random(1,10)+(($spa-_DL)*(random(150,170)+(_idleBonus*10)))>>
<<run cashX(_seed, "spa", $Attendant)>>
- <br> Since $he doesn't have enough girls to occupy all $his time, the spa takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
+ <br> Since $he doesn't have enough slaves to occupy all $his time, the spa takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<<if ($arcologies[0].FSHedonisticDecadence > 0) && (_DL == 0)>>
Society @@.green;loves@@ being allowed to lounge in your spa, greatly advancing your laid back culture.
<<= FutureSocieties.Change("Hedonistic", 2)>>
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index c80b9bf63ac..e2bbf2f5cbd 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -20,7 +20,7 @@
<<switch ($activeSlave.eyeColor)>>
<<case "blind blue">>
<<set $activeSlave.origEye = "deep blue">>
- <<case "milky white" "implant">>
+ <<case "implant" "milky white">>
<<set $activeSlave.origEye = either("blue", "brown", "dark blue", "dark green", "green", "hazel", "light blue", "light green")>>
<<default>>
<<set $activeSlave.origEye = $activeSlave.eyeColor>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 84898265c79..502b220a834 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -1085,13 +1085,13 @@
Exhausted, $he sits up and smiles to the crowd. $His show definitely drew attention to $his club. With a burst of energy $he leaps to $his feet, bows to the crowd, and gathers $his child<<if $slaves[$i].pregType > 1>>ren<</if>>, before making $his way off stage. As $he leaves the public's gaze, $he shouts out with a wink "the next showing ought to be in about nine months".
<<case "be the Attendant">>
- While tending to the girls in the spa, $slaves[$i].slaveName's water breaks. The girls quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
+ While tending to the guests in the spa, $slaves[$i].slaveName's water breaks. The slaves quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
<<set $humiliation = 1>>
<<ClothingBirth>>
$He thanks $his charges for their less than helpful efforts and collects $his child<<if $slaves[$i].pregType > 1>>ren<</if>> for removal. Upon returning, $he strips down and enters the pool, desperate for a break.
<<case "be the Matron">> /* TODO: This needs a rewrite */
- While tending to the girls in the spa, $slaves[$i].slaveName's water breaks. The girls quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
+ While tending to the infants in the spa, $slaves[$i].slaveName's water breaks. The nannies quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
<<set $humiliation = 1>>
<<ClothingBirth>>
$He thanks $his charges for their less than helpful efforts and collects $his child<<if $slaves[$i].pregType > 1>>ren<</if>> for removal. Upon returning, $he strips down and enters the pool, desperate for a break.
--
GitLab