From 3b45e41e80fb6bd0448322d324156c3b4aae7409 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 13 May 2019 23:37:38 -0500
Subject: [PATCH] OneDone
---
slave variables documentation - Pregmod.txt | 23 +++--
src/pregmod/pRaped.tw | 8 +-
src/uncategorized/RESS.tw | 4 +-
src/uncategorized/newSlaveIntro.tw | 109 +++++++++++---------
4 files changed, 82 insertions(+), 62 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index fafc3a6fe1c..46b341ef000 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -3701,18 +3701,19 @@ Once finished, add it into "customSlavesDatabase".
To test if your slave is functioning, start up a normal game, swap to cheat mode, max your rep, and view other slaveowner's stock in the slave market. If you cannot find your slave in the list, and you didn't start the game with your slave, you should double check your slave for errors. If a slave named "Blank" is present, then you likely messed up. Once you find your slave, check their description to make sure it is correct. If it is not, you messed up somewhere in setting them up.
-@@.green; - something good or health/libido/attraction gain
-@@.red; - something bad or health/libido/attraction loss
-@@.hotpink; - devotion gain
+@@.green; - something good or health/libido/attraction gain
+@@.red; - something bad or health/libido/attraction loss
+@@.hotpink; - devotion gain
@@.mediumorchid; - devotion loss
-@@.mediumaquamarine; - trust gain
-@@.gold; - trust loss
-@@.coral; - notable change and fetish loss
-@@.lightcoral; - fetish strength gain, fetish acquisition and fetish discovery
-@@.lime; - growth/improvement to a body part (reversed in some cases)
-@@.orange; - shrinking/degradation of a body part (reversed in some cases)
-@@.lightsalmon; - rivalry
-@@.lightgreen; - relationship
+@@.mediumaquamarine; - trust gain with higher devotion
+@@.orangered; - trust gain with lower devotion
+@@.gold; - trust loss
+@@.coral; - notable change and fetish loss
+@@.lightcoral; - fetish strength gain, fetish acquisition and fetish discovery
+@@.lime; - growth/improvement to a body part (reversed in some cases)
+@@.orange; - shrinking/degradation of a body part (reversed in some cases)
+@@.lightsalmon; - rivalry
+@@.lightgreen; - relationship
wombJS.tw subsystem:
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index aa79c4371c9..526d4ca65c7 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -247,13 +247,19 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<<set $activeSlave.behavioralFlaw = "odd">>
<<set $activeSlave.sexualFlaw = "hates penetration">>
<<set $activeSlave.anus = 2>>
+ <<set $activeSlave.counter.anal += 12, $activeSlave.counter.oral += 23>>
+ <<set $analTotal += 12, $oralTotal += 23>>
<<if $activeSlave.vagina > -1>>
<<set $activeSlave.vagina = 2>>
+ <<set $activeSlave.counter.vaginal += 12>>
+ <<set $vaginalTotal += 12>>
<<if random(1,100) > 60 && isFertile($activeSlave)>>
<<= knockMeUp($activeSlave, 100, 0, -2, 1)>>
<</if>>
+ <<else>>
+ <<set $activeSlave.counter.anal += 12, $analTotal += 12>>
<</if>>
- <<if $activeSlave.counter.publicUse>><<set $activeSlave.counter.publicUse += 47>><<else>><<set $activeSlave.counter.publicUse = 47>><</if>>
+ <<set $activeSlave.counter.publicUse += 47>>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
You declare $his holes fair game for the entire arcology. $He spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to $his ordeal, bruises all over $his body, cum leaking from $his @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index cdaf475a58c..69f33f0db1e 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5296,7 +5296,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<if $mutinery != 1>>
<br><<link "Lock $his dick in chastity">>
<<replace "#result2">>
- You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, $he immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<= WrittenMaster()>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves.
+ You simply clamp a chastity cage onto $his limp dick; $he'll be taking a little break from fucking girls for the time being. When $he comes to and finds $himself locked in chastity, $he immediately begins fiddling with it in an attempt to remove it. $He feels this punishment is laughable and only @@.orangered;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<= WrittenMaster()>> is getting locked in chastity, @@.orangered;spreading defiance@@ through your rebellious slaves.
<<set $activeSlave.trust += 10, $activeSlave.chastityPenis = 1>>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 5; } })>>
<</replace>>
@@ -5311,7 +5311,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</link>>
<br><<link "Mute $him">>
<<replace "#result2">>
- As you pull $his limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He tried to rape you, $he must be silenced. Restrained as $he is, the most $he can do is cry and beg. When $he awakens from surgery, $he realizes all you did was stop $him from talking; @@.mediumaquamarine;what stops $him from making another go at you?@@ Your other rebellious slaves see this as a minor loss for a potentially huge gain and, if anything, @@.mediumaquamarine;become more defiant.@@
+ As you pull $his limp body to the remote surgery, you notice $he understands what $he has done and begs you to reconsider your decision; but your mind is set. $He tried to rape you, $he must be silenced. Restrained as $he is, the most $he can do is cry and beg. When $he awakens from surgery, $he realizes all you did was stop $him from talking; @@.orangered;what stops $him from making another go at you?@@ Your other rebellious slaves see this as a minor loss for a potentially huge gain and, if anything, @@.orangered;become more defiant.@@
<<set $activeSlave.trust += 5, $activeSlave.devotion -= 15, $activeSlave.voice = 0>>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust += 10; } })>>
<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 857030cc2f0..ee2ed4b7471 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -946,6 +946,13 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<replace "#introResult">>
You gesture towards $eventSlave.slaveName. $He is <<if $eventSlave.intelligence+$eventSlave.intelligenceImplant > 15>>bright enough<<elseif (($eventSlave.skill.vaginal + $eventSlave.skill.anal + $eventSlave.skill.oral) > 100)>>skilled enough<<else>>obedient enough<</if>> to understand you mean a demonstration is in order. $eventSlave.slaveName starts things off with a <<if $eventSlave.skill.entertainment >= 100>>masterful<<elseif $eventSlave.skill.entertainment > 10>>skillful<<else>>passable<</if>> striptease, culminating in $him <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>bending over<<else>>kneeling<</if>> in front of you. $He eagerly moans as you enter $him, begging for your seed<<if $eventSlave.energy > 95>> like the slut $he is<<elseif $eventSlave.skill.whoring > 30>> like the whore $he is<<elseif ($eventSlave.assignment == "serve in the master suite") || ($eventSlave.assignment == "please you")>> like the fucktoy $he is<</if>>. As you finish, $he <<if $eventSlave.fetish == "cumslut">>opens $his mouth and savors your gift, thanking you once $he's swallowed enough to be able to talk again.<<elseif ($eventSlave.fetish == "buttslut") || ($eventSlave.fetish == "submissive")>>collapses on the floor with $his ass high in the air, thanking you for painting $his hole white.<<else>>thanks you.<</if>> Witnessing this display of servitude from $his <<if $eventSlave.genes == "XX">>daughter<<else>>son<</if>> @@.hotpink;eases $activeSlave.slaveName into $his new life,@@ and @@.mediumaquamarine;gives $him hope@@ $he can find a place here.
<</replace>>
+ <<if ($eventSlave.anus > 0) && ($eventSlave.fetish != "cumslut")>>
+ <<set $eventSlave.counter.anal += 1>>
+ <<set $analTotal += 1>>
+ <<else>>
+ <<set $eventSlave.counter.oral += 1>>
+ <<set $oralTotal += 1>>
+ <</if>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 4>>
<</link>>
@@ -957,10 +964,16 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Show $him how a professional does it">>
<<replace "#introResult">>
- Judging from $his earlier, amateur attempt, it's clear $activeSlave.slaveName is unfamiliar with the subtle nuances of a high-quality rape. You decide to clear your schedule for the rest of the day and teach $him yourself<<if $PC.dick == 0>>, with the help of your trusty strap-on, of course<</if>>. Over the course of several hours,
- <<if isFertile($activeSlave) && $PC.dick > 0>>
- <</if>>
+ Judging from $his earlier, amateur attempt, it's clear $activeSlave.slaveName is unfamiliar with the subtle nuances of a high-quality rape. You decide to clear your schedule for the rest of the day and teach $him yourself<<if $PC.dick == 0>>, with the help of your trusty strap-on, of course<</if>>. Once $he's bent over across your desk and properly restrained, $his lesson begins with you thrusting your <<if $PC.dick == 0>>fake <</if>>cock down $his throat as far as it will go. Over the course of the next several hours, you ensure that $he understands the fine points of nonconsensual oral<<if $activeSlave.vagina > -1>>, vaginal,<</if>> and anal intercourse as intimately as possible. When you're finally too tired to continue,you unshackle $his @@.red;bruised and bloody body@@ and ask $him what $he learned. $His voice hoarse from the same brutal fucking that has gaped $his @@.lime;asshole@@<<if $activeSlave.vagina > -1>> and @@.lime;pussy@@<</if>>, $he hesitantly replies that $he has @@.hotpink;learned a great deal about true dominance,@@ before fainting on the spot from a mixture of total exhaustion and pure terror. You've taught your student well.
<</replace>>
+ <<set $activeSlave.counter.oral += 15, $oralTotal += 15>>
+ <<set $activeSlave.anus = 2, $activeSlave.counter.anal += 15, $analTotal += 15>>
+ <<if $activeSlave.vagina > -1>>
+ <<set $activeSlave.vagina = 2, $activeSlave.counter.vaginal += 15, $vaginalTotal += 15>>
+ <</if>>
+ <<if isFertile($activeSlave) && $PC.dick > 0>>
+ <<= knockMeUp($PC, 100, 0, -1, 1)>>
+ <</if>>
<<set $activeSlave.devotion += 100>>
<</link>>
| <<link "Show $him that $he could have just asked">>
@@ -1843,57 +1856,57 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
<<if $cumSlaves > 3>>
-<br>
-<<link "Fill $him with cum">>
- <<replace "#introResult">>
- You securely restrain your new slave<<if $dairyRestraintsSetting > 1>> in a milking stall<</if>>. A quick finger check of $his holes allows you to choose wisely from a selection of hollow phalluses, which push into your helpless new slave's
- mouth,
- <<set $activeSlave.counter.oral += 1>>
- <<set $oralTotal += 1>>
- <<if ($activeSlave.vagina > 0)>>
- vagina,
- <<set $activeSlave.counter.vaginal += 1>>
- <<set $vaginalTotal += 1>>
- <</if>>
- <<if $activeSlave.anus > 0>>
- and squeeze into $his ass,
- <<set $activeSlave.counter.anal += 1>>
- <<set $analTotal += 1>>
- <</if>>
- with no room to spare.
- Your choices attach to long tubes, and with a fiendish smile you turn a valve. The lines run white with a mixture of fluids from your other slaves, and your newest slave begins to fill.
- <<if $activeSlave.devotion > 20>>
- <<if $activeSlave.fetish == "cumslut">>
- <<if $activeSlave.fetishKnown == 0>>
- $He seems genuinely eager to hold as much of the fluid as $he can. @@.green;$He's a cum fetishist!@@
- <<set $activeSlave.fetishKnown = 1>>
+ <br>
+ <<link "Fill $him with cum">>
+ <<replace "#introResult">>
+ You securely restrain your new slave<<if $dairyRestraintsSetting > 1>> in a milking stall<</if>>. A quick finger check of $his holes allows you to choose wisely from a selection of hollow phalluses, which push into your helpless new slave's
+ mouth,
+ <<set $activeSlave.counter.oral += 1>>
+ <<set $oralTotal += 1>>
+ <<if ($activeSlave.vagina > 0)>>
+ vagina,
+ <<set $activeSlave.counter.vaginal += 1>>
+ <<set $vaginalTotal += 1>>
+ <</if>>
+ <<if $activeSlave.anus > 0>>
+ and squeeze into $his ass,
+ <<set $activeSlave.counter.anal += 1>>
+ <<set $analTotal += 1>>
+ <</if>>
+ with no room to spare.
+ Your choices attach to long tubes, and with a fiendish smile you turn a valve. The lines run white with a mixture of fluids from your other slaves, and your newest slave begins to fill.
+ <<if $activeSlave.devotion > 20>>
+ <<if $activeSlave.fetish == "cumslut">>
+ <<if $activeSlave.fetishKnown == 0>>
+ $He seems genuinely eager to hold as much of the fluid as $he can. @@.green;$He's a cum fetishist!@@
+ <<set $activeSlave.fetishKnown = 1>>
+ <<else>>
+ $He groans with guilty pleasure, feeling $his muscles ache and $his torso swell. Before long, $he reaches a quivering orgasm.
+ <</if>>
+ As you release $him $he swings up with difficulty, but @@.hotpink;$he seems very pleased@@ to stay plugged for now.
+ <<set $activeSlave.devotion += 5>>
<<else>>
- $He groans with guilty pleasure, feeling $his muscles ache and $his torso swell. Before long, $he reaches a quivering orgasm.
+ <<if $activeSlave.eyes == -2>>$His face swells<<else>>$His eyes swell<</if>> with shock, but $he does not flinch or make a sound. When $he seems full enough, you shut off the valve, deciding to leave $him plugged for now. $He waddles off @@.hotpink;without apparent resentment@@ of this treatment.
+ <<set $activeSlave.devotion += 4>>
<</if>>
- As you release $him $he swings up with difficulty, but @@.hotpink;$he seems very pleased@@ to stay plugged for now.
- <<set $activeSlave.devotion += 5>>
<<else>>
- <<if $activeSlave.eyes == -2>>$His face swells<<else>>$His eyes swell<</if>> with shock, but $he does not flinch or make a sound. When $he seems full enough, you shut off the valve, deciding to leave $him plugged for now. $He waddles off @@.hotpink;without apparent resentment@@ of this treatment.
- <<set $activeSlave.devotion += 4>>
- <</if>>
- <<else>>
- <<if $activeSlave.fetish == "cumslut">>
- <<if $activeSlave.fetishKnown == 0>>
- $His eyes swell with profound horror at the realization of what is happening, and begin to leak tears as $he realizes that having $his body swell with semen is getting $him horny. @@.green;$He's a cum fetishist!@@
- <<set $activeSlave.fetishKnown = 1>>
+ <<if $activeSlave.fetish == "cumslut">>
+ <<if $activeSlave.fetishKnown == 0>>
+ $His eyes swell with profound horror at the realization of what is happening, and begin to leak tears as $he realizes that having $his body swell with semen is getting $him horny. @@.green;$He's a cum fetishist!@@
+ <<set $activeSlave.fetishKnown = 1>>
+ <<else>>
+ $He groans with guilty pleasure, feeling $his muscles ache and $his torso swell. $He does not orgasm from $his "meal," but feels much more pleasure than $he's willing to admit.
+ <</if>>
+ When you let $him up, $he's sobbing, more from humiliation than discomfort. However, $he @@.hotpink;submits@@ to an uncomfortable groping of $his stomach, which is pleasingly taut from the inflation. You decide to leave $him plugged for a few hours, impressing on $him still more that $his fate is out of $his control.
+ <<set $activeSlave.devotion += 4>>
<<else>>
- $He groans with guilty pleasure, feeling $his muscles ache and $his torso swell. $He does not orgasm from $his "meal," but feels much more pleasure than $he's willing to admit.
+ $He gasps in horror, and starts to struggle frantically against $his bonds. However, as the fluid reaches $him $he seems to resign $himself to $his fate. Once $he reaches a fullness you like you let $him up, @@.gold;fearful@@ due to the humiliation rather than the swelling. $He limps off to $his new duties as quickly as $he can, before you can unplug $him. Oh well!
+ <<set $activeSlave.trust -= 4>>
<</if>>
- When you let $him up, $he's sobbing, more from humiliation than discomfort. However, $he @@.hotpink;submits@@ to an uncomfortable groping of $his stomach, which is pleasingly taut from the inflation. You decide to leave $him plugged for a few hours, impressing on $him still more that $his fate is out of $his control.
- <<set $activeSlave.devotion += 4>>
- <<else>>
- $He gasps in horror, and starts to struggle frantically against $his bonds. However, as the fluid reaches $him $he seems to resign $himself to $his fate. Once $he reaches a fullness you like you let $him up, @@.gold;fearful@@ due to the humiliation rather than the swelling. $He limps off to $his new duties as quickly as $he can, before you can unplug $him. Oh well!
- <<set $activeSlave.trust -= 4>>
<</if>>
- <</if>>
- $His first day promises to be a full one!
- <</replace>>
-<</link>>
+ $His first day promises to be a full one!
+ <</replace>>
+ <</link>>
<</if>>
<<if ($activeSlave.amp != 1)>>
--
GitLab