From cb4b3d4616c448fe7e1676de49db17d9d53448e3 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 30 Jun 2019 19:45:03 -0400
Subject: [PATCH] autosurgery fixes
---
src/js/DefaultRules.js | 2 +-
src/js/rulesAutosurgery.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 5371e9ca59e..c20b7f8b7b3 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -2100,7 +2100,7 @@ window.DefaultRules = (function() {
slave.releaseRules = "restrictive";
r += `<br>Since ${slave.slaveName} is unable to masturbate, ${his} masturbation rules have been set to restrictive.`;
}
- } else if ((release !== 0) && (slave.releaseRules !== rule.releaseRules)) {
+ } else if ((release !== 1) && (slave.releaseRules !== rule.releaseRules)) {
slave.releaseRules = rule.releaseRules;
r += `<br>${slave.slaveName}'s masturbation rules have been set to ${rule.releaseRules}.`;
}
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index c19f52da1ba..4eb68991103 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -393,19 +393,19 @@ window.rulesAutosurgery = (function() {
if (slave.health > 20 && surgeries.length < 3) {
if (slave.waist >= -10 && thisSurgery.cosmetic > 0) {
commitProcedure("a narrower waist", s => { s.waist -= 20; });
- } else if (slave.hips < 1 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.hips)) {
+ } else if (thisSurgery.hips !== null && slave.hips < 1 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.hips)) {
commitProcedure("wider hips", slave => {
slave.hips++;
slave.hipsImplant++;
});
} else if (slave.waist >= -95 && V.seeExtreme === 1 && thisSurgery.cosmetic === 2) {
commitProcedure("a narrower waist", s => { s.waist = Math.clamp(s.waist - 20, -100, 100); });
- } else if (slave.hips < 2 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.hips)) {
+ } else if (thisSurgery.hips !== null && slave.hips < 2 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.hips)) {
commitProcedure("wider hips", slave => {
slave.hips++; // FIXME: repeats branch above
slave.hipsImplant++;
});
- } else if (slave.hips < 3 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.hips)) {
+ } else if (thisSurgery.hips !== null && slave.hips < 3 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.hips)) {
commitProcedure("wider hips", slave => {
slave.hips++; // FIXME: repeats branch above
slave.hipsImplant++;
--
GitLab