From 74f9e025947ccbe62b7b818521863cc770e16b2a Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 8 Jul 2019 19:30:01 +0100 Subject: Tag all activities --- images/toy/domme.groovy | 3 ++- scripts/toy.groovy | 4 +++- scripts/toy/bondage.groovy | 6 +++--- scripts/toy/cbt.groovy | 4 ++-- scripts/toy/chastity.groovy | 4 ++-- scripts/toy/humiliation.groovy | 6 +++--- scripts/toy/misc.groovy | 4 ++-- scripts/toy/pain.groovy | 8 ++++---- scripts/toy/tease.groovy | 6 +++--- 9 files changed, 24 insertions(+), 21 deletions(-) diff --git a/images/toy/domme.groovy b/images/toy/domme.groovy index 3e90153..3b55023 100644 --- a/images/toy/domme.groovy +++ b/images/toy/domme.groovy @@ -75,7 +75,8 @@ ], [ select: 'repeat', number: 'toy.randRange(1, 2 + ((toy.prop.punishment ?: 0) / 100))', - activities: [ 'playKneel', 'playBeatCock', 'playBeatBalls', 'playClamps', 'playNothing' ], + activities: [ 'playKneel', 'playBeatCock', 'playBeatBalls', 'playClamps' ], + intervals: [ null, 'intNothing' ], use: 'punishApply' ], [ select: 'take', diff --git a/scripts/toy.groovy b/scripts/toy.groovy index 597f71c..a77c5dd 100644 --- a/scripts/toy.groovy +++ b/scripts/toy.groovy @@ -40,6 +40,7 @@ return new Object() { final SITTER = "sarah-james"; final SOFT = "soft"; final DISAPPOINT = "disappoint"; + final PRE = "pre", INT = "int", PUNISH = "punish", REWARD = "reward", HUMILIATION = "humiliation"; final DATAFOLDER = getDataFolder(); // Imagery @@ -303,9 +304,10 @@ return new Object() { def setSessionAbort = { String r = null -> sessionAborted = r }; final activityList = [:]; - final addActivity = { String name, func, images = [] -> + final addActivity = { String name, func, images = [], tags = [] -> activityList[name] = [ func: func, + tags: tags ?: [], images: images ?: [] ]; } diff --git a/scripts/toy/bondage.groovy b/scripts/toy/bondage.groovy index 46803c1..ce17774 100644 --- a/scripts/toy/bondage.groovy +++ b/scripts/toy/bondage.groovy @@ -92,10 +92,10 @@ return waitTime; }; - toy.addActivity("preGag", { toy.preGag() }, [[toy.DRESSED]]); - toy.addActivity("preCollar", { toy.preCollar() }, [[toy.DRESSED]]); + toy.addActivity("preGag", { toy.preGag() }, [[toy.DRESSED]], [toy.PRE, toy.HUMILIATION, toy.BONDAGE]); + toy.addActivity("preCollar", { toy.preCollar() }, [[toy.DRESSED]], [toy.PRE, toy.HUMILIATION, toy.BONDAGE]); toy.addActivity("playBondage", { toy.playBondage() }, [ - [toy.DRESSED, toy.nTEASE], [toy.DRESSED, toy.TEASE], [toy.STOOD] ]); + [toy.DRESSED, toy.nTEASE], [toy.DRESSED, toy.TEASE], [toy.STOOD] ], [toy.PLAY, toy.PUNISH, toy.BONDAGE]); return { toy.addToy(toy.COLLAR, toy.COLLARED, "collar", "May I remove my collar?"); toy.addToy(toy.HANDCUFFS, toy.CUFFED, "handcuffs", "May I be uncuffed?"); diff --git a/scripts/toy/cbt.groovy b/scripts/toy/cbt.groovy index 30afcb3..e239988 100644 --- a/scripts/toy/cbt.groovy +++ b/scripts/toy/cbt.groovy @@ -102,7 +102,7 @@ return count * 5; }; - toy.addActivity("playBeatCock", { toy.playBeatCock() }, [[toy.DRESSED, toy.nTITS]]); - toy.addActivity("playBeatBalls", { toy.playBeatBalls() }, [[toy.DRESSED]]); + toy.addActivity("playBeatCock", { toy.playBeatCock() }, [[toy.DRESSED, toy.nTITS]], [toy.PLAY, toy.PUNISH, toy.PAIN]); + toy.addActivity("playBeatBalls", { toy.playBeatBalls() }, [[toy.DRESSED]], [toy.PLAY, toy.PUNISH, toy.PAIN]); return null; } diff --git a/scripts/toy/chastity.groovy b/scripts/toy/chastity.groovy index f04f4fc..7fd5830 100644 --- a/scripts/toy/chastity.groovy +++ b/scripts/toy/chastity.groovy @@ -106,8 +106,8 @@ } }; - toy.addActivity('preRelease', { toy.preRelease() }, [[toy.DRESSED, toy.TEASE]]); - toy.addActivity('preChastity', { toy.preChastity() }, [[toy.DRESSED, toy.TEASE]]); + toy.addActivity('preRelease', { toy.preRelease() }, [[toy.DRESSED, toy.TEASE]], [toy.PRE, toy.REWARD]); + toy.addActivity('preChastity', { toy.preChastity() }, [[toy.DRESSED, toy.TEASE]], [toy.PRE, toy.PUNISH]); toy.addActivity('postChastity', { toy.postChastity() }, [ [toy.DRESSED, toy.TEASE], [toy.DRESSED, toy.nTEASE]]); return null; diff --git a/scripts/toy/humiliation.groovy b/scripts/toy/humiliation.groovy index a2e4137..0ac8e2b 100644 --- a/scripts/toy/humiliation.groovy +++ b/scripts/toy/humiliation.groovy @@ -195,10 +195,10 @@ }; toy.addNamedEvent(toy.REDRESS, { name, arg, schedTime, rt -> toy.redress(rt) }); - toy.addActivity("preStrip", { toy.preStrip() }, [[toy.DRESSED]]); - toy.addActivity("playKneel", { toy.playKneel() }, [[toy.DRESSED]]); + toy.addActivity("preStrip", { toy.preStrip() }, [[toy.DRESSED]], [toy.PRE, toy.HUMILIATION]); + toy.addActivity("playKneel", { toy.playKneel() }, [[toy.DRESSED]], [toy.PLAY, toy.HUMILIATION]); toy.addActivity("playSuck", { toy.playSuck() }, [ - [toy.DRESSED, toy.nTEASE], [toy.DRESSED, toy.TEASE]]); + [toy.DRESSED, toy.nTEASE], [toy.DRESSED, toy.TEASE]], [toy.PLAY, toy.HUMILIATION]); toy.addRequestable("clothes", "May I wear clothes", { toy.requestClothes() }, { toy.stateIs(toy.NAKED) }); diff --git a/scripts/toy/misc.groovy b/scripts/toy/misc.groovy index 140d82c..6696f56 100644 --- a/scripts/toy/misc.groovy +++ b/scripts/toy/misc.groovy @@ -1,5 +1,5 @@ { toy -> - toy.metaClass.playNothing { + toy.metaClass.intNothing { (getRandom(3) + 2).times { show(imageTagsComment(showImage([TITS]))); pause(getRandom(10) + 10); @@ -8,6 +8,6 @@ toy.addNamedEvent(toy.PERMIT, { name, arg, schedTime, rt -> toy.givePermission(arg) }); toy.addRequestable("faq", "FAQ (webpage)", { useUrl("http://toy.randomdan.homeip.net/"); }); - toy.addActivity("playNothing", { toy.playNothing() }, [[toy.TITS]]); + toy.addActivity("intNothing", { toy.intNothing() }, [[toy.TITS]], [toy.INT]); return null; } diff --git a/scripts/toy/pain.groovy b/scripts/toy/pain.groovy index 861674e..9ccc9a2 100644 --- a/scripts/toy/pain.groovy +++ b/scripts/toy/pain.groovy @@ -129,10 +129,10 @@ }; }; - toy.addActivity('preClamps', { toy.preClamps() }, [[toy.DRESSED, toy.TEASE]]); - toy.addActivity('playClamps', { toy.playClamps() }, [[toy.DRESSED, toy.TEASE]]); - toy.addActivity('intSqueeze', { toy.intSqueeze() }, [[toy.DRESSED, toy.TEASE]]); - toy.addActivity('intClamps', { toy.intClamps() }, [[toy.DRESSED, toy.TEASE]]); + toy.addActivity('preClamps', { toy.preClamps() }, [[toy.DRESSED, toy.TEASE]], [toy.PRE, toy.PAIN]); + toy.addActivity('playClamps', { toy.playClamps() }, [[toy.DRESSED, toy.TEASE]], [toy.PLAY, toy.PUNISH, toy.PAIN]); + toy.addActivity('intSqueeze', { toy.intSqueeze() }, [[toy.DRESSED, toy.TEASE]], [toy.INT, toy.PAIN]); + toy.addActivity('intClamps', { toy.intClamps() }, [[toy.DRESSED, toy.TEASE]], [toy.INT, toy.PAIN]); return { toy.addToy(toy.CLAMPS, toy.CLAMPED, "nipple clamps", "May I remove the nipple clamps?"); } diff --git a/scripts/toy/tease.groovy b/scripts/toy/tease.groovy index af90dd8..74e3fbe 100644 --- a/scripts/toy/tease.groovy +++ b/scripts/toy/tease.groovy @@ -186,8 +186,8 @@ }; toy.setDefault("toy.strokeTeaseOffset", 0); - toy.addActivity("playStrokes", { toy.playStrokes() }, [[toy.TITS]]); - toy.addActivity("playEdges", { toy.playEdges() }, [[toy.TITS]]); - toy.addActivity("preEdge", { toy.preEdge() }, [[toy.DRESSED]]); + toy.addActivity("playStrokes", { toy.playStrokes() }, [[toy.TITS]], [toy.PLAY, toy.REWARD, toy.TEASE]); + toy.addActivity("playEdges", { toy.playEdges() }, [[toy.TITS]], [toy.PLAY, toy.REWARD, toy.TEASE]); + toy.addActivity("preEdge", { toy.preEdge() }, [[toy.DRESSED]], [toy.PRE, toy.REWARD, toy.TEASE]); return null; } -- cgit v1.2.3