From cc1e10d01b702c5bb26ba6231b6da13d1c717737 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 8 Feb 2017 13:24:47 -0500 Subject: [PATCH] =?UTF-8?q?Folant's=20Bugfixes=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/player/actions/fCaress.tw | 6 +++--- src/uncategorized/RESS.tw | 2 +- src/uncategorized/corporationDevelopments.tw | 6 +++--- src/uncategorized/personalAttentionSelect.tw | 2 +- src/uncategorized/randomNonindividualEvent.tw | 2 ++ src/uncategorized/saRelationships.tw | 4 ++-- src/uncategorized/seBirth.tw | 2 +- src/uncategorized/servantsQuarters.tw | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw index 5a0eb7ec090..c9b941eb012 100644 --- a/src/player/actions/fCaress.tw +++ b/src/player/actions/fCaress.tw @@ -61,10 +61,10 @@ Then, you gently tilt her <<if $activeSlave.face > 2>>overwhelmingly stunning<<e <<elseif ($activeSlave.devotion > 20)>> She accepts your touch willingly. As you are so close to her, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>girl<</if>>; she's doing her 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 her mind by your touch across her face. When you finally move your hand away, her $activeSlave.eyeColor eyes gaze into yours searchingly, looking for answers that are not there. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes beg for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs hesitantly, asking if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks hesitantly, "I-ith that it, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"<<else>>She asks hesitantly, "I-is that it, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>?"<</if>> <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>> - She shakes at your touch fearfully. As you move your hand along her unresisting face, her eagerness to avoid punishment leads her to stiffen, her nervousness is made apparent. You continue stroking her cheek, enjoying her fear, and the physical intimacy slowly does its work. She starts to relax, her resistance easing and her eyes start to close. When finally move your hand away, she looks at you for a long moment, her eyes darting up at you, before visibly catching herself with a reminder that she's a slave and you're her owner. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>Her eyes beg for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs hesitantly, asking if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks hesitantly, "I-ith that it, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"<<else>>She asks hesitantly, "I-is that it, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"<</if>> + She shakes at your touch fearfully. As you move your hand along her unresisting face, her eagerness to avoid punishment leads her to stiffen, her nervousness is made apparent. You continue stroking her cheek, enjoying her fear, and the physical intimacy slowly does its work. She starts to relax, her resistance easing and her eyes start to close. When finally move your hand away, she looks at you for a long moment, her eyes darting up at you, before visibly catching herself with a reminder that she's a slave and you're her owner. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes beg for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs hesitantly, asking if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks hesitantly, "I-ith that it, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"<<else>>She asks hesitantly, "I-is that it, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"<</if>> <<elseif ($activeSlave.trust < -50)>> - She is nearly frozen with fear, and does not resist as you start to caress her face. In fact, she barely reacts at all. She stares at you as you move your fingers across her stiff face, but it's like touching a statue. She is so filled with terror that she remains stiff even as it becomes clear to her you're not going to hurt her. When you bore of touching the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>girl<</if>> and move your hand away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>Her eyes beg for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs spastically, begging fearfully to know if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks nervously, "I-ith that it, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"<<else>>She asks nervously, "I-is that it, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"<</if>> Then she cringes. + She is nearly frozen with fear, and does not resist as you start to caress her face. In fact, she barely reacts at all. She stares at you as you move your fingers across her stiff face, but it's like touching a statue. She is so filled with terror that she remains stiff even as it becomes clear to her you're not going to hurt her. When you bore of touching the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>girl<</if>> and move your hand away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes beg for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs spastically, begging fearfully to know if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks nervously, "I-ith that it, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>?"<<else>>She asks nervously, "I-is that it, <<if $PC.title == 1>>Master<<else>>Mistress<</if>>?"<</if>> Then she cringes. <<else>> - She reflexively turns away from you, but you catch her head with one hand and slowly but gently move your other hand along her face. Spluttering, she leans backwards, but you tip forward with her and pin her against your desk, not stopping your gentle touch on her head. She tries to wriggle out of your grasp desperately, but her struggles slowly subside as she realizes that you're not taking this any farther. When you bore of it and move your hand away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>Her eyes demand an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs irritably, asking whether that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She splutters, "Ith that it, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>!?"<<else>>She splutters, "Is that it, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>!?"<</if>> + She reflexively turns away from you, but you catch her head with one hand and slowly but gently move your other hand along her face. Spluttering, she leans backwards, but you tip forward with her and pin her against your desk, not stopping your gentle touch on her head. She tries to wriggle out of your grasp desperately, but her struggles slowly subside as she realizes that you're not taking this any farther. When you bore of it and move your hand away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes demand an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs irritably, asking whether that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She splutters, "Ith that it, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title == 1>>Mathter<<else>>Mithtreth<</if>>!?"<<else>>She splutters, "Is that it, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>>!?"<</if>> <</if>> <</nobr>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 17ce04f263d..bdd71150e34 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -3193,7 +3193,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <br><<click "Put the old whore in her place">> <<replace "#name">>$activeSlave.slaveName<</replace>> <<replace "#result">> - You call out to stop her, and she turns obediently to listen. You tell her you're interested to see if her old body can still perform. Something about the way you say 'old' makes her flinch, and she's right to worry. You tell her to go out and make you ?00, and to hurry back if she wants to avoid punishment. She hesitates for an instant before hurrying outside. A few hours later you check on her remotely. The feed shows her walk quickly up to a couple out on the street; you can't hear what's said, but she turns around to rub her bare butt against the crotch of the man's pants. He pulls them down and fucks her right there, as the woman pulls and abuses her poor nipples. Boring of this, she switches to torturing the poor slave's <<if ($activeSlave.dick > 0)>>dick<<else>>pussy<</if>>, slapping her until she cries and then making out with the weeping whore. Much later, $activeSlave.slaveName limps tiredly into your office and gives you your @@color:yellowgreen;?00.@@ You ask her how she's feeling, and she mumbles, <<if SlaveStatsChecker.checkForLisp($activeSlave)>> "I'm OK, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>. Holeth are pretty thore though. Kinda loothe."<<else>>"I'm OK, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Holes are pretty sore though. Kinda loose."<</if>> You tell her that's of little concern, since she has relatively few years of use left: you may as well extract what value you can from her. She's too exhausted to hide her response, and collapses, @@color:gold;sobbing.@@ + You call out to stop her, and she turns obediently to listen. You tell her you're interested to see if her old body can still perform. Something about the way you say 'old' makes her flinch, and she's right to worry. You tell her to go out and make you ¤200, and to hurry back if she wants to avoid punishment. She hesitates for an instant before hurrying outside. A few hours later you check on her remotely. The feed shows her walk quickly up to a couple out on the street; you can't hear what's said, but she turns around to rub her bare butt against the crotch of the man's pants. He pulls them down and fucks her right there, as the woman pulls and abuses her poor nipples. Boring of this, she switches to torturing the poor slave's <<if ($activeSlave.dick > 0)>>dick<<else>>pussy<</if>>, slapping her until she cries and then making out with the weeping whore. Much later, $activeSlave.slaveName limps tiredly into your office and gives you your @@color:yellowgreen;¤200.@@ You ask her how she's feeling, and she mumbles, <<if SlaveStatsChecker.checkForLisp($activeSlave)>> "I'm OK, <<if def $PC.customTitleLisp>>$PC.customTitleLisp<<elseif $PC.title != 0>>Mathter<<else>>Mithtreth<</if>>. Holeth are pretty thore though. Kinda loothe."<<else>>"I'm OK, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>. Holes are pretty sore though. Kinda loose."<</if>> You tell her that's of little concern, since she has relatively few years of use left: you may as well extract what value you can from her. She's too exhausted to hide her response, and collapses, @@color:gold;sobbing.@@ <<set $cash += 200>> <<set $activeSlave.trust -= 5>> <</replace>> diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 3c1f7001831..0568c25be91 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -822,7 +822,7 @@ Drug asset prices are <</if>> <<if $drugAssets >= 2000>> <<if $drugUpgradeHormones == "unselected">> - <br>The corporation has surplus pharmeceutical fabrication to specialize. Hormones should be applied to + <br>The corporation has surplus pharmaceutical fabrication to specialize. Hormones should be applied to <<click "Feminize">><<set $drugUpgradeHormones = "XX">><<replace "#direction">><br><<print "You directed the corporation to treat slaves with female hormones.">><</replace>><</click>> | <<click "Masculinize">><<set $drugUpgradeHormones = "XY">><<replace "#direction">><br><<print "You directed the corporation to treat slaves with male hormones.">><</replace>><</click>> | <<click "Not applied">><<set $drugUpgradeHormones = "none">><<replace "#direction">><br><<print "You directed the corporation not to apply hormones.">><</replace>><</click>> @@ -830,7 +830,7 @@ Drug asset prices are <</if>> <<if $drugAssets >= 5000>> <<if $drugUpgradeInjectionOne == "unselected">> - <br>The corporation has surplus pharmeceutical fabrication to specialize. Growth injections should be applied until T&A are grown to a + <br>The corporation has surplus pharmaceutical fabrication to specialize. Growth injections should be applied until T&A are grown to a <<click "Tasteful size">><<set $drugUpgradeInjectionOne = "tasteful">><<replace "#direction">><br><<print "You directed the corporation to grow slaves' assets to a moderate size.">><</replace>><</click>> | <<click "Huge size">><<set $drugUpgradeInjectionOne = "huge">><<replace "#direction">><br><<print "You directed the corporation to grow slaves' assets to a huge size.">><</replace>><</click>> | <<click "Not applied">><<set $drugUpgradeInjectionOne = "none">><<replace "#direction">><br><<print "You directed the corporation not to apply growth injections.">><</replace>><</click>> @@ -838,7 +838,7 @@ Drug asset prices are <</if>> <<if $drugAssets >= 10000>> <<if $drugUpgradeInjectionTwo == "unselected">> - <br>The corporation has surplus pharmeceutical fabrication to specialize. Advanced growth injections should be + <br>The corporation has surplus pharmaceutical fabrication to specialize. Advanced growth injections should be <<click "Supermassive">><<set $drugUpgradeInjectionTwo = "supermassive">><<replace "#direction">><br><<print "You directed the corporation to apply supermassive growth injections.">><</replace>><</click>> | <<click "Pastoral">><<set $drugUpgradeInjectionTwo = "pastoral">><<replace "#direction">><br><<print "You directed the corporation to apply growth injections focused on milk<<if $seeDicks > 0>> and cum<</if>> production.">><</replace>><</click>> | <<click "Not applied">><<set $drugUpgradeInjectionTwo = "none">><<replace "#direction">><br><<print "You directed the corporation not to apply advanced growth injections.">><</replace>><</click>> diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw index 64fe91ea0d8..7b52f9fc7fd 100644 --- a/src/uncategorized/personalAttentionSelect.tw +++ b/src/uncategorized/personalAttentionSelect.tw @@ -135,7 +135,7 @@ Induce a flaw: <</if>> <<if $activeSlave.behavioralQuirk != "adores men">> <<if $activeSlave.behavioralFlaw != "hates women">> - | <<click "Hatren of women">><<set $trainingRegimen to "induce hatred of women">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</click>> + | <<click "Hatred of women">><<set $trainingRegimen to "induce hatred of women">><<replace "#training">><strong><<print $trainingRegimen>></strong><</replace>><</click>> <</if>> <</if>> <<if $activeSlave.behavioralQuirk != "fitness">> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 963a383f714..5446dc99c97 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -758,6 +758,7 @@ <<if $familyTesting == 1>> <<for $i to 0; $i < $slaves.length; $i++>> + <<if $slaves[$i].fuckdoll == 0>> <<if $slaves[$i].canRecruit == 1>> <<if ($slaves[$i].devotion > 50)>> <<if canWalk($slaves[$i])>> @@ -772,6 +773,7 @@ <</if>> <</if>> <</if>> + <</if>> <</for>> <<else>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 573b8246907..db872f155fd 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -397,7 +397,7 @@ Since she is mindbroken, she @@color:lightsalmon;can't really maintain@@ any mea <<set $slaves[$i].devotion += 2>> <<set $slaves[$i].trust += 2>> <<elseif ($slaves[$i].assignment is "whore") || ($slaves[$i].assignment is "work in the brothel") || ($slaves[$i].assignment is "serve the public") || ($slaves[$i].assignment is "serve in the club") || ($slaves[$i].assignment is "work a glory hole") || ($slaves[$i].assignment is "be confined in the arcade")>> - Her reliance on her formal relationship to you produces a slight increase of both @@color:hotpink;devotion@@ and @@color:mediumaquamarine;trust,@@ though this is reduced by being on a public sexual assignment rather than being kept for you alone. The public is less forgiving of you ordering your slave wife to fuck random citizens, @@color:red;seriously damaging your reptuation.@@ + Her reliance on her formal relationship to you produces a slight increase of both @@color:hotpink;devotion@@ and @@color:mediumaquamarine;trust,@@ though this is reduced by being on a public sexual assignment rather than being kept for you alone. The public is less forgiving of you ordering your slave wife to fuck random citizens, @@color:red;seriously damaging your reputation.@@ <<set $slaves[$i].devotion += 1>> <<set $slaves[$i].trust += 1>> <<set $rep -= 100>> @@ -1184,7 +1184,7 @@ Since she is mindbroken, she @@color:lightsalmon;can't really maintain@@ any mea <<set $slaves[$i].trust -= 4>> <<set $slaves[$i].devotion += 4>> <<else>> - $slaves[$i].slaveName is @@color:gold;painfully concious@@ that her <<if $slaves[$i].relation is "daughter">>mother<<else>>$slaves[$i].relation<</if>> $slaves[$j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. + $slaves[$i].slaveName is @@color:gold;painfully conscious@@ that her <<if $slaves[$i].relation is "daughter">>mother<<else>>$slaves[$i].relation<</if>> $slaves[$j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. <<set $slaves[$i].trust -= 2>> <<set $slaves[$i].devotion += 2>> <</if>> diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index 3ac91fbbb6a..589e4e187ae 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -729,7 +729,7 @@ Childbirth has @@color:lime;stretched out her vagina.@@ <<if $slaves[$i].health <= -100>> <br><br> - While attempting to recover, $slaves[$i].slaveName @@color;red:passes away@@ from complications. Her body was fatally damaged during childbirth, but her offspring is healthy, so her legacy will carry on. + While attempting to recover, $slaves[$i].slaveName @@color:red;passes away@@ from complications. Her body was fatally damaged during childbirth, but her offspring is healthy, so her legacy will carry on. <<set $activeSlave = $slaves[$i]>> <<display "Remove activeSlave">> <<set $slaveDead to 1>> diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw index 84cab186546..e15d974661f 100644 --- a/src/uncategorized/servantsQuarters.tw +++ b/src/uncategorized/servantsQuarters.tw @@ -78,7 +78,7 @@ $servantsQuartersNameCaps <</if>> <br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. -[[Expand the servantsQuarters|Servants' Quarters][$cash -= Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology), $servantsQuarters += 5]] //Costs ¤<<print Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>>// +[[Expand the servant's Quarters|Servants' Quarters][$cash -= Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology), $servantsQuarters += 5]] //Costs ¤<<print Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>>// <br> <<if $servantsQuartersUpgradeMonitoring == 1>> -- GitLab