From 9c55cc2051cec117597f70124f4532559ab4dca6 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 23 Jul 2019 16:23:43 -0500
Subject: [PATCH] StringFixes
---
src/js/utilJS.js | 2 +-
src/npc/fRelation.tw | 46 +++++++------------
src/uncategorized/PESS.tw | 2 +-
.../freeRangeDairyAssignmentScene.tw | 12 ++---
4 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index b707cba2ff5..b4003aee017 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1865,7 +1865,7 @@ window.pronounReplacer = function(slavetext) {
slavetext = "$He was once the princess of an old world kingdom up until $his loose habits caught up with $him and $he was exiled.";
break;
case "She was once the young trophy wife of a powerful man in the old world, but he sold her into slavery in revenge for her infidelity.":
- slavetext = "$He was once the young trophy wife of a powerful man in the old world, but he sold $him into slavery in revenge for $his infidelity.";
+ slavetext = "$He was once the young trophy $wife of a powerful man in the old world, but he sold $him into slavery in revenge for $his infidelity.";
break;
case "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty.":
slavetext = "$He was raised in a radical slave school that treated $him from a very young age, up to the point that $he never experienced male puberty.";
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 246fa961891..cba0954f576 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -1,53 +1,35 @@
:: FRelation [nobr]
-<<run Enunciate($activeSlave)>>
-<<run clearSummaryCache($activeSlave)>>
-<<setLocalPronouns $activeSlave>>
-
-
-
<<if ($partner == "mother")>>
<<set $partner = $slaveIndices[$activeSlave.mother]>>
- <<run clearSummaryCache($slaves[$partner])>>
- <<setLocalPronouns $slaves[$partner] 2>>
- <<set _activeSlaveRel = $daughter, _partnerRel = "mother">>
+ <<set _activeSlaveRel = "daughter", _partnerRel = "mother">>
<<elseif ($partner == "father")>>
<<set $partner = $slaveIndices[$activeSlave.father]>>
- <<run clearSummaryCache($slaves[$partner])>>
- <<setLocalPronouns $slaves[$partner] 2>>
- <<set _activeSlaveRel = $daughter, _partnerRel = "father">>
+ <<set _activeSlaveRel = "daughter", _partnerRel = "father">>
<<elseif ($partner == "daughter")>>
<<set $partner = randomAvailableDaughter($activeSlave)>>
<<set $partner = $slaveIndices[$partner.ID]>>
- <<run clearSummaryCache($slaves[$partner])>>
- <<setLocalPronouns $slaves[$partner] 2>>
<<if $activeSlave.ID == $slaves[$partner].father>>
- <<set _activeSlaveRel = "father", _partnerRel = _daughter2>>
+ <<set _activeSlaveRel = "father", _partnerRel = "daughter">>
<<elseif $activeSlave.ID == $slaves[$partner].mother>>
- <<set _activeSlaveRel = "mother", _partnerRel = _daughter2>>
+ <<set _activeSlaveRel = "mother", _partnerRel = "daughter">>
<</if>>
<<elseif ($partner == "sister")>>
<<set $partner = randomAvailableSister($activeSlave)>>
<<set $partner = $slaveIndices[$partner.ID]>>
- <<run clearSummaryCache($slaves[$partner])>>
- <<setLocalPronouns $slaves[$partner] 2>>
<<switch areSisters($activeSlave, $slaves[$partner])>>
<<case 3>>
- <<set _activeSlaveRel = "half-<<= $sister>>", _partnerRel = "half-<<= _sister2>>">>
+ <<set _activeSlaveRel = "half-sister", _partnerRel = "half-sister">>
<<case 2>>
- <<set _activeSlaveRel = $sister, _partnerRel = _sister2>>
+ <<set _activeSlaveRel = "sister", _partnerRel = "sister">>
<<case 1>>
<<set _activeSlaveRel = "twin", _partnerRel = "twin">>
<</switch>>
<<elseif ($partner == "relation")>>
<<set $partner = $slaveIndices[$activeSlave.relationTarget]>>
- <<run clearSummaryCache($slaves[$partner])>>
- <<setLocalPronouns $slaves[$partner] 2>>
<<set _activeSlaveRel = $activeSlave.relation, _partnerRel = $slaves[$partner].relation>>
<<else>>
<<set $partner = $slaveIndices[$activeSlave.relationshipTarget]>>
- <<run clearSummaryCache($slaves[$partner])>>
- <<setLocalPronouns $slaves[$partner] 2>>
<<switch $activeSlave.relationship>>
<<case 1>>
<<set _activeSlaveRel = "friend", _partnerRel = "friend">>
@@ -58,9 +40,15 @@
<<case 4>>
<<set _activeSlaveRel = "lover", _partnerRel = "lover">>
<<case 5>>
- <<set _activeSlaveRel = "slave $wife", _partnerRel = "slave _wife2">>
+ <<set _activeSlaveRel = "slave wife", _partnerRel = "slave wife">>
<</switch>>
<</if>>
+<<run Enunciate($activeSlave)>>
+<<run clearSummaryCache($activeSlave)>>
+<<setLocalPronouns $activeSlave>>
+
+<<run clearSummaryCache($slaves[$partner])>>
+<<setLocalPronouns $slaves[$partner] 2>>
You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your office.
@@ -80,7 +68,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
<<set $activeSlave.counter.oral += 2, $slaves[$partner].counter.oral += 2, $oralTotal += 2>>
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
-<<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == $daughter)>>
+<<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == "daughter")>>
$activeSlave.slaveName is enthusiastic when $he <<if canHear($activeSlave)>>hears<<else>>notices<</if>> you order $slaves[$partner].slaveName to come over. $His total immersion in sexual slavery has clearly uncovered a willingness to get very close to $his _partnerRel. You<<if ($PC.dick == 0)>> don a strap-on,<</if>> lie on the floor and instruct $slaves[$partner].slaveName to ride you. _He2 complies, and finds _his2 $daughter $activeSlave.slaveName
<<if ($slaves[$partner].dick > 0)>>
stroking _his2 cock while _he2 humps _his2 <<if $seeRace == 1>>$activeSlave.race <</if>>butt up and down on your cock.
@@ -95,12 +83,12 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
<<set $slaves[$partner].counter.oral++, $activeSlave.counter.oral++, $oralTotal++>>
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
-<<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == $sister || _activeSlaveRel == "half-<<= $sister>>")>>
+<<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == "sister" || _activeSlaveRel == "half-sister")>>
You call $activeSlave.slaveName's _activeSlaveRel $slaves[$partner].slaveName in for some incestuous fun, but see no reason to wait for _him2. When _he2 arrives, it's to the <<if canSee($slaves[$partner])>>sight<<else>>scene<</if>> of $activeSlave.slaveName sitting on the couch with $his legs spread with you <<if ($activeSlave.vagina > -1)>>gently fucking $his pussy<<else>>using $his asshole<</if>><<if ($PC.dick == 0)>> with a strap-on<</if>>. You pull out and order $slaves[$partner].slaveName to orally service _his2 <<print relativeTerm($slaves[$partner], $activeSlave)>>. _He2 gets down before the spread-eagled slave $girl to get to work. After watching $activeSlave.slaveName enjoy the attention for a while, you move behind the busy $slaves[$partner].slaveName and pull _him2 into a good position so you can fuck _him2 while _he2 sucks. After a few thrusts, $activeSlave.slaveName's eyes roll back. <<if ($activeSlave.voice == 0) || ($activeSlave.accent >= 3)>>$He gestures that it feels really good when you make $his <<print relativeTerm($activeSlave, $slaves[$partner])>> moan into $him.<<else>>"Oh <<Master>>," $he squeals, "it feel<<s>> <<s>>o good when you make _him2 moan into me!"<</if>>
<<set $slaves[$partner].counter.oral++, $activeSlave.counter.oral++, $oralTotal++>>
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
-<<elseif [$daughter, "father", "half-<<= $sister>>", "mother", $sister, "twin"].includes(_activeSlaveRel)>>
+<<elseif ["daughter", "father", "half-sister", "mother", "sister", "twin"].includes(_activeSlaveRel)>>
Since between them they aren't able to enthusiastically perform an incestuous threesome, you simply line $activeSlave.slaveName and $slaves[$partner].slaveName up next to one another on the couch next to your desk,<<if ($PC.dick == 0)>> don a strap-on,<</if>> and fuck <<if $seeRace == 1>>$activeSlave.race holes <</if>>at will. Whenever a hole begins to pall you just switch to another. $activeSlave.slaveName tries hard to ignore the fact that $he's getting fucked next to $his _partnerRel, and $slaves[$partner].slaveName pretends the cock getting shoved into _him2 isn't slick from _his2 _activeSlaveRel's fuckhole.
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
@@ -108,7 +96,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
$activeSlave.slaveName and $slaves[$partner].slaveName line up next to one another on the couch next to your desk<<if ($PC.dick == 0)>> while you don a strap-on,<</if>> and offer you their holes. They're just friends, but they're sex slaves and they see nothing wrong with enjoying sex with you, together. They keep up a constant stream of giggling, gasping, and smiling as each of them in turn feels a cock, warm and wet from their friend's body, transferred into them. Each of them does their best to help the other do well, even manually stimulating their friend when necessary<<if ($PC.boobs > 0)>> and spinning around to lavish attention on your nipples<</if>>.
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
-<<elseif ["friend with benefits", "lover", "slave $wife"].includes(_activeSlaveRel) && ($activeSlave.devotion > 20) && ($slaves[$partner].devotion > 20)>>
+<<elseif ["friend with benefits", "lover", "slave wife"].includes(_activeSlaveRel) && ($activeSlave.devotion > 20) && ($slaves[$partner].devotion > 20)>>
$activeSlave.slaveName and $slaves[$partner].slaveName eagerly retire to the couch and arrange themselves face to face so they can make out and enjoy each other's bodies as you enjoy theirs. You decide not to set up an elaborate threesome, and just <<if ($PC.dick == 0)>>engage in a little tribadism with<<else>>fuck<</if>> whatever hole catches your eye next. They rarely break their intimate kissing, forming between the two of them a loving entity on the couch with all sorts of interesting parts to experience. They're sex slaves, and you're fucking them, but they're also lovers who are very comfortable in each others' arms, kissing, fondling each other, and <<if ($PC.dick == 0)>>enjoying your pussy loving<<else>>taking your dick<</if>>.
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index cd3b46e9f1a..f7bec979ecd 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -538,7 +538,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<</replace>>
<<set $activeSlave.clothes = _clothesTemp>>
<<if $MixedMarriage == 1 && $activeSlave.relationship == -3 && $arcologies[0].FSPaternalist >= 60>>
- You instruct your slave-<<= $wife>> $activeSlave.slaveName to put on $his best dress and meet you at the door. You spend a nice night out with $him, taking in the sights before heading to a nice restaurant, where you receive the occasional @@.green;admiring glance@@ from your paternalistic citizens. Afterward, you attend a show at a venue known for its respectful plays acted out by talented slaves, and you conclude the evening by returning to your penthouse to have loving sex in your master bed. When you wake the next morning, you're greeted with a long kiss and @@.hotpink;an adoring look,@@ before $activeSlave.slaveName slides out of bed to begin $his morning duties.
+ You instruct your slave-<<= $wife>> $activeSlave.slaveName to put on $his best dress and meet you at the door. You spend a nice night out with $him, taking in the sights before heading to a nice restaurant, where you receive the occasional @@.green;admiring glance@@ from your paternalistic citizens. Afterwards, you attend a show at a venue known for its respectful plays acted out by talented slaves, and you conclude the evening by returning to your penthouse to have loving sex in your master bed. When you wake the next morning, you're greeted with a long kiss and @@.hotpink;an adoring look,@@ before $activeSlave.slaveName slides out of bed to begin $his morning duties.
<<run repX(500, "event", $activeSlave)>>
<<else>>
You instruct $activeSlave.slaveName to put on $his best dress and meet you at the door. You spend a nice night out with $him, walking along the club to a nice restaurant and then seeing a show before returning home for loving sex in your master bed. $He nestles under your arm, falling to sleep well before you, a @@.hotpink;contented@@ smile on $his face. There's a reason $he gets to sleep much quicker than you do. You lie awake for some time, remembering the @@.red;doubting and disapproving@@ faces of other prosperous citizens whenever they realized that you were treating a slave as an equal this evening.
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 81e69983ee0..830776ebac7 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -91,12 +91,11 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
<<set _relativeCattle = $slaves.filter(function(s) { return (areRelated(s, $activeSlave) && s.assignment == "work in the dairy") ; })>>
<<if _relativeCattle.length > 0>>
<<set _assayedSlave = _relativeCattle.random()>>
- <<setLocalPronouns _assayedSlave 2>>
<<set _assayedSlaveAvailable = 1>>
<<if $activeSlave.mother == _assayedSlave.ID>>
<<set _assayType = "mother">>
<<elseif _assayedSlave.mother == $activeSlave.ID || _assayedSlave.father == $activeSlave.ID>>
- <<set _assayType = _daughter2>>
+ <<set _assayType = "daughter">>
<<elseif $activeSlave.father == _assayedSlave.ID>>
<<set _assayType = "father">>
<<else>>
@@ -104,9 +103,9 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
<<case 1>>
<<set _assayType = "twin">>
<<case 2>>
- <<set _assayType = _sister2>>
+ <<set _assayType = "sister">>
<<case 3>>
- <<set _assayType = "half-<<= _sister2>>">>
+ <<set _assayType = "half-sister">>
<</switch>>
<</if>>
<</if>>
@@ -115,7 +114,6 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
<<if ($activeSlave.relation != 0)>>
<<set _assayedSlave = getSlave($activeSlave.relationTarget)>>
<<if (def _assayedSlave) && _assayedSlave.assignment == "work in the dairy">>
- <<setLocalPronouns _assayedSlave 2>>
<<set _assayedSlaveAvailable = 1>>
<<set _assayType = $activeSlave.relation>>
<</if>>
@@ -124,7 +122,6 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
<<if _assayedSlaveAvailable == 0 && $activeSlave.relationship > 0>>
<<set _assayedSlave = getSlave($activeSlave.relationshipTarget)>>
<<if (def _assayedSlave) && _assayedSlave.assignment == "work in the dairy">>
- <<setLocalPronouns _assayedSlave 2>>
<<set _assayedSlaveAvailable = 1>>
<<switch $activeSlave.relationship>>
<<case 1>>
@@ -136,11 +133,12 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
<<case 4>>
<<set _assayType = "lover">>
<<case 5>>
- <<set _assayType = "slave _wife2">>
+ <<set _assayType = "slave wife">>
<</switch>>
<</if>>
<</if>>
<<if _assayedSlaveAvailable == 1>>
+ <<setLocalPronouns _assayedSlave 2>>
$His _assayType _assayedSlave.slaveName is at the dairy, too. _He2 is in the adjacent stall. The two of them are going to be milked right next to each other.
<</if>>
--
GitLab