Fix and dedupe bug where clamp play would occur without context if toy already clamped

1 files changed, 15 insertions, 11 deletions

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 2cf9200..6918f38 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -632,8 +632,20 @@ def clamps = {
 			["let me see.", "hands behind your back."]]);
 	wait(getRandom(10) + 5);
 };
+def clampsShow = {
+	present([DRESSED,TEASE], [
+			["Let me see", "Show me"],
+			["those nipple clamps,", "those nasty clamps,"],
+			["they look painful.", "and jiggle them about for me!"]]);
+	wait(10);
+};
 def preClamps = {
-	clamps();
+	if (is(CLAMPED)) {
+		clampsShow();
+	}
+	else {
+		clamps();
+	}
 	clampPulls(getRandom(4));
 	return 1.8;
 };
@@ -914,21 +926,13 @@ def playBondage = {
 def playClamps = {
 	if (!has(CLAMPS)) return;
 	if (!is(CLAMPED)) clamps();
-	present([DRESSED], [
-			["Let me see", "Show me"],
-			["those nipple clamps", "those nasty clamps"],
-			["they look painful.", "and jiggle them about for me!"]]);
-	wait(10);
+	clampsShow();
 	return clampPulls(3 + getRandom(10));
 };
 def intClamps = {
 	if (!has(CLAMPS)) return;
 	if (!is(CLAMPED)) return;
-	present([DRESSED,TEASE], [
-			["Let me see", "Show me"],
-			["those nipple clamps", "those nasty clamps"],
-			["they look painful.", "and jiggle them about for me!"]]);
-	wait(10);
+	clampsShow();
 	return clampPulls(getRandom(5));
 };
 def intSqueeze = {