From 012e77aa95e9ecfdfed7a0be0c6e9438d4e5b471 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Mon, 18 Mar 2019 21:25:02 +0100
Subject: [PATCH] RA fixes
---
src/js/DefaultRules.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 2c76f5a3687..07f9314097f 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -884,9 +884,11 @@ window.DefaultRules = (function() {
/** @param {App.Entity.SlaveState} slave */
function ProcessLegAccessory(slave, rule) {
- if (rule.legAccessory !== undefined && rule.legAccessory !== "no default setting" && slave.amp !== 1 && slave.legAccessory !== rule.legAccessory) {
- slave.legAccessory = rule.legAccessory;
- r += `<br>${slave.slaveName}'s leg accessory was set to ${rule.legAccessory}.`;
+ if (rule.legAccessory !== undefined && rule.legAccessory !== "no default setting" && rule.legAccessory !== slave.legAccessory) {
+ if (slave.amp !== 1 && slave.legAccessory !== rule.legAccessory) {
+ slave.legAccessory = rule.legAccessory;
+ r += `<br>${slave.slaveName}'s leg accessory was set to ${rule.legAccessory}.`;
+ }
}
}
@@ -1047,7 +1049,7 @@ window.DefaultRules = (function() {
if ((rule.bellyImplantVol !== undefined) && slave.bellyImplant >= 0 && rule.bellyImplantVol >= 0) {
r += "<br>";
if (slave.health > -10 ) {
- let diff = rule.bellyImplantVol - slave.bellyImplant;
+ const diff = rule.bellyImplantVol - slave.bellyImplant;
if (diff >= 5000 && slave.bellyPain === 0 && slave.health > 50) {
r += `${slave.slaveName}'s belly is way too small, so ${he} has been directed to have intensive belly implant filling procedures throughout this week.`;
slave.bellyImplant += 1000;
--
GitLab