From fe3f6e0be03b23bbead4e09af81f55b4f07a1b36 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 15 Feb 2019 09:30:24 -0500
Subject: [PATCH] REFI sadist pass one

---
 src/npc/descriptions/fVagina.tw |   1 +
 src/uncategorized/REFI.tw       | 101 ++++++++------------------------
 src/uncategorized/endWeek.tw    |   1 +
 3 files changed, 25 insertions(+), 78 deletions(-)

diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 7a584b3395e..82dfc8b8f4b 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -1,3 +1,4 @@
+
 :: FVagina [nobr]
 
 <<set $desc = SlaveTitle($activeSlave)>>
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index b30e8819813..1ac06efcaf8 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -1,3 +1,4 @@
+
 :: REFI [nobr]
 
 /* This is one of several files that contains and organizes many different events.	*/
@@ -130,7 +131,6 @@
 <<switch $REFIevent>>
 
 <<case "sadist">>
-/* TODO: this will need a rewrite */
 
 /* 000-250-006 */
 <<if $seeImages == 1>>
@@ -143,47 +143,13 @@
 <</if>>
 /* 000-250-006 */
 
-<<if $subSlave.belly >= 1500>>
-	You have $subSlave.slaveName lying down on your desk, and are seeing to your own amusement and _his2 sadistic streak at once. _He2 has _his2 body flat on the surface, but is unrestrained, and has been told that _he2 must not rise off it at all, nor tilt _his2 bulk to either side. You then tell _his2 to count strokes and begin to flog _his2 _subBelly belly with a leathern instrument<<if $subSlave.pregKnown == 1>>, taking care not to cause _his2 pregnancy any lasting harm<</if>>. Before long _he2 is experiencing more pain than the human body can support without involuntary movement, and you tell _him2 to go back one count whenever _he2 does. At long last _he2 completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until _he2 stiffens again at the
-	<<if canDoAnal($subSlave) && $subSlave.anus > 0>>
-		burning sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> stretching _his2 anal sphincter. You are not gentle, and the rough sodomy combined with the burning of _his2 outraged skin as you slap yourself against it maintains _his2 pain high.
-	<<else>>
-		sudden sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> slamming deep into _his2 pussy. You are not gentle, and the rough fucking combined with the burning of _his2 outraged skin as you slap yourself against it maintains _his2 pain high.
-	<</if>>
-	Your grip around _his2 neck only adds to _his2 thrill.
+You are in your office, watching as $subSlave.slaveName takes a riding crop to another slave. This has become an almost daily occurence, as _he2 is liable to strike out against your other slaves out-of-turn if _he2 isn't allowed to get a chance to satisfy _his2 sadistic streak. The slave at _his2 feet is a quivering mess, though you've given $subSlave.slaveName strict instructions to not leave any permanent marks on the girl. The slave had been disobedient, and so you decided that you would let $subSlave.slaveName punish her. She winces as _he2 slowly drags the crop against the girl's shoulder, and you do your best to hide the small smile that threatens to escape. After another minute or so of the riding crop, you tell $subSlave.slaveName that this is getting boring and to change it up. _He2 gives you a wicked grin and gives 
+<<if $subSlave.dick > 0 && canAchieveErection($subSlave)>>
+	_his2 cock
 <<else>>
-	You have $subSlave.slaveName bent over your desk, and are seeing to your own amusement and _his2 sadistic streak at once. _He2 has _his2 body flat on the surface, but is unrestrained, and has been told that _he2 must not rise off it at all. You then tell _him2 to count strokes and begin to flog _his2
-	<<if $subSlave.butt <= 0>>
-		flat
-	<<elseif $subSlave.butt <= 1>>
-		small
-	<<elseif $subSlave.butt <= 2>>
-		round
-	<<elseif $subSlave.butt <= 3>>
-		curvy
-	<<elseif $subSlave.butt <= 4>>
-		huge
-	<<elseif $subSlave.butt <= 5>>
-		enormous
-	<<elseif $subSlave.butt <= 6>>
-		gigantic
-	<<elseif $subSlave.butt <= 7>>
-		ridiculous
-	<<elseif $subSlave.butt <= 10>>
-		immense
-	<<elseif $subSlave.butt <= 14>>
-		inhuman
-	<<elseif $subSlave.butt <= 20>>
-		absurdly massive
-	<</if>>
-	ass with a leathern instrument. Before long _he2 is experiencing more pain than the human body can support without involuntary movement, and you tell _him2 to go back one count whenever _he2 does. At long last _he2 completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until _he2 stiffens again at the
-	<<if canDoAnal($subSlave) && $subSlave.anus > 0>>
-		burning sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> stretching _his2 anal sphincter. You are not gentle, and the rough sodomy combined with the burning of _his2 outraged buttocks as you slap yourself against <<if $subSlave.butt < 2>>it<<else>>them<</if>> maintains _his2 pain high.
-	<<else>>
-		sudden sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> slamming deep into _his2 pussy. You are not gentle, and the rough fucking combined with the burning of _his2 outraged buttocks as you slap yourself against <<if $subSlave.butt < 2>>it<<else>>them<</if>> maintains _his2 pain high.
-	<</if>>
+	the strap-on _he2 is wearing
 <</if>>
-After you finish and _he2 leaves, wincing in agony<<if $subSlave.belly >= 1500>> and short of breath<</if>> but with a faraway look of release, you notice $activeSlave.slaveName at the door to your office. You call $him in.
+a few rubs before unceremoniously stuffing it into his victim's asshole. You can't hide your smile this time as the poor girl gives a loud shriek, and a small noise at the doorway catches your attention. To your surprise, you see $activeSlave.slaveName at the door to your office. You call $him in.
 <br><br>
 <<EventNameLink $activeSlave>> hesitates before explaining $himself, and the $desc is obviously aroused:
 <<if ($activeSlave.dick > 0) && ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>>
@@ -215,7 +181,7 @@ After you finish and _he2 leaves, wincing in agony<<if $subSlave.belly >= 1500>>
 <<else>>
 	<<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him.
 <</if>>
-It seems $he passed by while you were beating $subSlave.slaveName and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
+It seems $he passed by while $subSlave.slaveName was beating the girl and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now.
 
 <<case "masochist">>
 
@@ -781,7 +747,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 <<case "sadist">>
 /* TODO: rewrite this */
 
-<<link "Turn $him into another pain slut">>
+<<link "Show $him how enjoyable causing pain is">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 	<<if !canTalk($activeSlave)>>
@@ -790,9 +756,9 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 			<<if $activeSlave.amp == 1>>
 				subject and has no hands, it takes a long, frustrating time
 			<<else>>
-				subject, $he's forced to use delightfully humiliating gestures
+				subject, $he's forced to use gestures
 			<</if>>
-			to communicate $his desire to be abused.
+			to communicate $his desire to be abuse someone.
 		<<elseif $activeSlave.voice == 0>>
 			$He's
 			<<if $activeSlave.amp == 1>>
@@ -800,7 +766,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 			<<else>>
 				mute, so $he uses gestures to ask
 			<</if>>
-			you to hurt $him, too.
+			to hurt someone, too.
 		<<else>>
 			$He's incapable of forming
 			<<if $activeSlave.amp == 1>>
@@ -808,7 +774,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 			<<else>>
 				words, so $he uses gestures to ask
 			<</if>>
-			you to hurt $him, too.
+			to hurt someone, too.
 		<</if>>
 	<<else>>
 		<<if $activeSlave.lips > 70>>
@@ -818,41 +784,19 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 		<<else>>
 			$He asks,
 		<</if>>
-		"<<Master>>, can — can you hurt me? Like that?"
+		"<<Master>>, can — can I hurt someone? Like that?"
 	<</if>>
 	You make $him state it more explicitly, so $he tries again:
+	/* TODO: not sure what to change this to */
 	<<if $activeSlave.amp == 1 && !canTalk($activeSlave)>>
 		$he wriggles $himself into a position where $he can lightly slap $his amputee ass against a chair leg.
 	<<elseif !canTalk($activeSlave)>>
 		$he turns around and starts to spank $himself roughly.
 	<<else>>
-		"Plea<<s>>e beat me, <<Master>>!"
-	<</if>>
-	You shove $him
-	<<if $activeSlave.belly >= 300000>>
-		over $his _belly <<if $activeSlave.bellyPreg >= 2000>>pregnant <</if>> belly,
-	<<elseif $activeSlave.belly >= 1500>>
-		onto $his knees,
-	<<else>>
-		over the desk,
-	<</if>>
-	rub your hand over $his ass, which is quivering with anticipation and fear, and ask if $he wants you to hit $him. $He's almost beside $himself, shuddering at the titillation, but before $he can answer, you use your other hand to strike $his
-	<<if ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>>
-		caged dick.
-	<<elseif $activeSlave.dick > 0>>
-		cockhead.
-	<<elseif $activeSlave.vagina > -1 && canDoVaginal($activeSlave)>>
-		pussylips.
-	<<elseif $activeSlave.belly >= 1500>>
-		distended middle.
-	<<elseif $activeSlave.vagina > -1>>
-		chastity belt into $his pussylips.
-	<<elseif $activeSlave.scrotum > 1>>
-		testicles.
-	<<else>>
-		smooth crotch.
+		"Plea<<s>>e let me beat someone, <<Master>>!"
 	<</if>>
-	As $he writhes in agony, you tell $him to get used to it. $He's a pain slut now, second thoughts or not.
+	You call in another slave and have her kneel on the floor, ass up. You then hand $him a leathern cat-o-nine tails and tell $him to get busy, or $he'll take the other slave's place. As you note the remorse on $his face, you tell $him to get used to it. One of $his jobs is to cause pain now, second thoughts or not.
+	/* TODO: not sure what to do here */
 	<<if canDoAnal($activeSlave)>>
 		<<if $activeSlave.anus == 0>>
 			$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick == 1>>your dick brutally @@.lime;taking $his anal virginity@@<<else>>an enormous dildo @@.lime;stealing $his anal virginity@@<</if>>, followed by rough anal,
@@ -896,21 +840,21 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 	<<else>>
 		urethral torment.
 	<</if>>
-	@@.hotpink;$He has become more devoted to you,@@ and @@.lightcoral;$he has started to get off on pain.@@
+	@@.hotpink;$He has become more devoted to you,@@ and @@.lightcoral;$he has started to get off on causing pain.@@
 	<<set $activeSlave.devotion += 4>>
-	<<set $activeSlave.fetish = "masochist", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
+	<<set $activeSlave.fetish = "sadist", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
 	<</replace>>
 <</link>><<if canDoAnal($activeSlave) && ($activeSlave.anus == 0)>>//This option will take virginity//<<elseif !canDoAnal($activeSlave) && canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>> //This option will take anal virginity//<</if>>
-<br><<link "Steer $him away from pain obsession for the moment">>
+<br><<link "Steer $him away from an obsession with causing pain for the moment">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	Good slaves get aroused according to their masters' whim, not their own silly tendencies. You call $activeSlave.slaveName over before $he can give voice to $his interest in pain play,
+	Good slaves get aroused according to their masters' whim, not their own silly tendencies. You call $activeSlave.slaveName over before $he can give voice to $his interest in dishing out pain,
 	<<if canDoVaginal($activeSlave) || ($activeSlave.dick > 0 && !["chastity", "combined chastity"].includes($activeSlave.dickAccessory))>>
 		and let $him masturbate while <<if ($PC.dick == 0)>>eating you out<<else>>sucking you off<</if>>,
 	<<else>>
 		and play with $him until $he orgasms while <<if ($PC.dick == 0)>>eating you out<<else>>sucking you off<</if>>, all while
 	<</if>>
-	carefully keeping $his experience purely pleasurable. You'll keep an eye on $him, and with this correction @@.hotpink;$he'll become more submissive to you.@@
+	carefully making sure $he only causes pleasure. You'll keep an eye on $him, and with this correction @@.hotpink;$he'll become more submissive to you.@@
 	<<set $activeSlave.devotion += 4>>
 	<<set $activeSlave.oralCount += 1, $oralTotal += 1>>
 	<</replace>>
@@ -1599,6 +1543,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
 <</link>>
 
 <<case "dom">>
+/* TODO: */
 
 <<link "Turn $him into a dominant too">>
 	<<EventNameDelink $activeSlave>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index c6909755b9a..42d6eafde3b 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -1,3 +1,4 @@
+
 :: End Week [nobr]
 
 <<set State.expired.length = 0>>
-- 
GitLab