From 7a2ab4ce528b6fc315bd1ead0670076a34e81f43 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 23 Jun 2019 19:18:05 +0100
Subject: Move clampPulls

---
 scripts/toy.groovy      | 47 -----------------------------------------------
 scripts/toy/pain.groovy | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 213232a..cea79c0 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -255,53 +255,6 @@ return new Object() {
 		}
 		return tt;
 	};
-	def clampPulls = { amount ->
-		getRandom(1 + amount).times {
-			if (getRandom(2)) {
-				present([DRESSED], [
-						["Take them off.", "Remove them."]]);
-				wait(6 + getRandom(8));
-				if (getRandom(2)) {
-					present([DRESSED], [
-							["And put them back on", "Put them back"],
-							["right where they came from.", "where they were."]]);
-				}
-				else {
-					present([DRESSED], [
-							["Flip them", "Turn them"],
-							["90 degrees", "around"],
-							["and put them back.", "and replace them."]]);
-				}
-				wait(10 + getRandom(8));
-			}
-			else if (getRandom(2)) {
-				present([DRESSED], [
-						["Twist them"],
-						["for me.", "... twist those nipples."]]);
-				wait(6 + getRandom(5));
-				if (getRandom(2)) {
-					present(null, [
-							["More!", "A little more!", "Further!"]]);
-					wait(getRandom(10) + 2);
-				}
-			}
-			present([DRESSED], [
-					["Pull them tight.", "Pull them!"]]);
-			wait(getRandom(10) + 5);
-			if (getRandom(5) == 0) {
-				present(null, [
-						["Tighter!", "Harder!", "Further!"]]);
-				wait(getRandom(10) + 2);
-				present(null, [
-						["Haha!", "Ooo, they must hurt.", "Do they hurt?"]]);
-				wait(3);
-			}
-			present(null, [
-					["Release them.", "Let them go."]]);
-			wait(getRandom(5) + 3);
-		};
-		return amount;
-	};
 	// Pre-tease
 	def preStrip = { imageSpec = [DRESSED] ->
 		if (stateIs(NAKED)) return 1.1;
diff --git a/scripts/toy/pain.groovy b/scripts/toy/pain.groovy
index 05c7bb1..9e6b0c7 100644
--- a/scripts/toy/pain.groovy
+++ b/scripts/toy/pain.groovy
@@ -27,6 +27,54 @@
 		pause(getRandom(10) + 5);
 	};
 
+	toy.metaClass.clampPulls { amount ->
+		getRandom(1 + amount).times {
+			if (getRandom(2)) {
+				present([DRESSED], [
+						["Take them off.", "Remove them."]]);
+				pause(6 + getRandom(8));
+				if (getRandom(2)) {
+					present([DRESSED], [
+							["And put them back on", "Put them back"],
+							["right where they came from.", "where they were."]]);
+				}
+				else {
+					present([DRESSED], [
+							["Flip them", "Turn them"],
+							["90 degrees", "around"],
+							["and put them back.", "and replace them."]]);
+				}
+				pause(10 + getRandom(8));
+			}
+			else if (getRandom(2)) {
+				present([DRESSED], [
+						["Twist them"],
+						["for me.", "... twist those nipples."]]);
+				pause(6 + getRandom(5));
+				if (getRandom(2)) {
+					present(null, [
+							["More!", "A little more!", "Further!"]]);
+					pause(getRandom(10) + 2);
+				}
+			}
+			present([DRESSED], [
+					["Pull them tight.", "Pull them!"]]);
+			pause(getRandom(10) + 5);
+			if (getRandom(5) == 0) {
+				present(null, [
+						["Tighter!", "Harder!", "Further!"]]);
+				pause(getRandom(10) + 2);
+				present(null, [
+						["Haha!", "Ooo, they must hurt.", "Do they hurt?"]]);
+				pause(3);
+			}
+			present(null, [
+					["Release them.", "Let them go."]]);
+			pause(getRandom(5) + 3);
+		};
+		return amount;
+	};
+
 	toy.metaClass.clampsShow {
 		present([DRESSED,TEASE], [
 				["Let me see", "Show me"],
-- 
cgit v1.2.3