Add lounge support

2 files changed, 14 insertions, 7 deletions

diff --git a/images/toy/ancilla/lounge.jpg b/images/toy/ancilla/lounge.jpg
new file mode 100644
index 0000000..bd27f06
--- /dev/null
+++ b/images/toy/ancilla/lounge.jpg
diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 9cdd26b..b47586a 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -95,6 +95,9 @@ def showImage = { spec ->
 		return null;
 	}
 };
+def showLounge = {
+	setImage("toy/$OWNER/lounge.jpg");
+};
 def selectImageSet = { domme, specs ->
 	def matches = IMAGEDATA
 		.find({ d -> d.domme == domme })
@@ -952,7 +955,7 @@ def sessionSummon = { imageSpec ->
 			return true;
 		};
 	}
-	setImage(null);
+	showLounge();
 	show(null);
 	adjustPunish(5);
 	return false;
@@ -1060,7 +1063,7 @@ def sessionRelease = { goodToy ->
 		removeEvent(CUM);
 	}
 	wait(10);
-	setImage(null);
+	showLounge();
 	sessionAborted = null;
 	if (goodToy) {
 		adjustPunish(-20);
@@ -1075,7 +1078,7 @@ def playWait = {
 			["wait there.", "wait patiently.", "don't move."],
 			["I'll be with you shortly.", "I won't be a moment."]]);
 	showButtonGT("Yes, mistress", "ok", 10, 1);
-	setImage(null);
+	showLounge();
 	show(null);
 	wait(20 + getRandom(20));
 };
@@ -1102,6 +1105,7 @@ def playEvent = { rt = true, first = true ->
 		adjustPunish(25);
 	}
 	playSchedule(getTime());
+	showLounge();
 }
 def bedtime = {
 	dress([[LINGERIE,nTITS]]);
@@ -1128,6 +1132,7 @@ def redress = { rt ->
 	wait(getRandom(10) + 15);
 	showButtonG("Thank you, mistress", "ok");
 	set(NAKED, false);
+	showLounge();
 };
 def requestClothes = {
 	adjustPunish(5);
@@ -1227,6 +1232,7 @@ def confess = {
 		present([DRESSED, nTEASE], [
 				["Good!", "There better not be!"]]);
 		showButtonG("Yes, mistress", "ok");
+		showLounge();
 	}
 };
 
@@ -1390,7 +1396,7 @@ if (localTime() > 25.75 || localTime() < 7.5) { // 1:45am - 7:30am
 	exit();
 }
 if (plannedCheck(LUNCH) || plannedCheck(SHOPPING) || plannedCheck(PARTY)) {
-	setImage(null);
+	showLounge();
 	def note = loadString("toy.note");
 	def noteInstr = loadString("toy.noteInstr");
 	if (note) {
@@ -1412,7 +1418,7 @@ if (plannedCheck(LUNCH) || plannedCheck(SHOPPING) || plannedCheck(PARTY)) {
 	if (sessionSummon([DRESSED])) {
 		present([DRESSED], [["Hello, toy!"], ["I'm back home now."]]);
 		wait(10);
-		setImage(null);
+		showLounge();
 	}
 }
 else {
@@ -1421,9 +1427,9 @@ else {
 setupInitial();
 
 final cycleTime = 6;
+showLounge();
 while (true) {
-	setImage(null);
-	show(null);
+	show("Mistress will summon you when required.");
 	if (showButton("Please, Miss?", cycleTime) < cycleTime) {
 		def opts = [
 			[ lbl: "Status", act: setupShowState ],
@@ -1531,6 +1537,7 @@ while (true) {
  * images/toy/ancilla/pink/8.jpg
  * images/toy/ancilla/pink/9.jpg
  * images/toy/ancilla/pink/tags
+ * images/toy/ancilla/lounge.jpg
  * sounds/toy/165bpm.mp3
  * sounds/toy/180bpm.mp3
  * sounds/toy/240bpm.mp3