From c182b142f43642f46dc49dda8a15a2836093ba28 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 15 Dec 2018 13:01:01 +0000
Subject: Don't risk intervals calling themselves

---
 scripts/toy.groovy | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'scripts/toy.groovy')

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 312bb8e..1cb9672 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -1001,17 +1001,16 @@ def sessionPlay = {
 			adjustPunish(-val * ph);
 		}
 	};
-	def interval = {
-		def activities = [null, intClamps, intSqueeze];
-		apply(activities[getRandom(activities.size())], null);
-	};
 	def apply = { activitity, use = null ->
 		if (!activitity) return;
 		def val = (Float)activitity();
 		if (use) {
 			use(val);
 		}
-		interval();
+	};
+	def interval = {
+		def activities = [null, intClamps, intSqueeze];
+		apply(activities[getRandom(activities.size())], null);
 	};
 	def playRepeat = { amount, activities, use = null ->
 		amount.times {
@@ -1041,7 +1040,7 @@ def sessionPlay = {
 	else {
 		// Sub pleasure: good toy
 		playRepeat(1 + getRandom(3), [preRelease, preEdge, preGag, preClamps, preCollar, preStrip]);
-		playRepeat(1 + getRandom(3), [playStrokes, playEdges]);
+		playRepeat(1 + getRandom(3), [playStrokes, playEdges], interval);
 		playTake(getRandom(3), [postCum, postChastity]);
 		if (!sessionAborted) {
 			addEventIfMissing(CUM, getTime() + (DAY * 2) + getRandom(DAY * 2), PERMIT, CUM); // 2 - 4 days from now
-- 
cgit v1.2.3