From 496c79c5c7a0c1a6250e94dfeb1e2b07f4986bb8 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 22 Sep 2018 17:19:51 -0400
Subject: [PATCH] Miscellaneous fixes/tweaks
---
devNotes/twine JS.txt | 2 +
src/js/rulesAssistantOptions.tw | 2 +
src/pregmod/fPat.tw | 8 +--
src/uncategorized/BackwardsCompatibility.tw | 54 ++++++++++++++++-----
4 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index eea039bc3d6..49fb4ff6f9b 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -16815,6 +16815,7 @@ window.rulesAssistantOptions = (function() {
class EarwearList extends List {
constructor() {
const pairs = [
+ ["no default setting"],
["correct with hearing aids"],
["muffle with ear plugs"],
["deafen with ear plugs"]
@@ -17797,6 +17798,7 @@ window.rulesAssistantOptions = (function() {
class CosmeticSurgeryList extends List {
constructor() {
const items = [
+ ["no default setting"],
["none", 0],
["subtle", 1],
["invasive", 2],
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index a819449ff1f..3ac9e938b3e 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -2128,6 +2128,7 @@ window.rulesAssistantOptions = (function() {
class EarwearList extends List {
constructor() {
const pairs = [
+ ["no default setting"],
["correct with hearing aids"],
["muffle with ear plugs"],
["deafen with ear plugs"]
@@ -3110,6 +3111,7 @@ window.rulesAssistantOptions = (function() {
class CosmeticSurgeryList extends List {
constructor() {
const items = [
+ ["no default setting"],
["none", 0],
["subtle", 1],
["invasive", 2],
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index 923773fb57e..4b771b9e620 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -116,7 +116,7 @@ You tell $activeSlave.slaveName to
You walk around $him, drawing closer and slowly resting your hand on $his head. You let it rest for a few seconds to get $him accustomed to your touch.
<<if ($activeSlave.fetish == "mindbroken")>>
- Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your poor mentally shattered slave's inability to resist you. $He initially reacts slightly to your physical touch, but soon stops reacting completely. Nevertheless, you continue to gingerly stroke $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>shaven scalp <<else>>hair <</if>>, as you gently press his body into your chest<<if $activeSlave.amp == 1>> and onto your lap<</if>>. The warmth from your slave's body, and the action of petting $his head, combinded with the sound of $his breathing, allow you to feel more relaxed by the minute.
+ Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your poor mentally shattered slave's inability to resist you. $He initially reacts slightly to your physical touch, but soon stops reacting completely. Nevertheless, you continue to gingerly stroke $his <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>shaven scalp <<else>>hair <</if>>, as you gently press his body into your chest<<if $activeSlave.amp == 1>> and onto your lap<</if>>. The warmth from your slave's body, and the action of petting $his head, combined with the sound of $his breathing, allow you to feel more relaxed by the minute.
<<elseif ($activeSlave.relationship == -3) && $activeSlave.devotion+$activeSlave.trust >= 175>>
Tenderly and lovingly you brush your fingers along $his head, enjoying the feeling of your slave's utterly willing submission. $He slowly leans $his body closer and closer to you<<if $activeSlave.amp == 1>> and finally onto your lap<</if>>, relaxing as $he feels your caress. As $he shifts his weight to your chest, $he feels all of the daily stresses of the day melt away, and a deep, happy sigh escapes $his lips. You smile fondly, allowing all of the troubles of being an arcology owner dissipate, in a similar fashion to your slave. For now, just for now, you are just a <<if $PC.title == 1>>man and his <<else>>woman and her <</if>>devoted and content wife.
<<elseif ($activeSlave.relationship == -2)>>
@@ -126,7 +126,7 @@ You walk around $him, drawing closer and slowly resting your hand on $his head.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
$He stiffens at your touch but slowly relaxes at the sensation of your hand on $his head. You tenderly and lovingly stroke your fingers along $his scalp, enjoying the feeling of your slave's subservience. $He gently, submissively, presses $his head against your hand, like a dog. As you continue <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>kneading $his shaved scalp<<else>>stroking $his hair<</if>>, $he starts to clutch $his thighs, and if you listen you can hear subdued whimpers. $He looks up at you with adoring eyes, and relishes in the pureness of this act as his master's pet to $his beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>.
<<elseif $activeSlave.devotion > 50>>
- $He accepts it with devotion, leaning back into your gentle caresses. You tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's willingness to set aside her dignity for headpats. $He leans $his body backward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the sensation of <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tention start to melt away as well.
+ $He accepts it with devotion, leaning back into your gentle caresses. You tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's willingness to set aside her dignity for headpats. $He leans $his body backward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the sensation of <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tension start to melt away as well.
<<elseif $activeSlave.devotion > 20>>
$He willingly accepts it. As you tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's roiling emotions, and finally submission. You can still sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch. As you continue your ministrations, your slave slowly, and with more then a bit of uncertainty, finally starts to relax. $He looks at you with confusion and trepidation. Your eyes betray nothing however, you simply smile and press $his head into your <<if $PC.boobs == 1>>soft breasts<<else>>masculine chest<</if>>, all the while enjoying the feeling of your <<if $activeSlave.hStyle == "shaven bald" || $activeSlave.bald == 1>>hands gliding over $his smooth head<<else>>fingers gliding through $his hair<</if>>.
<<elseif $activeSlave.devotion >= -20 && $activeSlave.trust < -20>>
@@ -176,7 +176,7 @@ with your fingertips. You move your hand to the side of your slave's head, strok
<<elseif $activeSlave.devotion >= 20>>
This causes $him to shudder in delight.
<<elseif $activeSlave.devotion >= -20>>
- This causes $him to shiver unconciously.
+ This causes $him to shiver unconsciously.
<<elseif $activeSlave.trust <= -50>>
This forces $his back rigid, in an effort not to move an inch, out of fear.
<<elseif $activeSlave <= -21>>
@@ -196,7 +196,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
<</if>>
awaiting further use of $his body.
<<elseif ($activeSlave.relationship == -2)>>
- When you finally stop petting $him, <<if canSee($activeSlave)>>$his eyes remain closed just for a second <</if>>and $his mouth stands open in slackjawed joy, before $he slowly <<if canSee($activeSlave)>> opens $his eyes<<else>> turns his gaze towards you<</if>> and smiles warmly at you. Pleasure lights up $his face<<if ($activeSlave.amp != 1)>> as $his hand traces the path yours took up to $his head and mimics your last movements<<else>> as $his gaze drifts off to the right in memory, tilting $his head from side to side in sympathetic memory of how it felt to have your hand on $his head<</if>>.
+ When you finally stop petting $him, <<if canSee($activeSlave)>>$his eyes remain closed just for a second <</if>>and $his mouth stands open in slack-jawed joy, before $he slowly <<if canSee($activeSlave)>> opens $his eyes<<else>> turns his gaze towards you<</if>> and smiles warmly at you. Pleasure lights up $his face<<if ($activeSlave.amp != 1)>> as $his hand traces the path yours took up to $his head and mimics your last movements<<else>> as $his gaze drifts off to the right in memory, tilting $his head from side to side in sympathetic memory of how it felt to have your hand on $his head<</if>>.
<<if ($activeSlave.accent >= 3)>>
$He does $his best to communicate love with $his <<if canSee($activeSlave)>>$activeSlave.eyeColor eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 094af930984..a72d8c1f3f0 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3409,15 +3409,45 @@ Done!
<<set $brothelAdsSpending = 0>>
<</if>>
-<<run $defaultRules.filter(x => !([true, false, "no default setting"].includes(x.set.preg))).forEach(x => {
- if (x.set.preg === -1) x.set.preg = true;
- else x.set.preg = false;
-})>>
-
-<<run $defaultRules.filter(x => x.set.haircuts === undefined).forEach(x => { x.set.haircuts = "no default setting"; })>>
-
-<<run $defaultRules.filter(x => x.set.label === undefined).forEach(x => { x.set.label = "no default setting"; })>>
-
-<<run $defaultRules.filter(x => x.set.removeLabel === undefined).forEach(x => { x.set.removeLabel = "no default setting"; })>>
-
-<<run $defaultRules.filter(x => x.set.skinColour === undefined).forEach(x => { x.set.skinColor = "no default setting"; })>>
+<<for _bci = 0; _bci < $defaultRules.length; _bci++>>
+ <<set _rule = $defaultRules[_bci].set>>
+ <<if !([true, false, "no default setting"].includes(_rule.preg))>>
+ <<set _rule.preg = (_rule.preg === -1 ? true : false)>>
+ <</if>>
+ <<if ndef _rule.haircuts>>
+ <<set _rule.haircuts = "no default setting">>
+ <</if>>
+ <<if ndef _rule.label>>
+ <<set _rule.label = "no default setting">>
+ <</if>>
+ <<if ndef _rule.removeLabel>>
+ <<set _rule.removeLabel = "no default setting">>
+ <</if>>
+ <<if ndef _rule.skinColor>>
+ <<set _rule.skinColor = "no default setting">>
+ <</if>>
+ <<if ndef _rule.earwear>>
+ <<set _rule.earwear = "no default setting">>
+ <</if>>
+ <<if ndef _rule.surgery_hears>>
+ <<set _rule.surgery_hears = "no default setting">>
+ <</if>>
+ <<if ndef _rule.surgery_vasectomy>>
+ <<set _rule.surgery_vasectomy = "no default setting">>
+ <</if>>
+ <<if ndef _rule.dietCum>>
+ <<set _rule.dietCum = "no default setting">>
+ <</if>>
+ <<if ndef _rule.dietMilk>>
+ <<set _rule.dietMilk = "no default setting">>
+ <</if>>
+ <<if ndef _rule.toyHole>>
+ <<set _rule.toyHole = "no default setting">>
+ <</if>>
+ <<if ndef _rule.pornFeed>>
+ <<set _rule.pornFeed = "no default setting">>
+ <</if>>
+ <<if ndef _rule.pornFameSpending || _rule.pornFameSpending === -1>>
+ <<set _rule.pornFameSpending = "no default setting">>
+ <</if>>
+<</for>>
--
GitLab