diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js index 146c932ae36951db504cb1b3ddb686fb86969c1e..07489d6323774f5ba6e8f15a04b545da55923522 100644 --- a/src/js/datatypeCleanupJS.js +++ b/src/js/datatypeCleanupJS.js @@ -179,31 +179,27 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() { delete slave.brandLocation; slave.brand = brand; } - if (slave.brand.ankles) { - slave.brand["left ankle"] = slave.brand.ankles; - slave.brand["right ankle"] = slave.brand.ankles; - delete slave.brand.ankles; - } - if (slave.brand.calves) { - slave.brand["left calf"] = slave.brand.calves; - slave.brand["right calf"] = slave.brand.calves; - delete slave.brand.calves; - } - if (slave.brand.feet) { - slave.brand["left foot"] = slave.brand.feet; - slave.brand["right foot"] = slave.brand.feet; - delete slave.brand.feet; + + /* Head */ + if (slave.brand.cheeks) { + slave.brand["left cheek"] = slave.brand.cheeks; + slave.brand["right cheek"] = slave.brand.cheeks; + delete slave.brand.cheeks; } - if (slave.brand.hands) { - slave.brand["left hand"] = slave.brand.hands; - slave.brand["right hand"] = slave.brand.hands; - delete slave.brand.hands; + if (slave.brand.ears) { + slave.brand["left ear"] = slave.brand.ears; + slave.brand["right ear"] = slave.brand.ears; + delete slave.brand.ears; } - if (slave.brand["lower arms"]) { - slave.brand["left lower arm"] = slave.brand["lower arms"]; - slave.brand["right lower arm"] = slave.brand["lower arms"]; - delete slave.brand["lower arms"]; + + /* Torso */ + if (slave.brand.breasts) { + slave.brand["left breast"] = slave.brand.breasts; + slave.brand["right breast"] = slave.brand.breasts; + delete slave.brand.breasts; } + + /* Arms */ if (slave.brand.shoulders) { slave.brand["left shoulder"] = slave.brand.shoulders; slave.brand["right shoulder"] = slave.brand.shoulders; @@ -214,31 +210,48 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() { slave.brand["right upper arm"] = slave.brand["upper arms"]; delete slave.brand["upper arms"]; } + if (slave.brand["lower arms"]) { + slave.brand["left lower arm"] = slave.brand["lower arms"]; + slave.brand["right lower arm"] = slave.brand["lower arms"]; + delete slave.brand["lower arms"]; + } if (slave.brand.wrists) { slave.brand["left wrist"] = slave.brand.wrists; slave.brand["right wrist"] = slave.brand.wrists; delete slave.brand.wrists; } - if (slave.brand.cheeks) { - slave.brand["left cheek"] = slave.brand.cheeks; - slave.brand["right cheek"] = slave.brand.cheeks; - delete slave.brand.cheeks; - } - if (slave.brand.ears) { - slave.brand["left ear"] = slave.brand.ears; - slave.brand["right ear"] = slave.brand.ears; - delete slave.brand.ears; + if (slave.brand.hands) { + slave.brand["left hand"] = slave.brand.hands; + slave.brand["right hand"] = slave.brand.hands; + delete slave.brand.hands; } + + /* Legs */ if (slave.brand.buttocks) { slave.brand["left buttock"] = slave.brand.buttocks; slave.brand["right buttock"] = slave.brand.buttocks; delete slave.brand.buttocks; } + if (slave.brand.calves) { + slave.brand["left calf"] = slave.brand.calves; + slave.brand["right calf"] = slave.brand.calves; + delete slave.brand.calves; + } if (slave.brand.thighs) { slave.brand["left thigh"] = slave.brand.thighs; slave.brand["right thigh"] = slave.brand.thighs; delete slave.brand.thigh; } + if (slave.brand.ankles) { + slave.brand["left ankle"] = slave.brand.ankles; + slave.brand["right ankle"] = slave.brand.ankles; + delete slave.brand.ankles; + } + if (slave.brand.feet) { + slave.brand["left foot"] = slave.brand.feet; + slave.brand["right foot"] = slave.brand.feet; + delete slave.brand.feet; + } } })(); diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 9c263e1b91fe1804e05a30a33c53553ff090ebf2..94de5d816e1f910e6ff92008ad3957c8250652eb 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -2976,30 +2976,26 @@ window.rulesAssistantOptions = (function() { constructor() { super("Your preferred location for brands is", []); - const ears = new ListSubSection(this, "Ears", [ - ["Left", "left ear"], - ["Right", "right ear"] - ]); - this.appendChild(ears); - + // Head const cheeks = new ListSubSection(this, "Cheeks", [ ["Left", "left cheek"], ["Right", "right cheek"] ]); this.appendChild(cheeks); + const ears = new ListSubSection(this, "Ears", [ + ["Left", "left ear"], + ["Right", "right ear"] + ]); + this.appendChild(ears); + + // Arms const shoulders = new ListSubSection(this, "Shoulders", [ ["Left", "left shoulder"], ["Right", "right shoulder"] ]); this.appendChild(shoulders); - const breasts = new ListSubSection(this, "Breasts", [ - ["Left", "right breast"], - ["Right", "left breast"] - ]); - this.appendChild(breasts); - const upper_arms = new ListSubSection(this, "Arms, upper", [ ["Left", "left upper arm"], ["Right", "right upper arm"] @@ -3024,6 +3020,14 @@ window.rulesAssistantOptions = (function() { ]); this.appendChild(hand); + // Torso + const breasts = new ListSubSection(this, "Breasts", [ + ["Left", "left breast"], + ["Right", "right breast"] + ]); + this.appendChild(breasts); + + // Legs const buttocks = new ListSubSection(this, "Buttocks", [ ["Left", "left buttock"], ["Right", "right buttock"] @@ -3054,6 +3058,7 @@ window.rulesAssistantOptions = (function() { ]); this.appendChild(feet); + // Other const other = new ListSubSection(this, "Other", [ ["Neck", "neck"], ["Chest", "chest"], diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 4d71bc646961b7b435bea186a62206924db37971..f36eb8605cba2151c8f90e735324c966b1abd8ee 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1961,25 +1961,34 @@ $He is <<if $activeSlave.fuckdoll == 0>> /* Check it's not a facial brand. (posting much later, I have basically just printed the list that was here. It might need to be longer, but it's the only way I can think of to hide cheeks and ears in multiBrand.)*/ - <<= App.Desc.brand($activeSlave), "back">> + /* Sorted top to bottom */ + /* Torso */ <<= App.Desc.brand($activeSlave), "chest">> - <<= App.Desc.brand($activeSlave), "left ankle">> - <<= App.Desc.brand($activeSlave), "left calf">> - <<= App.Desc.brand($activeSlave), "left foot">> - <<= App.Desc.brand($activeSlave), "left hand">> - <<= App.Desc.brand($activeSlave), "left lower arm">> + <<= App.Desc.brand($activeSlave), "back">> + <<= App.Desc.brand($activeSlave), "lower back">> + + /* Arms */ <<= App.Desc.brand($activeSlave), "left shoulder">> <<= App.Desc.brand($activeSlave), "left upper arm">> + <<= App.Desc.brand($activeSlave), "left lower arm">> <<= App.Desc.brand($activeSlave), "left wrist">> - <<= App.Desc.brand($activeSlave), "lower back">> - <<= App.Desc.brand($activeSlave), "right ankle">> - <<= App.Desc.brand($activeSlave), "right calf">> - <<= App.Desc.brand($activeSlave), "right foot">> - <<= App.Desc.brand($activeSlave), "right hand">> - <<= App.Desc.brand($activeSlave), "right lower arm">> + <<= App.Desc.brand($activeSlave), "left hand">> + <<= App.Desc.brand($activeSlave), "right shoulder">> <<= App.Desc.brand($activeSlave), "right upper arm">> + <<= App.Desc.brand($activeSlave), "right lower arm">> + <<= App.Desc.brand($activeSlave), "right hand">> <<= App.Desc.brand($activeSlave), "right wrist">> + + /* Legs */ + /*buttock and thigh are displayed in descriptionWidgetsTattoos, if you can believe it */ + <<= App.Desc.brand($activeSlave), "left calf">> + <<= App.Desc.brand($activeSlave), "left ankle">> + <<= App.Desc.brand($activeSlave), "left foot">> + + <<= App.Desc.brand($activeSlave), "right calf">> + <<= App.Desc.brand($activeSlave), "right ankle">> + <<= App.Desc.brand($activeSlave), "right foot">> <</if>> <<skinDescription>>