diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 07b642bc8c4db5615e13207573ebe2feda33a310..a901b79934d598fc5a63a4b4ac69a570741c9e42 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1014,8 +1014,9 @@ You should have received a copy of the GNU General Public License along with thi <<set $fixedRace = 0>> <<set $ui = "start">> -<<set $brandTarget = {primary: "buttock", secondary: "buttock", RA: "buttock", local: "buttock"}>> -<<set $brandDesign = {primary: "your initials", RA: "your initials", local: "your initials"}>> +<<set $brandTarget = {primary: "buttock", secondary: "buttock", local: "buttock"}>> +<<set $brandDesign = {primary: "your initials", local: "your initials"}>> +<<set $brandRA = {buttock: "your initials"}>> <<set $dyedSkin = ["camouflage patterned", "dyed blue", "dyed gray", "dyed green", "dyed pink", "dyed red", "tiger striped"]>> diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 9da62a899d5915cf5339eb864e0af2e4173edd94..ceb0b91ec4b9edfd3b01dff99a5c1ac938ccd5f6 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -2804,7 +2804,13 @@ window.DefaultRules = (function() { if ((rule.autoBrand === 1)) { if ((keySum(slave.brand) === 0)) { if ((slave.health > -20)) { - slave.brand[brandTarget.RA] = V.brandDesign.RA; + let brandRA = State.variables.brandRA; + for (var prop1 in brandRA) { + if (brandRA.hasOwnProperty(prop1)) { + // Push each value from `brandRA` into `extended` + slave.brand[prop1] = brandRA[prop1]; + } + } if ((slave.devotion < 18)) { slave.devotion -= 5; } diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 405afbe16a28406657662be6ca24610902085efa..0c34a9b5e9a7eed4620c6bbb0535be1b13b711f2 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -3057,8 +3057,8 @@ window.rulesAssistantOptions = (function() { ]); this.appendChild(other); - this.setValue(V.brandTarget.RA); - this.onchange = (value) => V.brandTarget.RA = value; + this.setValue(V.brandRA); + this.onchange = (value) => V.brandRA[value] = value; } } diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 3dbdc9305c550e98db9868f29ceb0f6f72d6e620..6476cbe77daa22f257175f51ec32a455f856a3c7 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -39,15 +39,19 @@ <</if>> <<if typeof $brandTarget == "string">> - <<set $brandTarget = {primary: $brandTarget, secondary: "buttock", RA: $brandTarget, local: "buttock"}>> + <<set $brandTarget = {primary: $brandTarget, secondary: "buttock", local: "buttock"}>> <<elseif typeof $brandTarget != "object">> - <<set $brandTarget = {primary: "buttock", secondary: "buttock", RA: "buttock", local: "buttock"}>> + <<set $brandTarget = {primary: "buttock", secondary: "buttock", local: "buttock"}>> <</if>> <<if typeof $brandDesign == "string">> - <<set $brandDesign = {primary: $brandDesign, RA: $brandDesign, local: $brandDesign}>> + <<set $brandDesign = {primary: $brandDesign, local: $brandDesign}>> <<elseif typeof $brandDesign != "object">> - <<set $brandDesign = {primary: "your initials", RA: "your initials", local: "your initials"}>> + <<set $brandDesign = {primary: "your initials", local: "your initials"}>> +<</if>> + +<<if ndef $brandRA>> + <<set $brandRA = {buttock: "your initials"}>> <</if>> <<if def $servantMilkersJobs>>