From fa28a7ea89baaf57b53abc0b8ac88a862b9f9442 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Sat, 18 Aug 2018 18:35:15 -0500 Subject: [PATCH] Tests --- src/uncategorized/PESS.tw | 5 +++-- src/uncategorized/PETS.tw | 4 +++- src/uncategorized/RECI.tw | 3 ++- src/uncategorized/REFI.tw | 2 +- src/uncategorized/REFS.tw | 3 ++- src/uncategorized/RESS.tw | 7 ++++--- src/uncategorized/RETS.tw | 29 ++++++++++++++------------ src/uncategorized/generateXXSlave.tw | 9 ++++---- src/uncategorized/generateXYSlave.tw | 11 +++++----- src/utility/descriptionWidgetsStyle.tw | 2 +- 10 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw index 7aa1f47f4c5..9f7431068fd 100644 --- a/src/uncategorized/PESS.tw +++ b/src/uncategorized/PESS.tw @@ -70,12 +70,13 @@ <<set $desc = SlaveTitle($activeSlave)>> <<run Enunciate($activeSlave)>> +<<setLocalPronouns $activeSlave>> <<switch $PESSevent>> <<case "bodyguard beatdown">> -<<EventNameLink $activeSlave>> is a constant fixture by your side in your excursions outside the penthouse, as is befitting her position as your personal bodyguard. Largely the position is ceremonial; there are few citizens with a survival instinct compromised enough to risk attacking an arcology owner in the middle of their arcology. This evening, however, you run into one of those scant few citizens - a drunkard so inebriated that he doesn't seem to understand the danger in invading your personal space. Before your personal security can be further jeopardized, your bodyguard steps in. +<<EventNameLink $activeSlave>> is a constant fixture by your side in your excursions outside the penthouse, as is befitting $his position as your personal bodyguard. Largely the position is ceremonial; there are few citizens with a survival instinct compromised enough to risk attacking an arcology owner in the middle of their arcology. This evening, however, you run into one of those scant few citizens - a drunkard so inebriated that he doesn't seem to understand the danger in invading your personal space. Before your personal security can be further jeopardized, your bodyguard steps in. <<case "madam strategy">> @@ -93,7 +94,7 @@ Your milkmaid <<EventNameLink $activeSlave>> worked hard today. She's clearly ex <<case "tired milkmaid">> -Your milkmaid <<EventNameLink $activeSlave>> worked hard today. The cows have it much easier than she does, in many ways: all they have to do is give milk, while her life is one of hard labor. Long after they're asleep, she's cleaning the dairy and getting ready for the next day. At long last she's done, and even though she's exhausted, she takes a few minutes to thoroughly stretch her aching body. She's a big girl, and the play of her muscles across her back as she works out the kinks is quite eye-catching. +Your milkmaid <<EventNameLink $activeSlave>> worked hard today. The cows have it much easier than $he does, in many ways: all they have to do is give milk, while $his life is one of hard labor. Long after they're asleep, she's cleaning the dairy and getting ready for the next day. At long last she's done, and even though she's exhausted, she takes a few minutes to thoroughly stretch her aching body. She's a big girl, and the play of her muscles across her back as she works out the kinks is quite eye-catching. <<case "loving concubine">> diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw index 7dac3a20fc2..7017f65da0f 100644 --- a/src/uncategorized/PETS.tw +++ b/src/uncategorized/PETS.tw @@ -67,6 +67,8 @@ <</if>> /* 000-250-006 */ +<<setLocalPronouns $activeSlave>> +<<setLocalPronouns $subSlave 2>> <<switch $PETSevent>> @@ -79,7 +81,7 @@ <</if>> <<set $activeSlave.penetrativeCount += 1>> <<set $penetrativeTotal += 1>> -Late at night, you decide to walk through the clinic to look over its patients personally. As soon as you enter the space, left dimly lit at night to encourage sleep, you hear a quiet moaning and the distinct noise of flesh on flesh. Heading over towards that area, you note the noise is coming from where $subSlave.slaveName is listed as resting. Appearing quietly, you see <<EventNameLink $activeSlave>> between her patient's legs, which are spread wide by the stirrups provided with each patient bed for examination of a slave's holes. +Late at night, you decide to walk through the clinic to look over its patients personally. As soon as you enter the space, left dimly lit at night to encourage sleep, you hear a quiet moaning and the distinct noise of flesh on flesh. Heading over towards that area, you note the noise is coming from where $subSlave.slaveName is listed as resting. Appearing quietly, you see <<EventNameLink $activeSlave>> between $his patient's legs, which are spread wide by the stirrups provided with each patient bed for examination of a slave's holes. <br><br> <<if $seed == 1>> She's pounding eagerly away and mauling her patient's bare boobs with both hands. diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw index 06227682a4f..d78d9cb54a4 100644 --- a/src/uncategorized/RECI.tw +++ b/src/uncategorized/RECI.tw @@ -53,6 +53,7 @@ <<run Enunciate($activeSlave)>> <<set $desc = SlaveTitle($activeSlave)>> +<<setLocalPronouns $activeSlave>> <<switch $RECIevent>> @@ -74,7 +75,7 @@ <<else>> <<set $skinDesc = "brown">> <</if>> -The slave bathrooms are designed to completely eliminate privacy. There are few partitions, and those are glass. Your better-behaved slaves have all long since lost any hesitation about performing their ablutions nude. As you pass through the area, you notice <<EventNameLink $activeSlave>> checking out her own anus in the bathroom mirror. +The slave bathrooms are designed to completely eliminate privacy. There are few partitions, and those are glass. Your better-behaved slaves have all long since lost any hesitation about performing their ablutions nude. As you pass through the area, you notice <<EventNameLink $activeSlave>> checking out $his own anus in the bathroom mirror. <br><br> There's no other way to describe what she's doing: the $desc has her back to the mirror<<if $activeSlave.height < 160>> and is up on tiptoe to bring her butthole into view<</if>>, and she's <<if $activeSlave.butt > 6>> diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw index 2bfa3bf9953..faa2651321e 100644 --- a/src/uncategorized/REFI.tw +++ b/src/uncategorized/REFI.tw @@ -63,7 +63,7 @@ <<set $desc = SlaveTitle($activeSlave)>> <<run Enunciate($activeSlave)>> <<set _belly = bellyAdjective($activeSlave)>> - +<<setLocalPronouns $activeSlave>> <<switch $REFIevent>> diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw index 9277e9ee5f7..3f2e64e66a5 100644 --- a/src/uncategorized/REFS.tw +++ b/src/uncategorized/REFS.tw @@ -42,6 +42,7 @@ <<set $desc = SlaveTitle($activeSlave)>> <<run Enunciate($activeSlave)>> +<<setLocalPronouns $activeSlave>> <<switch $REFSevent>> @@ -382,7 +383,7 @@ On this particular outing you happen to cross paths with a comely female citizen <span id="result2"> <<link "Enslave her afterwards">> <<replace "#result2">> - After she regains her bearings from your sexual encounter, the older woman slips on her simple clothes and attempts to slink away from your private suite unobtrusively. She makes it out the door before being confronted by a glowing array of wallscreen monitors, each displaying a visual representation of your purchase of her considerable debt and subsequent enslavement of her on the basis of that debt. Tears begin to stream down her weathered cheeks as she sinks to her knees, her hopes of making it through the breadth of her long life without enslavement now dashed. + After she regains $his bearings from your sexual encounter, the older woman slips on her simple clothes and attempts to slink away from your private suite unobtrusively. She makes it out the door before being confronted by a glowing array of wallscreen monitors, each displaying a visual representation of your purchase of her considerable debt and subsequent enslavement of her on the basis of that debt. Tears begin to stream down her weathered cheeks as she sinks to her knees, her hopes of making it through the breadth of her long life without enslavement now dashed. <br><br> <<set $cash -= 10000>> <<set $activeSlaveOneTimeMinAge = 36>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 9c00e5094fe..c66a140c733 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -56,6 +56,7 @@ <<set $desc = SlaveTitle($activeSlave)>> <<run Enunciate($activeSlave)>> <<set _belly = bellyAdjective($activeSlave)>> +<<setLocalPronouns $activeSlave>> <<switch $RESSevent>> @@ -5362,7 +5363,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<case "sore shoulders">> -<<link "Make her work it out">> +<<link "Make $him work it out">> <<EventNameDelink $activeSlave>> <<replace "#result">> You tell $him to get ready to go into a handstand. $He looks puzzled, but anticipatory, and hurries to comply. @@ -5426,7 +5427,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <<else>> "@@.mediumaquamarine;Thank you@@ <<Master>>!" $he squeaks as a hand <</if>> - dives for her crotch. $He + dives for $his crotch. $He <<if ($activeSlave.vagina == -1) && ($activeSlave.dick == 0)>> rubs her perineum and anus <<elseif ["chastity belt", "combined chastity"].includes($activeSlave.vaginalAccessory)>> @@ -5445,7 +5446,7 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look. <</replace>> <</link>> <<if $activeSlave.anus > 0>> - <br><<link "Fuck her">> + <br><<link "Fuck $him">> <<replace "#result2">> You gently push her shoulders forward. $He moans as the forward lean stretches her hip flexors, and then breathes deeply with relief as you pull $his legs back and out of their crossed position. The rush of a completed stretch crashes into $him, and $he relaxes completely. This change of position leaves her with her <<if $activeSlave.butt > 6>>massive ass<<elseif $activeSlave.butt > 3>>big butt<<else>>rear<</if>> pointed right at you, and $he knows what's coming next. $His <<if $activeSlave.anus > 2>>loose butthole relaxes completely into a gape that positively begs to be penetrated<<elseif $activeSlave.anus > 1>>relaxed anus opens into a slight gape that positively begs to be penetrated<<else>>tight anus relaxes slightly, her rosebud begging to be fucked<</if>>. You rise partway to kneel behind $him, <<if $PC.dick == 0>>sliding fingers inside the slave's ass and humping your pussy against the heel of that hand<<else>>using a hand to guide your member inside the slave's ass<<if $PC.vagina == 1>>, not without teasing your own pussylips a bit<</if>><</if>>. $He gasps when your other hand grabs one of her shoulders and continues the massage. You quickly find that working out a knot in her muscles produces reflexive reactions across her whole body, notably including her anal sphincter. After you've driven her into a state of @@.hotpink;mindless satiation@@ and climaxed yourself, you let her slump to the floor and curl up around her sweaty body. <<set $activeSlave.devotion += 2>> diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index e873205dc88..56200386002 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -23,20 +23,20 @@ /* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */ <<if Array.isArray($RETSevent)>> - <<set $activeSlave = $eventSlave>> - <<if $cheatMode == 1>> - <<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */ - ''A random two slave event would have been selected from the following:'' - <br> - <<for _i = 0; _i < $RETSevent.length; _i++>> - <<print "[[$RETSevent[_i]|RETS][$RETSevent = $RETSevent[" + _i + "]]]">> + <<set $activeSlave = $eventSlave>> + <<if $cheatMode == 1>> + <<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */ + ''A random two slave event would have been selected from the following:'' <br> - <</for>> - <br><br>[[Go Back to Random Individual Event|Random Individual Event][$activeSlave = 0]] - <<else>> - <<set $RETSevent = $RETSevent.random()>> - <<goto "RETS">> - <</if>> + <<for _i = 0; _i < $RETSevent.length; _i++>> + <<print "[[$RETSevent[_i]|RETS][$RETSevent = $RETSevent[" + _i + "]]]">> + <br> + <</for>> + <br><br>[[Go Back to Random Individual Event|Random Individual Event][$activeSlave = 0]] + <<else>> + <<set $RETSevent = $RETSevent.random()>> + <<goto "RETS">> + <</if>> <<else>> <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">> @@ -174,6 +174,9 @@ <</if>> /* 000-250-006 */ +<<setLocalPronouns $activeSlave>> +<<setLocalPronouns $subSlave 2>> + <<run Enunciate($activeSlave)>> <<switch $RETSevent>> diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw index 8237e9b77f4..c5deb89c068 100644 --- a/src/uncategorized/generateXXSlave.tw +++ b/src/uncategorized/generateXXSlave.tw @@ -186,13 +186,14 @@ <<if ($activeSlave.physicalAge > random(0,100))>> <<set $activeSlave.eyes = -1>> <<if random(0,100) > 90>> - <<if setup.gratefulCareers.includes($activeSlave.career)>> - <<set $activeSlave.eyes = -2>> - <</if>> + <<set $activeSlave.eyes = -2>> <</if>> <</if>> -<<if ($activeSlave.physicalAge > random(30,100))>> +<<if ($activeSlave.physicalAge > random(0,100))>> <<set $activeSlave.hears = -1>> + <<if random(0,100) > 90>> + <<set $activeSlave.hears = -2>> + <</if>> <</if>> diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw index 7537f1e26d4..9dafc91928b 100644 --- a/src/uncategorized/generateXYSlave.tw +++ b/src/uncategorized/generateXYSlave.tw @@ -1,4 +1,4 @@ -:: Generate XY Slave [nobr] +:: Generate XY Slave [nobr] <<BaseSlave>> /% Defaults that differ from the old template %/ @@ -95,13 +95,14 @@ <<if ($activeSlave.physicalAge > random(0,100))>> <<set $activeSlave.eyes = -1>> <<if random(0,100) > 90>> - <<if setup.gratefulCareers.includes($activeSlave.career)>> - <<set $activeSlave.eyes = -2>> - <</if>> + <<set $activeSlave.eyes = -2>> <</if>> <</if>> -<<if ($activeSlave.physicalAge > random(30,100))>> +<<if ($activeSlave.physicalAge > random(0,100))>> <<set $activeSlave.hears = -1>> + <<if random(0,100) > 90>> + <<set $activeSlave.hears = -2>> + <</if>> <</if>> /% Since we use nationality for height effects we need to initialize it now instead of later on like in vanilla Free Cities. %/ diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index dbd1e3afbad..a2f8ffea71d 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -2688,7 +2688,7 @@ $His <</if>> <</if>> <<else>> - $his face is featurelessly obscured by the Fuckdoll suit from the top of $his head down to $his face hole. + $His face is featurelessly obscured by the Fuckdoll suit from the top of $his head down to $his face hole. <</if>> <</widget>> -- GitLab