summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2018-12-28 01:45:23 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2018-12-28 01:45:23 +0000
commitfe9123f929fce5b3853179a2b0c2b54b284ab253 (patch)
treeb4b90c6a854e4d36f01cbfd47a02a5beb3cdf278 /scripts
parentRemove and reschedule play event in case it occurred during immediate punishment (diff)
downloadtoy-fe9123f929fce5b3853179a2b0c2b54b284ab253.zip
Fix and dedupe bug where clamp play would occur without context if toy already clamped
Diffstat (limited to 'scripts')
-rw-r--r--scripts/toy.groovy26
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 = {