Livingwood Chastity Updated to include Bra and Shared Parameters.

chastity/belt/belt_livingwood.js

@@ -6,25 +6,28 @@ const { getUserVar, setUserVar } = require("../../functions/usercontext")
 // or every 15 minutes, until the wearer successfully orgasms. 
 exports.growthCoefficient = (data) => { return 1 }
 exports.decayCoefficient = (data) => { return 0.1 }
-exports.minVibe = (data) => { 
-    return Math.max(Math.min(Math.floor((Date.now() - (getUserVar(data.userID, "livingwoodbelt") ?? Date.now())) / 900000), 20), getUserVar(data.userID, "livingwoodvibe")) 
+exports.minVibe = (data) => {
+    return Math.max(Math.min(Math.floor((Date.now() - (getUserVar(data.userID, "livingwoodbelt") ?? Date.now())) / 900000), 20), getUserVar(data.userID, "livingwoodvibe"))
 }
 // Note, we must use a regular function context to retrieve a this correctly. 
-exports.onOrgasm = function(data) {
+exports.onOrgasm = function (data) {
     setUserVar(data.userID, "livingwoodvibe", Math.max((this.minVibe(data) - 10), 0))
     setUserVar(data.userID, "livingwoodbelt", Date.now());
 }
-exports.onFailedOrgasm = function(data) {
+exports.onFailedOrgasm = function (data) {
     console.log(this);
     setUserVar(data.userID, "livingwoodvibe", Math.min((this.minVibe(data) + 1), 20));
 }
 exports.onEquip = (data) => {
-    setUserVar(data.userID, "livingwoodvibe", 0);
-	setUserVar(data.userID, "livingwoodbelt", Date.now());
+    if (getUserVar(data.userID, "livingwoodvibe") == {}) setUserVar(data.userID, "livingwoodvibe", 0);
+    if (getUserVar(data.userID, "livingwoodbelt") == {}) setUserVar(data.userID, "livingwoodbelt", Date.now());
 }
 exports.onUnequip = (data) => {
-    setUserVar(data.userID, "livingwoodvibe", 0);
-	setUserVar(data.userID, "livingwoodbelt", Date.now());
+    // Check if user is wearing a Livingwood Bra otherwise Null Out Vars
+    if (getChastityBra(data.userID).chastitytype.includes("Livingwood")) {
+        setUserVar(data.userID, "livingwoodvibe", {});
+        setUserVar(data.userID, "livingwoodbelt", {});
+    }
 }
 
 exports.tags = ["living"]

chastity/bra/bra_livingwood.js

@@ -6,7 +6,7 @@ const { getUserVar, setUserVar } = require("../../functions/usercontext")
 // or every 15 minutes, until the wearer successfully orgasms. 
 //
 // This code is copied from chastity/belt/belt_livingwood.js and should be reviewed. Commented out for now.
-/*
+
 exports.growthCoefficient = (data) => { return 1 }
 exports.decayCoefficient = (data) => { return 0.1 }
 exports.minVibe = (data) => { 
@@ -21,13 +21,16 @@ exports.onFailedOrgasm = function(data) {
     setUserVar(data.userID, "livingwoodvibe", Math.min((this.minVibe() + 1), 20));
 }
 exports.onEquip = (data) => {
-    setUserVar(data.userID, "livingwoodvibe", 0);
-	setUserVar(data.userID, "livingwoodbelt", Date.now());
+    if (getUserVar(data.userID, "livingwoodvibe") == {}) setUserVar(data.userID, "livingwoodvibe", 0);
+    if (getUserVar(data.userID, "livingwoodbelt") == {}) setUserVar(data.userID, "livingwoodbelt", Date.now());
 }
 exports.onUnequip = (data) => {
-    setUserVar(data.userID, "livingwoodvibe", 0);
-	setUserVar(data.userID, "livingwoodbelt", Date.now());
-}*/
+    // Check if user is wearing a Livingwood Belt otherwise Null Out Vars
+    if (getChastity(data.userID).chastitytype.includes("Livingwood")) {
+        setUserVar(data.userID, "livingwoodvibe", {});
+        setUserVar(data.userID, "livingwoodbelt", {});
+    }
+}
 
 // Name
 exports.name = "Livingwood Bra"