From 9b941d6346381e3458fe9f5140d3de1d7f4fc7f2 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 20 Apr 2019 12:18:15 +0100
Subject: Fix bug around undressing/exposing/unlocking

Reported by Yorushi.
---
 scripts/toy.groovy | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 11843fe..a6d2a3e 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -19,6 +19,7 @@ return new Object() {
 	// 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", DILDO = "dildo";
 	final SPOON = "spoon";
+	final COCK = "cock";
 	// fetish.<name>
 	final BONDAGE = "bondage", CBT = "cbt", CHORES = "chores", PAIN = "pain";
 	// toy.permission.<name>
@@ -343,6 +344,7 @@ return new Object() {
 		return null;
 	};
 	def harden = { imageSpec ->
+		expose(imageSpec);
 		present(imageSpec, [
 				["I want to see you hard.", "I need you hard now, very hard."],
 				["Stroke it, slowly...", "Slow worship strokes..."],
@@ -371,12 +373,14 @@ return new Object() {
 		playBackgroundSound(null);
 	};
 	def expose = { imageSpec ->
+		if (sessionToys[COCK]) return;
 		if (!is(NAKED)) {
 			present(imageSpec, [
 					["Get that cock out, toy;", "Let's see that cock of mine."],
 					["I want to torment it.", "It's playtime!"]]);
 			wait(10);
 		}
+		sessionToys[COCK] = getTime();
 	};
 	// Return whether toy came or not
 	def mightCum = { time, lenient = false, reason = "without permission" ->
@@ -692,11 +696,11 @@ return new Object() {
 		showButtonG("Yes, ${dommeTitle()}", "ok");
 		wait(15);
 		set(CHASTE, false);
+		sessionToys[COCK] = getTime();
 		showButtonGT("Thank you, ${dommeTitle()}", "ok", 80, 1);
 	};
 	def preEdge = {
 		if (is(CHASTE)) return;
-		expose([DRESSED]);
 		harden([DRESSED]);
 		edge(4, [DRESSED]);
 		present([DRESSED], [
@@ -798,6 +802,7 @@ return new Object() {
 				["hands behind your head,", "arms up,", "hands high up,"],
 				["let me see you properly.", "let's see what we have.", "I want a good view."]]);
 		wait(10);
+		sessionToys[COCK] = getTime();
 		return 1.1;
 	};
 
-- 
cgit v1.2.3