From 023ba9cb78d38b19ff3687dedd897feeb293388d Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Thu, 24 Dec 2020 16:40:38 -0500 Subject: [PATCH] more --- src/endWeek/saLongTermMentalEffects.js | 2 +- src/endWeek/saLongTermPhysicalEffects.js | 2 +- src/js/eventSelectionJS.js | 4 ++-- src/js/slaveSummaryHelpers.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/endWeek/saLongTermMentalEffects.js b/src/endWeek/saLongTermMentalEffects.js index 82ae9886005..3d9753216ac 100644 --- a/src/endWeek/saLongTermMentalEffects.js +++ b/src/endWeek/saLongTermMentalEffects.js @@ -1861,7 +1861,7 @@ App.SlaveAssignment.longTermMentalEffects = (function() { } } if (slave.heels === 1) { - if (!["boots", "extreme heels", "heels", "pumps"].includes(slave.shoes)) { + if (!(App.Data.shoes.get(slave.shoes) && App.Data.shoes.get(slave.shoes).highHeels)) { if (slave.fetish !== "submissive") { if (slave.career === "a dairy cow" || slave.career === "a breeding bull") { r.push(`${He} sees ${himself} as an animal, and as such, is perfectly content`); diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js index 8b8cdd1b13d..f57fbca9074 100644 --- a/src/endWeek/saLongTermPhysicalEffects.js +++ b/src/endWeek/saLongTermPhysicalEffects.js @@ -1546,7 +1546,7 @@ App.SlaveAssignment.longTermPhysicalEffects = (function() { r.push(`leglessness renders`); } else if ((!hasBothLegs(slave))) { r.push(`missing leg renders`); - } else if (slave.heels === 1 && !["boots", "extreme heels", "heels"].includes(slave.shoes)) { + } else if (slave.heels === 1 && !(App.Data.shoes.get(slave.shoes) && App.Data.shoes.get(slave.shoes).highHeels)) { r.push(`clipped heels render`); } } diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js index f6a9abd4904..4bcce09bd7d 100644 --- a/src/js/eventSelectionJS.js +++ b/src/js/eventSelectionJS.js @@ -429,7 +429,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) { if (V.slaves.length > 2) { if (eventSlave.devotion >= -20) { if (eventSlave.heels === 1) { - if (eventSlave.shoes === "heels" || eventSlave.shoes === "boots" || eventSlave.shoes === "extreme heels") { + if ((App.Data.shoes.get(eventSlave.shoes) && App.Data.shoes.get(eventSlave.shoes).highHeels)) { V.RESSevent.push("tendon fall"); } } @@ -1657,7 +1657,7 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) { if (V.slaves.length > 2) { if (eventSlave.devotion >= -20) { if (eventSlave.heels === 1) { - if (eventSlave.shoes === "heels" || eventSlave.shoes === "boots" || eventSlave.shoes === "extreme heels") { + if (App.Data.shoes.get(eventSlave.shoes) && App.Data.shoes.get(eventSlave.shoes).highHeels) { V.RESSevent.push("tendon fall"); } } diff --git a/src/js/slaveSummaryHelpers.js b/src/js/slaveSummaryHelpers.js index 8f0f33ba1c9..a0d8db579ba 100644 --- a/src/js/slaveSummaryHelpers.js +++ b/src/js/slaveSummaryHelpers.js @@ -1175,7 +1175,7 @@ App.UI.SlaveSummaryImpl = function() { * @returns {void} */ function long_shoes(slave, c) { - if (["boots", "extreme heels", "extreme platform heels", "flats", "heels", "platform heels", "platform shoes", "pumps"].includes(slave.shoes)) { + if (App.Data.shoes.get(slave.shoes) && App.Data.shoes.get(slave.shoes).highHeels) { makeSpan(c, slave.shoes, undefined, true); } else if (slave.heels === 1) { makeSpan(c, "Crawling.", "yellow"); -- GitLab