Add plain text hint to gagged text buttons.

1 files changed, 23 insertions, 23 deletions

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index b4836ce..7ba695f 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -172,7 +172,7 @@ def positioned = { i -> loadString("toy.position") == i };
 def adjustPunish = { p -> save("toy.punishment", getPunish() + p); };
 def getPunish = { loadInteger("toy.punishment"); };
 def sessionAborted = null;
-def gagText = { t ->
+def gagText = { t, p ->
 	if (!is(GAGGED)) return t;
 	return t.split(/\s+/)
 		.collect {
@@ -181,10 +181,10 @@ def gagText = { t ->
 			'h' * getRandom((int)Math.max(1.0, it.length() * 0.8))
 		}
 	.join(" ")
-		.capitalize();
+		.capitalize() + " ($p)";
 };
-def showButtonG = { s, t = null ->
-	return t != null ? showButton(gagText(s), t) : showButton(gagText(s));
+def showButtonG = { s, p, t = null ->
+	return t != null ? showButton(gagText(s, p), t) : showButton(gagText(s, p));
 };
 def present = { imageSpec, texts ->
 	if (texts) {
@@ -204,11 +204,11 @@ def harden = { imageSpec ->
 			["stroke it, slowly...", "slow strokes..."],
 			["don't edge...", "no edging..."],
 			["and do NOT cum.", "and definitely no cumming."]]);
-	if (showButtonG("Hard, mistress", 60) == 60) {
+	if (showButtonG("Hard, mistress", "hard", 60) == 60) {
 		present(null, [
 				["What's taking so long!?", "Come on!", "Don't disappoint me."],
 				["Slap it about a bit!.", "Get it hard, now!", "Pinch your nipples."]]);
-		showButtonG("Hard, mistress");
+		showButtonG("Hard, mistress", "hard");
 	}
 };
 def expose = { imageSpec ->
@@ -220,7 +220,7 @@ def expose = { imageSpec ->
 	}
 };
 def mightCum = { time ->
-	if (showButtonG("Sorry, misstress, I'm cumming without permission", time) < time) {
+	if (showButtonG("Sorry, misstress, I'm cumming without permission", "cumming", time) < time) {
 		playBackgroundSound(null);
 		sessionAborted = CUM;
 		present(null, [
@@ -229,9 +229,9 @@ def mightCum = { time ->
 		adjustPunish(100);
 		wait(10);
 		present([DRESSED], [["Clean up your mess!"]]);
-		showButtonG("Yes, misstress");
+		showButtonG("Yes, misstress", "ok");
 		wait(10);
-		showButtonG("Cleaned up, misstress, back");
+		showButtonG("Cleaned up, misstress, back", "back");
 		return true;
 	}
 	return false;
@@ -242,7 +242,7 @@ def edge = { amount, imageSpec ->
 		present(imageSpec, [
 				["Stroke to edge now, toy...", "Edge!"],
 				["Don't cum.", "No cumming.", "No accidents though."]]);
-		showButtonG("Edging, mistress"); // TODO: time check
+		showButtonG("Edging, mistress", "edging"); // TODO: time check
 		if (getRandom(2) == 1) {
 			present(imageSpec, [
 					["Hold it...", "And hold...", "Keeping going..."]]);
@@ -273,7 +273,7 @@ def strokes = { amount, imageSpec ->
 		def beat = BEATS[beatNo];
 		playBackgroundSound("toy/${beat.bpm}bpm.mp3", 10); // Lots, to cover offset
 		def len = getRandom(java.lang.Math.max(1, beat.len + (sto * beatNo)));
-		if (showButtonG("Edging, mistress", len) < len) {
+		if (showButtonG("Edging, mistress", "edging", len) < len) {
 			sto -= 1;
 			edges += 1;
 			playBackgroundSound(null);
@@ -291,8 +291,8 @@ def strokes = { amount, imageSpec ->
 					if (mightCum(getRandom(20) + 5)) return;
 				case 2:
 					switch(getSelectedValue("Would you like to cum, toy?", [
-								gagText("Please, mistress, may I cum!?"),
-								gagText("No, mistress, please torment me more!")
+								gagText("Please, mistress, may I cum!?", "yes"),
+								gagText("No, mistress, please torment me more!", "no")
 					])) {
 						case 0:
 							present(imageSpec, [
@@ -326,10 +326,10 @@ def preRelease = {
 	present([DRESSED], [
 			["I'm feeling generous, toy...", "Well, that's not good to me..."],
 			["let's get that chastity device off.", "take your chastity device off."]]);
-	showButtonG("Yes, mistress");
+	showButtonG("Yes, mistress", "ok");
 	wait(15);
 	set(CHASTE, false);
-	showButtonG("Thank you, mistress");
+	showButtonG("Thank you, mistress", "ok");
 };
 def preEdge = {
 	if (is(CHASTE)) return;
@@ -357,7 +357,7 @@ def preGag = {
 			["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);
-	showButtonG("Gagged, mistress"); // TODO: time check
+	showButtonG("Gagged, mistress", "gagged"); // TODO: time check
 };
 def preClamps = {
 	if (is(CLAMPED)) return;
@@ -373,11 +373,11 @@ def preClamps = {
 			["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");
+	showButtonG("Yes, mistress", "ok");
 	show(null);
 	wait(10);
 	set(CLAMPED, true);
-	showButtonG("Back, mistress"); // TODO: time check
+	showButtonG("Back, mistress", "back"); // TODO: time check
 	present([DRESSED], [
 			["On your knees,", "Kneel before me"],
 			["let me see.", "hands behind your back."]]);
@@ -406,11 +406,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");
+	showButtonG("Yes, mistress", "ok");
 	show(null);
 	wait(10);
 	set(COLLARED, true);
-	showButtonG("Back, mistress"); // TODO: time check
+	showButtonG("Back, mistress", "back"); // TODO: time check
 };
 def preStrip = { imageSpec = [DRESSED] ->
 	if (is(NAKED)) return;
@@ -420,7 +420,7 @@ def preStrip = { imageSpec = [DRESSED] ->
 	present([DRESSED], [
 			["All of them off!", "And the rest!", "Keep going."]]);
 	set(NAKED, true);
-	showButtonG("Naked, mistress");
+	showButtonG("Naked, mistress", "naked");
 	(getRandom(2) + 1).times {
 		switch (getRandom(2)) {
 			case 0:
@@ -478,7 +478,7 @@ def postChastity = {
 			["Bring back the key.", "I want the key of course."]]);
 	wait(10);
 	show(null);
-	showButtonG("Locked, mistress. Here's the key.");
+	showButtonG("Locked, mistress. Here's the key.", "locked");
 	set(CHASTE, true);
 	present([DRESSED,TEASE], [
 			["Good boy.", "Thank you, toy."]]);
@@ -643,7 +643,7 @@ def bedtime = {
 		present([LINGERIE,nTITS], [
 				["Very good, toy.", "OK"],
 				["Bedtime!", "Off to bed with you!", "Bed! Now!"]]);
-		showButtonG("Good night, mistress");
+		showButtonG("Good night, mistress", "night");
 	}
 	exit();
 };