diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 7b827ee4acea4f7820d84924e008f641227e3789..71f4dc5377c9dc820e0f6c1c47ef67879314623a 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -2802,20 +2802,17 @@ window.DefaultRules = (function() { } } if ((rule.autoBrand === 1)) { - if ((slave.health > -20)) { - let brandRA = rule.brandRA; - for (var prop1 in brandRA) { - if (brandRA.hasOwnProperty(prop1)) { - // Push each value from `brandRA` into `extended` - slave.brand[prop1] = brandRA[prop1]; + if ((slave.brand === 0)) { + if ((slave.health > -20)) { + slave.brand = V.brandDesign.RA; + slave.brandLocation = V.brandTarget.RA; + if ((slave.devotion < 18)) { + slave.devotion -= 5; } + 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.`; } - if ((slave.devotion < 18)) { - slave.devotion -= 5; - } - 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.`; } } } diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 184777b23b931f00f5230a353fed210870fecb43..9c263e1b91fe1804e05a30a33c53553ff090ebf2 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -3064,8 +3064,8 @@ window.rulesAssistantOptions = (function() { ]); this.appendChild(other); - this.setValue(JSON.stringify(current_rule.set.brandRA, null, 4)); - this.onchange = (value) => current_rule.set.brandRA[value] = value; + this.setValue(V.brandTarget.RA); + this.onchange = (value) => V.brandTarget.RA = value; } }