From e1a08a024a3d638cd28285bacc7b4c18d3ec11a6 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 23 Apr 2019 10:30:00 -0500
Subject: [PATCH] DividedUp

---
 src/js/storyJS.js         | 20 ++++++++++++++++++--
 src/uncategorized/RESS.tw | 33 ++++++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 744d3f1abd3..b86699ddd03 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -396,15 +396,31 @@ window.overpowerCheck = /** @param {App.Entity.SlaveState} slave */ function (sl
 
 	if (State.variables.arcologies[0].FSPhysicalIdealist !== "unset") {
 		if (PC.title === 1) {
-			strength = 100;
+			strength = 110;
 		} else {
-			strength = 80;
+			strength = 90;
 		}
 	} else if (PC.title === 1) {
 		strength = 50;
 	} else {
 		strength = 30;
 	}
+	switch (PC.career) {
+		case "mercenary":
+			strength += 25;
+			break;
+		case "gang":
+			strength += 15;
+			break;
+		case "slaver":
+			strength += 8;
+			break;
+		case "escort":
+			strength += 2;
+			break;
+		default:
+			break;
+	}
 	strength += (185-slave.height);
 	strength -= (PC.belly/1000);
 	strength += (PC.warfare/3);
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index fba42ed3b26..0f2c35e58f6 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -44,7 +44,7 @@
 <<set _clothesTemp = $activeSlave.clothes>>
 <<switch $RESSevent>>
 /*Some events start with the slave naked (any event that starts with the daily inspection, for example). Here we switch their clothing just for the image to load, then switch it back quickly so the player's choice is not messed up.*/
-<<case "devoted lotion" "sore shoulders" "bed snuggle" "confident tanning" "devoted nympho" "devoted exhibition" "permitted masturbation" "terrified inspection" "spa boobs" "resistant shower" "resistant gelding" "rebellious arrogant" "bondage gear" "vocal disobedience" "heavy piercing" "resting amp" "age implant" "shift masturbation" "shift sleep" "slave dick huge" "obedient idiot" "tendon fall" "unhappy virgin" "fearful balls" "extreme aphrodisiacs" "shaped areolae" "huge tits" "trusting HG" "ignorant horny" "used whore" "restricted smart" "restricted profession" "mods please" "penitent" "devoted waist" "muscles" "obedient girlish" "huge naturals" "hugely pregnant" "slave dick on slave" "slave clit on slave" "language lesson" "kitchen molestation" "mindbroken morning" "sleeping ambivalent" "sexy succubus" "PA flirting" "fucktoy tribbing" "tittymonster inspection" "bonded love" "bad dream" "cockfeeder resistance" "suppository resistance" "shower slip" "happy dance" "plimb help" "orchiectomy please" "torpedo squeeze" "retching cum feeding" "subjugation blues" "transition anxiety" "moist pussy" "breast expansion blues" "gaped asshole" "ara ara" "im scared" "ass fitting" "young PC age difference" "old PC age difference" "devoted educated slave" "devoted shortstack" "desperate null" "implant inspection" "back stretch" "modest clothes">>
+<<case "age implant" "ara ara" "ass fitting" "back stretch" "bad dream" "bed snuggle" "bondage gear" "bonded love" "breast expansion blues" "cockfeeder resistance" "confident tanning" "devoted educated slave" "devoted exhibition" "devoted lotion" "desperate null" "devoted nympho" "devoted shortstack" "devoted waist" "extreme aphrodisiacs" "fearful balls" "fucktoy tribbing" "gaped asshole" "happy dance" "heavy piercing" "huge naturals" "huge tits" "hugely pregnant" "ignorant horny" "im scared" "implant inspection" "kitchen molestation" "language lesson" "mindbroken morning" "modest clothes" "mods please" "moist pussy" "muscles" "obedient girlish" "obedient idiot" "old PC age difference" "orchiectomy please" "PA flirting" "penitent" "permitted masturbation" "plimb help" "rebellious arrogant" "resistant gelding" "resistant shower" "resting amp" "restricted profession" "restricted smart" "retching cum feeding" "sexy succubus" "shaped areolae" "shift masturbation" "shift sleep" "shower slip" "slave clit on slave" "slave dick huge" "slave dick on slave" "sleeping ambivalent" "sore shoulders" "spa boobs" "subjugation blues" "suppository resistance" "tendon fall" "terrified inspection" "tittymonster inspection" "torpedo squeeze" "transition anxiety" "trusting HG" "unhappy virgin" "used whore" "vocal disobedience" "young PC age difference">>
 	<<set $activeSlave.clothes = "no clothing">>
 <<case "whore rebellious">>
 	/* this scene states they are wearing "thick, durable latex with temperature regulation and anchor points for restraint" no matter what they are assigned to wear. */
@@ -217,11 +217,13 @@ Finishing your work, you lean back for a well-deserved break. Your peace is quic
 	<<elseif ($PC.career == "escort")>>
 		but you simply give $him a kick to the groin; $he wouldn't be the first person to try this shit on you.
 	<<elseif ($PC.career == "slaver") || $PC.slaving >= 20>>
-		but you simply give $him a kick to the groin, a little trick you remember from your early memories on how to deal with rebellious slaves.
+		but you simply give $him a kick to the groin, a little trick you remember from your early days on how to deal with rebellious slaves.
 	<<elseif ($PC.warfare >= 20)>>
 		but you have no problem grabbing $him and pushing $him to the ground, grabbing both $his arms to make sure $he doesn't try to step up.
 	<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
 		but you are far stronger, easily lifting $him into the air and slamming $him back to the ground.
+	<<else>>
+		but you quickly and simply strike $him in the head with a nearby paperweight, disorienting $him long enough for you to subdue $him.
 	<</if>>
 	<<set $mutinery = 0>>
 <<else>>
@@ -5045,7 +5047,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			<br><<link "Deny $him from ever having satisfying sex again">>
 				<<replace "#result2">>
-				You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
+				You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
 				<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
 				<<= AnalVCheck()>>
 				<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5145,7 +5147,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			<br><<link "Deny $him from ever having satisfying sex again">>
 				<<replace "#result2">>
-				You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
+				You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
 				<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
 				<<= AnalVCheck()>>
 				<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5240,7 +5242,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			<br><<link "Deny $him from ever having satisfying sex again">>
 				<<replace "#result2">>
-				You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
+				You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
 				<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
 				<<= AnalVCheck()>>
 				<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5310,7 +5312,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</if>>
 		<br><<link "Deny $him from ever having satisfying sex again">>
 			<<replace "#result2">>
-			You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly find $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
+			You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
 			<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
 			<<= AnalVCheck()>>
 			<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5327,8 +5329,21 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 		<<if overpowerCheck($activeSlave, $PC) >= random(1,100)>>
-			You struggle underneath $his grip and manage to wriggle your arms free. You grab the amorous bull and effortlessly flip $him off of you. $He might be strong, but you are <<if $arcologies[0].FSPhysicalIdealist != "unset">>a chiseled god<<if $PC.title == 0>>dess<</if>><<else>>far stronger<</if>>. You <<if $PC.dick == 0>>grab your biggest strap-on<<else>>stroke your growing erection<</if>> as $he struggles to right $himself, catching $his hips as $he tries to escape. You show no mercy as you force yourself into $his <<if $activeSlave.anus == 0>>virgin<</if>> ass and viciously fuck $him like $he intended to do to you. You savor the sight of your every thrust against $his prostate forcing spurts of precum out $his gigantic, throbbing erection. You pick up the pace as $he climaxes, soaking the sheets beneath $him; $he's not getting out of this until you are satisfied. By the end of things, the master suite reeks of fresh cum and $activeSlave.slaveName's twitching body is the center piece of $his semen puddle. The sheets will definitely need a changing, you note, as $his semi-erect cock twitches and a thick rope of jism sprays forth.
-			<<= AnalVCheck(5)>>
+			You struggle underneath $his grip and manage to wriggle your arms free. You grab the amorous bull and effortlessly flip $him off of you. $He might be strong, but you are <<if $arcologies[0].FSPhysicalIdealist != "unset">>a chiseled god<<if $PC.title == 0>>dess<</if>><<else>>far stronger<</if>>.
+			<br><br><span id="result2">
+			<<link "Show $him who's in charge">>
+				<<replace "#result2"
+				You <<if $PC.dick == 0>>grab your biggest strap-on<<else>>stroke your growing erection<</if>> as $activeSlave.slaveName struggles to right $himself, catching $his hips as $he tries to escape. You show no mercy as you force yourself into $his <<if $activeSlave.anus == 0>>virgin<</if>> ass and viciously fuck $him like $he intended to do to you. You savor the sight of your every thrust against $his prostate forcing spurts of precum out $his gigantic, throbbing erection. You pick up the pace as $he climaxes, soaking the sheets beneath $him; $he's not getting out of this until you are satisfied. By the end of things, the master suite reeks of fresh cum and $activeSlave.slaveName's twitching body is the center piece of $his semen puddle. The sheets will definitely need a changing, you note, as $his semi-erect cock twitches and a thick rope of jism sprays forth.
+				<<= AnalVCheck(5)>>
+				<</replace>>
+			<</link>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
+			<br><<link "Just get $him out of here">>
+				<<replace "#result2"
+				You grab $activeSlave.slaveName by the scruff of $his neck as $he struggles to right $himself and literally throw $him out of your room and into the hallway, where $he lands with a painful-sounding crash. You decide to deal with getting that mess cleaned up later; for now, you're going back to bed.
+				<<set $activeSlave.health -= 10>>
+				<</replace>>
+			<</link>>
+			</span>
 		<<else>>
 			You struggle underneath $his grip and manage to wriggle your arms free. You push at the amorous bull and attempt to lift the heavy $girl off you. $activeSlave.slaveName takes this poorly and rams $his gigantic dick straight into your vagina and through your cervix. You pass out from the pain.
 			<br><br>
@@ -5337,7 +5352,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<set $activeSlave.counter.penetrative += 4, $penetrativeTotal += 4>>
 		<</if>>
 	<</replace>>
-<</link>><<if ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
+<</link>>
 <br><<link "Wait for a chance to escape">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-- 
GitLab