Move imageTagsComment

2 files changed, 42 insertions, 41 deletions

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 5e2be3b..1f76ae9 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -255,47 +255,6 @@ return new Object() {
 		}
 		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 (!stateIs(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 (stateIs(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 (stateIs(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 clampPulls = { amount ->
 		getRandom(1 + amount).times {
 			if (getRandom(2)) {
diff --git a/scripts/toy/imagery.groovy b/scripts/toy/imagery.groovy
index 4198051..b437fec 100644
--- a/scripts/toy/imagery.groovy
+++ b/scripts/toy/imagery.groovy
@@ -71,6 +71,48 @@
 		return matches[getRandom(matches.size())];
 	};
 
+	toy.metaClass.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 (!stateIs(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 (stateIs(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 (stateIs(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;
+	};
+
 	toy.metaClass.dress { specs ->
 		def outfit = loadString("toy.owner.outfit");
 		def outfitTime = loadInteger("toy.owner.outfitTime");