From f6994f46ae86acc1e77a9cb693fce23a5dc76432 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 9 Feb 2017 14:32:38 -0500
Subject: [PATCH] Bugfixes
---
src/npc/fAbuse.tw | 63 ++++++++++++++------------
src/uncategorized/saLongTermEffects.tw | 36 +++++++--------
2 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index f9b6493d263..e1d76371fe4 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -158,10 +158,10 @@
The slap seems to have excited her, seeing her hard nipples and wet pussy, and her eyes practically beg for more.
<</if>>
-<<if ($PC.dick is 0)>>
- <<if ($activeSlave.amp isnot 1) and ($activeSlave.clothes isnot "no clothing")>>While she strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
-<<elseif $PC.vagina == 1>>
+<<if ($PC.dick == 1)>>
While she strips, your stiffening cock rises, revealing your pussy and earning
+<<elseif $PC.vagina == 1>>
+ <<if ($activeSlave.amp isnot 1) and ($activeSlave.clothes isnot "no clothing")>>While she strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
<<if ($activeSlave.fetish is "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
a shy look
<<elseif ($activeSlave.fetish is "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 95)>>
@@ -172,29 +172,34 @@
from your victim.
<</if>>
-<<if ($activeSlave.amp is 1)>>
- <<if ($activeSlave.clothes isnot "no clothing")>>You rip the clothes off her limbless torso<<else>>You walk up to her<</if>> and spank her brutally, causing her to be spun around to present
-<<else>>
- You order her to present
-<</if>>
-<<if ($activeSlave.vagina gt -1)>>her holes<<else>>her hole<</if>> to you
-
-<<if ($activeSlave.amp isnot 1)>>
-and spank her brutally
-<<if ($activeSlave.fetish is "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- making her pussy throb
-<</if>>
-<<if $activeSlave.devotion lt -50>>
- until she complies.
-<<elseif $activeSlave.devotion < -20>>
- as she slowly complies.
-<<elseif $activeSlave.devotion <= 20>>
- as she fearfully complies.
-<<elseif $activeSlave.devotion <= 50>>
- as she rushes to comply.
+<<if ($activeSlave.amp == 1)>>
+ <<if ($activeSlave.clothes != "no clothing")>>Growing impatient, you rip the clothes off her limbless torso<<else>>You walk up to her<</if>> and spank her brutally; spinning her to present
+ <<if ($activeSlave.vagina > -1)>>
+ her holes
+ <<else>>
+ her hole
+ <</if>>
+ to you and
+ <<if ($activeSlave.fetish is "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
+ <<if canAchieveErection($activeSlave)>>making her erect dick throb<<elseif $activeSlave.vagina > -1>>making her pussy throb<<else>>making her butthole throb<</if>>
+ <</if>>
+ with anticipation.
<<else>>
- as she complies.
-<</if>>
+ You order her to present <<if ($activeSlave.vagina > -1)>>her holes<<else>>her hole<</if>> to you and spank her brutally
+ <<if ($activeSlave.fetish is "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
+ <<if canAchieveErection($activeSlave)>>making her erect dick throb<<elseif $activeSlave.vagina > -1>>making her pussy throb<<else>>making her butthole throb<</if>>
+ <</if>>
+ <<if $activeSlave.devotion lt -50>>
+ until she complies.
+ <<elseif $activeSlave.devotion < -20>>
+ as she slowly complies.
+ <<elseif $activeSlave.devotion <= 20>>
+ as she fearfully complies.
+ <<elseif $activeSlave.devotion <= 50>>
+ as she rushes to comply.
+ <<else>>
+ as she complies.
+ <</if>>
<</if>>
<<if $seeRace is 1>>
@@ -244,18 +249,18 @@ and spank her brutally
<<elseif ($activeSlave.dick gt 0) and ($activeSlave.balls gt 0)>>
You ram <<if ($PC.dick is 0)>>the strap-on<<else>>your dick<</if>> into her sissy butt without lubricant. As she flinches you announce that she'll be taking part in giving herself anal pain. She humps into you lamely, so you administer a truly agonizing slap to her balls<<if ($PC.dick is 0)>><<else>> that makes her anal ring stiffen deliciously around your dick<</if>>. To avoid further punishment she fucks herself against you almost hard enough to hurt herself.<<if ($PC.vagina == 1) && ($PC.dick == 1)>> Fortunately for her, this gets you so wet that some of your pussyjuice makes it down onto your shaft and serves as improvised lube.<</if>> You orgasm explosively
<<AnalVCheck>>
- <<set $asspain to 1>>
+ <<set _asspain to 1>>
<<elseif ($activeSlave.dick gt 0)>>
You ram your dick into her gelded butt without lubricant and sodomize her as hard as you can without damaging your property.<<if $PC.vagina == 1>> Fortunately for her, this gets you so wet that some of your pussyjuice makes it down onto your shaft and serves as improvised lube.<</if>> She's such a slut that she shows signs of enjoyment, but you put a stop to that whenever it happens by slapping and flicking her cock. You cum explosively
<<AnalVCheck>>
- <<set $asspain to 1>>
+ <<set _asspain to 1>>
<<else>>
She's got no special physical targets for abuse, so you just rape her hard and fast, raining stinging slaps down on her as you do. She cries and whimpers; you finish
<<BothVCheck>>
<</if>>.
<<if ($activeSlave.ID isnot $Bodyguard.ID)>>
This leaves her sobbing on the floor <<if ($PC.dick is 0)>>as you shuck off the strap-on and drop it on her face<<else>>with cum dripping out of her<</if>>.
-<<elseif ($activeSlaveID is $Bodyguard.ID) && ($activeSlave.fetish is "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 95)>>
+<<elseif ($activeSlave.ID is $Bodyguard.ID) && ($activeSlave.fetish is "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 95)>>
She thanks you rapidly, trying to break away from the pleasure of your reward. She quickly gets back to her feet and stumbles towards the shower, to make sure you won't stay unprotected too long.
<<else>>
Even though she's in a somewhat bad shape, she still jumps back to her feet and stumbles towards the shower, to make sure you won't stay unprotected too long.
@@ -263,7 +268,7 @@ Even though she's in a somewhat bad shape, she still jumps back to her feet and
<<if ($activeSlave.ID isnot $Bodyguard.ID)>>
<<if $activeSlave.minorInjury is 0>>
-<<if $asspain is 1>>
+<<if _asspain is 1>>
The anal rape leaves her with a sore butthole.
<<elseif random(1,100) gt 50>>
<<set $activeSlave.minorInjury to either("black eye", "split lip", "bruise")>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 9aa1b3e561c..b4d46a8fbf6 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -414,6 +414,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<set $skillIncrease = 5>><<OralSkillIncrease $slaves[$i]>>
<</if>>
<</if>>
+<</if>>
<<if ($slaves[$i].bellyAccessory != "none")>>
<<if ($slaves[$i].bellyAccessory is "an extreme corset") or ($slaves[$i].bellyAccessory is "a corset")>>
@@ -630,19 +631,19 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<if ($slaves[$i].vagina < 4)>>
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].fetish != "mindbroken">>
- <<if ($slaves[$i].sexualQuirk is "size queen")>>
- She thinks of the massive dildo stretching out her womanhood as @@color:lime;preparation for the biggest cocks,@@ and @@color:hotpink;looks forward@@ to take anything, dicks, hands, truly anything, inside her newly capacious cunt.
- <<set $slaves[$i].devotion += 4>>
- <<elseif ($slaves[$i].fetish is "masochist") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
- She gets off on the agony of having her cunt @@color:lime;permanently stretched@@ by a huge dildo. The terrible combination of pain and pleasure @@color:hotpink;breaks her will@@ but fills her with @@color:gold;fear.@@
- <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 5>>
- <<elseif ($slaves[$i].fetish is "submissive") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
- She submits to the agony of having her cunt @@color:lime;permanently stretched@@ by a huge dildo. Having her hole ruined at your whim @@color:hotpink;breaks her will@@ but fills her with @@color:gold;fear.@@
- <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 5>>
- <<else>>
- The agony of having her cunt @@color:lime;permanently stretched@@ by a huge dildo fills her with @@color:mediumorchid;resentment@@ and @@color:gold;fear.@@
- <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
- <</if>>
+ <<if ($slaves[$i].sexualQuirk is "size queen")>>
+ She thinks of the massive dildo stretching out her womanhood as @@color:lime;preparation for the biggest cocks,@@ and @@color:hotpink;looks forward@@ to take anything, dicks, hands, truly anything, inside her newly capacious cunt.
+ <<set $slaves[$i].devotion += 4>>
+ <<elseif ($slaves[$i].fetish is "masochist") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
+ She gets off on the agony of having her cunt @@color:lime;permanently stretched@@ by a huge dildo. The terrible combination of pain and pleasure @@color:hotpink;breaks her will@@ but fills her with @@color:gold;fear.@@
+ <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 5>>
+ <<elseif ($slaves[$i].fetish is "submissive") && ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
+ She submits to the agony of having her cunt @@color:lime;permanently stretched@@ by a huge dildo. Having her hole ruined at your whim @@color:hotpink;breaks her will@@ but fills her with @@color:gold;fear.@@
+ <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 5>>
+ <<else>>
+ The agony of having her cunt @@color:lime;permanently stretched@@ by a huge dildo fills her with @@color:mediumorchid;resentment@@ and @@color:gold;fear.@@
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
+ <</if>>
<</if>>
<</if>>
<<set $slaves[$i].vagina += 1>>
@@ -650,7 +651,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
Her cavernous pussy accomodates the huge dildo she's required to wear.
<</if>>
<<elseif ($slaves[$i].vaginalAccessory is "long, huge dildo")>>
- <<if ($slaves[$i].vagina < 4)>>
+ <<if ($slaves[$i].vagina < 4)>>
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].fetish != "mindbroken">>
<<if ($slaves[$i].sexualQuirk is "size queen")>>
@@ -669,10 +670,8 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
<<set $slaves[$i].vagina += 1>>
- <</if>>
- <<else>>
- Her cavernous pussy accomodates the huge dildo she's required to wear.
- <</if>>
+ <<else>>
+ Her cavernous pussy accomodates the huge dildo she's required to wear.
<</if>>
<</if>>
<<if ($slaves[$i].vaginalAccessory is "long, huge dildo") || ($slaves[$i].vaginalAccessory is "long, large dildo") || ($slaves[$i].vaginalAccessory is "long dildo")>>
@@ -723,6 +722,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<<set $slaves[$i].devotion += 2>>
<</if>>
<</if>>
+ <</if>>
<<elseif ($slaves[$i].buttplug is "large plug") || ($slaves[$i].buttplug is "long, large plug")>>
<<if $slaves[$i].anus < 3>>
<<if random(1,2) == 1>>
--
GitLab