diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js index 05c28959ad0b5c672576595c0a54192a88e5dbf5..c74e0b5a83b45e9d523ae7d5ef910699bb852d74 100644 --- a/src/npc/descriptions/longSlave.js +++ b/src/npc/descriptions/longSlave.js @@ -2,7 +2,7 @@ * @param {App.Entity.SlaveState} slave * @returns {string} */ -App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, showClothing = true} = {}) { +App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = V.saleDescription, showClothing = V.showClothing, eventDescription = V.eventDescription} = {}) { const r = []; const { He, His, him, he, his @@ -12,7 +12,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s SlaveStatClamp(slave); r.push(`<span id="artFrame">`); - if (V.seeImages === 1 && V.eventDescription !== 1 && passage() !== "Slave Interact") { + if (V.seeImages === 1 && eventDescription !== 1 && passage() !== "Slave Interact") { if (V.imageChoice === 1) { r.push(`<div class="imageRef lrgVector"><div class="mask"> </div>${SlaveArt(slave, 3, 0)}</div>`); } else { @@ -27,7 +27,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(`(<span class="yellow"><span style="font-weight:bold">${slave.custom.label}</span></span>)`); } - if (V.saleDescription === 1 && V.ui !== "start") { + if (saleDescription === 1 && V.ui !== "start") { if (V.applyLaw === 1) { r.push(`has passed inspection to be sold in your arcology.`); r.push(App.Desc.lawCompliance(slave)); // includes CheckForGingering @@ -86,8 +86,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s } } - V.desc = SlaveTitle(slave); - r.push(`<span style="font-weight:bold"><span class="coral">V.desc.</span></span>`); + r.push(`<span style="font-weight:bold"><span class="coral">${SlaveTitle(slave)}.</span></span>`); if (slave.indenture > -1) { r.push(`${His}`); @@ -116,7 +115,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(App.Desc.ageAndHealth(slave)); - if (V.saleDescription !== 1) { + if (saleDescription !== 1) { if (V.clinic !== 0 && V.clinicUpgradeScanner === 1) { if (slave.chem > 15) { r.push(`${V.clinicNameCaps}'s scanners score long term carcinogenic buildup in ${his} body at <span class="cyan">${Math.ceil(slave.chem / 10)}.</span>`); @@ -134,8 +133,8 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(App.Desc.mind(slave)); - if (V.saleDescription === 0) { - if (V.eventDescription === 0) { + if (saleDescription === 0) { + if (eventDescription === 0) { if (canSee(slave)) { if (slave.attrKnown === 1) { if (slave.assignment !== "work in the dairy" || V.dairyRestraintsSetting > 1) { @@ -169,7 +168,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(`<br> `); - if (V.saleDescription === 0) { + if (saleDescription === 0) { if (slave.origin !== 0) { r.push(`${slave.origin}`); } @@ -275,7 +274,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(App.Desc.clothingCorset(slave)); } - if (V.showClothing === 1 && V.saleDescription === 0) { + if (showClothing === 1 && saleDescription === 0) { r.push(`${He}`); } else { r.push(`${slave.slaveName}`); @@ -306,7 +305,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(App.Desc.heels(slave, "foot")); r.push(App.Desc.skin(slave)); - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(App.Desc.accent(slave)); } @@ -360,7 +359,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(App.Desc.mods(slave, "extra")); } - if (V.showClothing === 1 && V.saleDescription === 0) { + if (showClothing === 1 && saleDescription === 0) { r.push(App.Desc.ears(slave)); r.push(App.Desc.upperFace(slave)); r.push(App.Desc.hair(slave)); @@ -467,7 +466,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = false, s r.push(App.Desc.face(slave)); r.push(App.Desc.mouth(slave)); - if (V.showClothing === 1 && V.saleDescription === 0) { + if (showClothing === 1 && saleDescription === 0) { if (slave.fuckdoll === 0) { r.push(App.Desc.collar(slave)); r.push(App.Desc.faceAccessory(slave));