From 71400f5058d5da66ea2adbaf20da8bdf32db1e18 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 18 Dec 2018 23:27:25 -0600
Subject: [PATCH] Hmm
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 2 +-
devNotes/inducedNCS.txt | 16 ++++----
devNotes/twine JS.txt | 10 ++---
player variables documentation - Pregmod.txt | 2 +-
src/facilities/nursery/nursery.tw | 4 +-
src/interaction/cyberConfig.tw | 4 +-
src/pregmod/widgets/pregmodWidgets.tw | 12 +++---
src/uncategorized/RESS.tw | 24 ++++++------
src/uncategorized/RETS.tw | 2 +-
.../freeRangeDairyAssignmentScene.tw | 2 +-
src/uncategorized/pePitFight.tw | 21 ++++++-----
src/uncategorized/surgeryDegradation.tw | 6 +--
src/uncategorized/walkPast.tw | 2 +-
src/utility/optionsWidgets.tw | 37 +++++++++----------
14 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index b141fc4fc44..8f558e04bc6 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4813,7 +4813,7 @@
-added fairyanon's descriptions
9
- -fixed extra <</if>> in longSlaveDescrption.tw, line 726 and extra periods
+ -fixed extra <</if>> in longSlaveDescription.tw, line 726 and extra periods
8
-finished vanilla update
diff --git a/devNotes/inducedNCS.txt b/devNotes/inducedNCS.txt
index 15bd5c41445..16c2eec4c4d 100644
--- a/devNotes/inducedNCS.txt
+++ b/devNotes/inducedNCS.txt
@@ -1,11 +1,11 @@
Induced NCS:
The idea is a genetic change that you can't undo, once done. It is an expensive damaging process, and the
- first time it is run many of the secondary sexual characteristics development will reverse strongly:
+ first time it is run many of the secondary sexual characteristics development will reverse strongly:
including height, hips width, shoulders width, dick or clit size, labia or scrotum size, and breast size.
In addition, from then on, every week a small chance of shrinking any of these items. In addition, growth
- features (drugs, hormones, food) work at a disadvantage, while growth-reversal features (drugs, hormones,
- food) work at an advantage. Finally, precocious puberty is generically incremented, such that drugs,
- hormones or treatments that advance puberty are heightened while simultaneously drugs, hormones or
+ features (drugs, hormones, food) work at a disadvantage, while growth-reversal features (drugs, hormones,
+ food) work at an advantage. Finally, precocious puberty is generically incremented, such that drugs,
+ hormones or treatments that advance puberty are heightened while simultaneously drugs, hormones or
treatments that work against puberty are lowered, with the exception of hormone blockers, which work as
advertised.
@@ -34,17 +34,17 @@ Updated sa Long Term Effects.
1: every slave visually appearing less than 9 will not be affected.
2: visually 45 yrs and over will always look 1 year younger each week.
3: from 44 down to 9, the slave accumulates NCSyouthening points every week building towards a sliding
- youthening value which starts at 2 weeks for 44, and evenly progresses towards 10 weeks for slaves
+ youthening value which starts at 2 weeks for 44, and evenly progresses towards 10 weeks for slaves
12 and under.
-
+
Formula, slaves <= 8 are ignored.
Calculate _youtheningDifference the slaves visual age less 8, yielding 0 to say 38 or so, more than
that will be dealt with further down the line. Take the _youthDifference divide by four and add .25
- to evenly break into 0 below 9, and 10 at 45, round to int to get the _youtheningLevel. Subtract
+ to evenly break into 0 below 9, and 10 at 45, round to int to get the _youtheningLevel. Subtract
_youtheningLevel from 11 to find out the _youtheningRequirement
- Every week, slaves that appear older than 8 year old lolis or shotas will have their NCSyouthening
+ Every week, slaves that appear older than 8 year old lolis or shotas will have their NCSyouthening
incremented. Then this youthening is tested against the _youtheningRequirement, if at or better,
the NCS youthens the slave, and resets the NCSyouthening.
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 0460f81e7bd..328deb28c70 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -34863,7 +34863,7 @@ window.GenerateNewSlave = (function(){
/*SecForceEX JS*/
window.SFC = function() {
const V = State.variables;
- if (V.SF.MercCon.CanAttend === -1) {return `The Colonel`;}
+ if (V.SF.MercCon.CanAttend === -1) {return `The Colonel`;}
else {
if (V.SF.Facility.LCActive > 0) {return `Lieutenant Colonel <<= SlaveFullName(V.SF.Facility.LC)>>`;}
else {return `a designated soldier`;}}
@@ -34930,7 +34930,7 @@ window.Count = function() {
}
if (V.terrain !== "oceanic") { T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.max += T.GU;
- T.max += T.LBU, T.Base += T.LB;}
+ T.max += T.LBU, T.Base += T.LB;}
if (V.terrain === "oceanic" || V.terrain === "marine") {
T.NY = S.AircraftCarrier + S.Sub + S.HAT, T.Base += T.NY;
T.NYU = T.ACU + T.SubU + T.HATU, T.max += T.NYU;}
@@ -35252,21 +35252,21 @@ window.Interactions = function() {
choice = `$SF.Caps is turning over spare capital in tribute this week. `;
if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"I think I can find @@.yellowgreen;<<print cashFormat(Math.ceil($CashGift))>>@@ for you, boss."`;}
- else {
+ else {
choice += `"We can spare@@.yellowgreen;<<print cashFormat(Math.ceil($CashGift))>>@@ in tribute this week, `;
if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}
else if (V.choice == 2){
choice = `$SF.Caps will be throwing a military parade this week. `;
if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"I expect the @@.green;public to enjoy@@ the parade, boss."`;}
- else {
+ else {
choice += `"I'll have plans for an @@.green;popular parade@@ on your desk, `;
if (V.PC.title != 1){choice += `sir."`;}else{choice += `ma'am."`;}}}
else if (V.choice == 3){
choice = `$SF.Caps will be conducting corporate sabotage on rival arcologies' businesses. `;
if (V.SF.MercCon.CanAttend === -1 && (C.Talk + C.Fun !== 1)) {
choice += `"Our interests should see a @@.yellowgreen;big boost,@@ boss."`;}
- else {
+ else {
choice += `"Your @@.yellowgreen;arcology's business prospects should see an improvement@@ this week, <<= properTitle()>>.`;
}}}
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index f0bb6410e8c..48bfbc48c7a 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -164,7 +164,7 @@ lactation:
is player lactating
0 - no
1 - yes
-
+
lactationDuration:
how many more weeks the player will lactate for
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index a712d623d15..e563599966f 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -426,7 +426,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
Hormone levels are purposefully set higher than recommended; over-active reproductive systems likely.
[[Limit|Nursery][$nurseryHormonesSetting = 1]] | [[Disable|Nursery][$nurseryHormonesSetting = 0]]
<<elseif $nurseryHormonesSetting == 1>>
- Hormone levels are being carefully managed; children will be released with fully functional reproductive organs.
+ Hormone levels are being carefully managed; children will be released with fully functional reproductive organs.
[[Overload|Nursery][$nurseryHormonesSetting = 2]] | [[Disable|Nursery][$nurseryHormonesSetting = 0]]
<<elseif $nurseryHormonesSetting == 0>>
Hormones management systems are offline; children will undergo normal puberty.
@@ -517,7 +517,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
very impressive.
<<else>>
immense.
- <</if>> /* TODO: how much of this would make sense to include?
+ <</if>> /* TODO: how much of this would make sense to include?
<<if $cribs[$i].dick > 0>>
<<if $cribs[$i].dick <= 3>>
The latest analysis reported $his dick will end up being around the average
diff --git a/src/interaction/cyberConfig.tw b/src/interaction/cyberConfig.tw
index 063bfbc1e55..dd2c8a9a829 100644
--- a/src/interaction/cyberConfig.tw
+++ b/src/interaction/cyberConfig.tw
@@ -151,9 +151,9 @@
<<set $activeSlave.amp = 1>>
Due to built-in safeties it is necessary to remove each limb separately, first releasing the lock and then waiting for automated seal release.<br>
<<if ($activeSlave.devotion > 20)>>
- You instruct $him to lie down on the table and proceed to remove $his limbs. $He <<if canSee($activeSlave)>>watches<<else>>listens<</if>> with interest as you work.<<if ($activeSlave.devotion > 50)>> As you remove the last limb $he playfully wiggles $his stumps at you.<</if>>
+ You instruct $him to lie down on the table and proceed to remove $his limbs. $He <<if canSee($activeSlave)>>watches<<elseif canHear($activeSlave)>>listens<<else>>waits<</if>> with interest as you work.<<if ($activeSlave.devotion > 50)>> As you remove the last limb $he playfully wiggles $his stumps at you.<</if>>
<<else>>
- You order $him to lie down on the table and proceed to remove $his limbs. $He <<if canSee($activeSlave)>>watches<<else>>listens<</if>> with a bitter expression as you work.
+ You order $him to lie down on the table and proceed to remove $his limbs. $He <<if canSee($activeSlave)>>watches<<elseif canHear($activeSlave)>>listens<<else>>waits<</if>> with a bitter expression as you work.
<</if>>
<<case 2>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 14a9853e518..c98e43d1949 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1161,12 +1161,12 @@ extremely pale -5
<<widget "GenSkinTone">>
<<script>>
(function() {
- var skinToMelanin = {'pure black': 10, ebony: 9.5, black: 9, 'dark brown': 8.5, brown: 8, 'light brown': 7.5, dark: 7, 'dark olive': 6.5, bronzed: 6, tanned: 5.5, natural: 5, olive: 4.5, 'light olive': 4, lightened: 3.5, light: 3, white: 2.5, fair: 2, 'very fair': 1.5, 'extremely fair': 1.25, pale: 1, 'extremely pale': 0.5, 'pure white': 0};
- var parents = State.variables.args;
- var skin0 = parents[0] ? (skinToMelanin[parents[0].skin] || 5) : 3;
- var skin1 = parents[1] ? (skinToMelanin[parents[1].skin] || 5) : 3;
- var skin = Math.round(Math.random() * (skin1 - skin0) + skin0);
- State.variables.activeSlave.skin = ['pure white', 'extremely pale', 'pale', 'extremely fair', 'very fair', 'fair', 'white', 'light', 'lightened', 'light olive', 'olive', 'natural', 'tanned', 'bronzed', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'ebony', 'black', 'pure black'][skin];
+ var skinToMelanin = {'pure black': 10, ebony: 9.5, black: 9, 'dark brown': 8.5, brown: 8, 'light brown': 7.5, dark: 7, 'dark olive': 6.5, bronzed: 6, tanned: 5.5, natural: 5, olive: 4.5, 'light olive': 4, lightened: 3.5, light: 3, white: 2.5, fair: 2, 'very fair': 1.5, 'extremely fair': 1.25, pale: 1, 'extremely pale': 0.5, 'pure white': 0};
+ var parents = State.variables.args;
+ var skin0 = parents[0] ? (skinToMelanin[parents[0].skin] || 5) : 3;
+ var skin1 = parents[1] ? (skinToMelanin[parents[1].skin] || 5) : 3;
+ var skin = Math.round(Math.random() * (skin1 - skin0) + skin0);
+ State.variables.activeSlave.skin = ['pure white', 'extremely pale', 'pale', 'extremely fair', 'very fair', 'fair', 'white', 'light', 'lightened', 'light olive', 'olive', 'natural', 'tanned', 'bronzed', 'dark olive', 'dark', 'light brown', 'brown', 'dark brown', 'ebony', 'black', 'pure black'][skin];
})();
<</script>>
<</widget>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index c886300f1b8..6afe08e723f 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2827,7 +2827,7 @@ neck, $activeSlave.skin, <<if $activeSlave.muscles > 95>>hugely muscled<<elseif
<<case "bonded love">>
-Working in your office early in the morning, you can hear the low, human hum of your slaves who work during the daytime busily getting ready for their days. Suddenly, there's motion at your doorway, and <<EventNameLink $activeSlave>> hurries in. $He's nude, $his $activeSlave.skin skin glowing with the fresh cleanliness of having just gotten out of the shower. $He <<if canSee($activeSlave)>>glances at you<<else>>listens<</if>> to see if $he's unwelcome, and seeing no sign that $he is, the devoted $desc comes over to your desk.
+Working in your office early in the morning, you can hear the low, human hum of your slaves who work during the daytime busily getting ready for their days. Suddenly, there's motion at your doorway, and <<EventNameLink $activeSlave>> hurries in. $He's nude, $his $activeSlave.skin skin glowing with the fresh cleanliness of having just gotten out of the shower. $He <<if canSee($activeSlave)>>glances at you<<elseif canHear($activeSlave)>>listens<<else>>waits<</if>> to see if $he's unwelcome, and seeing no sign that $he is, the devoted $desc comes over to your desk.
<<if $activeSlave.boobs < 400>>
$His little $activeSlave.boobShape tits barely move at all as $he walks, though $his $activeSlave.nipples nipples certainly catch your eye.
<<elseif Math.floor($activeSlave.boobsImplant/$activeSlave.boobs) >= .75>> /* tiny little 200cc implants in 20000cc tits are laughable. Now we make sure those tits are fake. */
@@ -5839,7 +5839,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
<br><<link "Spend the day in bed">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistantName to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick == 1>>get a blowjob<<if $PC.vagina == 1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick == 1>>shot your load down her throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<else>>listen to<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<else>>listening intently<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
+ What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistantName to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick == 1>>get a blowjob<<if $PC.vagina == 1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick == 1>>shot your load down her throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<elseif canHear($activeSlave)>>listen to<<else>>put on<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<else>>listening intently<<else>>staying as silent as possible<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
<<set $activeSlave.oralCount++, $oralTotal++>>
You have a meal delivered,
<<if $activeSlave.vagina > 0 && canDoVaginal($activeSlave)>>
@@ -5852,7 +5852,7 @@ brought in to you. This time <<EventNameLink $activeSlave>> has been sent to del
fuck $him,
<<set $activeSlave.oralCount++, $oralTotal++>>
<</if>>
- and then share a shower and a nap. Thus invigorated, you decide to tour the arcology's nightlife, and tell her $he'll accompany you. $He hurries to get ready, filled with excitement. A lovely day.
+ and then share a shower and a nap. Thus invigorated, you decide to tour the arcology's nightlife, and tell $him $he'll accompany you. $He hurries to get ready, filled with excitement. A lovely day.
<<set $activeSlave.trust += 4>>
<<if _didAnal == 1>>
<<= AnalVCheck()>>
@@ -10719,15 +10719,15 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<else>>
$He <<say>>s, a little tearfully, "<<Master>>, thi<<s>> guy wanted to u<<s>>e my butt in public. <<S>>o of cour<<s>>e I let him, and he made me <<s>>it in hi<<s>> lap to do it, and held my leg<<s>> back <<s>>o everyone could <<s>>ee! And then another guy thought it wa<<s>> hot and waited, and then fucked me in my a<<ss>> too. Another girl finally noti<<c>>ed and re<<s>>cued me after four cock<<s>>, <<Master>>. I'm really <<s>>ore."
<</if>>
- $He <<if canSee($activeSlave)>>looks up at you with big $activeSlave.eyeColor eyes<<else>>gazes at you<</if>> for a long moment, a final tear leaking down her $activeSlave.skin cheek, before $he suddenly
+ $He <<if canSee($activeSlave)>>looks up at you with big $activeSlave.eyeColor eyes<<else>>gazes at you<</if>> for a long moment, a final tear leaking down $his $activeSlave.skin cheek, before $he suddenly
<<if !canTalk($activeSlave)>>
shakes with mute laughter.
<<else>>
giggles.
<</if>>
- $He explains $himself after a while: it's not what $he thought $he'd be doing with her life,
+ $He explains $himself after a while: it's not what $he thought $he'd be doing with $his life,
<<switch $activeSlave.career>>
- <<case "a breeder" "a Futanari Sister" "a fuckdoll" "a bioreactor" "a slave" "a dairy slave" "a dairy cow" "a breeding bull" 0>>
+ <<case "a bioreactor" "a breeder" "a breeding bull" "a dairy cow" "a dairy slave" "a fuckdoll" "a Futanari Sister" "a slave" 0>>
once upon a time.
<<default>>
back when $he was $activeSlave.career.
@@ -10740,15 +10740,15 @@ You tell her kindly that you understand, and that $he'll be trained to address t
$He kisses you on the cheek and @@.mediumaquamarine;thanks you@@ for listening instead of raping $him.
<<set $activeSlave.trust += 4>>
<br><br><span id="result2">
- <<link "Kiss her back">>
+ <<link "Kiss $him back">>
<<replace "#result2">>
You turn to kiss her back, on the lips this time. $He <<if canSee($activeSlave)>>sees<<else>>feels<</if>> your intention and @@.mediumaquamarine;complies trustingly,@@ closing $his eyes and tilting her head slightly so your lips lock perfectly.
<<if ($activeSlave.lips > 70)>>
$His ridiculous, pillowlike lips part softly.
<<elseif ($activeSlave.teeth == "pointy")>>
- $He opens her jaw wide, careful to keep her shark's teeth well clear of you.
+ $He opens $his jaw wide, careful to keep $his shark's teeth well clear of you.
<</if>>
- After a few seconds, $he realizes you aren't planning to break the kiss anytime soon, and softens, her<<if $activeSlave.bellyPreg >= 1500>> pregnant<</if>> body relaxing against yours. $He scoots closer to you, bringing $his legs up under her on the couch cushions so $he can face you comfortably. $He leans one
+ After a few seconds, $he realizes you aren't planning to break the kiss anytime soon, and softens, $his<<if $activeSlave.bellyPreg >= 1500>> pregnant<</if>> body relaxing against yours. $He scoots closer to you, bringing $his legs up under her on the couch cushions so $he can face you comfortably. $He leans one
<<if $activeSlave.weight > 160>>
extremely well padded
<<elseif $activeSlave.weight > 95>>
@@ -10764,7 +10764,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<set $activeSlave.trust += 2>>
<</replace>>
<</link>>
- <br><<link "Rape her">>
+ <br><<link "Rape $him">>
<<replace "#result2">>
But $he's wrong to place that kind of faith in you. As $he withdraws from the kiss, you snake a betraying hand between $his butt and the couch, and shove
<<if $activeSlave.anus <= 1>>
@@ -10780,7 +10780,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<else>>
face first
<</if>>
- on the floor in front of you. $He tries to spread $his butt and angle $his hips like a good $girl, but you slap $his hands away and push your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> inside her without regard for her poor anus. $He shudders and begins to cry, and keeps crying as you ravage $his asshole. When you climax and pull out, $he continues to weep, but stumbles off to wash. When $he comes back, $he's still sniffling, but without being prompted,
+ on the floor in front of you. $He tries to spread $his butt and angle $his hips like a good $girl, but you slap $his hands away and push your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> inside her without regard for $his poor anus. $He shudders and begins to cry, and keeps crying as you ravage $his asshole. When you climax and pull out, $he continues to weep, but stumbles off to wash. When $he comes back, $he's still sniffling, but without being prompted,
<<if $activeSlave.belly >= 300000>>
@@.hotpink;$he leans over $his belly and offers you her sore butthole again.@@
<<else>>
@@ -19703,7 +19703,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t
<<= AnalVCheck()>>
<</replace>>
<</link>><<if $activeSlave.anus == 0>>//This option will take anal virginity//<</if>>
-<br><<link "Ignore her pleas">>
+<br><<link "Ignore $his pleas">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You order $him to take the next pose in the inspection series, as though $he hadn't broken down at all. There's such understated menace in your voice that $he gets right back to her feet, using the back of a $activeSlave.skin hand to cuff away her tears. "Y-ye<<s>>, <<Master>>," $he sniffles, trying to get $himself under control, and then shudders.
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index fc09ffe9af8..cadb2bc0441 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1589,7 +1589,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<br><<link "$His butt is being saved for later">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You tell $him to sit down on the couch and listen. $He obeys, carefully avoiding the spot where you and $subSlave.slaveName embraced. You explain that $subSlave.slaveName is an experienced anal slave, and that you enjoy having sex with _him2 there. You point out how much $subSlave.slaveName enjoyed _himself2 ($activeSlave.slaveName studiously avoids <<if canSee($activeSlave)>>looking at<<else>>facing<</if>> the moist spot on the couch that evidences this), and tell $him that anal sex can be very enjoyable. $He <<if canSee($activeSlave)>>looks at<<else>>listens to<</if>> you uncomprehendingly,<<if $activeSlave.belly >= 5000>> $his hand resting on $his rounded middle,<</if>> so you try a different tack. You tell $him that $his anal virginity has a price: it makes $him a more valuable slave. $He'll probably be fucked back there someday soon, but it's not something you plan to do lightly. And in any case, $he'll be trained to enjoy the experience when it happens. Hesitantly, $he <<say>>s, "I under<<s>>tand, <<Master>>. I @@.mediumaquamarine;tru<<s>>t you.@@" $He seems more confident for the rest of the inspection, and when it's done, $he leaves with less worry on $his face.
+ You tell $him to sit down on the couch and listen<<if !canHear($activeSlave)>>, so to speak<</if>>. $He obeys, carefully avoiding the spot where you and $subSlave.slaveName embraced. You explain that $subSlave.slaveName is an experienced anal slave, and that you enjoy having sex with _him2 there. You point out how much $subSlave.slaveName enjoyed _himself2 ($activeSlave.slaveName studiously avoids <<if canSee($activeSlave)>>looking at<<else>>facing<</if>> the moist spot on the couch that evidences this), and tell $him that anal sex can be very enjoyable. $He <<if canSee($activeSlave)>>looks at<<elseif canHear($activeSlave)>>listens to<<else>>waits for<</if>> you uncomprehendingly,<<if $activeSlave.belly >= 5000>> $his hand resting on $his rounded middle,<</if>> so you try a different tack. You tell $him that $his anal virginity has a price: it makes $him a more valuable slave. $He'll probably be fucked back there someday soon, but it's not something you plan to do lightly. And in any case, $he'll be trained to enjoy the experience when it happens. Hesitantly, $he <<say>>s, "I under<<s>>tand, <<Master>>. I @@.mediumaquamarine;tru<<s>>t you.@@" $He seems more confident for the rest of the inspection, and when it's done, $he leaves with less worry on $his face.
<<set $activeSlave.trust += 5>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 398014ac454..534d1c2c0ff 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -359,7 +359,7 @@ With the first milking cycle being over, $activeSlave.slaveName drifts into a re
$He grins madly around the phallus $he stuffed in $his mouth.
<</if>>
<<if $dairyPregSetting > 0 && isFertile($activeSlave) && $activeSlave.vagina > 0>>
- $He gets comfortable around $his cum-bloated belly as the impregantor continues its task.
+ $He gets comfortable around $his cum-bloated belly as the impregnator continues its task.
<</if>>
<<if $activeSlave.lactation > 0>>
The milking cups <<if $activeSlave.nipples == "fuckable">>over<<else>>on<</if>> $his nipples pulse slower and with less vigor. The lactation never fully subsides. The steady but gentle suction helps increasing milk production without actually draining the breasts.
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index c3680abf0bd..6dffe6e9ce1 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -144,23 +144,24 @@ Across the ring, $his opponent's owner nods civilly to you and examines $activeS
Finally, $his opponent enters as well.
<<set _randomOpponent = random(1,120)>>
+<<setNonlocalPronouns $seeDicks>>
<<if _randomOpponent > 100>>
- She is a hulking, musclebound girl with a wasp waist and immense rear. She seems nothing short of excited.
+ _HeU is a hulking, musclebound girl with a wasp waist and immense rear. _HeU seems nothing short of excited.
<<set _opponent = 6>>
<<elseif _randomOpponent > 80>>
- She is a huge, muscular Amazon filled with confidence.
+ _HeU is a huge, muscular Amazon filled with confidence.
<<set _opponent = 5>>
<<elseif _randomOpponent > 60>>
- She is a short but muscular shemale, trying to look confident.
+ _HeU is a short but muscular shemale, trying to look confident.
<<set _opponent = 4>>
<<elseif _randomOpponent > 40>>
- She is a tall, thin woman covered in ropy muscle, trying to hide her terror.
+ _HeU is a tall, thin woman covered in ropy muscle, trying to hide _hisU terror.
<<set _opponent = 3>>
<<elseif _randomOpponent > 20>>
- She is a decent-looking slave, physically fit but obviously scared.
+ _HeU is a decent-looking slave, physically fit but obviously scared.
<<set _opponent = 2>>
<<else>>
- She is an average looking slave, so frightened there's urine running down her leg. She must have annoyed her master to earn this.
+ _HeU is an average looking slave, so frightened there's urine running down _hisU leg. _HeU must have annoyed _hisU master to earn this.
<<set _opponent = 1>>
<</if>>
@@ -169,23 +170,23 @@ The umpire announces gravely that the fight is to the death and rings a bell.
<br><br>
<<if $deadliness > (_opponent + 1)>>
- $activeSlave.slaveName senses that $he is greatly superior, and decides to make a quick end before $his opponent can try something foolish. $He feints high and stabs low; $his enemy just manages to parry the low stab, but is so much weaker that $activeSlave.slaveName simply overpowers her, so that she falls onto her back with the force of the clash. $activeSlave.slaveName takes one step forward and runs $his sword through the prostrate slave's heart. This victory has @@.green;won you some renown@@ and @@.yellowgreen;a sum of money@@ from each of the spectators.
+ $activeSlave.slaveName senses that $he is greatly superior, and decides to make a quick end before $his opponent can try something foolish. $He feints high and stabs low; $his enemy just manages to parry the low stab, but is so much weaker that $activeSlave.slaveName simply overpowers _himU, so that _heU falls onto _hisU back with the force of the clash. $activeSlave.slaveName takes one step forward and runs $his sword through the prostrate slave's heart. This victory has @@.green;won you some renown@@ and @@.yellowgreen;a sum of money@@ from each of the spectators.
<<set $rep += 500>>
<<set $cash += 5000>>
<<set $activeSlave.pitKills += 1>>
<<set $pitKillsTotal += 1>>
<<elseif $deadliness > (_opponent)>>
- The combat is long and exhausting. $activeSlave.slaveName and $his opponent are closely matched in terms of skill, so neither takes foolish risks and a protracted, bloody fight results as both slaves take horrible but non-lifethreatening cuts. Finally, $activeSlave.slaveName's superior physical condition wins out and $his opponent falls from exhaustion and blood loss. $activeSlave.slaveName stumbles over to open her throat. This victory has @@.green;won you some renown@@ and @@.yellowgreen;a sum of money@@ from each of the spectators, though $activeSlave.slaveName is @@.red;badly hurt.@@
+ The combat is long and exhausting. $activeSlave.slaveName and $his opponent are closely matched in terms of skill, so neither takes foolish risks and a protracted, bloody fight results as both slaves take horrible but non-life-threatening cuts. Finally, $activeSlave.slaveName's superior physical condition wins out and $his opponent falls from exhaustion and blood loss. $activeSlave.slaveName stumbles over to open _hisU throat. This victory has @@.green;won you some renown@@ and @@.yellowgreen;a sum of money@@ from each of the spectators, though $activeSlave.slaveName is @@.red;badly hurt.@@
<<set $rep += 500>>
<<set $cash += 5000>>
<<set $activeSlave.health = -50>>
<<set $activeSlave.pitKills += 1>>
<<set $pitKillsTotal += 1>>
<<elseif $deadliness > (_opponent-1)>>
- The combat is long and exhausting. $activeSlave.slaveName and $his opponent are closely matched in terms of skill, so neither takes foolish risks and a protracted, bloody fight results as both slaves take horrible but non-lifethreatening cuts. Finally, $activeSlave.slaveName's inferior physical condition fails $him and $he falls from exhaustion and blood loss. As $he slumps $he catches your eye with a look of apology. $His opponent stumbles over to open $his throat. $activeSlave.slaveName @@.red;has been killed.@@
+ The combat is long and exhausting. $activeSlave.slaveName and $his opponent are closely matched in terms of skill, so neither takes foolish risks and a protracted, bloody fight results as both slaves take horrible but non-life-threatening cuts. Finally, $activeSlave.slaveName's inferior physical condition fails $him and $he falls from exhaustion and blood loss. As $he slumps $he catches your eye with a look of apology. $His opponent stumbles over to open $his throat. $activeSlave.slaveName @@.red;has been killed.@@
<<set $activeSlave.health -= 1000>>
<<else>>
- $activeSlave.slaveName is outmatched from the start. In the first pass, $his opponent moves beyond $him, opening a long gash in $his thigh as she goes. Thus injured, $activeSlave.slaveName fails to block a slash that severs $his Achilles tendon on the other side. On $his knees, $he barely manages to ward off one more blow before the second one opens $his belly. $activeSlave.slaveName @@.red;has been killed.@@
+ $activeSlave.slaveName is outmatched from the start. In the first pass, $his opponent moves beyond $him, opening a long gash in $his thigh as _heU goes. Thus injured, $activeSlave.slaveName fails to block a slash that severs $his Achilles tendon on the other side. On $his knees, $he barely manages to ward off one more blow before the second one opens $his belly. $activeSlave.slaveName @@.red;has been killed.@@
<<set $activeSlave.health -= 1000>>
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 83c2a67ce46..de35b9e454f 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -105,7 +105,7 @@
<<else>>
<<switch $surgeryType>>
- <<case "fuckdoll" "mindbreak" "blind" "remove eyes" "amp" "removeLimbs" "amp1" "PLimb interface1" "PLimb interface2" "PLimb interface3">>
+ <<case "amp" "amp1" "blind" "fuckdoll" "mindbreak" "PLimb interface1" "PLimb interface2" "PLimb interface3" "remove eyes" "removeLimbs">>
<<set _ID = $activeSlave.ID>>
<<if _ID == $Lurcher.ID>><<set $Lurcher = 0>><</if>>
<<if _ID == $Recruiter.ID>><<set $Recruiter = 0>><</if>>
@@ -477,7 +477,7 @@ As the remote surgery's long recovery cycle completes,
<<replace "#seed">>
You simply take $him on the spot, using $him to your liking and shooting a load deep into $his receptive pussy. The implant rewards $him upon successful fertilization, so $his moans of pleasure as you pull out of $him inform you $he'll soon <<if $activeSlave.broodmother == 2>>be greatly swollen<<else>>grow heavy<</if>> with @@.lime;your brood.@@
<<set $activeSlave.pregSource = -1>>
- <<set WombImpregnate($activeSlave, 1, -1, 1)>> /* to ensure player fatherinity we need actual fetus here */
+ <<set WombImpregnate($activeSlave, 1, -1, 1)>> /* to ensure player paternity we need actual fetus here */
<<= VaginalVCheck()>>
<</replace>>
<</link>>
@@ -486,7 +486,7 @@ As the remote surgery's long recovery cycle completes,
<<case "preg1hack">>
The hacking process is brief, being little more than inserting the actuator into $his vagina, and leaves $him with @@.red;nothing more than minor health effects@@ from the altered implant functions. $He leaves the surgery without any specific feeling, but $he knows that something has been done to $his implant.
- <<set $activeSlave.broodmotherFetuses = either(2, 2, 2, 2, 3, 3, 4)>> /*My testing show that 2 or 3 relatively safe for generic adult slave with effective curatives or clinic, 4 - high risk of bursting. So there is a catch with it.*/
+ <<set $activeSlave.broodmotherFetuses = either(2, 2, 2, 2, 3, 3, 4)>> /*My testing shows that 2 or 3 relatively safe for generic adult slave with effective curatives or clinic, 4 - high risk of bursting. So there is a catch with it.*/
<<if $activeSlave.fetish == "mindbroken">>
/*nothing*/
<<elseif ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 83d9310b667..3218f7b36ea 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -336,7 +336,7 @@
<<else>> /* TOGETHER TIME */
<<if ($activeSlave.actualAge >= _partnerSlave.actualAge+10) && canTalk(_partnerSlave)>>
- tidying up their room together. _partnerSlave.slaveName is chattering about _his2 day, while $activeSlave.slaveName listens quietly, smiling fondly at $his _activeSlaveRel's prattle.
+ tidying up their room together. _partnerSlave.slaveName is chattering about _his2 day, while $activeSlave.slaveName <<if canHear($activeSlave)>>listens<<else>>works<</if>> quietly, smiling fondly at $his _activeSlaveRel's prattle.
<<elseif ($activeSlave.amp !== 1) && !canTalk($activeSlave)>>
getting ready for bed. $activeSlave.slaveName is using gestures to tell $his $activeSlave.slaveName about $his day; _partnerSlave.slaveName is very patient and does _his2 best to follow.
<<elseif ($activeSlave.behavioralQuirk == "confident") && canTalk($activeSlave)>>
diff --git a/src/utility/optionsWidgets.tw b/src/utility/optionsWidgets.tw
index e536ed037da..9dbaa27d048 100644
--- a/src/utility/optionsWidgets.tw
+++ b/src/utility/optionsWidgets.tw
@@ -5,7 +5,7 @@
Should be placed in a <span> with id = "OptionLineSeparations"
%/
<<widget "OptionLineSeparations">>
-Line separations are
+Line separations are
<<if $lineSeparations == 0>>
@@.red;HIDDEN.@@
//<<link 'Show'>>
@@ -74,21 +74,21 @@ Line separations are
<<OptionSortBy>>
<</replace>>
<</link>>
-|
+|
<<link 'Age'>>
<<set $sortSlavesBy = "actualAge">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
-|
+|
<<link 'How old they look'>>
<<set $sortSlavesBy = "visualAge">>
<<replace '#OptionSortBy'>>
<<OptionSortBy>>
<</replace>>
<</link>>
-|
+|
<<link 'Age of their body'>>
<<set $sortSlavesBy = "physicalAge">>
<<replace '#OptionSortBy'>>
@@ -163,7 +163,6 @@ Line separations are
<</if>>
<</widget>>
-
/%
Call as <<OptionRulesAssistantMain>>
Should be placed in a <span> with id = "OptionRulesAssistantMain"
@@ -204,7 +203,7 @@ Main menu assignment shortcuts are
<</replace>>
<</link>>//
<<else>>
- @@.red;HIDDEN.@@
+ @@.red;HIDDEN.@@
//<<link 'Show'>>
<<set $displayAssignments = 1>>
<<replace '#OptionDisplayAssignments'>>
@@ -222,7 +221,7 @@ Main menu assignment shortcuts are
<<widget "OptionSummaryStats">>
Granular slave stat numbers are
<<if $summaryStats == 1>>
- @@.cyan;DISPLAYED.@@
+ @@.cyan;DISPLAYED.@@
//<<link 'Hide'>>
<<set $summaryStats = 0>>
<<replace '#OptionSummaryStats'>>
@@ -230,7 +229,7 @@ Granular slave stat numbers are
<</replace>>
<</link>>//
<<else>>
- @@.red;HIDDEN.@@
+ @@.red;HIDDEN.@@
//<<link 'Display'>>
<<set $summaryStats = 1>>
<<replace '#OptionSummaryStats'>>
@@ -749,7 +748,7 @@ Race is
<<widget "OptionAbbreviateClothes">>
Clothes are
<<if $abbreviateClothes == 2>>
- @@.cyan;SUMMARIZED.@@
+ @@.cyan;SUMMARIZED.@@
//<<link 'Hide'>>
<<set $abbreviateClothes = 0>>
<<replace '#OptionAbbreviateClothes'>>
@@ -757,7 +756,7 @@ Clothes are
<</replace>>
<</link>>//
<<else>>
- @@.red;HIDDEN.@@
+ @@.red;HIDDEN.@@
//<<link 'Summarize'>>
<<set $abbreviateClothes = 2>>
<<replace '#OptionAbbreviateClothes'>>
@@ -774,7 +773,7 @@ Clothes are
<<widget "OptionAbbreviateOrigins">>
Origins are
<<if $abbreviateOrigins == 2>>
- @@.cyan;SUMMARIZED.@@
+ @@.cyan;SUMMARIZED.@@
//<<link 'Hide'>>
<<set $abbreviateOrigins = 0>>
<<replace '#OptionAbbreviateOrigins'>>
@@ -782,7 +781,7 @@ Origins are
<</replace>>
<</link>>//
<<else>>
- @@.red;HIDDEN.@@
+ @@.red;HIDDEN.@@
//<<link 'Summarize'>>
<<set $abbreviateOrigins = 2>>
<<replace '#OptionAbbreviateOrigins'>>
@@ -799,7 +798,7 @@ Origins are
<<widget "OptionAbbreviateRulesets">>
Rules Assistant rulesets are
<<if $abbreviateRulesets == 2>>
- @@.cyan;SUMMARIZED.@@
+ @@.cyan;SUMMARIZED.@@
//<<link 'Hide'>>
<<set $abbreviateRulesets = 0>>
<<replace '#OptionAbbreviateRulesets'>>
@@ -807,7 +806,7 @@ Rules Assistant rulesets are
<</replace>>
<</link>>//
<<else>>
- @@.red;HIDDEN.@@
+ @@.red;HIDDEN.@@
//<<link 'Summarize'>>
<<set $abbreviateRulesets = 2>>
<<replace '#OptionAbbreviateRulesets'>>
@@ -824,7 +823,7 @@ Rules Assistant rulesets are
<<widget "OptionAbbreviateSidebar">>
Facilities in the sidebar are
<<if $abbreviateSidebar == 2>>
- @@.cyan;SUMMARIZED.@@
+ @@.cyan;SUMMARIZED.@@
//<<link 'Abbreviate'>>
<<set $abbreviateSidebar = 1>>
<<replace '#OptionAbbreviateSidebar'>>
@@ -832,7 +831,7 @@ Facilities in the sidebar are
<</replace>>
<</link>>//
<<else>>
- @@.yellow;ABBREVIATED.@@
+ @@.yellow;ABBREVIATED.@@
//<<link 'Summarize'>>
<<set $abbreviateSidebar = 2>>
<<replace '#OptionAbbreviateSidebar'>>
@@ -847,9 +846,9 @@ Facilities in the sidebar are
Should be placed in a <span> with id = "OptionAbbreviateMissing"
%/
<<widget "OptionAbbreviateMissing">>
-Missing slave parents are
+Missing slave parents are
<<if $showMissingSlavesSD>>
- @@.cyan;SHOWN.@@
+ @@.cyan;SHOWN.@@
//<<link 'Hide'>>
<<set $showMissingSlavesSD = false>>
<<replace '#OptionAbbreviateMissing'>>
@@ -857,7 +856,7 @@ Missing slave parents are
<</replace>>
<</link>>//
<<else>>
- @@.red;HIDDEN.@@
+ @@.red;HIDDEN.@@
//<<link 'Show'>>
<<set $showMissingSlavesSD = true>>
<<replace '#OptionAbbreviateMissing'>>
--
GitLab