From 7796abd8d6b74b40808d113744a85caf14d88e09 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 29 Mar 2019 19:22:58 +0000
Subject: Don't repeat suck instructions if dildo already present

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

(limited to 'scripts')

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 994af35..b9c31c4 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -15,7 +15,7 @@ final HOUR = 3600.0;
 final soonFormatter = java.time.format.DateTimeFormatter.ofPattern("EEEE 'at' h:mma");
 // Notes
 // toys.<name> ankle_cuffs, ballgag, blindfold, chastity_belt, clothespins, cockring, dog_collar, handcuffs, hood, nipple_clamps, ring_gag
-final BALLGAG = "ballgag", COLLAR = "dog_collar", CLAMPS = "nipple_clamps", CHASTITY = "chastity_belt", HANDCUFFS = "handcuffs";
+final BALLGAG = "ballgag", COLLAR = "dog_collar", CLAMPS = "nipple_clamps", CHASTITY = "chastity_belt", HANDCUFFS = "handcuffs", DILDO = "dildo";
 final SPOON = "spoon";
 // fetish.<name>
 final BONDAGE = "bondage", CBT = "cbt", CHORES = "chores", PAIN = "pain";
@@ -1088,23 +1088,32 @@ def playSuck = {
 	def suckBeat = { beat, n ->
 		suck("toy/${beat}bpm.mp3", n, 2 * (60 / beat));
 	};
-	present([DRESSED], [
-			["Time for you to amuse me, you little slut."],
-			["Get your dildo and secure it somewhere nearby, about eye level when kneeling."]]);
-	wait(10);
-	showButtonGT("Done, ${dommeTitle()}", "done", 60, 1);
-	present([DRESSED], [
-			["The rules are simple:\n"],
-			["On my first bell, you take the head in your mouth and start to pleasue it.\n"],
-			["When you hear the beat, you suck the shaft, one beat in, one beat out again.\n"],
-			["Lastly, on the crack of my whip, you take the whole thing in and suck from the base.\n"],
-			["I know you'll enjoy it, don't be shy.\n"],
-			["One more thing..."],
-			["That cock doesn't doesn't leave your mouth until I say so, listen for second bell and then return to me."]]);
-	showButtonGT("Understood, ${dommeTitle()}", "understood", 30, 1);
-	present([TEASE], [
-			["Get ready"]]);
-	showButtonGT("Ready, ${dommeTitle()}", "ready", 10, 1);
+	if (sessionToys.containsKey(DILDO)) {
+		present([DRESSED], [
+				["Back to your dildo.", "Amuse me some more."],
+				["Same as before, listen for my bell, slut."]]);
+		showButtonG("Yes, ${dommeTitle()}", "ok");
+	}
+	else {
+		present([DRESSED], [
+				["Time for you to amuse me, you little slut."],
+				["Get your dildo and secure it somewhere nearby, about eye level when kneeling."]]);
+		wait(10);
+		showButtonGT("Done, ${dommeTitle()}", "done", 60, 1);
+		sessionToys[DILDO] = getTime();
+		present([DRESSED], [
+				["The rules are simple:\n"],
+				["On my first bell, you take the head in your mouth and start to pleasure it.\n"],
+				["When you hear the beat, you suck the shaft, one beat in, one beat out again.\n"],
+				["Lastly, on the crack of my whip, you take the whole thing in and suck from the base.\n"],
+				["I know you'll enjoy it, don't be shy.\n"],
+				["One more thing..."],
+				["That cock doesn't doesn't leave your mouth until I say so, listen for second bell and then return to me."]]);
+		showButtonGT("Understood, ${dommeTitle()}", "understood", 30, 1);
+		present([TEASE], [
+				["Get ready"]]);
+		showButtonGT("Ready, ${dommeTitle()}", "ready", 10, 1);
+	}
 	show(null);
 
 	final target = loadInteger("toy.deepthroat.goal") ?: 5;
-- 
cgit v1.2.3