From fe0c22c5ddd1237a63f5a4fafa2a4d4a032cd97a Mon Sep 17 00:00:00 2001
From: fcanon <fcanon@nowhere.na>
Date: Tue, 30 May 2017 00:36:16 -0400
Subject: [PATCH] fix frequency of REFI events
---
src/uncategorized/randomNonindividualEvent.tw | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 58d272f44ab..fd3b3097701 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -196,39 +196,41 @@
<</if>>
<</for>>
+<<set $buttslutInterestTargetID = 0, $cumslutInterestTargetID = 0, $submissiveInterestTargetID = 0, $humiliationInterestTargetID = 0, $boobsInterestTargetID = 0, $pregnancyInterestTargetID = 0, $masochistInterestTargetID = 0>>
+
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($slaves[$i].speechRules != "restrictive")>>
<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
<<if ($slaves[$i].fetish == "none") || ($slaves[$i].fetishStrength <= 60)>>
- <<if ($buttslutID != 0)>>
+ <<if ($buttslutID != 0) && ($buttslutInterestTargetID == 0)>>
<<if ($slaves[$i].anus != 0)>>
<<set $REFIevent.push("buttslut")>>
<<set $buttslutInterestTargetID = $slaves[$i].ID>>
<</if>>
<</if>>
- <<if ($cumslutID != 0)>>
+ <<if ($cumslutID != 0) && ($cumslutInterestTargetID == 0)>>
<<set $REFIevent.push("cumslut")>>
<<set $cumslutInterestTargetID = $slaves[$i].ID>>
<</if>>
- <<if ($subID != 0)>>
+ <<if ($subID != 0) && ($submissiveInterestTargetID == 0)>>
<<set $REFIevent.push("submissive")>>
<<set $submissiveInterestTargetID = $slaves[$i].ID>>
<</if>>
- <<if ($humiliationID != 0)>>
+ <<if ($humiliationID != 0) && ($humiliationInterestTargetID == 0)>>
<<set $REFIevent.push("humiliation")>>
<<set $humiliationInterestTargetID = $slaves[$i].ID>>
<</if>>
- <<if ($boobsID != 0)>>
+ <<if ($boobsID != 0) && ($boobsInterestTargetID == 0)>>
<<set $REFIevent.push("boobs")>>
<<set $boobsInterestTargetID = $slaves[$i].ID>>
<</if>>
- <<if ($pregnancyID != 0)>>
+ <<if ($pregnancyID != 0) && ($pregnancyInterestTargetID == 0)>>
<<if ($slaves[$i].anus != 0)>>
<<set $REFIevent.push("pregnancy")>>
<<set $pregnancyInterestTargetID = $slaves[$i].ID>>
<</if>>
<</if>>
- <<if ($masochistID != 0)>>
+ <<if ($masochistID != 0) && ($masochistInterestTargetID == 0)>>
<<if ($slaves[$i].anus != 0)>>
<<set $REFIevent.push("masochist")>>
<<set $masochistInterestTargetID = $slaves[$i].ID>>
--
GitLab