diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index e157663a37f599761ca1061133eace728baed236..6864e4c35b8a35ab922a096724aede5170cdaabc 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,11 @@
4/20/2018
+ 65
+ -finished REFI cleaning
+ -red army uniform and schutzstaffel uniform from Deepmurk
+ -more vectors from Deepmurk too
+
64
-added options to allow/deny DJ and Madam fixing flaws
-added anon's pirate themed FCTV channel
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index e00be24723345205ff238fd4adcdabe38eb968da..92a3d673effb060293156f608367dfd9a95e7b85 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -571,6 +571,7 @@ It seems she passed by while $subSlave.slaveName was blowing you. She swallows p
<<set $analTotal += 1>>
<</if>>
<<set $subSlave = $slaves[_refi]>>
+<<set _subBelly = bellyAdjective($subSlave)>>
/* 000-250-006 */
<<if $seeImages == 1>>
@@ -583,9 +584,37 @@ It seems she passed by while $subSlave.slaveName was blowing you. She swallows p
<</if>>
/* 000-250-006 */
-You have $subSlave.slaveName pinned up against a railing on a balcony that overlooks a public atrium. Passersby below cannot see you, but they can certainly see $subSlave.slaveName's upper body as she takes your dick. She's blushing furiously with the sex and with her trademark mixed arousal and embarrassment at having an audience. She makes a show of trying to disguise the fact that she's getting railed, but it's obvious. When you finish, you pull her off the railing so she can clean up. <<EventNameLink $activeSlave>> saw the denouement of this exhibitionist fun, and seems intrigued.
+You have $subSlave.slaveName pinned up against a railing on a balcony that overlooks a public atrium. Passersby below cannot see you, but they can certainly see $subSlave.slaveName's upper body as she takes your dick. She's blushing furiously with the sex and with her trademark mixed arousal and embarrassment at having an audience. She makes a show of trying to disguise the fact that she's getting railed, but it's obvious. When you finish, you pull her off the railing so she can clean up. <<EventNameLink $activeSlave>> <<if canSee($activeSlave)>>saw<<else>>heard<</if>> the denouement of this exhibitionist fun, and seems intrigued.
<br><br>
-<<EventNameLink $activeSlave>> hesitates before explaining herself, and the $desc is obviously aroused: <<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>she's got a string of precum leaking out of her chastity cage<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormoneBalance >= 100)>>though her hormone-filled body can't get her dick hard any more, she's got a string of precum coming off her member<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>though her gelded body can't get her dick hard any more, she's got a string of precum coming off her limp member<<elseif $activeSlave.dick > 4>>her gigantic cock is standing out like a mast<<elseif $activeSlave.dick > 2>>she's sporting an impressive erection<<elseif $activeSlave.dick > 0>>her little penis is rock hard<<elseif $activeSlave.clit > 0>>her large clit is visibly engorged<<else>>her nipples are hard and there's a sheen on her pussylips<</if>>. There was a glint of envy in her eyes when she saw $subSlave.slaveName's satisfaction at being publicly used. It should be possible to either encourage this fascination with humiliation or steer her away from it for now.
+<<EventNameLink $activeSlave>> hesitates before explaining herself, and the $desc is obviously aroused:
+<<if ($activeSlave.dick > 0) && ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>>
+ she's got a string of precum leaking out of her chastity cage.
+<<elseif ($activeSlave.dick > 0) && ($activeSlave.hormoneBalance >= 100)>>
+ though her hormone-filled body can't get her dick hard any more, she's got a string of precum coming off her member.
+<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>
+ though her gelded body can't get her dick hard any more, she's got a string of precum coming off her limp member.
+<<elseif canAchieveErection($activeSlave)>>
+ <<if $activeSlave.dick > 4>>
+ her gigantic cock is standing out like a mast.
+ <<elseif $activeSlave.dick > 2>>
+ she's sporting an impressive erection.
+ <<elseif $activeSlave.dick > 0>>
+ her little penis is rock hard.
+ <</if>>
+<<elseif $activeSlave.dick > 7>>
+ she's got a string of precum coming off her engorged member.
+<<elseif $activeSlave.dick > 0>>
+ she's got a string of precum coming off her limp member.
+<<elseif $activeSlave.clit > 0>>
+ her large clit is visibly engorged.
+<<elseif $activeSlave.vagina > -1>>
+ her nipples are hard and there's a sheen on her pussylips.
+<<elseif $activeSlave.balls > 0>>
+ her nipples are hard and there is a distinct dribble of precum running from her featureless crotch.
+<<else>>
+ her nipples are hard and there is a clear scent of lust around her.
+<</if>>
+There was a glint of envy <<if canSee($activeSlave)>>in her eyes when she saw<<else>>across her face as she listened to<</if>> $subSlave.slaveName's satisfaction at being publicly used. It should be possible to either encourage this fascination with humiliation or steer her away from it for now.
<<default>>
<br>ERROR: bad REFI event $REFIevent
@@ -1413,38 +1442,63 @@ You have $subSlave.slaveName pinned up against a railing on a balcony that overl
<<link "Turn her into a cumslut too">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- Focusing a slave's sexuality on cum isn't as easy as some other manipulations, for the simple reason that even you have a limited supply of the stuff. So, you take another approach; you instruct $activeSlave.slaveName to accompany $subSlave.slaveName, and vice versa, whenever their duties permit. They're to act as sexual partners, and share cum whenever there's any forthcoming. They spend the week giving blowjobs whenever they can, and making out to swap the cum back and forth afterward. If someone insists on penetrating them instead, that just means that the other has to suck it out of her before they can share it. Most importantly, $activeSlave.slaveName is punished if she ever orgasms without cum in her mouth. Soon, she gets aroused by the mere scent of the stuff. @@.hotpink;She has become more submissive to you,@@ and @@.lightcoral;her sexuality now focuses on cum.@@
+ Focusing a slave's sexuality on cum isn't as easy as some other manipulations, for the simple reason that even you have a limited supply of the stuff and it would be a shame to waste it all on her. So, you take another approach; you instruct $activeSlave.slaveName to accompany $subSlave.slaveName, and vice versa, whenever their duties permit. They're to act as sexual partners, and share cum whenever there's any forthcoming. They spend the week giving blowjobs whenever they can, and making out to swap the cum back and forth afterward. If someone insists on penetrating them instead, that just means that the other has to suck it out of her before they can share it. Most importantly, $activeSlave.slaveName is punished if she ever orgasms without cum in her mouth. Soon, she gets aroused by the mere scent of the stuff. @@.hotpink;She has become more submissive to you,@@ and @@.lightcoral;her sexuality now focuses on cum.@@
<<set $activeSlave.devotion += 4>>
- <<set $activeSlave.oralCount += 50>>
- <<set $oralTotal += 50>>
- <<set $activeSlave.fetish = "cumslut">>
+ <<set $activeSlave.oralCount += 50, $oralTotal += 50>>
+ <<set $activeSlave.fetish = "cumslut", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
<</replace>>
<</link>>
<br><<link "Steer her away from cum obsession 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 she can give voice to her interest in cum, and fuck her until she orgasms, but you are careful to keep your cum well away from her. You'll keep an eye on her, and with this correction @@.hotpink;she'll become more submissive to you.@@
- <<SimpleVCheck>>
+ Good slaves get aroused according to their masters' whim, not their own silly tendencies. You call $activeSlave.slaveName over before she can give voice to her interest in cum, and
+ <<if (canDoVaginal($activeSlave) && $activeSlave.vagina > 0) || (canDoAnal($activeSlave) && $activeSlave.anus > 0)>>
+ fuck her until she orgasms, but you are careful to keep your cum well away from her.
+ <<else>>
+ enjoy her until she orgasms, making sure to not involve cum at all.
+ <</if>>
+ You'll keep an eye on her, and with this correction @@.hotpink;she'll become more submissive to you.@@
+ <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
+ <<set $activeSlave.vaginalCount++, $vaginalTotal++>>
+ <<elseif canDoAnal($activeSlave) && $activeSlave.anus > 0>>>>
+ <<set $activeSlave.analCount++, $analTotal++>>
+ <</if>>
<<set $activeSlave.devotion += 4>>
<</replace>>
-<</link>><<if (($activeSlave.anus == 0) && ($activeSlave.vagina == -1)) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
+<</link>>
<<case "humiliation">>
<<link "Turn her into a humiliation fetishist too">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You bring $activeSlave.slaveName to the railing $subSlave.slaveName just left. For a long while, you just play with her naked breasts, requiring her to look any member of the public below that stares at her right in the eyes. She sobs and shakes with abject embarrassment as she locks eyes with person after person. After enough of this, she's so sexually primed that she orgasms convulsively almost immediately after you enter her from behind. @@.hotpink;She has become more obedient,@@ and @@.lightcoral;her sexuality now focuses on public humiliation.@@
- <<SimpleVCheck>>
- <<set $activeSlave.fetish = "humiliation">>
- <<set $activeSlave.fetishKnown = 1>><<set $activeSlave.fetishStrength = 65>>
+ You bring $activeSlave.slaveName to the railing $subSlave.slaveName just left. For a long while, you just play with her naked breasts, <<if canSee($activeSlave)>>requiring her to look any member of the public below that stares at her right in the eyes<<else>>making sure to keep her well informed of how many passersby are ogling her<</if>>. She sobs and shakes with abject embarrassment <<if canSee($activeSlave)>>as she locks eyes with person after person<<else>>whistle and catcall<</if>>. After enough of this, she's so sexually primed that she orgasms convulsively almost immediately
+ <<if (canDoVaginal($activeSlave) && $activeSlave.vagina > 0) || (canDoAnal($activeSlave) && $activeSlave.anus > 0)>>
+ after you enter her from behind.
+ <<else>>
+ once run your hand across her crotch.
+ <</if>>
+ @@.hotpink;She has become more obedient,@@ and @@.lightcoral;her sexuality now focuses on public humiliation.@@
+ <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
+ <<VaginalVCheck>>
+ <<elseif canDoAnal($activeSlave) && $activeSlave.anus > 0>>
+ <<AnalVCheck>>
+ <</if>>
+ <<set $activeSlave.devotion += 4>>
+ <<set $activeSlave.fetish = "humiliation", $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65>>
<</replace>>
<</link>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
<br><<link "Steer her away from humiliation fetishism 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 she can give voice to her interest in humiliation and fuck her privately in your office. You'll keep an eye on her, and with this correction @@.hotpink;she'll become more obedient.@@
- <<SimpleVCheck>>
+ <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
+ <<VaginalVCheck>>
+ <<elseif canDoAnal($activeSlave) && $activeSlave.anus > 0>>
+ <<AnalVCheck>>
+ <<else>>
+ <<SimpleSexAct $activeSlave>>
+ <</if>>
<<set $activeSlave.devotion += 4>>
<</replace>>
<</link>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 23c795dc4398d581bc06ac85fccd3f18cc360e00..9b01bd906a4940db399f2246608236bfd89959ed 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -208,10 +208,8 @@
<</if>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
<<if ($cumslutID == 0)>>
- <<if $PC.dick == 1>>
- <<if !["dildo gag", "massive dildo gag", "ball gag", "bit gag"].includes($slaves[$i].collar)>>
- <<set $cumslutID = $slaves[$i].ID>>
- <</if>>
+ <<if !["dildo gag", "massive dildo gag", "ball gag", "bit gag"].includes($slaves[$i].collar)>>
+ <<set $cumslutID = $slaves[$i].ID>>
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "submissive")>>
@@ -221,16 +219,16 @@
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "humiliation")>>
- <<if ($slaves[$i].anus > 0)>>
- <<if ($humiliationID == 0)>>
- <<set $humiliationID = $slaves[$i].ID>>
- <</if>>
+ <<if (($slaves[$i].anus > 0 && canDoAnal($slaves[$i])) || ($slaves[$i].vagina > 0 && canDoVaginal($slaves[$i])) && $slaves[$i].belly < 30000)>>
+ <<if ($humiliationID == 0)>>
+ <<set $humiliationID = $slaves[$i].ID>>
+ <</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "boobs")>>
<<if ($slaves[$i].lactation > 0)>>
- <<if ($boobsID == 0)>>
- <<set $boobsID = $slaves[$i].ID>>
- <</if>>
+ <<if ($boobsID == 0)>>
+ <<set $boobsID = $slaves[$i].ID>>
+ <</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "pregnancy")>>
<<if ($pregnancyID == 0)>>
@@ -255,10 +253,8 @@
<<if isSlaveAvailable($slaves[$i])>>
<<if ($slaves[$i].fetish == "none") || ($slaves[$i].fetishStrength <= 60)>>
<<if ($buttslutID != 0) && ($buttslutInterestTargetID == 0)>>
- <<if ($slaves[$i].anus != 0)>>
- <<set $REFIevent.push("buttslut")>>
- <<set $buttslutInterestTargetID = $slaves[$i].ID>>
- <</if>>
+ <<set $REFIevent.push("buttslut")>>
+ <<set $buttslutInterestTargetID = $slaves[$i].ID>>
<</if>>
<<if ($cumslutID != 0) && ($cumslutInterestTargetID == 0)>>
<<if $PC.dick == 1>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 2353e99a738fc9a8c0dff4d83bae45843c3373c8..10706e75e2bebcb00faa543565a0b05b4b722fe7 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6097,9 +6097,9 @@
<<elseif !canWalk($slaves[$i]) && ($slaves[$i].diet != "muscle building")>>
<<if $slaves[$i].muscles > -80>>
Since she is incapable of moving herself,
- <<if $universalRulesImmobileSlavesMaintainMuscles == 1 && $slaves[$i].muscles > 5>>
+ <<if $universalRulesImmobileSlavesMaintainMuscles == 1 && $slaves[$i].muscles >= 0>>
and is required to maintain her musculature, she regularly lifts weights to stave off muscular atrophy.
- <<elseif $slaves[$i].muscles > 5>>
+ <<elseif $slaves[$i].muscles >= -5>>
she steadily @@.orange;loses muscle definition.@@
<<set $slaves[$i].muscles-->>
<<else>>