From 390ee2ef072fef1b80d8832fa6c2bac636c38b0f Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 9 Jun 2024 18:19:00 -0400 Subject: [PATCH 1/2] fixes --- js/003-data/clothes/001-slaveWearData.js | 1 - src/endWeek/saDevotion.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/js/003-data/clothes/001-slaveWearData.js b/js/003-data/clothes/001-slaveWearData.js index b99156c14fa..073159f8dc0 100644 --- a/js/003-data/clothes/001-slaveWearData.js +++ b/js/003-data/clothes/001-slaveWearData.js @@ -746,7 +746,6 @@ App.Data.clothes = (new Map()) name: "Striped underwear", get requirements() { return V.boughtItem.clothing.pantsu === 1 || V.continent === "Japan"; }, exposure: 2, - topless: true } ) .set("a confederate army uniform", diff --git a/src/endWeek/saDevotion.js b/src/endWeek/saDevotion.js index 649aa859161..095e858f67d 100644 --- a/src/endWeek/saDevotion.js +++ b/src/endWeek/saDevotion.js @@ -267,11 +267,11 @@ App.SlaveAssignment.devotion = function saDevotion(slave) { } else if (intimidated > 0) { r.push(`${He} finds you intimidating, putting ${him} <span class="trust dec">on edge</span> around you.`); } else if (intimidated <= -5) { - r.push(`${He} finds you completely benign and <span class="trust dec">feels little threat</span> from you.`); + r.push(`${He} finds you completely benign and <span class="trust inc">feels little threat</span> from you.`); } else if (intimidated < 0) { r.push(`${He} doesn't find you very intimidating, allowing ${him} <span class="trust inc">to relax</span> around you.`); } - slave.trust += 1 * intimidated; + slave.trust -= 1 * intimidated; } if (slave.devotion <= 20 && slave.devotion >= -50) { if (slave.trust > 20 && slave.devotion <= -20) { -- GitLab From 0034afe4da789ccde5d31390607cd7aff566255b Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 9 Jun 2024 18:38:25 -0400 Subject: [PATCH 2/2] Slightly adjust isUnmodded and tatScore to reflect facial tattoos being visible --- src/js/statsChecker/statsChecker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js index 5e140176664..44d24b32176 100644 --- a/src/js/statsChecker/statsChecker.js +++ b/src/js/statsChecker/statsChecker.js @@ -115,7 +115,7 @@ globalThis.SlaveStatsChecker = (function() { score += 1.25; } if (slave.lipsTat !== 0) { - score += 1.25; + score += 1.5; } if (slave.shouldersTat !== 0) { score += 1; @@ -224,7 +224,7 @@ globalThis.SlaveStatsChecker = (function() { const brands = brandScore(slave); const scars = scarScore(slave); - return (!isModded(slave) && slave.piercing.corset.weight === 0 && piercings < 3 && tattoos < 2 && brands < 2 && scars <= 1); + return (!isModded(slave) && slave.piercing.corset.weight === 0 && piercings < 3 && tattoos < 1.5 && brands < 2 && scars <= 1); } }()); -- GitLab