diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw index 18ce8b22b15c78359202ee272958ee6cf08d9866..74bbe8b42f802181c68b363b40105e492244e832 100644 --- a/src/facilities/nursery/longChildDescription.tw +++ b/src/facilities/nursery/longChildDescription.tw @@ -1186,6 +1186,15 @@ $He is <<= App.Desc.brand($activeChild), "right foot")>> <</if>> +/* Opposite way of handling above, if that ever proves more conevient. */ +/*<<if $activeChild.fuckdoll == 0>>*/ + /* Describe any brands that aren't on the face */ + /*<<for _brandName, _brand range $activeSlave.brand>> + <<if (!["left ear", "left cheek", "right ear", "right cheek"].includes(_brandName))>> + $His _brandName is marked with _brand. + <</for>> +<</if>> +*/ <<skinDescription>> <<if $saleDescription == 1>> diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index be75b7640dd670c2310c7036b9bb985e578877b8..e24ce744477c62d72fbe06bf45588b80903512dc 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -1321,9 +1321,7 @@ App.Entity.SlaveState = class SlaveState { * brand * * @type {Object.<string, string>} */ - this.brand = { - neck: "your initials" - }; + this.brand = {}; /** has pierced ears * * 0: no; 1: yes; 2: heavy */ diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js index 7721bf3779294e24ce16844e827d43c56af4292c..a55b7e5c6841272e130baaf45591f9c87f99c6e5 100644 --- a/src/js/datatypeCleanupJS.js +++ b/src/js/datatypeCleanupJS.js @@ -178,6 +178,12 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() { } delete slave.brandLocation; slave.brand = brand; + } else if (typeof slave.brand === "object") { // Make sure key and value are strings + for (let [key, value] of Object.entries(slave.brand)) { + if (typeof key !== "string" || typeof value !== "string") { + delete slave.brand[key]; + } + } } /* Head */ diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index bcdb2e8260d2dce10475e1527fbfbfb83137c8cb..7739b0d636165fa973d73c09492317449b7539a5 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -602,15 +602,13 @@ App.Desc.brand = function(slave, surface) { r += `${His} fake belly has ${slave.brand["belly"]} branded on it. `; } else { for (let [key, value] of Object.entries(slave.brand)) { - if (value !== 0) { - if (r === ``) { - r += `${He} has `; - } - r += `${value} branded into the flesh of ${his} ${key}, `; + if (r === ``) { + r += `${He} has `; } + r += `${value} branded into the flesh of ${his} ${key}, `; } if (r !== ``) { - r += `marking him as yours. `; + r += `marking him as yours. `; } else { r += `${His} body is unmarked by brands. `; } diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw index f8a52a6ad07a08bea965c841569ddc666e91917d..49df1f054b9e0426dde967887ce3507c98907474 100644 --- a/src/npc/databases/dSlavesDatabase.tw +++ b/src/npc/databases/dSlavesDatabase.tw @@ -455,7 +455,7 @@ <<set $heroSlaves.push(_HS)>> <<set _HS = App.Entity.SlaveState.makeSkeleton()>> -<<set _HS.slaveName = "'Funbags' Young", _HS.birthName = "Young", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = -10, _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 3550, _HS.boobsImplant = 3000, _HS.nipplesPiercing = 1, _HS.areolae = 3, _HS.boobsTat = "degradation", _HS.butt = 2, _HS.face = 15, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.tonguePiercing = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.brand["chest"] = "SLUT ", _HS.skill.oral = 100, _HS.aphrodisiacs = 1, _HS.addict = 22, _HS.collar = "shock punishment", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>> +<<set _HS.slaveName = "'Funbags' Young", _HS.birthName = "Young", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 23, _HS.physicalAge = 23, _HS.visualAge = 23, _HS.ovaryAge = 23, _HS.health = -10, _HS.devotion = 90, _HS.height = 175, _HS.nationality = "Korean", _HS.race = "asian", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "pale", _HS.hLength = 10, _HS.waist = -55, _HS.boobs = 3550, _HS.boobsImplant = 3000, _HS.nipplesPiercing = 1, _HS.areolae = 3, _HS.boobsTat = "degradation", _HS.butt = 2, _HS.face = 15, _HS.lipsPiercing = 2, _HS.lipsTat = "degradation", _HS.tonguePiercing = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.brand["chest"] = "SLUT", _HS.skill.oral = 100, _HS.aphrodisiacs = 1, _HS.addict = 22, _HS.collar = "shock punishment", _HS.shoes = "heels", _HS.attrXY = 40, _HS.fetish = "cumslut", _HS.fetishKnown = 1>> <<set $heroSlaves.push(_HS)>> <<set _HS = App.Entity.SlaveState.makeSkeleton()>> diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js index d26cf3ad8250ab1a665fe7e42be307cb35ffff29..ec5987ff7588f190eb4200a09b753d62b1e08b3d 100644 --- a/src/npc/descriptions/boobs/boobs.js +++ b/src/npc/descriptions/boobs/boobs.js @@ -1480,15 +1480,11 @@ App.Desc.boobsExtra = function(slave, pronouns) { * @returns {string} */ App.Desc.boobsBrand = function(slave) { - let r = ``; if (State.variables.showBodyMods === 1) { if (slave.fuckdoll === 0) { - r += App.Desc.brand(slave, "chest"); - r += App.Desc.brand(slave, "left breast"); - r += App.Desc.brand(slave, "right breast"); + return(App.Desc.brand(slave, "chest") + App.Desc.brand(slave, "left breast") + App.Desc.brand(slave, "right breast")); } } - return r; }; /**