From c5397de2eeda87023f08ea4f7cafd283715b9ed6 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 29 Dec 2020 16:35:26 -0500
Subject: [PATCH] fix buttplugs
---
js/003-data/gameVariableData.js | 2 +-
js/003-data/slaveWearData.js | 12 ++++++------
.../backwardsCompatibility/backwardsCompatibility.js | 4 ++++
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 15d295d1db5..185951e4364 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -784,7 +784,7 @@ App.Data.resetOnNGPlus = {
},
customItem: {
/** @type {Map<string, slaveButtplugs>} */
- buttPlugs: new Map([]),
+ buttplug: new Map([]),
dildos: new Map([]),
},
dairyPiping: 0,
diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js
index 192ca82fae3..976ac8371e7 100644
--- a/js/003-data/slaveWearData.js
+++ b/js/003-data/slaveWearData.js
@@ -831,9 +831,9 @@ App.Data.clothes = new Map([
* @typedef {Map<string, slaveWear>} slaveWearCategory
*/
-/** @type {Object.<string, slaveWearCategory>} */
+/** @type {Object.<string, slaveWearCategory>} string should be the slave property being modified.*/
App.Data.slaveWear = {
- collars: new Map([
+ collar: new Map([
["stylish leather", {name: "Stylish leather"}],
["satin choker", {name: "Satin choker"}],
["silk ribbon", {name: "Silken ribbon"}],
@@ -940,7 +940,7 @@ App.Data.slaveWear = {
],
]),
- bellyAccessories: new Map([
+ bellyAccessory: new Map([
["none", {name: "None"}],
["a corset", {name: "Tight corset"}],
["an extreme corset", {name: "Extreme corset"}],
@@ -983,7 +983,7 @@ App.Data.slaveWear = {
]
]),
- vaginalAttachments: new Map([
+ vaginalAttachment: new Map([
["none", {name: "None"}],
["vibrator",
{
@@ -1003,7 +1003,7 @@ App.Data.slaveWear = {
]
]),
- dickAccessories: new Map([
+ dickAccessory: new Map([
["none", {name: "None"}],
["bullet vibrator", {name: "Bullet vibrator"}],
["smart bullet vibrator",
@@ -1016,7 +1016,7 @@ App.Data.slaveWear = {
]
]),
- buttplugAttachments: new Map([
+ buttplugAttachment: new Map([
["none", {name: "None"}],
["tail",
{
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 4f1d151b088..19182f0e0c9 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -156,6 +156,10 @@ App.Update.globalVariables = function(node) {
V.customItem.vaginalAccessory = V.customItem.dildos;
delete V.customItem.dildos;
}
+ if (V.customItem.hasOwnProperty("buttPlugs")) {
+ V.customItem.buttplug = V.customItem.buttPlugs;
+ delete V.customItem.buttPlugs;
+ }
if (V.releaseID <= 1110) {
V.researchLab.tasks = V.researchLab.tasks.filter((t) => (!(t.hasOwnProperty("slaveID")) || Object.keys(V.slaveIndices).includes(t.slaveID)));
}
--
GitLab