diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index c20b7f8b7b35a3f7e7ad93f12df7a52b5876059d..d5a060907ded06bb089cc9bf0430dc0b77c4ac06 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -1693,7 +1693,7 @@ window.DefaultRules = (function() { */ function ProcessDiet(slave, rule) { // Diet Setting - if (rule.diet !== undefined && rule.diet !== null) { + if ((rule.diet !== undefined && rule.diet !== null) || rule.weight !== null) { /* if ((slave.boobs >= 1600) && (slave.muscles <= 5) && (slave.amp !== 1) && ((rule.muscles == null) || (rule.muscles === 0))) { if ((slave.diet !== "muscle building")) { @@ -1715,12 +1715,16 @@ window.DefaultRules = (function() { } } else { if (rule.weight !== null) { - if (slave.weight - 5 > rule.weight.max && slave.diet !== "restricted") { - slave.diet = "restricted"; - r += `<br>${slave.slaveName} is too fat so ${his} diet has been set to restricted.`; - } else if (slave.weight + 5 < rule.weight.min && slave.diet !== "fattening") { - slave.diet = "fattening"; - r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`; + if (slave.weight > rule.weight.max) { + if (slave.diet !== "restricted" ) { + slave.diet = "restricted"; + r += `<br>${slave.slaveName} is too fat so ${his} diet has been set to restricted.`; + } + } else if (slave.weight < rule.weight.min) { + if (slave.diet !== "fattening") { + slave.diet = "fattening"; + r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`; + } } else if ((rule.muscles !== undefined) && (rule.muscles !== null) && (slave.amp !== 1)) { if (App.RA.shallShrink(slave.muscles, rule.muscles, 8)) { if ((slave.diet !== "slimming")) {