From dfcba0a0d3c9de9037ee0e45eb2725398b782069 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 10 Jul 2019 16:54:53 +0100 Subject: Simplify final punish activities and stop bondage occurring twice --- images/toy/domme.groovy | 2 +- scripts/toy/bondage.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/toy/domme.groovy b/images/toy/domme.groovy index 6335d3a..40d374d 100644 --- a/images/toy/domme.groovy +++ b/images/toy/domme.groovy @@ -81,7 +81,7 @@ ], [ select: 'take', number: 'toy.randRange(1, 2 + ((toy.prop.punishment ?: 0) / 100))', - activities: [ 'playBondage', '*play,punish' ], + activities: [ '*!pre,!int,punish' ], use: 'punishApply' ], [ activities: [ 'postChastity' ] diff --git a/scripts/toy/bondage.groovy b/scripts/toy/bondage.groovy index d0cf42b..399f7ff 100644 --- a/scripts/toy/bondage.groovy +++ b/scripts/toy/bondage.groovy @@ -95,7 +95,7 @@ toy.addActivity("preGag", { toy.preGag() }, [[toy.DRESSED]], [toy.PRE, toy.HUMILIATION, toy.BONDAGE, toy.BALLGAG]); toy.addActivity("preCollar", { toy.preCollar() }, [[toy.DRESSED]], [toy.PRE, toy.HUMILIATION, toy.BONDAGE, toy.COLLAR]); toy.addActivity("playBondage", { toy.playBondage() }, [ - [toy.DRESSED, toy.nTEASE], [toy.DRESSED, toy.TEASE], [toy.STOOD] ], [toy.PLAY, toy.PUNISH, toy.BONDAGE]); + [toy.DRESSED, toy.nTEASE], [toy.DRESSED, toy.TEASE], [toy.STOOD] ], [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?"); -- cgit v1.2.3