From f92b924c930958dadfa9e2b3dd3539d9be24701c Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 3 Jul 2021 02:54:28 -0700
Subject: [PATCH] Fixes: 1. Remove stray quote in RES Move for female PCs 2.
Fix rendering error when attempting to sell shelter slaves 3. Fix "D virgin
asspussy" slave buyer offering an unreasonably small amount of money for
qualifying slaves 4. Fix RE Snatch and Grab Followup failing to trigger
---
src/events/schools/resMove.js | 2 +-
src/interaction/sellSlave.js | 4 ++--
src/js/eventSelectionJS.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/events/schools/resMove.js b/src/events/schools/resMove.js
index a9666fb672e..d73c01943d5 100644
--- a/src/events/schools/resMove.js
+++ b/src/events/schools/resMove.js
@@ -43,7 +43,7 @@ App.Events.RESMove = class RESMove extends App.Events.BaseEvent {
if (V.PC.title) {
playerName = `Mr. ${V.PC.slaveName}`;
} else {
- playerName = `"Ms. ${V.PC.slaveName}`;
+ playerName = `Ms. ${V.PC.slaveName}`;
}
} else {
playerName = V.PC.slaveName;
diff --git a/src/interaction/sellSlave.js b/src/interaction/sellSlave.js
index 7d978cb8af4..035d8edec11 100644
--- a/src/interaction/sellSlave.js
+++ b/src/interaction/sellSlave.js
@@ -839,7 +839,7 @@ App.Interact.sellSlave = function(slave) {
App.Events.addParagraph(scene, t);
if (isShelterSlave(slave)) {
- App.Events.addParagraph(scene, [`${He} was placed in your care by the Slave Shelter. Selling ${him} will `, App.UI.DOM.makeElement("span", "violate your contract with them.", "reputation dec")]);
+ App.Events.addParagraph(scene, [`${He} was placed in your care by the Slave Shelter. Selling ${him} will `, App.UI.DOM.makeElement("span", "violate your contract with them.", ["reputation", "dec"])]);
}
/**
@@ -1555,7 +1555,7 @@ App.Interact.sellSlave = function(slave) {
}
}],
["D virgin asspussy", {
- cost: Math.trunc((cost * 1.35) / 500),
+ cost: 500 * Math.trunc((cost * 1.35) / 500),
offerDesc: `from a prominent citizen who appreciates ${girl}s who are both vaginal virgins and anal veterans.`,
get requirements() { return (slave.vagina === 0 && slave.anus > 1 && slave.skill.anal >= 100 && slave.physicalAge < 25); },
percentOdds: 60,
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index fb237c730e8..7f09dbde4e4 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1064,7 +1064,7 @@ if(eventSlave.drugs === "breast injections") {
}
}
- if (V.eventResults.snatch === 0 && eventSlave.origin === "$He is your share of a raid on an illegal laboratory by your mercenaries." && eventSlave.newGamePlus === 0) {
+ if (V.eventResults.snatch === 2 && eventSlave.origin === "$He is your share of a raid on an illegal laboratory by your mercenaries." && eventSlave.newGamePlus === 0) {
if (V.geneticMappingUpgrade === 2 && eventSlave.health.condition > 25 && eventSlave.devotion > 50 && V.cash > V.surgeryCost * 4) {
/* only one slave ever qualifies, so give it a bit more weight */
V.events.push("RE snatch and grab followup");
--
GitLab