From 4ce6700e4ea33a8f124cceeff2180b443cb85892 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Sun, 27 Dec 2020 23:14:03 -0500
Subject: [PATCH] Fix data names
---
src/endWeek/saClothes.js | 2 +-
src/endWeek/slaveAssignmentReport.js | 1 +
src/js/utilsAssessSlave.js | 10 +++++++---
src/npc/descriptions/crotch/vaginalAccessory.js | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js
index e2cd5e60178..b9fb0854f29 100644
--- a/src/endWeek/saClothes.js
+++ b/src/endWeek/saClothes.js
@@ -920,7 +920,7 @@ App.SlaveAssignment.clothes = (function() {
*
*/
function vaginaAccessories(slave) {
- const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.vaginalAccessories.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
if (slave.vaginalAccessory !== "none") {
if (dildo.width === 0) {
r.push(`Constantly wearing a ${slave.vaginalAccessory}`);
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 66e04ff3a74..aeb76395524 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -1,6 +1,7 @@
App.EndWeek.slaveAssignmentReport = function() {
const facilities = App.Entity.facilities;
const arcology = V.arcologies[0];
+ debugger;
const initialEmployeesCount = App.Utils.countFacilityWorkers(); // will be used to show differences after all the assignment changes
const initialPenthouseTotalEmployeesCount = _countPenthousePopulation();
diff --git a/src/js/utilsAssessSlave.js b/src/js/utilsAssessSlave.js
index 7f4c6e6166f..804be4ec9ed 100644
--- a/src/js/utilsAssessSlave.js
+++ b/src/js/utilsAssessSlave.js
@@ -292,7 +292,11 @@ globalThis.plugLength = function(slave) {
* @returns {0|1|2|3}
*/
globalThis.dildoWidth = function(slave) {
- const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.vaginalAccessories.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
+ if (dildo === undefined) {
+ console.log("missing dildo: ", slave.vaginalAccessory)
+ return 0
+ }
return dildo.width || 0;
};
@@ -301,7 +305,7 @@ globalThis.dildoWidth = function(slave) {
* @returns {0|1|2}
*/
globalThis.dildoLength = function(slave) {
- const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.vaginalAccessories.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
return dildo.length || 0;
};
@@ -310,6 +314,6 @@ globalThis.dildoLength = function(slave) {
* @returns {number}
*/
globalThis.dildoVibeLevel = function(slave) {
- const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.vaginalAccessories.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
return dildo.vibrates || 0;
};
diff --git a/src/npc/descriptions/crotch/vaginalAccessory.js b/src/npc/descriptions/crotch/vaginalAccessory.js
index 3963d5f6bad..948766998f0 100644
--- a/src/npc/descriptions/crotch/vaginalAccessory.js
+++ b/src/npc/descriptions/crotch/vaginalAccessory.js
@@ -18,7 +18,7 @@ App.Desc.vaginalAccessory = function(slave) {
} else {
held = `held in place by a strap, which ${he} can remove for vaginal intercourse`;
}
- const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.vaginalAccessories.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessories.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
switch (dildo.width) {
case 0:
r.push(`A ${slave.vaginalAccessory} is attached on ${his} clit, ${held}.`); // FIXME: not super happy with this
--
GitLab