From e340b041d7cf2b77fb63e4ddddc1dbd9ff505707 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Wed, 29 Apr 2020 21:06:27 +0200
Subject: [PATCH] Add proxy for special slaves.
The proxy is available under the "S" global object and "S" SugarCube
temporary variable, providess access to all the special slaves
(managers, activeSlave, the lurcher and the Stud)
Implemented as per discussion in #1717.
---
src/004-base/proxies.js | 3 +-
src/004-base/specialSlavesProxy.js | 61 ++++++++++++++++++++++++++++++
src/zz1-last/setupEventHandlers.js | 6 +++
3 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 src/004-base/specialSlavesProxy.js
diff --git a/src/004-base/proxies.js b/src/004-base/proxies.js
index 40af52badfb..d28b2503a69 100644
--- a/src/004-base/proxies.js
+++ b/src/004-base/proxies.js
@@ -103,7 +103,8 @@ Object.defineProperty(window, "V", {
return State.variables;
}
});
-//This should be used if the user might use V under normal, non-cheating circumstances but shouldn't be punished for accidentally setting the value. The attempt to make the change will simply be disregarded.
+
+// This should be used if the user might use V under normal, non-cheating circumstances but shouldn't be punished for accidentally setting the value. The attempt to make the change will simply be disregarded.
globalThis.runWithReadonlyProxy = function(callback) {
globalThis.storyProxy = createReadonlyProxy(State.variables);
try {
diff --git a/src/004-base/specialSlavesProxy.js b/src/004-base/specialSlavesProxy.js
new file mode 100644
index 00000000000..b74bfdb8b6a
--- /dev/null
+++ b/src/004-base/specialSlavesProxy.js
@@ -0,0 +1,61 @@
+App.SpecialSlavesProxy = class SpecialSlavesProxy {
+ constructor() {
+ }
+
+ get Attendant() {
+ return V.Attendant;
+ }
+ get Bodyguard() {
+ return V.Bodyguard;
+ }
+ get Collectrix() {
+ return V.Collectrix;
+ }
+ get Concubine() {
+ return V.Concubine;
+ }
+ get DJ() {
+ return V.DJ;
+ }
+ get Farmer() {
+ return V.Farmer;
+ }
+ get HeadGirl() {
+ return V.HeadGirl;
+ }
+ get Lurcher() {
+ return slaveStateById(V.LurcherID);
+ }
+ get Madam() {
+ return V.Madam;
+ }
+ get Matron() {
+ return V.Matron;
+ }
+ get Milkmaid() {
+ return V.Milkmaid;
+ }
+ get Nurse() {
+ return V.Nurse;
+ }
+ get Recruiter() {
+ return V.Recruiter;
+ }
+ get Schoolteacher() {
+ return V.Schoolteacher;
+ }
+ get Stewardess() {
+ return V.Stewardess;
+ }
+ get Stud() {
+ return slaveStateById(V.StudID);
+ }
+ get Wardeness() {
+ return V.Wardeness;
+ }
+ get activeSlave() {
+ return V.activeSlave;
+ }
+};
+
+globalThis.S = new App.SpecialSlavesProxy();
diff --git a/src/zz1-last/setupEventHandlers.js b/src/zz1-last/setupEventHandlers.js
index 190756ccced..44cba09f389 100644
--- a/src/zz1-last/setupEventHandlers.js
+++ b/src/zz1-last/setupEventHandlers.js
@@ -9,3 +9,9 @@ $(document).on(':storyready', function(ev) {
$(document).one(':passagestart', function() {
App.EventHandlers.optionsChanged();
});
+
+$(document).on(':passagestart', function() {
+ Object.defineProperty(State.temporary, "S", {
+ get: () => S
+ });
+});
--
GitLab