From 9955cd7c3460a38e6356c668668fa450faa5661b Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 30 Dec 2018 12:28:29 +0000 Subject: Don't exit when owner goes to bed, just drop back to the lounge Also adds check toy isn't still up shortly after --- scripts/toy.groovy | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/scripts/toy.groovy b/scripts/toy.groovy index 6844554..1deaf3c 100644 --- a/scripts/toy.groovy +++ b/scripts/toy.groovy @@ -28,7 +28,7 @@ final REDRESS = "redress"; final TOYTOYS = [CUFFED, COLLARED, CLAMPED, GAGGED]; final RELEASEFROM = "releaseFrom"; final LUNCH = "lunch", SHOPPING = "shopping", PARTY = "party", SLEEPING = "sleeping"; -final BEDTIME = "bedtime", WAKEUP = "wakeup"; +final BEDTIME = "bedtime", WAKEUP = "wakeup", BEDTIMECHECK = "bedtimeCheck"; final BEGINPLAN = "beginPlan", ENDPLAN = "endPlan"; final FRIENDS = [ "Tori", "Sophie", "Krystal" ]; // toy.position @@ -1188,6 +1188,8 @@ def bedtime = { rt, schedTime -> ["Very good, toy.", "OK."], ["Bedtime for you!", "Off to bed with you!", "Bed! Now!"]]); showButtonG("Good night, mistress", "night"); + addEvent(BEDTIMECHECK, getTime() + 300 + getRandom(600), BEDTIMECHECK); + showLounge(); } // Assume toy will return dressed tomorrow removeEvent(REDRESS); @@ -1201,8 +1203,21 @@ def bedtime = { rt, schedTime -> def t = schedTime + (6 * (int)HOUR) + getRandom(2 * (int)HOUR); addEvent(SLEEPING, t, WAKEUP); removeEvent(PLAY); - if (rt) { - exit(); +}; +def bedtimeCheck = { rt -> + dress([[LINGERIE,nTITS]]); + if (rt && sessionSummon([LINGERIE,nTITS])) { + present([LINGERIE,nTITS], [ + ["Hey!", "Ah ha!"], + ["What are you doing still up?", "Didn't I send you to bed?"]]); + showButtonG("Sorry, mistress", "sorry"); + present([LINGERIE,nTITS], [ + ["Get yourself to bed", "In bed"], + ["right now!", "this instant!"], + ["I'll deal with you later."]]); + showButtonG("Yes, mistress", "ok"); + adjustPunish(75); + showLounge(); } }; def wakeup = { rt -> @@ -1435,6 +1450,7 @@ def endPlan = { rt, plan -> // Initial - basic checks and defaults namedEvents = [ bedtime: { name, arg, schedTime, rt -> bedtime(rt, schedTime) }, + bedtimeCheck: { name, arg, schedTime, rt -> bedtimeCheck(rt) }, wakeup: { name, arg, schedTime, rt -> wakeup(rt) }, beginPlan: { name, arg, schedTime, rt -> beginPlan(rt, name, arg) }, endPlan: { name, arg, schedTime, rt -> endPlan(rt, name) }, -- cgit v1.2.3