From f4b98c9eb2f77285669247bbf1bf06a8ee6ec45d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 10 Jan 2019 23:08:24 -0500
Subject: [PATCH] Fixed issues with calcGenderLawBeauty()
---
devNotes/twine JS.txt | 6 ++++--
src/js/slaveCostJS.tw | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index d61eb59799c..69154c1a9f0 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -39157,13 +39157,15 @@ window.Beauty = (function() {
if (arcology.FSPhysicalIdealist === "unset" && arcology.FSHedonisticDecadenceStrongFat === 0 && slave.muscles > 30) { /*muscle check*/
V.genderLawPass = 0;
- } else if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
+ }
+ if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
if (slave.weight > 130 || slave.weight <= -30) {
V.genderLawPass = 0;
}
} else if (Math.abs(slave.weight) > 30) {
V.genderLawPass = 0;
- } else if (arcology.FSAssetExpansionist !== "unset") {
+ }
+ if (arcology.FSAssetExpansionist !== "unset") {
if (slave.boobs < 500 || slave.boobs > 1600 || slave.butt < 3 || slave.butt > 6) {
V.genderLawPass = 0;
}
diff --git a/src/js/slaveCostJS.tw b/src/js/slaveCostJS.tw
index cfafbf8bce4..3a12643876a 100644
--- a/src/js/slaveCostJS.tw
+++ b/src/js/slaveCostJS.tw
@@ -1119,13 +1119,15 @@ window.Beauty = (function() {
if (arcology.FSPhysicalIdealist === "unset" && arcology.FSHedonisticDecadenceStrongFat === 0 && slave.muscles > 30) { /*muscle check*/
V.genderLawPass = 0;
- } else if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
+ }
+ if (arcology.FSHedonisticDecadence !== "unset" || arcology.FSPhysicalIdealistStrongFat === 1) { /*weight check*/
if (slave.weight > 130 || slave.weight <= -30) {
V.genderLawPass = 0;
}
} else if (Math.abs(slave.weight) > 30) {
V.genderLawPass = 0;
- } else if (arcology.FSAssetExpansionist !== "unset") {
+ }
+ if (arcology.FSAssetExpansionist !== "unset") {
if (slave.boobs < 500 || slave.boobs > 1600 || slave.butt < 3 || slave.butt > 6) {
V.genderLawPass = 0;
}
--
GitLab