From 01d47f8b989cf28fa114776e6b6d73e4dc09c2d6 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 23 Jun 2019 13:39:21 +0100
Subject: Fix assignment to parent property bug

Fixes bug with assignment to DOMME and sessionAborted properties from metaClass method.
---
 scripts/toy.groovy               | 4 ++--
 scripts/toy/imagery.groovy       | 9 +++++----
 scripts/toy/orgasmControl.groovy | 2 +-
 scripts/toy/social.groovy        | 2 +-
 scripts/toy/tease.groovy         | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/toy.groovy b/scripts/toy.groovy
index 82427ac..5e2be3b 100644
--- a/scripts/toy.groovy
+++ b/scripts/toy.groovy
@@ -51,7 +51,7 @@ return new Object() {
 			if (!f.exists()) return [:];
 			return Eval.me(f.text);
 		};
-		return [
+		DOMME = [
 			"$DATAFOLDER/images/toy/domme.groovy",
 			"$DATAFOLDER/images/toy/$domme/person.groovy",
 			"$DATAFOLDER/images/toy/$domme/$set/set.groovy" ]
@@ -1196,7 +1196,7 @@ return new Object() {
 		// GO!
 		setDefault("toy.owner", "ancilla");
 		OWNER = loadString("toy.owner");
-		DOMME = loadDomme(OWNER);
+		loadDomme(OWNER);
 		loadModules(this);
 		def getDayNum = { Math.floorDiv(getTime() - localTimeOffset() - 14400, 86400) };
 		def getAvail = { dayNum -> loadInteger("toy.availability.$dayNum") ?: 0 };
diff --git a/scripts/toy/imagery.groovy b/scripts/toy/imagery.groovy
index a0f1ddf..4198051 100644
--- a/scripts/toy/imagery.groovy
+++ b/scripts/toy/imagery.groovy
@@ -79,7 +79,7 @@
 			if (prev) {
 				prev = prev.sets[outfit];
 				if (prev && specs.every({ spec -> selectImage(OWNER, prev.set, spec)})) {
-					DOMME = loadDomme(OWNER, outfit);
+					loadDomme(OWNER, outfit);
 					return outfit;
 				}
 			}
@@ -89,11 +89,12 @@
 			showPopup("No outfit for $OWNER : $specs");
 			save("toy.owner.outfit", null);
 			save("toy.owner.outfitTime", null);
-			DOMME = loadDomme(OWNER, outfit);
-			return;
+			loadDomme(OWNER, outfit);
+			return null;
 		}
 		save("toy.owner.outfit", outfit.set);
 		save("toy.owner.outfitTime", getTime());
-		DOMME = loadDomme(OWNER, outfit.set);
+		loadDomme(OWNER, outfit.set);
+		return outfit.set;
 	};
 }
diff --git a/scripts/toy/orgasmControl.groovy b/scripts/toy/orgasmControl.groovy
index dc5214e..2c2613b 100644
--- a/scripts/toy/orgasmControl.groovy
+++ b/scripts/toy/orgasmControl.groovy
@@ -14,7 +14,7 @@
 				present(null, [
 						["Bah!", "Pfft. I'm very disappointed in you."],
 						["Ruin it.", "Don't touch it."]]);
-				sessionAborted = CUM;
+				toy.sessionAborted = CUM;
 				adjustPunish(80);
 			}
 			adjustPunish(taken * 10);
diff --git a/scripts/toy/social.groovy b/scripts/toy/social.groovy
index d07b9f0..028106f 100644
--- a/scripts/toy/social.groovy
+++ b/scripts/toy/social.groovy
@@ -48,7 +48,7 @@
 		else if (has(CHASTITY) && !stateIs(CHASTE)) {
 			leaveNote("I want you in chastity until I return!", CHASTE);
 		}
-		DOMME = loadDomme(OWNER);
+		loadDomme(OWNER);
 		setAway(plan);
 		removeEvent(PLAY);
 		showLounge();
diff --git a/scripts/toy/tease.groovy b/scripts/toy/tease.groovy
index 4fa42d9..eba22bd 100644
--- a/scripts/toy/tease.groovy
+++ b/scripts/toy/tease.groovy
@@ -33,7 +33,7 @@
 			if (showButtonG("Hard, ${dommeTitle()}", "hard", 30) == 30) {
 				playBackgroundSound("toy/180bpm.mp3");
 				if (showButtonG("Hard, ${dommeTitle()}", "hard", 30) == 30) {
-					sessionAborted = SOFT;
+					toy.sessionAborted = SOFT;
 					present(imageSpec, [
 							["Bah!", "Pathetic!"],
 							["That's no good to me!", "How do I have fun with that!?"]]);
-- 
cgit v1.2.3