diff --git a/src/npc/descriptions/drugs.js b/src/npc/descriptions/drugs.js index dd86fdde2aa98175a227c9c6fc536ef222ade2a7..158effb501c72aa0c83a962deb57aee845e9fc1c 100644 --- a/src/npc/descriptions/drugs.js +++ b/src/npc/descriptions/drugs.js @@ -9,6 +9,14 @@ App.Desc.drugs = function(slave) { } = getPronouns(slave); let ignoredRule; if (slave.fuckdoll === 0) { + r.push(drugs()); + r.push(aphrodisiacs()); + } + + return r.join(" "); + + function drugs() { + const r = []; switch (slave.drugs) { case "priapism agents": if (slave.dick > 0 && slave.dick <= 10) { @@ -17,7 +25,7 @@ App.Desc.drugs = function(slave) { } else { if (slave.dick > 8) { r.push(`${His} oversized dick is painfully engorged to a state of semi-hardness due to the priapism agents.`); - } else if ((slave.dick > 6)) { + } else if (slave.dick > 6) { r.push(`${He} sports a painful, oversized erection due to the priapism agents.`); } else { r.push(`${He} sports a throbbing, painful erection due to the priapism agents.`); @@ -238,6 +246,11 @@ App.Desc.drugs = function(slave) { break; default: } + return r.join(" "); + } + + function aphrodisiacs() { + const r = []; if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiacs") { if (slave.fetish === "mindbroken") { ignoredRule = 1; @@ -259,7 +272,7 @@ App.Desc.drugs = function(slave) { } else { r.push(`${himself}.`); } - } else if (slave.rules.release.masturbation === 0 && slave.rules.release.master === 0 && ignoredRule === 0) { + } else if (slave.rules.release.masturbation === 0 && slave.rules.release.master === 0 && ignoredRule === 0) { r.push(`aphrodisiacs, but is not permitted to touch ${him}self nor beg you for release. ${He} writhes with extreme sexual frustration, desperate to not break the rules in front of`); if (slave.inflationType === "aphrodisiacs") { r.push(`you, but only manages to stir up the aphrodisiacs contained in ${his} gut, further strengthening their effects on ${him}.`); @@ -274,9 +287,9 @@ App.Desc.drugs = function(slave) { } } } else if (!canDoVaginal(slave) && !canDoAnal(slave) && (slave.dick === 0 || slave.chastityPenis) && slave.fetish === "boobs" && slave.boobs > 300) { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -312,9 +325,9 @@ App.Desc.drugs = function(slave) { r.push(`before you, ${he} desperately presents ${his} chest in the hopes you'll grab hold of ${his} favorite body parts.`); } } else if (canDoAnal(slave) && slave.fetish === "buttslut") { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -354,11 +367,11 @@ App.Desc.drugs = function(slave) { r.push(`before you, ${he} desperately presents ${his} anus hoping to entice you into giving ${him} relief.`); } } else if (slave.vagina >= 0 && slave.dick > 0) { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { if (!canDoVaginal(slave) && slave.chastityPenis) { if (canDoAnal(slave)) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -401,7 +414,7 @@ App.Desc.drugs = function(slave) { } } else if (canDoVaginal(slave)) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -424,7 +437,7 @@ App.Desc.drugs = function(slave) { } } else if (!slave.chastityPenis) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -450,7 +463,7 @@ App.Desc.drugs = function(slave) { } } else { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -518,11 +531,11 @@ App.Desc.drugs = function(slave) { } } } else if (slave.vagina >= 0) { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { if (!canDoVaginal(slave)) { if (canDoAnal(slave)) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -565,7 +578,7 @@ App.Desc.drugs = function(slave) { } } else { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -618,11 +631,11 @@ App.Desc.drugs = function(slave) { r.push(`in turn, hoping that something will entice you to give ${him} relief.`); } } else if (slave.dick > 0) { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { if (slave.chastityPenis) { if (canDoAnal(slave)) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -665,7 +678,7 @@ App.Desc.drugs = function(slave) { } } else { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -728,8 +741,8 @@ App.Desc.drugs = function(slave) { r.push(`no penis and`); } r.push(`no vagina, and`); - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { - if (ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -793,13 +806,13 @@ App.Desc.drugs = function(slave) { r.push(`${He}'s on`); if (!hasAnyArms(slave)) { r.push(`aphrodisiacs, but is an amputee, so ${he} cannot touch ${him}self. ${He} writhes with sexual frustration.`); - } else if (slave.rules.release.masturbation === 0 && slave.rules.release.master === 0 && ignoredRule === 0) { + } else if (slave.rules.release.masturbation === 0 && slave.rules.release.master === 0 && ignoredRule === 0) { r.push(`aphrodisiacs, but is not permitted to touch ${him}self nor beg you for release, so as ${he} obeys your commands ${he} shifts ${his} weight uncomfortably.`); if (canAchieveErection(slave) && !slave.chastityPenis) { r.push(`${His} erect dick sways as ${he} does.`); } } else if (slave.vagina >= 0 && slave.dick > 0) { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { if (!canDoVaginal(slave) && slave.chastityPenis) { r.push(`aphrodisiacs, but is wearing chastity and cannot touch ${him}self. ${He} writhes with sexual frustration as ${he} runs ${his}`); if (hasBothArms(slave)) { @@ -810,7 +823,7 @@ App.Desc.drugs = function(slave) { r.push(`across ${his} body.`); } else if (canDoVaginal(slave)) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -823,7 +836,7 @@ App.Desc.drugs = function(slave) { } } else if (!slave.chastityPenis) { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -836,7 +849,7 @@ App.Desc.drugs = function(slave) { } } else { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -855,12 +868,12 @@ App.Desc.drugs = function(slave) { } } } else if (slave.vagina >= 0) { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { if (!canDoVaginal(slave)) { r.push(`aphrodisiacs, but is wearing a chastity belt and cannot touch ${him}self. ${He} writhes with sexual frustration.`); } else { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -876,12 +889,12 @@ App.Desc.drugs = function(slave) { r.push(`aphrodisiacs, but is not permitted to touch ${him}self, so as ${he} obeys your commands ${he} shifts ${his} weight uncomfortably.`); } } else if (slave.dick > 0) { - if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { + if (slave.rules.release.masturbation === 1 || ignoredRule === 1) { if (slave.chastityPenis) { r.push(`aphrodisiacs, but is wearing a chastity cage and cannot touch ${him}self. ${He} writhes with sexual frustration.`); } else { r.push(`aphrodisiacs and`); - if (ignoredRule === 1) { + if (ignoredRule === 1) { r.push(`has disregarded ${his} masturbation restriction,`); } else { r.push(`is allowed to masturbate,`); @@ -910,12 +923,11 @@ App.Desc.drugs = function(slave) { } if (slave.addict > 0 && slave.addict <= 2) { r.push(`${He} is a new <span class="cyan">aphrodisiac addict.</span>`); - } else if ((slave.addict > 0) && (slave.addict < 10)) { + } else if (slave.addict > 0 && slave.addict < 10) { r.push(`${He} is a confirmed <span class="cyan">aphrodisiac addict.</span>`); - } else if ((slave.addict > 0)) { + } else if (slave.addict > 0) { r.push(`${He} is completely <span class="cyan">dependent on aphrodisiacs,</span> and it is unlikely you will ever be able to wean ${him} off them.`); } + return r.join(" "); } - - return r.join(" "); };