From b4259c2febf935dcf00ac087993c67b8eedfee4b Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 23 Mar 2019 13:04:43 +0000
Subject: Move activity list global

---
 scripts/toy.groovy | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'scripts/toy.groovy')

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 08c0e73..13dfc20 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -1150,6 +1150,30 @@ def sessionSummon = { imageSpec ->
 	adjustPunish(5);
 	return false;
 };
+final activityList = [
+	'intSqueeze': intSqueeze,
+	'intClamps': intClamps,
+	'preRelease': preRelease,
+	'preChastity': preChastity,
+	'preEdge': preEdge,
+	'preGag': preGag,
+	'preStrip': preStrip,
+	'preCollar': preCollar,
+	'preClamps': preClamps,
+	'playStrokes': playStrokes,
+	'playEdges': playEdges,
+	'playKneel': playKneel,
+	'playBeatBalls': playBeatBalls,
+	'playClamps': playClamps,
+	'playNothing': playNothing,
+	'playBondage': playBondage,
+	'playSuck': playSuck,
+	'postCum': postCum,
+	'postPermitCum': {
+		addEventIfMissing(CUM, getTime() + (DAY * 2) + getRandom(DAY * 2), PERMIT, CUM); // 2 - 4 days from now
+	},
+	'postChastity': postChastity
+	];
 def sessionPlay = {
 	if (is(CHASTE)) sessionToys[CHASTITY] = getTime();
 	def playScope = [
@@ -1208,30 +1232,7 @@ def sessionPlay = {
 				};
 			}
 		],
-		'activities': [
-			'intSqueeze': intSqueeze,
-			'intClamps': intClamps,
-			'preRelease': preRelease,
-			'preChastity': preChastity,
-			'preEdge': preEdge,
-			'preGag': preGag,
-			'preStrip': preStrip,
-			'preCollar': preCollar,
-			'preClamps': preClamps,
-			'playStrokes': playStrokes,
-			'playEdges': playEdges,
-			'playKneel': playKneel,
-			'playBeatBalls': playBeatBalls,
-			'playClamps': playClamps,
-			'playNothing': playNothing,
-			'playBondage': playBondage,
-			'playSuck': playSuck,
-			'postCum': postCum,
-			'postPermitCum': {
-				addEventIfMissing(CUM, getTime() + (DAY * 2) + getRandom(DAY * 2), PERMIT, CUM); // 2 - 4 days from now
-			},
-			'postChastity': postChastity
-		]
+		'activities': activityList
 	];
 	final eval = { expr -> Eval.me('toy', playScope, expr.toString()) };
 	if (is("DEBUG")) {
-- 
cgit v1.2.3