diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index ad89c391b22402e1e746089ca59c18dbacae011d..578b394c81681e6ec7285726276f2dbbf5034663 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -1567,23 +1567,19 @@ window.DefaultRules = (function() { r += `<br>${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`; } } - } else if (rule.weight !== null && (slave.weight > rule.weight.max || slave.weight < rule.weight.min)) { - 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 ((slave.diet !== "healthy")) { - slave.diet = "healthy"; - r += `<br>${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`; - } - } + } else if (rule.weight !== null && 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 (rule.weight !== null && 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.weight !== null && ["restricted", "fattening"].includes(slave.diet)) { + slave.diet = "healthy"; + r += `<br>${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`; } else if ((rule.diet === "attractive")) { if (((slave.weight > 95) || ((slave.weight > 30) && (slave.hips < 2)))) { if ((slave.diet !== "restricted")) {