Simplify beginPlan

1 files changed, 6 insertions, 10 deletions

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 51b4778..e09b5a7 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -1,6 +1,6 @@
 // Toy main
 
-setInfos(9, "Toy", "Your frustration is my amusement.", "rascalDan", "WIP", 0xFFFFFF, "en", ["", "", ""]);
+setInfos(9, "Toy", "Become my new plaything.", "rascalDan", "WIP", 0xFFFFFF, "en", ["bondage", "femaledom", "formale", "long", "pain", "toys", "joi"]);
 final VERSION = 1;
 final DAY = 86400;
 final HOUR = 3600.0;
@@ -985,18 +985,17 @@ def beginPlan = { plan ->
 			[ "I'm going out now, toy.", "$plan time!" ],
 			[ "Will you be good while I'm gone?", "You will behave as I expect?" ]]);
 		wait(10);
-		if (has(CHASTITY) && !is(CHASTE)) {
-			postChastity();
-		}
+		postChastity();
 		present([DRESSED,TEASE], [
 				[ "Back later!", "See you soon, toy" ]]);
 		wait(5);
-		return;
+		exit();
 	}
-	else if (has(CHASTITY)) {
+	if (has(CHASTITY)) {
 		leaveNote("I want you in chastity until I return!", CHASTE);
 	}
 	adjustPunish(5);
+	exit();
 };
 // Initial - basic checks and defaults
 def setupInitial = {
@@ -1095,7 +1094,7 @@ while (true) {
 			case 0: setupShowState(); break;
 			case 1: setupShowCalendar(); break;
 			case 2: playtime(); break;
-			case 3: beginPlan(LUNCH); exit();
+			case 3: beginPlan(LUNCH); break;
 			case 4: confess(); break;
 			case 5: return "toy";
 		}
@@ -1105,15 +1104,12 @@ while (true) {
 	}
 	else if (plannedCheck(LUNCH)) {
 		beginPlan(LUNCH);
-		exit();
 	}
 	else if (plannedCheck(SHOPPING)) {
 		beginPlan(SHOPPING);
-		exit();
 	}
 	else if (plannedCheck(PARTY)) {
 		beginPlan(PARTY);
-		exit();
 	}
 	else if (getRandom(1000) == 0) {
 		playtime();