From a74903049042afc677a8fe4faecd7aed99b13b10 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Mon, 1 Apr 2019 18:30:17 -0400
Subject: [PATCH] fix RA always charging for slave markings
---
src/js/DefaultRules.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index a92b3ca508f..dfaf0c7b841 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -2239,7 +2239,7 @@ window.DefaultRules = (function() {
cashX(forceNeg(V.modCost), "slaveMod", slave);
r += `<br>${slave.slaveName}'s hair has been cut; it `;
} else {
- cashX(forceNeg(V.modCost*Math.trunc((rule.hLength-slave.hLength)/10)), "slaveMod");
+ cashX(forceNeg(V.modCost*Math.trunc((rule.hLength-slave.hLength)/10)), "slaveMod", slave);
r += `<br>${slave.slaveName} has been given extensions; ${his} hair `;
}
r += `is now ${lengthToEitherUnit(rule.hLength)} long.`;
@@ -2363,12 +2363,14 @@ window.DefaultRules = (function() {
if (rule.markings !== undefined && (rule.markings !== "no default setting")) {
if (slave.markings === "beauty mark" && (rule.markings === "remove beauty marks" || rule.markings === "remove both")) {
r += `<br>${slave.slaveName}'s beauty mark has been removed.`;
+ slave.markings = "none";
+ cashX(forceNeg(V.modCost), "slaveMod", slave);
}
if (slave.markings === "birthmark" && (rule.markings === "remove birthmarks" || rule.markings === "remove both")) {
r += `<br>${slave.slaveName}'s birthmark has been bleached away.`;
- }
- slave.markings = "none";
- cashX(forceNeg(V.modCost), "slaveMod", slave);
+ cashX(forceNeg(V.modCost), "slaveMod", slave);
+ slave.markings = "none";
+ }
}
if (rule.skinColor !== undefined && rule.skinColor !== "no default setting" && rule.skinColor !== slave.skin) {
@@ -2429,7 +2431,7 @@ window.DefaultRules = (function() {
}
if (rule.clitPiercing === 3) {
- cashX(-1000, "slaveMod");
+ cashX(-1000, "slaveMod", slave);
} else {
cashX(forceNeg(V.modCost), "slaveMod", slave);
}
--
GitLab