From d920b116327e904ece82be019176425dbff971bf Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Tue, 2 Oct 2018 00:51:29 -0400
Subject: [PATCH] isSlaveAvailable fix
---
src/uncategorized/RESS.tw | 26 +++++++++++-----------
src/uncategorized/randomIndividualEvent.tw | 14 ++++++------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 5dded971f9c..f2078f269f7 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -6685,7 +6685,8 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look.
<</if>>
<</replace>>
<</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take virginity//<</if>>
-<<if ($cumSlaves >= 5)>>
+<<set _cumSlaves = $slaves.filter(function(s) { return s.assignment == "work in the dairy" && s.balls > 0 && isSlaveAvailable(s) && canPenetrate(s); })>>
+<<if _cumSlaves.length >= 5>>
<br><<link "Replace the machines with cockmilkees from the Dairy">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
@@ -6700,18 +6701,17 @@ $He cranes her neck, glancing over her shoulder to give you a pleading look.
<</if>>
<<set $activeSlave.devotion += 4>>
<<set _totalFuckers = 0>>
- <<for _RESS = 0; _RESS < $slaves.length; _RESS++>>
- <<if $slaves[_RESS].assignment == "work in the dairy" && $slaves[_RESS].balls != 0 && canPenetrate($slaves[_RESS])>>
- <<set $slaves[_RESS].devotion += 4, $slaves[_RESS].penetrativeCount++>>
- <<set $penetrativeTotal++, _totalFuckers++>>
- <<if canImpreg($activeSlave, $slaves[_RESS])>>
- <<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>>
- <<= knockMeUp($activeSlave, 5, 2, $slaves[_RESS].ID)>>
- <<elseif canDoVaginal($activeSlave)>>
- <<= knockMeUp($activeSlave, 5, 0, $slaves[_RESS].ID)>>
- <<elseif canDoAnal($activeSlave)>>
- <<= knockMeUp($activeSlave, 5, 1, $slaves[_RESS].ID)>>
- <</if>>
+ <<for _ress = 0; _ress < _cumSlaves.length; _ress++>>
+ <<set _RESS = $slaveIndices[_cumSlaves[_ress].ID]>>
+ <<set $slaves[_RESS].devotion += 4, $slaves[_RESS].penetrativeCount++>>
+ <<set $penetrativeTotal++, _totalFuckers++>>
+ <<if canImpreg($activeSlave, $slaves[_RESS])>>
+ <<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>>
+ <<= knockMeUp($activeSlave, 5, 2, $slaves[_RESS].ID)>>
+ <<elseif canDoVaginal($activeSlave)>>
+ <<= knockMeUp($activeSlave, 5, 0, $slaves[_RESS].ID)>>
+ <<elseif canDoAnal($activeSlave)>>
+ <<= knockMeUp($activeSlave, 5, 1, $slaves[_RESS].ID)>>
<</if>>
<</if>>
<</for>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index fd287d76a0b..75978ee01a4 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -86,6 +86,13 @@
<</if>>
<</if>>
<</if>>
+ <<if $slaves[$i].anus > 0 && canDoAnal($slaves[$i])>>
+ <<if $slaves[$i].devotion > 50>>
+ <<if $slaves[$i].amp == 0>>
+ <<set $RERepressedAnalVirginSubIDs.push($slaves[$i].ID)>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if $slaves[$i].assignmentVisible == 1>>
<<if $slaves[$i].livingRules == "luxurious">>
@@ -96,13 +103,6 @@
<</if>>
<</if>>
<</if>>
- <<if $slaves[$i].anus > 0 && canDoAnal($slaves[$i])>>
- <<if $slaves[$i].devotion > 50>>
- <<if $slaves[$i].amp == 0>>
- <<set $RERepressedAnalVirginSubIDs.push($slaves[$i].ID)>>
- <</if>>
- <</if>>
- <</if>>
<</if>>
<</if>>
<<if $slaves[$i].assignment == "work in the dairy" || $slaves[$i].assignment == "get milked">>
--
GitLab