From a2891cc416183120acd86ba7e542351a35bfee53 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Tue, 28 May 2019 14:01:09 -0400
Subject: [PATCH] more RA
---
src/init/storyInit.tw | 5 +++--
src/js/DefaultRules.js | 8 +++++++-
src/js/rulesAssistantOptions.js | 4 ++--
src/uncategorized/BackwardsCompatibility.tw | 12 ++++++++----
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 07b642bc8c4..a901b79934d 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 9da62a899d5..ceb0b91ec4b 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 405afbe16a2..0c34a9b5e9a 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 3dbdc9305c5..6476cbe77da 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>>
--
GitLab