From 72888fa24ddd2ce0c8f5204040ae65861d211f55 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 24 Mar 2019 16:15:00 +0000 Subject: Get [mistress'] title from domme object --- scripts/toy.groovy | 159 +++++++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 77 deletions(-) diff --git a/scripts/toy.groovy b/scripts/toy.groovy index 3b4aeff..0464e23 100644 --- a/scripts/toy.groovy +++ b/scripts/toy.groovy @@ -158,6 +158,12 @@ def getProp = {i, f, d = null -> if (v == null) return d; return v; }; +def getDommeProp = { i, d = null -> + final v = DOMME[i]; + if (v == null) return d; + return v; +}; +def dommeTitle = { getDommeProp("title", "Mistress") }; def loadB = { p -> loadBoolean(p)}; def loadI = { p -> loadInteger(p)}; def loadS = { p -> loadString(p)}; @@ -236,7 +242,7 @@ def execEvents = { rt -> def sessionAborted = null; def sessionToys = [:]; def gagText = { t, p -> - if (!is(GAGGED)) return t; + if (!is(GAGGED)) return t.toString(); return t.split(/\s+/) .collect { 'm' * getRandom((int)Math.max(1.0, it.length() * 1.0)) + @@ -316,7 +322,6 @@ def imageTagsComment = { tags -> } return null; }; - def harden = { imageSpec -> present(imageSpec, [ ["I want to see you hard.", "I need you hard now, very hard."], @@ -325,21 +330,21 @@ def harden = { imageSpec -> ["and do NOT cum.", "and definitely no cumming."], ["Not yet.", "Maybe soon."]]); playBackgroundSound("toy/90bpm.mp3", 2); //45sec - if (showButtonG("Hard, mistress", "hard", 60) == 60) { + if (showButtonG("Hard, ${dommeTitle()}", "hard", 60) == 60) { playBackgroundSound(null); present(imageSpec, [ ["What's taking so long!?", "Come on!", "Don't disappoint me."], ["Slap it about a bit!.", "Get it hard, now!", "Pinch your nipples."]]); playBackgroundSound("toy/165bpm.mp3"); - if (showButtonG("Hard, mistress", "hard", 30) == 30) { + if (showButtonG("Hard, ${dommeTitle()}", "hard", 30) == 30) { playBackgroundSound("toy/180bpm.mp3"); - if (showButtonG("Hard, mistress", "hard", 30) == 30) { + if (showButtonG("Hard, ${dommeTitle()}", "hard", 30) == 30) { sessionAborted = SOFT; present(imageSpec, [ ["Bah!", "Pathetic!"], ["That's no good to me!", "How do I have fun with that!?"]]); adjustPunish(100); - showButtonG("Sorry, mistress", "sorry"); + showButtonG("Sorry, ${dommeTitle()}", "sorry"); } } } @@ -355,7 +360,7 @@ def expose = { imageSpec -> }; // Return whether toy came or not def mightCum = { time, lenient = false, reason = "without permission" -> - final taken = showButtonG("Sorry, mistress, I'm cumming $reason", "cumming", time); + final taken = showButtonG("Sorry, ${dommeTitle()}, I'm cumming $reason", "cumming", time); if (taken < time) { playBackgroundSound(null); if (lenient && taken < 2) { @@ -374,9 +379,9 @@ def mightCum = { time, lenient = false, reason = "without permission" -> adjustPunish(taken * 10); wait(10); present([DRESSED], [["Clean up your mess!"]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); wait(10); - showButtonG("Cleaned up, mistress, back", "back"); + showButtonG("Cleaned up, ${dommeTitle()}, back", "back"); return true; } return false; @@ -408,7 +413,7 @@ def cumChanceCountdown = { ["Cum, cum", "Cum for me"], ["you little slut.", "my lucky toy.", "you dirty boy."]]); wait(10); - showButtonG("Thank you, mistress.", "ok"); + showButtonG("Thank you, ${dommeTitle()}.", "ok"); return true; }; def cumChanceWindow = { @@ -424,11 +429,11 @@ def cumChanceWindow = { ["Cum, cum", "Cum for me"], ["you little slut.", "my lucky toy.", "you dirty boy."]]); def w = 4 + getRandom(4); - if (showButtonG("Cumming, mistress", "cumming", w) == w) { + if (showButtonG("Cumming, ${dommeTitle()}", "cumming", w) == w) { w = 3; present(null, [ ["Quickly now!", "Hurry!"]]); - if (showButtonG("Cumming, mistress", "cumming", w) == w) { + if (showButtonG("Cumming, ${dommeTitle()}", "cumming", w) == w) { present([TEASE], [ ["Stop!", "Let go.", "Hands off!"], ["Time's up!", "You had your chance."]]); @@ -436,7 +441,7 @@ def cumChanceWindow = { } } wait(10); - showButtonG("Thank you, mistress.", "ok"); + showButtonG("Thank you, ${dommeTitle()}.", "ok"); return true; }; def cumChanceRuin = { @@ -451,12 +456,12 @@ def cumChanceRuin = { present([TITS], [ ["Try to cum!"]]); def w = 3 + getRandom(8); - if (showButtonG("Cumming, mistress", "cumming", w) < w) { + if (showButtonG("Cumming, ${dommeTitle()}", "cumming", w) < w) { present([TEASE], [ ["Hands off!", "Leave it."], ["Let it all ooze out.", "You're not getting a proper release."]]); wait(10); - showButtonG("Thank you, mistress.", "ok"); + showButtonG("Thank you, ${dommeTitle()}.", "ok"); return true; } if (n > 0) { @@ -476,7 +481,7 @@ def edge = { amount, imageSpec -> present(imageSpec, [ ["Stroke to edge now, toy...", "Edge!"], ["Don't cum.", "No cumming.", "No accidents though."]]); - showButtonGT("Edging, mistress", "edging", allowedTime + 20, 1); + showButtonGT("Edging, ${dommeTitle()}", "edging", allowedTime + 20, 1); if (getRandom(2) == 1) { present(imageSpec, [ ["Hold it...", "And hold...", "Keeping going..."]]); @@ -522,7 +527,7 @@ def strokes = { amount, imageSpec -> def beat = BEATS[beatNo]; playBackgroundSound("toy/${beat.bpm}bpm.mp3", 10); // Lots, to cover offset def len = getRandom(Math.max(5, beat.len + (sto * beatNo))); - if (showButtonG("Edging, mistress", "edging", len) < len) { + if (showButtonG("Edging, ${dommeTitle()}", "edging", len) < len) { sto -= 1; edges += 1; itr = 0; @@ -544,8 +549,8 @@ def strokes = { amount, imageSpec -> } case 2: switch(getSelectedValue("Would you like to cum, toy?", [ - gagText("Please, mistress, may I cum!?", "yes"), - gagText("No, mistress, please torment me more!", "no") + gagText("Please, ${dommeTitle()}, may I cum!?", "yes"), + gagText("No, ${dommeTitle()}, please torment me more!", "no") ])) { case 0: if (can(CUM)) { @@ -657,17 +662,17 @@ def preRelease = { ["You should be", "When you're"], ["practically breaking out,", "about to break it for me,"], ["we'll continue.", "then I'll see about letting it out."]]); - showButtonG("Hard, mistress, please let me out", "hard"); + showButtonG("Hard, ${dommeTitle()}, please let me out", "hard"); present([DRESSED,TEASE], [ ["OK then.", "Fine, fine."], ["I'm feeling generous, toy...", "Well, it's no good to me like that..."], ["I have the keys right here,", "I have the keys here somewhere... OK,"], ["unlock yourself and", "take your chastity device off"], ["let me see my cock.", "let's see it."]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); wait(15); set(CHASTE, false); - showButtonGT("Thank you, mistress", "ok", 80, 1); + showButtonGT("Thank you, ${dommeTitle()}", "ok", 80, 1); }; def preEdge = { if (is(CHASTE)) return; @@ -685,17 +690,17 @@ def preGag = { present([DRESSED], [ ["Go fetch your gag, toy...", "Bring me your gag, toy..."], ["Quickly!", "Hurry back!"]]); - showButton("Yes, mistress"); + showButton("Yes, ${dommeTitle()}"); show(null); wait(10); - showButtonGT("Back, mistress", "back", 50, 2); + showButtonGT("Back, ${dommeTitle()}", "back", 50, 2); present([DRESSED], [ ["Good boy.", "Very good."], ["Put it on..."], ["Nice and tight.", "Tight!"], ["I don't want to a hear a word from you.", "A quiet toy is a good toy."]]); set(GAGGED, true); - showButtonGT("Gagged, mistress", "gagged", 20, 2); + showButtonGT("Gagged, ${dommeTitle()}", "gagged", 20, 2); return 1.2; }; def clamps = { @@ -712,11 +717,11 @@ def clamps = { ["Go put your nipple clamps on...", "I want those nipples clamped..."], ["but on your way back...", "no walking though..."], ["crawl, down on all fours.", "on your knees."]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); show(null); wait(10); set(CLAMPED, true); - showButtonGT("Back, mistress", "back", 60, 1); + showButtonGT("Back, ${dommeTitle()}", "back", 60, 1); present([DRESSED], [ ["On your knees,", "Kneel before me"], ["let me see.", "hands behind your back."]]); @@ -746,11 +751,11 @@ def preCollar = { ["You look underdressed, toy.", "A toy without a collar doesn't look right."], ["Go put your collar on", "I want a collar around your neck"], ["and crawl back like the slutty puppy dog you are.", "and kneel before me."]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); show(null); wait(10); set(COLLARED, true); - showButtonGT("Back, mistress", "back", 60, 1); + showButtonGT("Back, ${dommeTitle()}", "back", 60, 1); return 1.1; }; def preStrip = { imageSpec = [DRESSED] -> @@ -761,7 +766,7 @@ def preStrip = { imageSpec = [DRESSED] -> present(imageSpec, [ ["All of them off!", "And the rest!", "Keep going."]]); set(NAKED, true); - showButtonGT("Naked, mistress", "naked", 60, 5); + showButtonGT("Naked, ${dommeTitle()}", "naked", 60, 5); present(null, [ ["Very good. Now...", "I see..."], ["on your knees before me,", "kneel,", "stand up straight,", "on your feet,"], @@ -818,7 +823,7 @@ def chastity = { pre -> } wait(10); show(null); - showButtonGT("Locked, mistress. Here's the key.", "locked", 180, 1); + showButtonGT("Locked, ${dommeTitle()}. Here's the key.", "locked", 180, 1); set(CHASTE, true); present([DRESSED,TEASE], [ ["Good boy.", "Thank you, toy."]]); @@ -837,7 +842,7 @@ def postChastity = { ["keep you like that"], ["all the time?", "permanently?"]]); def sh = getSelectedValue(null, [ - gagText("Yes, Mistres", "yes"), gagText("Please, Mistress, no", "no")]); + gagText("Yes, ${dommeTitle()}", "yes"), gagText("Please, ${dommeTitle()}, no", "no")]); if (sh == 0) { present([DRESSED,TEASE], [ ["Good boy.", "Thank you, toy."]]); @@ -886,9 +891,9 @@ def getSpoon = { ["Go to the kitchen...", "From the kitchen..."], ["bring me", "get yourself"], ["a wooden spoon or similar."]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); wait(5); - showButtonGT("Back, mistress", "back", 20, 1); + showButtonGT("Back, ${dommeTitle()}", "back", 20, 1); sessionToys[SPOON] = getTime(); } }; @@ -905,7 +910,7 @@ def playBeatBalls = { ["Good.", "Right."], ["Take those balls in one hand", "In one hand, hold your balls"], ["and in the other, get ready to beat them.", "and get ready to beat them with other."]]); - showButtonGT("Yes, mistress", "ok", 10, 1); + showButtonGT("Yes, ${dommeTitle()}", "ok", 10, 1); present([DRESSED], [ ["You concentrate on beating,", "Don't worry,"], ["I'll be keeping count.", "I'll count them for you."]]); @@ -931,7 +936,7 @@ def playBeatBalls = { present([DRESSED], [ ["Stop!", "Ok, you can stop now."], ["They look a little sore.", "Is that a nice tingly feeling?"]]); - showButtonG("Thank you, mistress.", "ok"); + showButtonG("Thank you, ${dommeTitle()}.", "ok"); show(null); wait(5); return beats / 10.0; @@ -956,7 +961,7 @@ def playBeatCock = { }); if (it < n - 1) { def sh = getSelectedValue("Still hard?", [ - gagText("Yes, Mistres", "yes"), gagText("No, Mistress", "no")]); + gagText("Yes, ${dommeTitle()}", "yes"), gagText("No, ${dommeTitle()}", "no")]); if (sh == 1) { harden([DRESSED, nTITS]); } @@ -976,7 +981,7 @@ def playKneel = { present([DRESSED], [ ["Right, slut.", "Come here, toy."], ["On the floor, right there.", "Kneel at my feet."]]); - showButtonGT("Yes, mistress.", "ok", 20, 1); + showButtonGT("Yes, ${dommeTitle()}.", "ok", 20, 1); present([DRESSED], [ ["When I say go,", "In a moment,"], ["you'll crawl", "turn and crawl"], @@ -984,7 +989,7 @@ def playKneel = { ["You'll stay there,", "And then you won't move,"], ["head bowed", "face down"], ["until I call you back.", "until you're summoned."]]); - showButtonG("Yes, mistress.", "ok"); + showButtonG("Yes, ${dommeTitle()}.", "ok"); present(null, [["Wait..."]]); wait(getRandom(10) + 10); present([DRESSED], [["Ok, go!", "Now! Off you go."]]); @@ -994,7 +999,7 @@ def playKneel = { def kneelTime = 60 + getRandom(240); wait(kneelTime); while (playBackgroundSound("bell.wav") || true) { - if (showButtonG("Back, mistress", "back", 20) != 20) break; + if (showButtonG("Back, ${dommeTitle()}", "back", 20) != 20) break; } present([DRESSED], [ ["Good boy.", "Very good."], @@ -1009,9 +1014,9 @@ def playBondage = { prep.collect { p -> p(); }; present([DRESSED, nTEASE], [ ["Go fetch your handcuffs"]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); wait(10); - showButtonGT("Back, mistress", "back", 60, 1); + showButtonGT("Back, ${dommeTitle()}", "back", 60, 1); present([DRESSED, nTEASE], [ ["Good."], ["Down on the floor.", "On your knees.", "Down there, where you are."]]); @@ -1048,7 +1053,7 @@ def playBondage = { ["and come back.", "and hurry back."]]); wait(10); setImage(null); - showButtonGT("Freed, mistress", "freed", 120, 1); + showButtonGT("Freed, ${dommeTitle()}", "freed", 120, 1); return waitTime; }; def playSuck = { @@ -1069,7 +1074,7 @@ def playSuck = { ["Time for you to amuse me, you little slut."], ["Get your dildo and secure it somewhere nearby, about eye level when kneeling."]]); wait(10); - showButtonGT("Done, mistress", "done", 60, 1); + showButtonGT("Done, ${dommeTitle()}", "done", 60, 1); present([DRESSED], [ ["The rules are simple:\n"], ["On my first bell, you take the head in your mouth and start to pleasue it.\n"], @@ -1078,10 +1083,10 @@ def playSuck = { ["I know you'll enjoy it, don't be shy.\n"], ["One more thing..."], ["That cock doesn't doesn't leave your mouth until I say so, listen for second bell and then return to me."]]); - showButtonGT("Understood, mistress", "understood", 30, 1); + showButtonGT("Understood, ${dommeTitle()}", "understood", 30, 1); present([TEASE], [ ["Get ready"]]); - showButtonGT("Ready, mistress", "ready", 10, 1); + showButtonGT("Ready, ${dommeTitle()}", "ready", 10, 1); show(null); final target = loadInteger("toy.deepthroat.goal") ?: 5; @@ -1102,8 +1107,8 @@ def playSuck = { wait(randRange(10, 20)); // Head playBackgroundSound("bell.wav"); // End - showButtonGT("Back, mistress", "back", 15, 1); - if (getBoolean("Did you perform as ordered?", "Yes, mistress", "No, mistress")) { + showButtonGT("Back, ${dommeTitle()}", "back", 15, 1); + if (getBoolean("Did you perform as ordered?", "Yes, ${dommeTitle()}", "No, ${dommeTitle()}")) { present([DRESSED], [ ["Good boy"]]); adjustPunish(-4 * target); @@ -1184,11 +1189,11 @@ def removeToy = { toy, imageSpec -> present(imageSpec, [ ["OK,"], ["you may remove your $toyName.", "the $toyName can come off.", "take the $toyName off."]]); - showButtonG("Thank you, mistress", "ok"); + showButtonG("Thank you, ${dommeTitle()}", "ok"); wait(5); set(toy, false); removeEvent("$RELEASEFROM-$toy"); - showButtonGT("Removed, mistress", "removed", 20, 1); + showButtonGT("Removed, ${dommeTitle()}", "removed", 20, 1); }; // Session def sessionSummon = { imageSpec -> @@ -1215,7 +1220,7 @@ def sessionSummon = { imageSpec -> break; } playBackgroundSound(n == limit ? "shortwhip.wav" : "bell.wav"); - if (showButton("Yes, Miss?", timeMax) < timeMax) { + if (showButton("Yes, ${dommeTitle()}?", timeMax) < timeMax) { return true; }; } @@ -1397,7 +1402,7 @@ def sessionRelease = { goodToy -> ["No clothes now for a while,", "Keep those clothes off,"], ["you don't get clothes until I say.", "I like seeing you naked."]]); addEvent(REDRESS, getTime() + 600 + getRandom(1200), "redress"); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); } } if (goodToy) { @@ -1432,7 +1437,7 @@ def playWait = { ["On your knees,", "On the floor,", "Down... at my feet,",], ["wait there.", "wait patiently.", "don't move."], ["I'll be with you shortly.", "I won't be a moment."]]); - showButtonGT("Yes, mistress", "ok", 10, 1); + showButtonGT("Yes, ${dommeTitle()}", "ok", 10, 1); showLounge(); show(null); wait(20 + getRandom(20)); @@ -1477,7 +1482,7 @@ def bedtime = { rt, schedTime -> present([LINGERIE,nTITS], [ ["Very good, toy.", "OK."], ["Bedtime for you!", "Off to bed with you!", "Bed! Now!"]]); - showButtonG("Good night, mistress", "night"); + showButtonG("Good night, ${dommeTitle()}", "night"); addEvent(BEDTIMECHECK, getTime() + 300 + getRandom(600), BEDTIMECHECK); showLounge(); } @@ -1500,12 +1505,12 @@ def bedtimeCheck = { rt -> present([LINGERIE,nTITS], [ ["Hey!", "Ah ha!"], ["What are you doing still up?", "Didn't I send you to bed?"]]); - showButtonG("Sorry, mistress", "sorry"); + showButtonG("Sorry, ${dommeTitle()}", "sorry"); present([LINGERIE,nTITS], [ ["Get yourself to bed", "In bed"], ["right now!", "this instant!"], ["I'll deal with you later."]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); adjustPunish(75); showLounge(); } @@ -1527,7 +1532,7 @@ def redress = { rt -> ["OK, toy,"], ["you can put some clothes back on now.", "get yourself covered up."]]); wait(getRandom(10) + 15); - showButtonG("Thank you, mistress", "ok"); + showButtonG("Thank you, ${dommeTitle()}", "ok"); set(NAKED, false); showLounge(); }; @@ -1553,7 +1558,7 @@ def requestClothes = { else { present([DRESSED], [["Good boy."]]); } - showButtonG("Thank you, mistress", "ok"); + showButtonG("Thank you, ${dommeTitle()}", "ok"); showLounge(); }; def requestRelease = { toy -> @@ -1576,7 +1581,7 @@ def requestRelease = { toy -> else { present([DRESSED], [["Good boy."]]); } - showButtonG("Thank you, mistress", "ok"); + showButtonG("Thank you, ${dommeTitle()}", "ok"); showLounge(); }; // Confession @@ -1590,7 +1595,7 @@ def confessChastityRelease = { if (getBoolean(null)) { present([DRESSED, nTEASE], [ ["Good!", "There's that at least."]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); } else { adjustPunish(300); @@ -1600,7 +1605,7 @@ def confessChastityRelease = { ["slut!", "whore!", "brat!"], ["Get it locked back up", "Back in chastity"], ["right now!", "this instant!"]]); - showButtonGT("Locked, mistress. Here's the key.", "locked", 180, 1); + showButtonGT("Locked, ${dommeTitle()}. Here's the key.", "locked", 180, 1); } if (getBoolean("Did you get erect whilst out?")) { adjustPunish(50); @@ -1615,7 +1620,7 @@ def confessStroked = { present([DRESSED,nTEASE], [ ["Awww, poor little toy.", "Naught little toy!"], ["You know you aren't allowed.", "You get to stroke only when I say."]]); - showButtonG("Sorry, mistress", "sorry"); + showButtonG("Sorry, ${dommeTitle()}", "sorry"); if (getBoolean("Did you get to the edge?")) { adjustPunish(40); adjustPunish(getInteger("How many times?", 1) * 5); @@ -1656,7 +1661,7 @@ def confess = { ["I'm very disappointed in you.", "You've been a very bad toy!"], ["Immediate punishment!", "So you will suffer... right now!"]]); adjustPunish(100); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); removeEvent(PLAY); sessionPlay(); sessionRelease(sessionAborted == null); @@ -1665,7 +1670,7 @@ def confess = { else { present([DRESSED, nTEASE], [ ["Good!", "There better not be!"]]); - showButtonG("Yes, mistress", "ok"); + showButtonG("Yes, ${dommeTitle()}", "ok"); showLounge(); } }; @@ -1759,40 +1764,40 @@ def setupInitial = { def name = loadString("intro.name"); present([DRESSED,nTEASE], [ ["Welcome, $name, to your new life as my plaything, my toy."]]); - showButton("Thank you, mistress"); + showButton("Thank you, ${dommeTitle()}"); present([DRESSED,nTEASE], [ ["My rules are simple, do what I say, when I say, and you'll be rewarded... eventually."]]); - showButton("Thank you, mistress"); + showButton("Thank you, ${dommeTitle()}"); present([DRESSED,nTEASE], [ ["But if you disappointment me, disobey me or disrespect me, then you'll be punished."]]); - showButton("Yes, mistress"); + showButton("Yes, ${dommeTitle()}"); present([DRESSED,TEASE], [ ["I will tease you... and I will torment you..."]]); - showButton("Yes, mistress"); + showButton("Yes, ${dommeTitle()}"); present([TITS], [ ["... and I will break... and then you will suffer!"]]); - showButton("Thank you, mistress"); + showButton("Thank you, ${dommeTitle()}"); present([TITS], [ ["Now, your devotion is important to me."], ["I have expectations my toy be available to play with as much as possible."]]); - showButton("Yes, mistress"); + showButton("Yes, ${dommeTitle()}"); present([TITS], [ ["You can indicate your availability by running this script."], ["I will summon you when I wish to play."]]); - showButton("Understood, mistress"); + showButton("Understood, ${dommeTitle()}"); present([DRESSED,TEASE], [ ["Would you like to set this script as default?"]]); if (getBoolean(null)) { save("intro.start_script", "toy"); present([DRESSED,nTEASE], [ ["Good boy."]]); - showButton("Thank you, mistress"); + showButton("Thank you, ${dommeTitle()}"); } present([DRESSED,nTEASE], [ ["Run along now, toy."], ["I'll summon you with a bell when I want you."], ["Lisen carefully!"]]); - showButton("Yes, mistress"); + showButton("Yes, ${dommeTitle()}"); present(null, [ ["All images are the property of their respective owners, see watermarks (OnlyTease, ForeverVamp).\n"], ["Don't do anything you aren't 100% comfortable doing.\n"], @@ -1878,7 +1883,7 @@ while (true) { def note = loadString("toy.note"); def noteInstr = loadString("toy.noteInstr"); if (note) { - show("Mistress is away ($away)... but you find a note:\n$note"); + show("${dommeTitle()} is away ($away)... but you find a note:\n$note"); showButton("OK"); if (noteInstr) { set(noteInstr, true); @@ -1886,7 +1891,7 @@ while (true) { readNote(); } else { - show("Mistress is away ($away)..."); + show("${dommeTitle()} is away ($away)..."); } if (e && e.event && e.event.time > getTime()) { wait(e.event.time - getTime()); @@ -1898,10 +1903,10 @@ while (true) { show("$e.name: $timeStr -> ${e.event.func}(${e.event.arg})"); } else { - show("Mistress will summon you when required."); + show("${dommeTitle()} will summon you when required."); } final waitTime = Math.min(cycleTime, e.event.time - getTime()); - final clickTime = showButton("Please, Miss?", waitTime); + final clickTime = showButton("Please, ${dommeTitle()}?", waitTime); if (clickTime < waitTime) { def opts = [ [ lbl: "FAQ (webpage)", act: showFaq ], -- cgit v1.2.3