diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 2d8924f991f46aaa604c31a246f27b7163ebd7e7..0a6f2fda0e9ec8f5b2faa7ea0ad7247707b24ae5 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -2901,7 +2901,7 @@ window.DefaultRules = (function() { } else if (rule.brandDesign !== slave.brand[right]) { brandPlace = "right"; } - /* if (["upper arms", "lower arms", "wrists", "hands"].includes(rule.brandTarget)) { + if (["upper arms", "lower arms", "wrists", "hands"].includes(rule.brandTarget)) { // Arms if (!hasLimb(slave, "left arm") && !hasLimb(slave, "right arm")) { brandPlace = ""; @@ -2935,7 +2935,7 @@ window.DefaultRules = (function() { brandPlace = ""; } } - } */ + } if (["left", "right"].includes(brandPlace)) { if (slave.devotion < 18) { slave.devotion -= 5; @@ -2960,13 +2960,14 @@ window.DefaultRules = (function() { r += `<br>${slave.slaveName} has been branded on both ${rule.brandTarget}, with <span class="gold">fear</span>${slave.devotion < 18 ? `, <span class="mediumorchid">regard,</span>` : ``} and <span class="red">health</span> consequences.`; } } else if (slave.brand[rule.brandTarget] !== rule.brandDesign) { - /*if ( + if ( (!hasLimb(slave, "left arm") && ["left upper arm", "left lower arm", "left wrist", "left hand"].includes(rule.brandTarget)) || (!hasLimb(slave, "right arm") && ["right upper arm", "right lower arm", "right wrist", "right hand"].includes(rule.brandTarget)) || (!hasLimb(slave, "left leg") && ["left thigh", "left calf", "left ankle", "left foot"].includes(rule.brandTarget)) || (!hasLimb(slave, "right leg") && ["right thigh", "right calf", "right ankle", "rightfoot"].includes(rule.brandTarget)) ) { - } else {*/ + // no brand needed due to amp. + } else { slave.brand[rule.brandTarget] = rule.brandDesign; if ((slave.devotion < 18)) { slave.devotion -= 5; @@ -2974,7 +2975,7 @@ window.DefaultRules = (function() { slave.trust -= 5; slave.health -= 10; r += `<br>${slave.slaveName} has been branded, with <span class="gold">fear</span>${slave.devotion < 18 ? `, <span class="mediumorchid">regard,</span>` : ``} and <span class="red">health</span> consequences.`; - //} + } } } }