From e3369690eea959ccd16b6027a10397ea7f76e718 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 8 Apr 2018 02:22:56 -0400
Subject: [PATCH] fixes and sanityCheck update.
---
sanityCheck | 4 ++--
src/player/actions/fondleBoobs.tw | 16 +++++++++++++++-
src/pregmod/fDick.tw | 3 +++
src/uncategorized/remoteSurgery.tw | 2 +-
4 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/sanityCheck b/sanityCheck
index 4439db027c1..1392ffad385 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -83,8 +83,8 @@ $GREP -E "<<display|<<click|<<.*\.contains" -- src/*.tw | myprint "ObsoleteMacro
# Check for double articles
$GREP -E "\Wa an\W" -- src/*.tw | myprint "DoubleArticle"
# Check for incorrect articles
-$GREP -i -E "\Wa (a|e|i|o|u)." -- src/*.tw | grep -i -vE "\Wa (un|eu|us|ut|on|ur|in)." | grep -i -vE "(&|<<s>>|UM)." | myprint "IncorrectArticle"
-$GREP -i -E "\Wan (b|c|d|f|g|j|k|l|m|n|p|q|r|s|t|v|w|x|y|z)\w." -- src/*.tw | grep -i -vE "[A-Z]{3}" | myprint "IncorrectArticle"
+$GREP -i -E "\Wa (a|e|i|o|u)." -- src/*.tw | grep -a -i -vE "\Wa (un|eu|us|ut|on|ur|in)." | grep -a -i -vE "(&|<<s>>|UM)." | myprint "IncorrectArticle"
+$GREP -i -E "\Wan (b|c|d|f|g|j|k|l|m|n|p|q|r|s|t|v|w|x|y|z)\w." -- src/*.tw | grep -a -i -vE "[A-Z]{3}" | myprint "IncorrectArticle"
# Check for $ sign mid-word
$GREP -i "\w$\w" -- src/*.tw | myprint "VarSignMidWord"
# check for $ sign at beginning of macro
diff --git a/src/player/actions/fondleBoobs.tw b/src/player/actions/fondleBoobs.tw
index cebd4c6cce5..058b8a19f3a 100644
--- a/src/player/actions/fondleBoobs.tw
+++ b/src/player/actions/fondleBoobs.tw
@@ -96,7 +96,21 @@ You call her over so you can fondle her
cute breasts,
<<else>>
flat breasts,
- <</if>><<if ($activeSlave.amp != 1)>> she places her hands on your <<if $PC.boobs == 1>>bosom<<else>>manly chest<</if>> in turn, her tendency towards sexual dominance encouraging her to compete with you in fondling each other.<</if>> You both alternate between taking your mouth to her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples and hers to yours, gently nuzzling and nibbling while simultaneously fondling each other all the while. Both of you continue to passionately lick, nibble, stroke and fondle one other until tiredly, she slows down. When you eventually stop, she looks up at you happily. <<if ($activeSlave.accent >= 3)>>She does her best to communicate excitement with her $activeSlave.eyeColor eyes, since she does not speak $language well enough to express herself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave)>>She does her best to communicate excitement with her $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>She signs that she liked that.<<else>>"That wa<<s>> fun, <<Master>>," she <<say>>s cheerfully.<</if>> She looks at you with her $activeSlave.eyeColor eyes, smiling.
+ <</if>>
+ <<if ($activeSlave.amp != 1)>>
+ she places her hands on your <<if $PC.boobs == 1>>bosom<<else>>manly chest<</if>> in turn, her tendency towards sexual dominance encouraging her to compete with you in fondling each other.
+ <</if>>
+ You both alternate between taking your mouth to her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples and hers to yours, gently nuzzling and nibbling while simultaneously fondling each other all the while. Both of you continue to passionately lick, nibble, stroke and fondle one other until tiredly, she slows down. When you eventually stop, she looks up at you happily.
+ <<if ($activeSlave.accent >= 3)>>
+ She does her best to communicate excitement with her $activeSlave.eyeColor eyes, since she does not speak $language well enough to express herself.
+ <<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+ She does her best to communicate excitement with her $activeSlave.eyeColor eyes.
+ <<elseif !canTalk($activeSlave)>>
+ She signs that she liked that.
+ <<else>>
+ "That wa<<s>> fun, <<Master>>," she <<say>>s cheerfully.
+ <</if>>
+ She looks at you with her $activeSlave.eyeColor eyes, smiling.
<<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
She eagerly comes over to you, to stand between you and your desk. You lean over while she submissively lies down upon it, face up, with her breasts pointed to the air. You place your hands on her
<<if ($activeSlave.boobs >= 20000)>>
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index 6900c252409..2f94513c499 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -101,8 +101,11 @@
<<elseif $activeSlave.devotion >= -20>>
You ride her until you both climax.
<<if $activeSlave.trust < -20>>
+ Having hesitatingly followed your instructions, she lies as still as she can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on her terrified cock. While she is too afraid to enjoy pleasuring you, she obediently thrusts into you. She timidly warns you that she is about to cum; in response you speed up your pace and clamp down hard on her throbbing shaft. She cries out in surprise, overwhelmed by your orgasmic <<if $PC.vagina == 1>>cunt<<else>>rectal<</if>> spasms, and blows her load in you like a good little slave.
<<elseif $activeSlave.trust <= 20>>
+ Having obediently followed your instructions, she lies as still as she can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on her willing cock. While she is too uncertain of her position in the hierarchy to really enjoy herself, she hesitatingly thrusts into you. When she feels she is nearing her limit, she gives you proper warning that she is about to cum; in response you speed up your pace and clamp down hard on her throbbing shaft. She cries out in surprise, overwhelmed by your orgasmic <<if $PC.vagina == 1>>cunt<<else>>rectal<</if>> spasms and boldness, and blows her load in you during the confusion.
<<else>>
+ Having obediently followed your instructions, she energetically pounds you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on her eager cock. She grabs your hips and pounds you a little too eagerly, not even slowing down as you begin to feel her tense with orgasm. Without so much as a warning to you, she trembles with orgasm, pumping her load deep into your <<if $PC.vagina == 1>>cunt<<else>>rectum<</if>> and setting off your own. You glare daggers at her as she profusely apologizes for her lack of restraint.
<</if>>
<<else>>
<<if $activeSlave.trust < -20>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 3352f75e5b7..1b6c5711657 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1566,7 +1566,7 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<<if $activeSlave.fuckdoll == 0>>
<br>$pronounCap is a normal sex slave, not a living sex toy.
<<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
- [[Encase in a Fuckdoll suit|Surgery Degradation][$activeSlave.subTarget=0, $activeSlave.sentence=0, $activeSlave.training=0, $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1, $activeSlave.inflation=0, $activeSlave.inflationType="none", $activeSlave.inflationMethod=0, $activeSlave.inflationSource=0, $surgeryType = "fuckdoll"]] //This is permanent and will greatly restrict $possessive//
+ [[Encase in a Fuckdoll suit|Surgery Degradation][$activeSlave.subTarget=0, $activeSlave.sentence=0, $activeSlave.training=0, $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1, $activeSlave.inflation=0, $activeSlave.inflationType="none", $activeSlave.inflationMethod=0, $activeSlave.milkSource=0, $activeSlave.cumSource=0, $surgeryType = "fuckdoll"]] //This is permanent and will greatly restrict $possessive//
<</if>>
<<else>>
<br>$pronounCap is encased in a Fuckdoll suit. [[Extract it|Surgery Degradation][$activeSlave.fuckdoll=0, $activeSlave.clothes="no clothing", $activeSlave.shoes="none", $surgeryType = "fuckdollExtraction"]]
--
GitLab