From e7c9804310bda21963d364c973ca96fa5b21e654 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 12 Feb 2025 17:18:37 -0500
Subject: [PATCH 1/2] Clamp porn spending correctly.
---
src/data/backwardsCompatibility/datatypeCleanup.js | 2 +-
src/data/verification/verifySlaveState.js | 2 +-
src/interaction/siRecords.js | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 93d10759929..853624c865f 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -986,7 +986,7 @@ App.Update.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
function slavePornDatatypeCleanup(slave) {
slave.porn.feed = Math.clamp(+slave.porn.feed, 0, 1) || 0;
slave.porn.viewerCount = Math.max(+slave.porn.viewerCount, 0) || 0;
- slave.porn.spending = Math.max(+slave.porn.spending, 0) || 0;
+ slave.porn.spending = Math.clamp(+slave.porn.spending, 0, 5000) || 0;
slave.porn.prestige = Math.clamp(+slave.porn.prestige, 0, 3) || 0;
if (typeof slave.porn.prestigeDesc !== "string") {
slave.porn.prestigeDesc = 0;
diff --git a/src/data/verification/verifySlaveState.js b/src/data/verification/verifySlaveState.js
index 062aaf8652f..4e5c5d3151c 100644
--- a/src/data/verification/verifySlaveState.js
+++ b/src/data/verification/verifySlaveState.js
@@ -174,7 +174,7 @@ App.Verify.I.slaveDiet = (actor, location) => {
App.Verify.I.slavePorn = (actor, location) => {
actor.porn.feed = Math.clamp(+actor.porn.feed, 0, 1) ?? 0;
actor.porn.viewerCount = Math.max(+actor.porn.viewerCount, 0) ?? 0;
- actor.porn.spending = Math.max(+actor.porn.spending, 0) ?? 0;
+ actor.porn.spending = Math.clamp(+actor.porn.spending, 0, 5000) ?? 0;
actor.porn.prestige = Math.clamp(+actor.porn.prestige, 0, 3) ?? 0;
if (actor.porn.fameType === "none") {
actor.porn.prestige = 0;
diff --git a/src/interaction/siRecords.js b/src/interaction/siRecords.js
index 770a46d3f56..3943f752de4 100644
--- a/src/interaction/siRecords.js
+++ b/src/interaction/siRecords.js
@@ -75,7 +75,8 @@ App.UI.SlaveInteract.records = function(slave, refresh) {
App.UI.DOM.makeTextBox(
slave.porn.spending,
v => {
- slave.porn.spending = v;
+ slave.porn.spending = Math.clamp(v, 0, 5000);
+ refresh();
},
true
)
--
GitLab
From eab4770c90f00f487be99c5864e779fdfd11aa6f Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 12 Feb 2025 17:19:21 -0500
Subject: [PATCH 2/2] Fix stray header appearing in market assistant intro if
you trigger it early.
---
src/events/assistant/assistantMarket.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/events/assistant/assistantMarket.js b/src/events/assistant/assistantMarket.js
index e04526b94e9..bf7fc48860f 100644
--- a/src/events/assistant/assistantMarket.js
+++ b/src/events/assistant/assistantMarket.js
@@ -112,9 +112,9 @@ App.Events.assistantMarket = class assistantMarket extends App.Events.BaseEvent
}
App.Events.addParagraph(node, r);
- App.UI.DOM.appendNewElement("h3", node, "Personal Assistant and Market Assistant relationship styles");
if (V.assistant.personality !== 0 && V.assistant.appearance !== "normal") {
+ App.UI.DOM.appendNewElement("h3", node, "Personal Assistant and Market Assistant relationship styles");
const responses = [
new App.Events.Result(`Cute`, cute),
new App.Events.Result(`Romantic`, romantic),
--
GitLab