From 7b7ea89878213a975c6e57e6e6292e617415eba0 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 9 Aug 2021 13:44:50 -0400
Subject: [PATCH] tweaks
---
src/js/slaveCostJS.js | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 8eb7ea4d47c..66b965f6084 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1341,7 +1341,7 @@ globalThis.BeautyArray = (function() {
if (arcology.FSTransformationFetishist > 20) {
if (slave.lips > 70) {
if (slave.lipsImplant / slave.lips < 0.5) {
- adjustBeauty("Lips: Transformation Fetishist", -(((slave.lips / 10) + (arcology.FSTransformationFetishist / 20))));
+ adjustBeauty("Lips: Transformation Fetishist", -((slave.lips / 10) + (arcology.FSTransformationFetishist / 20)));
}
}
if (slave.hips === 3) {
@@ -2350,7 +2350,7 @@ globalThis.slaveCost = function(slave, isStartingSlave = false, followLaws = fal
} else {
sortedBeautyMapKeys = Array.from(beautyObj.map.keys()).sort((a, b) => (a < b) ? 1 : -1);
}
- } else if (criteria === "value") {
+ } else if (criteria === "value") {
if (direction === "descending") {
sortedBeautyMapKeys = Array.from(beautyObj.map.keys()).sort((a, b) => (beautyObj.map.get(a) > beautyObj.map.get(b)) ? 1 : -1);
} else {
@@ -2358,8 +2358,6 @@ globalThis.slaveCost = function(slave, isStartingSlave = false, followLaws = fal
}
}
-
-
for (const key of sortedBeautyMapKeys) {
let value = beautyObj.map.get(key);
value = (Math.floor(value * 10) / 10);
@@ -2477,11 +2475,11 @@ globalThis.slaveCostBeauty = (function() {
updateMultiplyer(`devotion`, slave.devotion / 200);
if (slave.devotion < -20) {
if (slave.trust > 0) {
- updateMultiplyer(`low devotion`, -slave.trust / 200);
+ updateMultiplyer(`trust with low devotion`, -slave.trust / 200);
}
} else {
if (slave.trust > 0) {
- updateMultiplyer(`trusting devotion`, slave.trust / 200);
+ updateMultiplyer(`trust with devotion`, slave.trust / 200);
}
}
}
@@ -2530,17 +2528,17 @@ globalThis.slaveCostBeauty = (function() {
}
if (arcology.FSRepopulationFocusSMR === 1) {
if (slave.preg < -1) {
- updateMultiplyer(`repop sterile`, -0.5);
+ updateMultiplyer(`repopulationist sterile`, -0.5);
} else if (slave.bellyPreg >= 300000) {
- updateMultiplyer(`repop mega preg`, 1);
+ updateMultiplyer(`repopulationist mega preg`, 1);
} else if (slave.bellyPreg >= 120000) {
- updateMultiplyer(`repop very preg`, 0.5);
+ updateMultiplyer(`repopulationist very preg`, 0.5);
} else if (slave.preg > slave.pregData.normalBirth / 4) {
- updateMultiplyer(`repop showing`, 0.1);
+ updateMultiplyer(`repopulationist showing`, 0.1);
}
} else if (arcology.FSRestartSMR === 1) {
if (slave.preg < -1) {
- updateMultiplyer(`restart sterile`, 0.5);
+ updateMultiplyer(`restart sterile`, 0.5);
} else if (slave.bellyPreg >= 300000) {
updateMultiplyer(`restart mega preg`, -2.5);
} else if (slave.bellyPreg >= 30000) {
@@ -2676,13 +2674,10 @@ globalThis.slaveCostBeauty = (function() {
} else if (slave.birthWeek < 4) {
updateMultiplyer(`birthWeek`, 0.1);
}
- } else if (slave.physicalAge === V.minimumSlaveAge) {
- if (slave.birthWeek === 0) {
- updateMultiplyer(`birthWeek`, 0.2);
- } else if (slave.birthWeek < 4) {
- updateMultiplyer(`birthWeek`, 0.05);
- }
- } else if (slave.physicalAge === V.fertilityAge && canGetPregnant(slave) && (arcology.FSRepopulationFocus !== "unset" || arcology.FSGenderFundamentalist !== "unset")) {
+ } else if (
+ slave.physicalAge === V.minimumSlaveAge ||
+ (slave.physicalAge === V.fertilityAge && canGetPregnant(slave) && (arcology.FSRepopulationFocus !== "unset" || arcology.FSGenderFundamentalist !== "unset"))
+ ) {
if (slave.birthWeek === 0) {
updateMultiplyer(`birthWeek`, 0.2);
} else if (slave.birthWeek < 4) {
--
GitLab