From 3d58ebd3ccfe9ab28e9b858b13897fbc6a546e50 Mon Sep 17 00:00:00 2001
From: Trashman1138 <11461-Trashman1138@users.noreply.gitgud.io>
Date: Wed, 10 Jul 2019 02:02:31 -0700
Subject: [PATCH] Replace economyJS.js
---
src/js/economyJS.js | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 9036ed26649..e435f4fdd23 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1132,14 +1132,16 @@ window.slaveJobValues = function() {
}
if (s.assignment === "serve in the club" || toTheClub === 1) {
beautyMultiplier += V.DJRepBonus;
- }
- if (canHear(s) === false) {
- beautyMultiplier -= 0.15;
- // $His inability to move to the rhythm of the music is very off putting to those looking to party.
+ if (canHear(s) === false) {
+ beautyMultiplier -= 0.65;
+ // $His inability to move to the rhythm of the music is very off putting to those looking to party.
+ } else if ((s.hears === -1 && s.earwear !== "hearing aids") || (s.hears === 0 && s.earwear === "muffling ear plugs")) {
+ beautyMultiplier -= 0.75;
+ }
}
// Injuries
- if (s.curatives < 1 || s.inflationType !== "curative") {
+ if (s.curatives < 1 && s.inflationType !== "curative") {
if (s.health < -50) {
s.health -= 8;
s.minorInjury = 1;
@@ -1148,16 +1150,16 @@ window.slaveJobValues = function() {
s.minorInjury = 1;
} else if (!canDoVaginal(s)) {
if (canDoAnal(s)) {
- if (jsRandom(1, 100) > 40 + (10 * (s.skill.anal + s.skill.oral))) {
+ if (jsRandom(1, 100) > 40 + (3 * (s.skill.anal + s.skill.oral)/10)) {
s.health -= 5;
s.minorInjury = 1;
}
- } else if (jsRandom(1, 100) > 40 + (10 * s.skill.oral)) {
+ } else if (jsRandom(1, 100) > 70 + (3/10 * s.skill.oral)) {
s.health -= 5;
s.minorInjury = 1;
}
} else if (s.skill.anal + s.skill.oral + s.skill.vaginal < 300) {
- if (jsRandom(1, 100) > 10 + ((s.skill.anal + s.skill.oral + s.skill.vaginal) / 10)) {
+ if (jsRandom(1, 100) > 10 + (3*(s.skill.anal + s.skill.oral + s.skill.vaginal) / 10)) {
s.minorInjury = 1;
}
}
@@ -1183,13 +1185,6 @@ window.slaveJobValues = function() {
s.minorInjury = "sore muscle";
}
}
- if ((s.hears === -1 && s.earwear !== "hearing aids") || (s.hears === 0 && s.earwear === "muffling ear plugs") || (s.hears === -2)) {
- if (!canHear(s)) {
- beautyMultiplier -= 0.5;
- } else {
- beautyMultiplier -= 0.75;
- }
- }
// The amount of sexual acts
s.sexAmount = Beauty(s) / 2 + 100;
--
GitLab