diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js index e2cd5e60178d1842c8a1267bf8c76334295a3345..b9fb0854f29ef31dde73a8a264d95a0ebe5b0bb1 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 66e04ff3a7434370cd096d808e27c48e8f3cbc2c..aeb76395524f0ee2fb1115b09d72a7859885f7e4 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 7f4c6e6166fa67241b313151361f87f328f836c6..804be4ec9edc2951ae2003b6e1ae607a055a4dc4 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 3963d5f6bad1f8a8e9a6c3e22a36242fc2118d2c..948766998f0f5488617774baff953795c8effd19 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