From 080713ab80b3550f88a2e6b708b67d988ea9ec25 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 31 Aug 2017 16:46:27 -0400
Subject: [PATCH] fixes and reFullBed.tw tweaks (wip)
---
src/uncategorized/REroyalblood.tw | 3 +-
src/uncategorized/nextWeek.tw | 2 +-
src/uncategorized/randomNonindividualEvent.tw | 7 +-
src/uncategorized/reFullBed.tw | 78 +++++++++++++------
src/utility/raWidgets.tw | 2 +-
5 files changed, 64 insertions(+), 28 deletions(-)
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index bf5923780b2..facd94da7f8 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -832,7 +832,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</for>>
<</replace>>
<</if>>
-</span>
<<if $cash >= 2500000>>
<br><<link "Send a unheard amount of credits and goods to retrive the entire court.">>
<<replace "#result">>
@@ -1017,8 +1016,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
<</replace>>
-</span>
<</link>> // It will cost about ¤2500000 to enslave the entire court.//
<<else>>
//You lack the necessary funds to enslave the entire court.//
<</if>>
+</span>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 7340197e58a..025ada049bd 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -230,7 +230,7 @@
<<set $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $boobsID = -1, $boobsInterestTargetID = -1, $brideSlave = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $FResult = 0, $groomSlave = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $i = 0, $individualCosts = 0, $influenceBonus = 0, $j = 0, $masochistID = -1, $masochistInterestTargetID = -1, $opinion = 0, $r = 0, $subID = -1, $submissiveInterestTargetID = -1, $weddingSlaveID = -1, $x = 0>>
/% 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 = [], $qualifiedFS = []>>
+<<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 = []>>
/% Slave Objects using 0 instead of null. Second most memory eaten up. %/
<<set $activeSlave = 0, $displaySlave = 0, $domSlave = 0, $eventSlave = 0, $RERelationshipSlave = 0, $slaveWithoutBonuses = 0, $subSlave = 0, $milfSlave = 0, $milkTap = 0, $relation = 0>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 15410e493c8..64faad6176c 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -273,7 +273,12 @@
<</if>>
<<if $fuckSlaves > 1>>
- <<set $events.push("RE full bed")>>
+ <<set $bedSlaves = $slaves.filter(function(s) { return s.devotion > 50 && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine") && s.amp != 1 && canDoAnal(s); })>>
+ <<if def $bedSlaves[1]>>
+ <<set $bedSlaves = $bedSlaves.shuffle()>>
+ <<set $bedSlaves.length = 2>>
+ <<set $events.push("RE full bed")>>
+ <</if>>
<</if>>
<<if $fuckSlaves > 3>>
<<set $events.push("RE staffed morning")>>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index fc6607bcc92..8a1367707e8 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -2,17 +2,19 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
-<<set _bedSlaveIndex = []>>
-<<for _i = 0; _i < $slaves.length; _i++>>
- <<if $slaves[_i].devotion > 50 && $slaves[_i].anus > 0 && ($slaves[_i].assignment == "please you" || $slaves[_i].assignment == "serve in the master suite" || $slaves[_i].assignment == "be your Concubine") && $slaves[_i].amp != 1>>
- <<set _bedSlaveIndex.push(_i)>>
- <</if>>
-<</for>>
-<<if _bedSlaveIndex.length < 2>>
- <<goto "RIE Eligibility Check">>
-<<else>>
-<<set _bedSlaveOne = _bedSlaveIndex.pluck()>>
-<<set _bedSlaveTwo = _bedSlaveIndex.pluck()>>
+<<set _bedSlaveOne = $slaves.findIndex(function(s) { return s.ID == $bedSlaves[0].ID; })>>
+<<set _bedSlaveTwo = $slaves.findIndex(function(s) { return s.ID == $bedSlaves[1].ID; })>>
+
+/* 000-250-006 */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_bedSlaveOne] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_bedSlaveTwo] 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
You have the luxury of being attended to by a coterie of devoted sex slaves. Tonight, $slaves[_bedSlaveTwo].slaveName and $slaves[_bedSlaveOne].slaveName are with you when it's time for bed, so they strip naked and climb under the sheets with you, one on either side. Each snuggles in under one of your arms so she can rest her head on your shoulder, a hand on your chest, her breasts against your flank, <<if $slaves[_bedSlaveTwo].belly > 5000 && $slaves[_bedSlaveOne].belly > 5000>>her swollen belly against yours, <</if>>and the warmth between her legs against your hip.
@@ -26,30 +28,60 @@ Today was an unusually relaxing day, and you aren't particularly tired.
<<link "Take a slave in each hand">>
<<replace "#result">>
With your arms each around a slave, you begin to run your hands across their bodies. They snuggle closer to you, their nipples growing hard and their hips grinding against you. As your grasp runs lower and lower, cupping and massaging their buttocks, they begin to kiss the chest against which their adoring faces are pressed, and reach down <<if $PC.dick == 0>>to your pussy<<else>><<if $PC.vagina == 1>>towards your cock and cunt<<else>>for your member<</if>><</if>>. The more manually skilled begins to give you a gentle stroke, while the other softly massages your <<if ($PC.dick == 0)>>mons<<else>>testicles<</if>>. They stiffen in unison when you hook two fingers up each asshole, but immediately relax and begin to work you harder. They orgasm one after the other, their butts clenching against your intruding fingers, and then eagerly clean you with their mouths when you climax yourself. They have become @@.hotpink;still more devoted to you.@@
- <<set $slaves[_bedSlaveOne].devotion += 4>>
- <<set $slaves[_bedSlaveTwo].devotion += 4>>
- <<set $slaves[_bedSlaveOne].analCount += 1>>
- <<set $slaves[_bedSlaveTwo].analCount += 1>>
+ <<set $slaves[_bedSlaveOne].devotion += 4, $slaves[_bedSlaveTwo].devotion += 4>>
+ <<set $slaves[_bedSlaveOne].analCount++, $slaves[_bedSlaveTwo].analCount++>>
<<set $analTotal += 2>>
<</replace>>
<</link>>
<<if bigBellyPreg($slaves[_bedSlaveOne]) && bigBellyPreg($slaves[_bedSlaveTwo]) && $PC.dick == 1>>
<br><<link "Fondle their pregnancies">>
<<replace "#result">>
- With your arms each around a slave, you begin to run your hands across their bodies, focusing your attention on their full pregnancies. They snuggle closer to you, their nipples growing hard and their hips grinding against you. As they move, your rising cock catches in between their gravid middles, giving you an idea. Shifting your arms under and around their backs, you pull them together over your erect member and begin using their taut stomachs to pleasure yourself. They quickly catch on and push closer to each other, trapping your dick between them. Once they begin rubbing, and you humping, the skin surrounding you is quickly coated in precum. They smile at you as they feel your penis tense, and with one final thrust you coat their bellies in a layer of cum. They love your discovery of a new way to enjoy their bodies and become @@.hotpink;even more devoted to you.@@
- <<set $slaves[_bedSlaveOne].devotion += 5>>
- <<set $slaves[_bedSlaveTwo].devotion += 5>>
+ With your arms each around a slave, you begin to run your hands across their bodies, focusing your attention on their full pregnancies. They snuggle closer to you, their nipples growing hard and their hips grinding against you. As they move, your rising cock catches between their gravid middles, giving you an idea. Shifting your arms under and around their backs, you pull them together over your erect member and begin using their taut stomachs to pleasure yourself. They quickly catch on and push closer to each other, trapping your dick between them. Once they begin rubbing, and you humping, the skin surrounding you is quickly coated in precum. They smile at you as they feel your penis tense, and with one final thrust you coat their bellies in a layer of cum. They love your discovery of a new way to enjoy their bodies and become @@.hotpink;even more devoted to you.@@
+ <<set $slaves[_bedSlaveOne].devotion += 5, $slaves[_bedSlaveTwo].devotion += 5>>
+ <</replace>>
+<</link>>
+<</if>>
+/*
+<<if canGetPregnant($slaves[_bedSlaveOne]) && canGetPregnant($slaves[_bedSlaveTwo]) && $PC.dick == 1>>
+<br><<link "Tire yourself out with some babymaking">>
+ <<replace "#result">>
+ Without warning, you roll on top of $slaves[_bedSlaveOne].slaveName and slip your dick right into her
+ <<if $slaves[_bedSlaveOne].mpreg == 1>>
+ <<if $slaves[_bedSlaveOne].vagina == 0>>virgin <</if>>anus.
+ <<else>>
+ <<if $slaves[_bedSlaveOne].vagina == 0>>virgin <</if>>pussy.
+ <</if>>
+ Once the surprise wears off and the pleasure sets in, she wraps her arms around you and basks in your attention. Feeling left out, $slaves[_bedSlaveTwo].slaveName slides over to tease her bucking bedmate. Drawing close to the moaning girl, she reaches for for bouncing tits, only to cop a feel of your cock thrusting deep inside her. She watches, eyes wide with lust, at the bulge of your penis in her lower belly. You make sure to give her a show before you cum, thrusting hard and deep as you can. She gasps at the sight and brings her hand to the lump just in time to feel you ejaculate deep inside $slaves[_bedSlaveOne].slaveName. You beckon her to lie down next to exhausted girl and spread her legs for her seeding. As you take her, $slaves[_bedSlaveOne].slaveName leans over and pulls her into a deep kiss. You make sure to not blow your next load too quickly, instead savoring the sight of your soon-to-be-mothers making out, but you can only hold out so long before you paint the depths of $slaves[_bedSlaveTwo].slaveName's <<if $slaves[_bedSlaveTwo].vagina == 0>>once virgin <</if>>pussy with your potent baby batter. You switch off with the two of them, fucking them in turn, until both girls pass out with a hand on the other's belly and cum pooling from their thoroughly seeded pussies. You slide back in between them for a well earned sleep. They have become @@.hotpink;still more devoted to you.@@
<</replace>>
<</link>>
<</if>>
+*/
<br><<link "Pull up the sheets and wrestle">>
<<replace "#result">>
Without warning, you jerk the sheets all the way up and pin them at the head of the bed. They giggle as you seize first the one and then the other, groping and tickling. $slaves[_bedSlaveTwo].slaveName and $slaves[_bedSlaveOne].slaveName catch the spirit of fun, and rove around in the soft darkness under the sheets. You're <<if $PC.dick == 1>>rock hard<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>soaking wet<</if>> in no time, wrestling with two naked slaves, and begin to fuck the first one you can grab and hold. <<if ($slaves[_bedSlaveOne].amp != 1) && ($slaves[_bedSlaveTwo].amp != 1)>>When you <<if ($PC.dick == 0)>>finish with her<<else>>come inside her<</if>>, you release her and she slides out of bed to wash; by the time she gets back under the sheets, clean and fresh, you're on the point of filling the other.<<else>>When you <<if ($PC.dick == 0)>>finish with her<<else>>come inside her<</if>>, you carry her limbless, helpless body out of bed to wash her, and then return to the bed to fuck the other.<</if>> You switch off with the two of them, fucking them in turn, until everyone falls asleep in an exhausted pile. They have become @@.mediumaquamarine;still more trusting of you.@@
- <<set $slaves[_bedSlaveOne].trust += 4>>
- <<set $slaves[_bedSlaveTwo].trust += 4>>
- <<set $slaves[_bedSlaveOne].analCount += 3>>
- <<set $slaves[_bedSlaveTwo].analCount += 3>>
- <<set $analTotal += 6>>
+ <<set $slaves[_bedSlaveOne].trust += 4, $slaves[_bedSlaveTwo].trust += 4>>
+ <<if canDoVaginal(_bedSlaveOne)>>
+ <<set $slaves[_bedSlaveOne].vaginalCount += 2>>
+ <<set $vaginalTotal += 2>>
+ <<set $slaves[_bedSlaveOne].analCount++>>
+ <<set $analTotal++>>
+ <<KnockMeUp $slaves[_bedSlaveOne] 10 2 -1>>
+ <<else>>
+ <<set $slaves[_bedSlaveOne].analCount += 3>>
+ <<set $analTotal += 3>>
+ <<KnockMeUp $slaves[_bedSlaveOne] 15 1 -1>>
+ <</if>>
+ <<if canDoVaginal(_bedSlaveTwo)>>
+ <<set $slaves[_bedSlaveTwo].vaginalCount += 2>>
+ <<set $vaginalTotal += 2>>
+ <<set $slaves[_bedSlaveTwo].analCount++>>
+ <<set $analTotal++>>
+ <<KnockMeUp $slaves[_bedSlaveTwo] 10 2 -1>>
+ <<else>>
+ <<set $slaves[_bedSlaveTwo].analCount += 3>>
+ <<set $analTotal += 3>>
+ <<KnockMeUp $slaves[_bedSlaveTwo] 15 1 -1>>
+ <</if>>
<</replace>>
<</link>>
</span>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 51d6f986e67..8233ac9a288 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -1911,7 +1911,7 @@ Diet support for growth drugs:
<<replace "#applied">>
<<for _rai = 0; _rai < $slaves.length; _rai++>>
<<if ($slaves[_rai].useRulesAssistant)>>
- <<set $slaves[_rai].currentSummary = 0>>
+ <<ClearSummaryCache $slaves[_rai]>>
<<CheckAutoRulesActivate $slaves[_rai]>> /* does not use or modify $currentRule */
<<DefaultRules $slaves[_rai]>> /* does not use or modify $currentRule */
<</if>>
--
GitLab