Split out image tag commenter

1 files changed, 42 insertions, 40 deletions

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 049ee56..15c4728 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -264,6 +264,47 @@ def showButtonGT = { s, p, t, pc ->
 	}
 	return tt;
 };
+def imageTagsComment = { tags ->
+	if (!tags || tags.isEmpty()) return null;
+	tags = tags.intersect([ASS, CROP, BOOTS, PUSSY, SSSH])
+	if (tags.isEmpty()) return null;
+	Collections.shuffle(tags);
+	switch (tags[0]) {
+		case ASS:
+			if (!is(GAGGED))
+				return compose([
+						["Come closer,", "Don't be shy,"],
+						["kiss it!", "two kisses on each cheek."]]);
+			else
+				return compose([
+						["Too bad you can't kiss it like that.", "Maybe I should ungag you so you can kiss it?"]]);
+			break;
+		case CROP:
+			return compose([
+					["You know what this is for?", "Good boys get rewards, bad ones getting a beating.", "Would you like your ass a darker shade?"]]);
+			break;
+		case BOOTS:
+			if (is(GAGGED))
+				return compose([
+						["I know you'd like to worship them.", "Too bad that tongue can't be put to good use."]]);
+			else
+				return compose([
+						["Get down there, worship my boots.", "See any dirt on my boots? Maybe you should lick them clean!"]]);
+		case PUSSY:
+			if (is(GAGGED))
+				return compose([
+						["I know you'd like to pleasure me.", "Too bad that tongue can't be put to good use."]]);
+			else
+				return compose([
+						["How about you start licking it?", "How much would like your tongue in there?"]]);
+			break;
+		case SSSH:
+			return compose([
+					["Quiet now.", "Sssssh.", "Patience."]]);
+			break;
+	}
+	return null;
+};
 
 def harden = { imageSpec ->
 	present(imageSpec, [
@@ -777,46 +818,7 @@ def playEdges = {
 };
 def playNothing = {
 	(getRandom(3) + 2).times {
-		def tags = showImage([TITS]).intersect(
-				[ASS, CROP, BOOTS, PUSSY, SSSH]);
-		Collections.shuffle(tags);
-		if (tags.isEmpty()) {
-			show(null);
-		}
-		else {
-			switch (tags[0]) {
-				case ASS:
-					if (!is(GAGGED))
-						present(null, [
-								["Come closer,", "Don't be shy,"],
-								["kiss it!", "two kisses on each cheek."]]);
-					break;
-				case CROP:
-					present(null, [
-							["You know what this is for?", "Good boys get rewards, bad ones getting a beating.", "Would you like your ass a darker shade?"]]);
-					break;
-				case BOOTS:
-					if (is(GAGGED))
-						present(null, [
-								["I know you'd like to worship them.", "Too bad that tongue can't be put to good use."]]);
-					else
-						break;
-				case PUSSY:
-					if (is(GAGGED))
-						present(null, [
-								["I know you'd like to pleasure me.", "Too bad that tongue can't be put to good use."]]);
-					else
-						present(null, [
-								["How about you start licking it?", "How much would like your tongue in there?"]]);
-					break;
-				case SSSH:
-					present(null, [
-							["Quiet now.", "Sssssh.", "Patience."]]);
-					break;
-				default:
-					show(null);
-			}
-		}
+		show(imageTagsComment(showImage([TITS])));
 		wait(getRandom(10) + 10);
 	};
 };