From 40aaf463b091e004ec6b762b4dba3831b99893cc Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 6 Jan 2019 12:57:17 +0000
Subject: Add image comments during stroking

---
 scripts/toy.groovy | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'scripts/toy.groovy')

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 15c4728..497d903 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -478,7 +478,7 @@ def edge = { amount, imageSpec ->
 	};
 };
 def strokes = { amount, imageSpec ->
-	present(imageSpec, [
+	def tags = present(imageSpec, [
 			["Stroke to the beat, toy.", "Follow the beat.", "Beat it!"],
 			["No cumming unless I say so...", "Don't cum without my say so,"],
 			["Tell me if you get too close.", "so tell me if you're edging.", "I don't want any messes."]]);
@@ -491,15 +491,30 @@ def strokes = { amount, imageSpec ->
 		];
 	def sto = loadInteger("toy.strokeTeaseOffset");
 	def edges = 0;
+	def itr = 0;
 	(getRandom(amount) + 5).times {
 		if (sessionAborted) return;
+		switch (itr) {
+			case 2:
+				final cmt = imageTagsComment(tags);
+				if (cmt) {
+					show(cmt);
+				}
+				break;
+			case 4:
+				present(null, [
+						["Don't stop stroking!", "Keep jerking.", "Keep stroking."]]);
+				break;
+		}
+		itr += 1;
 		def beatNo = getRandom(BEATS.size());
 		def beat = BEATS[beatNo];
 		playBackgroundSound("toy/${beat.bpm}bpm.mp3", 10); // Lots, to cover offset
-		def len = getRandom(Math.max(1, beat.len + (sto * beatNo)));
+		def len = getRandom(Math.max(5, beat.len + (sto * beatNo)));
 		if (showButtonG("Edging, mistress", "edging", len) < len) {
 			sto -= 1;
 			edges += 1;
+			itr = 0;
 			playBackgroundSound(null);
 			switch (getRandom(3)) {
 				case 0:
@@ -544,7 +559,7 @@ def strokes = { amount, imageSpec ->
 					}
 					playBackgroundSound(null);
 			}
-			present(imageSpec, [
+			tags = present(imageSpec, [
 					["Back to stroking, toy...", "Get to it again...."],
 					["follow the beat..."],
 					["no accidents.", "and concentrate."]]);
-- 
cgit v1.2.3