diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index a26a7120732f3d3e9993fea1c25d0b9949aac7fe..b30e8819813bab1d5bd6be80d89bcfb0bc33be8d 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -59,7 +59,7 @@
<<set $slaves[_refi].induceLactation += 4>>
<<run induceLactation($slaves[_refi])>>
<</if>>
- <<case "dominant">>
+ <<case "dom">>
/* TODO: expand this */
<<set $activeSlave = getSlave($dominantInterestTargetID)>>
<<set _refi = $slaveIndices[$dominantID]>>
@@ -98,8 +98,6 @@
<<set $slaves[_refi].analCount += 1>>
<<set $analTotal += 1>>
<</if>>
- <<case "dom">>
- <<case "sadist">>
<</switch>>
<<if Array.isArray($REFIevent)>>
@@ -516,7 +514,7 @@ Though you never touch anything but _his2 nipples, _he2 climaxes twice. After yo
<</if>>
It seems $he passed by while you were drinking from $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.
-<<case "dominant">>
+<<case "dom">>
/* 000-250-006 */
<<if $seeImages == 1>>
@@ -686,7 +684,12 @@ It seems $he passed by while you were buttfucking $subSlave.slaveName and found
<</if>>
/* 000-250-006 */
-You wake up to the sensation of $subSlave.slaveName eagerly sucking your dick. _He2's industriously pumping _his2 mouth up and down on your member. In truth, $subSlave.slaveName doesn't give the perfect blowjob: _he2 loves cum so much that _he2 mostly enjoys oral sex in an anticipatory way, and usually works to make the recipient cum as soon as possible so as to get _his2 favorite treat into _his2 mouth quicker. Still, _his2 enthusiasm is nice and _he2 does have permission to wake you at your usual time in this way. As you get up after finishing, you notice <<EventNameLink $activeSlave>> at the door to your bedroom. You call $him in.
+<<if $PC.dick > 0>>
+ You wake up to the sensation of $subSlave.slaveName eagerly sucking your dick. _He2's industriously pumping _his2 mouth up and down on your member. In truth, $subSlave.slaveName doesn't give the perfect blowjob: _he2 loves cum so much that _he2 mostly enjoys oral sex in an anticipatory way, and usually works to make the recipient cum as soon as possible so as to get _his2 favorite treat into _his2 mouth quicker. Still, _his2 enthusiasm is nice and _he2 does have permission to wake you at your usual time in this way. As you get up after finishing, you notice <<EventNameLink $activeSlave>> at the door to your bedroom. You call $him in.
+<<else>>
+ /* TODO: add checks for release rules / whether the slave can service other slaves / citizens */
+ You come across $subSlave.slaveName in the middle of what appears to be an impromptu blowbang, one that seems to be drawing to a close. One by one, the citizens pull out of _his2 wide-open mouth and splash cum into it. The bliss on _his2 face is obvious even from where you are standing, and as you watch the scene unfolding before you, you notice <<EventNameLink $activeSlave>> is also looking on. You call $him over.
+<</if>>
<br><br>
<<EventNameLink $activeSlave>> hesitates before explaining $himself, and the $desc is obviously aroused:
<<if ($activeSlave.dick > 0) && ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>>
@@ -718,7 +721,7 @@ You wake up to the sensation of $subSlave.slaveName eagerly sucking your dick. _
<<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 $subSlave.slaveName was blowing you. $He swallows painfully at the <<if canSee($activeSlave)>>sight of the satisfied cumslut swirling your ejaculate around _his2 mouth<<elseif canHear($activeSlave)>>sound of the satisfied cumslut savoring your fresh load<<else>>reminder of the taste and texture of your cum<</if>>. 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 <<if $PC.dick > 0>>in the midst of _his2 little oral party<<else>>blowing you<</if>>. $He swallows painfully at the <<if canSee($activeSlave)>>sight of the satisfied cumslut swirling the ejaculate around _his2 mouth<<elseif canHear($activeSlave)>>sound of the satisfied cumslut savoring the fresh load<<else>>reminder of the taste and texture of the cum<</if>>. It should be possible to either encourage this fascination or steer $him away from it for now.
<<case "humiliation">>
@@ -1595,40 +1598,39 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<</replace>>
<</link>>
-<<case "dominant">>
-/* TODO: rewrite this */
+<<case "dom">>
-<<link "Turn $him into a submissive too">>
+<<link "Turn $him into a dominant too">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
<<if canWalk($activeSlave) && canSee($activeSlave)>>
- You snap your fingers at $activeSlave.slaveName and point commandingly at the floor next to your desk. You tell $him that a proper sub does what $his dom wants, always, and leave $him kneeling obediently beside you for some time.
+ You order a passing slave to come in and kneel besides you, then snap your fingers at $activeSlave.slaveName and point commandingly at her. You tell $him that a proper dom does what $he wants -- with your permission, of course -- and order $him to get started on the other slave.
<<elseif $activeSlave.amp == 1>>
- You place $activeSlave.slaveName's helpless body on the floor next to your desk. You tell $him that a proper sub does what $his dom wants, always, and leave $him lying obediently beside you for some time.
+ You place $activeSlave.slaveName's helpless body on the floor next to your desk, then order a passing slave to come in and service $him. You tell $him that a proper dom does what he wants -- with your permission, of course -- and order $him to tell the other slave what to do.
<<else>>
- You guide $activeSlave.slaveName to the floor next to your desk and push $him to $his knees. You tell $him that a proper sub does what $his dom wants, always, and leave $him waiting obediently beside you for some time.
+ You order a passing slave to come in and kneel besides you, then guide $activeSlave.slaveName to the waiting slave. You tell $him that a proper dom does what $he wants -- with your permission, of course -- and order $him to get started on the other slave.
<</if>>
- Then, without preamble, you stand up again and <<if $PC.dick == 0>>ride $his face<<else>>throatfuck $him<</if>>, intentionally ensuring that $he gags and struggles. $activeSlave.slaveName spends almost all $his sexual experiences in subspace for the rest of the week. Even other slaves who have sex with $him are required to use $him, not make love to $him. @@.hotpink;$He has become more obedient,@@ and @@.lightcoral;$his sexuality now focuses on submission.@@
+ Then, you watch as $he begins to use the other slave as $his plaything. $activeSlave.slaveName spends almost all $his sexual experiences dominating other slaves for the rest of the week. The other slaves who have sex with $him are $his to use, not for $him to make love to. @@.hotpink;$He has become more obedient,@@ and @@.lightcoral;$his sexuality now focuses on domination.@@
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.oralCount += 10, $oralTotal += 10>>
- <<set $activeSlave.fetish = "submissive", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
+ <<set $activeSlave.fetish = "dom", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
<</replace>>
<</link>>
-<br><<link "Steer $him away from total submission for the moment">>
+<br><<link "Steer $him away from total domination 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 submission, and make $him
+ 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 domination, and
<<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
- ride <<if ($PC.dick == 0)>>a strap-on you're wearing<<else>>your dick<</if>>.
+ make $him take <<if ($PC.dick == 0)>>a strap-on you've put on<<else>>your dick<</if>>, hard.
<<= VaginalVCheck()>>
<<elseif canDoAnal($activeSlave) && $activeSlave.anus > 0>>
- ride <<if ($PC.dick == 0)>>a strap-on you're wearing<<else>>your dick<</if>>.
+ make $him take <<if ($PC.dick == 0)>>a strap-on you've put on<<else>>your dick<</if>>, hard.
<<= AnalVCheck()>>
<<else>>
- <<if $PC.dick == 1>>suck you off<<if $PC.vagina == 1>> and eat you out<</if>><<else>>eat you out<</if>> at $his own pace.
+ <<if $PC.dick == 1>>ram your dick down $his throat<<if $PC.vagina == 1>> and make $him eat you out<</if>><<else>>mash your clit in $his face, making $him eat you out<</if>>.
<<set $activeSlave.oralCount++, $oralTotal++>>
<</if>>
- You ensure that $he maintains the active role throughout. You'll keep an eye on $him, and with this correction @@.hotpink;$he'll become more obedient.@@
+ You ensure that $he maintains the submissive role throughout. You'll keep an eye on $him, and with this correction @@.hotpink;$he'll become more obedient.@@
<<set $activeSlave.devotion += 4>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index f5f2a66720a61b1601548915acf0aacb41f82aca..631f325e1df5dd4a27186f17094d049e097ec4c6 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -379,7 +379,7 @@
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
/% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
<<set $i = 0, $j = 0, $x = 0, $r = 0, $opinion = 0, $influenceBonus = 0, $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $FResult = 0, $groomSlave = -1, $brideSlave = -1, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>>
-<<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $dominantID = -1, $dominantInterestID = -1, $subID = -1, $submissiveInterestTargetID = -1>>
+<<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $domID = -1, $dominantInterestID = -1, $subID = -1, $submissiveInterestTargetID = -1>>
/% Other arrays %/
<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $qualifiedNicknames = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $qualifiedFS = [], $eligibleSlaves = [], $slavesInLine = []>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 43bc740c0f10fbc8f42b5edecab444ed92088ec9..997662ba0af99ef9223774ab4a8c7825710f4f87 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -287,7 +287,7 @@
<<set $cumslutInterestTargetID = $slaves[$i].ID>>
<</if>>
<<if ($dominantID != 0) && ($dominantInterestTargetID == 0)>>
- <<set $REFIevent.push("dominant")>>
+ <<set $REFIevent.push("dom")>>
<<set $dominantInterestTargetID = $slaves[$i].ID>>
<<if ($subID != 0) && ($submissiveInterestTargetID == 0)>>
<<set $REFIevent.push("submissive")>>