diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js index 6ca6c2dcb52e20168a162b7f2e5ce57754d93768..69db2b464aefa44dbd7a2f292169e40f002e31b2 100644 --- a/src/js/slaveCostJS.js +++ b/src/js/slaveCostJS.js @@ -188,7 +188,7 @@ window.Beauty = (function() { * @param {App.Entity.SlaveState} slave */ function calcCosmeticsBeauty(slave) { - if (keySum(slave.brand) !== 0) { + for (let [key, value] of Object.entries(slave.brand)) { if (V.rep > 10000) { beauty += 1; } else if (V.rep < 5000) { @@ -2232,7 +2232,7 @@ window.slaveCost = (function() { if (slave.geneticQuirks.albinism === 2) { multiplier += 0.2; } - if (keySum(slave.brand) !== 0) { + for (let [key, value] of Object.entries(slave.brand)) { if (V.rep > 10000) { multiplier += 0.1; } else if (V.rep < 5000) { diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 9ec7c5b9f5985d1fad7c073b5762587e99426dc5..6e219a6079272324942e6af4d0c30c2ea76c8a0f 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -145,7 +145,7 @@ window.SlaveSummaryUncached = (function() { long_implants(slave); long_lactation(slave); long_mods(slave); - if (keySum(slave.brand) !== 0) { + if (!jQuery.isEmptyObject(slave.brand)) { r += `Branded.`; } r += `</span>`; @@ -2412,7 +2412,7 @@ window.SlaveSummaryUncached = (function() { } else { r += `Mods`; } - if (keySum(slave.brand) !== 0) { + if (!jQuery.isEmptyObject(slave.brand)) { r += `Br`; } r += " "; diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw index 59fcb7846912ac642ff0cd5bfb9d38a0af7bd56d..e45bbdec198b5046e9084864e98cc068f16b29ba 100644 --- a/src/npc/uploadSlave.tw +++ b/src/npc/uploadSlave.tw @@ -135,7 +135,7 @@ anusPiercing: $activeSlave.anusPiercing, anusTat: "$activeSlave.anusTat", makeup: $activeSlave.makeup, nails: $activeSlave.nails, -brand: <<if keySum($activeSlave.brand) == 0>>0,<<else>> +brand: <<if (!jQuery.isEmptyObject($activeSlave.brand))>>0,<<else>> <<for _brandName, _brand range $activeSlave.brand>> <<if _brand == 0>> <<continue>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 9a8b9483995afb73e782f77e6c31fa64c98914ed..5421394574b4a70636ddfa25135db5a631402c95 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -897,7 +897,7 @@ Branding: <</link>> <</capture>> <</for>> -<<if (keySum($activeSlave.brand) === 0)>> +<<if (jQuery.isEmptyObject($activeSlave.brand))>> <br>$His skin is unmarked. <</if>>