From 0214f8559b60edb8549b06957dd6c58e76ab8132 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Tue, 28 May 2019 18:50:13 -0400
Subject: [PATCH] fix

---
 src/init/storyInit.tw                       |  3 +-
 src/js/datatypeCleanupJS.js                 | 84 +++++++++++++--------
 src/uncategorized/BackwardsCompatibility.tw |  4 +-
 3 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 61fcdbf0f43..07b642bc8c4 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1014,9 +1014,8 @@ 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", local: "buttock"}>>
+<<set $brandTarget = {primary: "buttock", secondary: "buttock", RA: "buttock", local: "buttock"}>>
 <<set $brandDesign = {primary: "your initials", RA: "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/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index e0022df84b7..85c801578a1 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -174,43 +174,61 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() {
 		if (typeof slave.brand !== "object") {
 			let brand = {};
 			if (slave.brandLocation !== 0) {
-				if (slave.brandLocation === "ankles") {
-					brand["left ankle"] = slave.brand;
-					brand["right ankle"] = slave.brand;
-				} else if (slave.brandLocation === "calves") {
-					brand["left calf"] = slave.brand;
-					brand["right calf"] = slave.brand;
-				} else if (slave.brandLocation === "feet") {
-					brand["left foot"] = slave.brand;
-					brand["right foot"] = slave.brand;
-				} else if (slave.brandLocation === "hands") {
-					brand["left hand"] = slave.brand;
-					brand["right hand"] = slave.brand;
-				} else if (slave.brandLocation === "lower arms") {
-					brand["left lower arm"] = slave.brand;
-					brand["right lower arm"] = slave.brand;
-				} else if (slave.brandLocation === "shoulders") {
-					brand["left shoulders"] = slave.brand;
-					brand["right shoulders"] = slave.brand;
-				} else if (slave.brandLocation === "upper arms") {
-					brand["left upper arm"] = slave.brand;
-					brand["right upper arm"] = slave.brand;
-				} else if (slave.brandLocation === "wrists") {
-					brand["left wrist"] = slave.brand;
-					brand["right wrist"] = slave.brand;
-				} else if (slave.brandLocation === "cheeks") {
-					brand["left cheek"] = slave.brand;
-					brand["right cheek"] = slave.brand;
-				} else if (slave.brandLocation === "ears") {
-					brand["left ears"] = slave.brand;
-					brand["right ears"] = slave.brand;
-				} else {
-					brand[slave.brandLocation] = slave.brand;
+				brand[slave.brandLocation] = slave.brand;
 				}
-			}
 			delete slave.brandLocation;
 			slave.brand = brand;
 		}
+		if (slave.brand.ankles) {
+			brand["left ankle"] = slave.brand.ankles;
+			brand["right ankle"] = slave.brand.ankles;
+			delete slave.brand.ankles;
+		}
+		if (slave.brand.calves) {
+			brand["left calf"] = slave.brand.calves;
+			brand["right calf"] = slave.brand.calves;
+			delete slave.brand.calves;
+		}
+		if (slave.brand.feet) {
+			brand["left foot"] = slave.brand.feet;
+			brand["right foot"] = slave.brand.feet;
+			delete slave.brand.feet;
+		}
+		if (slave.brand.hands) {
+			brand["left hand"] = slave.brand.hands;
+			brand["right hand"] = slave.brand.hands;
+			delete slave.brand.hands;
+		}
+		if (slave.brand["lower arms"]) {
+			brand["left lower arm"] = slave.brand["lower arms"];
+			brand["right lower arm"] = slave.brand["lower arms"];
+			delete slave.brand["lower arms"];
+		}
+		if (slave.brand.shoulders) {
+			brand["left shoulders"] = slave.brand.shoulders;
+			brand["right shoulders"] = slave.brand.shoulders;
+			delete slave.brand.shoulders;
+		}
+		if (slave.brand["upper arms"]) {
+			brand["left upper arm"] = slave.brand["upper arms"];
+			brand["right upper arm"] = slave.brand["upper arms"];
+			delete slave.brand["upper arms"];
+		}
+		if (slave.brand.wrists) {
+			brand["left wrist"] = slave.brand.wrists;
+			brand["right wrist"] = slave.brand.wrists;
+			delete slave.brand.wrists;
+		}
+		if (slave.brand.cheeks) {
+			brand["left cheek"] = slave.brand.cheeks;
+			brand["right cheek"] = slave.brand.cheeks;
+			delete slave.brand.cheeks;
+		}
+		if (slave.brand.ears) {
+			brand["left ears"] = slave.brand.ears;
+			brand["right ears"] = slave.brand.ears;
+			delete slave.brand.ears;
+		}
 	}
 })();
 
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 4b47077cf22..6d9839813bf 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -39,9 +39,9 @@
 <</if>>
 
 <<if typeof $brandTarget == "string">>
-	<<set $brandTarget = {primary: $brandTarget, secondary: "buttock", local: "buttock"}>>
+	<<set $brandTarget = {primary: $brandTarget, secondary: "buttock", RA: $brandTarget, local: "buttock"}>>
 <<elseif typeof $brandTarget != "object">>
-	<<set $brandTarget = {primary: "buttock", secondary: "buttock", local: "buttock"}>>
+	<<set $brandTarget = {primary: "buttock", secondary: "buttock", RA: "buttock", local: "buttock"}>>
 <</if>>
 
 <<if typeof $brandDesign == "string">>
-- 
GitLab