diff --git a/devNotes/legacy files/walkPast.txt b/devNotes/legacy files/walkPast.txt index 24409533e856c26366476b0755832722291b2333..cea73b76a4b07e94f04e793a2d5860adac0f0580 100644 --- a/devNotes/legacy files/walkPast.txt +++ b/devNotes/legacy files/walkPast.txt @@ -1947,7 +1947,7 @@ Slight jiggling can be seen in $his chubby belly as $he moves. <</if>> <<= App.Desc.crotch($activeSlave)>> - <<= App.Desc.dick($activeSlave)>> + <<= App.Desc.dick({slave: $activeSlave, saleDescription: 0})>> <<= App.Desc.vagina($activeSlave)>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js index 0ff1b3580d0bd95d4a6868311d779bf323ec24fe..d1797fd12fce26b3c767b9a51eb1014cc47a4211 100644 --- a/src/interaction/main/walkPast.js +++ b/src/interaction/main/walkPast.js @@ -8257,7 +8257,7 @@ globalThis.walkPast = (function() { // Desc dick and vag t += App.Desc.crotch(slave); t += ` `; - t += App.Desc.dick(slave); + t += App.Desc.dick({slave: slave, saleDescription: 0}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": diff --git a/src/npc/descriptions/crotch/dick.js b/src/npc/descriptions/crotch/dick.js index 8928310140fe82095145a41eec4d60426d838aca..6b412857cbf2643966615db875b325a5a6403b05 100644 --- a/src/npc/descriptions/crotch/dick.js +++ b/src/npc/descriptions/crotch/dick.js @@ -2,7 +2,7 @@ * @param {App.Entity.SlaveState} slave * @returns {string} */ -App.Desc.dick = function(slave) { +App.Desc.dick = function({slave, saleDescription, eventDescription, applyLaw} = {}) { const r = []; const { he, him, his, hers, himself, girl, He, His @@ -696,7 +696,7 @@ App.Desc.dick = function(slave) { } else if ((slave.prostate > 1)) { r.push(`${He}'s got a string of precum dangling from the tip of ${his} cock; ${his} artificially hyperactive prostate keeps ${him} that way.`); } - } else if ((V.saleDescription === 1 && V.gingering === "vasodilator")) { + } else if ((saleDescription === 1 && V.gingering === "vasodilator")) { r.push(`${He}'s painfully erect.`); if (slave.prostate > 2) { r.push(`The area above ${his} crotch has a slight swell to it from ${his} prostate implant. A constant dribble of precum drips from the tip of ${his} cock; ${his} artificially hyperactive prostate keeps ${him} that way.`); @@ -920,7 +920,7 @@ App.Desc.dick = function(slave) { if (V.dickAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a cock`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -954,7 +954,7 @@ App.Desc.dick = function(slave) { if (V.dickAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a cock`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -988,7 +988,7 @@ App.Desc.dick = function(slave) { if (V.dickAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a cock`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1054,7 +1054,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1090,7 +1090,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1126,7 +1126,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1142,7 +1142,7 @@ App.Desc.dick = function(slave) { if (slave.foreskin > 0) { if (slave.foreskin - slave.dick < -1) { r.push(`${His} cockhead is much too large for ${his} foreskin, probably as a result of recent penis growth it hasn't had time to stretch to accommodate yet.`); - if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (V.saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { + if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { r.push(`The bit of erect dickhead visible at the tip of the uncomfortably stretched skin is an angry color from being squeezed so hard.`); } else if (canAchieveErection(slave)) { r.push(`${He} isn't erect right now, but getting a hard-on will probably be very uncomfortable for ${him}.`); @@ -1151,7 +1151,7 @@ App.Desc.dick = function(slave) { } } else if ((slave.foreskin - slave.dick === -1)) { r.push(`${His} foreskin is stretched by ${his} dickhead, probably as a result of recent penis growth it hasn't had time to get used to yet.`); - if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (V.saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { + if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { r.push(`${His} erection has stretched the skin there taut.`); } else if (canAchieveErection(slave)) { r.push(`${He} isn't erect right now, but getting a hard-on will probably be a bit uncomfortable for ${him}.`); @@ -1160,7 +1160,7 @@ App.Desc.dick = function(slave) { } } else if ((slave.foreskin - slave.dick === 1)) { r.push(`${His} foreskin seems too large for ${his} dick, probably as a result of recent penis shrinkage.`); - if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (V.saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { + if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { r.push(`${His} erection cannot fully retract it, though it's loose enough that this doesn't look uncomfortable.`); } else if (canAchieveErection(slave)) { r.push(`${He} isn't erect right now, making the tip of ${his} dick look shriveled.`); @@ -1169,7 +1169,7 @@ App.Desc.dick = function(slave) { } } else if ((slave.foreskin - slave.dick > 1)) { r.push(`${His} foreskin is far too large for ${his} dick, probably as a result of recent penis shrinkage.`); - if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (V.saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { + if (canAchieveErection(slave) && ((slave.devotion > 20) || (slave.aphrodisiacs > 0) || (saleDescription === 1 && V.gingering === "vasodilator") || (slave.inflationType === "aphrodisiac") || (slave.drugs === "priapism agents"))) { r.push(`${His} erection cannot retract it at all, though it's loose enough that this doesn't look uncomfortable. Orgasming, though, will likely produce a dribbling mess.`); } else if (canAchieveErection(slave)) { r.push(`${He} isn't erect right now, so the excess skin droops lamely off ${his} cockhead.`); @@ -1437,7 +1437,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1473,7 +1473,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1509,7 +1509,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1867,7 +1867,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1903,7 +1903,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -1939,7 +1939,7 @@ App.Desc.dick = function(slave) { if (V.ballsAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with balls`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js index 0b9846478aa15f9b9263838324dc178b6790853a..0d8247aabdef87a86bd0586e5ae3ddb22360bd8a 100644 --- a/src/npc/descriptions/longSlave.js +++ b/src/npc/descriptions/longSlave.js @@ -734,9 +734,9 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = V.saleDe r = []; r.push(App.Desc.crotch(slave)); - r.push(App.Desc.dick(slave)); + r.push(App.Desc.dick({slave: slave, saleDescription: saleDescription})); r.push(App.Desc.vagina(slave)); - r.push(App.Desc.anus({slave: slave, saleDescription: 0})); + r.push(App.Desc.anus({slave: slave, saleDescription: saleDescription})); $(p).append(r.join(` `)); el.appendChild(p);