diff --git a/.eslintrc.js b/.eslintrc.js index 373096fc15d111fe53d79324668b423f3d3226cf..9e912a752dae5dab782d86ce4d751561455845d7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,10 +17,8 @@ module.exports = { } }, "rules": { - "semi": "error", "semi-spacing": "warn", "semi-style": "warn", - "no-undef": "off", "eqeqeq": "error", "default-case": "error", "no-unused-vars": "off", @@ -30,7 +28,8 @@ module.exports = { "object-curly-newline": "error", "object-curly-spacing": "error", "no-var": "error", - "sort-vars": "warn", - "spaced-comment": "warn" + "spaced-comment": "warn", + "no-undef": "off", + "no-unused-var": "off" // just until we can figure out some way of having eslint recognize the different modules } }; \ No newline at end of file diff --git a/src/interaction/main/useGuard.js b/src/interaction/main/useGuard.js index cbc6ada15a4c98d3953e867489ce39c7a593b275..0d09ceb2786632ae8b6170829da604ad0241a31a 100644 --- a/src/interaction/main/useGuard.js +++ b/src/interaction/main/useGuard.js @@ -1,22 +1,18 @@ -/* eslint-disable no-unused-vars */ -/* eslint-disable no-undef */ - -/** breaks in the last case in switches are not required, but are highly recommended */ /* OPEN USEGUARD */ App.Interact.UseGuard = function(slave) { "use strict"; const V = State.variables; let r = ``; - var pronouns = getPronouns(slave); - var he = pronouns.pronoun; - var him = pronouns.object; - var his = pronouns.possessive; - var hers = pronouns.possessivePronoun; - var himself = pronouns.objectReflexive; - var boy = pronouns.noun; - var He = capFirstChar(he); - var His = capFirstChar(his); + let pronouns = getPronouns(slave); + let he = pronouns.pronoun; + let him = pronouns.object; + let his = pronouns.possessive; + let hers = pronouns.possessivePronoun; + let himself = pronouns.objectReflexive; + let boy = pronouns.noun; + let He = capFirstChar(he); + let His = capFirstChar(his); r = `${slave.slaveName} is standing behind your left shoulder, guarding your person. `; switch (slave.clothes) { diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index a8f3cb3b1253f82ccaecfe584bc758f479944fea..dd27d6ef3b6eaaa3c0401e6e2b2572416b8b0693 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -4,15 +4,15 @@ App.Desc.eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) { "use strict"; const V = State.variables; let r = ``; - var pronouns = getPronouns(slave); - var he = pronouns.pronoun; - var him = pronouns.object; - var his = pronouns.possessive; - var hers = pronouns.possessivePronoun; - var himself = pronouns.objectReflexive; - var boy = pronouns.noun; - var He = capFirstChar(he); - var His = capFirstChar(his); + let pronouns = getPronouns(slave); + let he = pronouns.pronoun; + let him = pronouns.object; + let his = pronouns.possessive; + let hers = pronouns.possessivePronoun; + let himself = pronouns.objectReflexive; + let boy = pronouns.noun; + let He = capFirstChar(he); + let His = capFirstChar(his); if (slave.eyes === -2) { const HC = hasVisibleHeterochromia(slave) ? 1 : 0; @@ -255,15 +255,15 @@ App.Desc.ageAndHealth = /** @param {App.Entity.SlaveState} slave */ function (sl const V = State.variables; let r = ``; let bodyNCS; - var pronouns = getPronouns(slave); - var he = pronouns.pronoun; - var him = pronouns.object; - var his = pronouns.possessive; - var hers = pronouns.possessivePronoun; - var himself = pronouns.objectReflexive; - var boy = pronouns.noun; - var He = capFirstChar(he); - var His = capFirstChar(his); + let pronouns = getPronouns(slave); + let he = pronouns.pronoun; + let him = pronouns.object; + let his = pronouns.possessive; + let hers = pronouns.possessivePronoun; + let himself = pronouns.objectReflexive; + let boy = pronouns.noun; + let He = capFirstChar(he); + let His = capFirstChar(his); if (!slave.fuckdoll) { if (slave.health < -90) { @@ -634,15 +634,15 @@ App.Desc.brand = /** @param {App.Entity.SlaveState} slave */ function (slave) { const V = State.variables; let r = ``; let bellyAccessory; - var pronouns = getPronouns(slave); - var he = pronouns.pronoun; - var him = pronouns.object; - var his = pronouns.possessive; - var hers = pronouns.possessivePronoun; - var himself = pronouns.objectReflexive; - var boy = pronouns.noun; - var He = capFirstChar(he); - var His = capFirstChar(his); + let pronouns = getPronouns(slave); + let he = pronouns.pronoun; + let him = pronouns.object; + let his = pronouns.possessive; + let hers = pronouns.possessivePronoun; + let himself = pronouns.objectReflexive; + let boy = pronouns.noun; + let He = capFirstChar(he); + let His = capFirstChar(his); if (slave.brand) { bellyAccessory = slave.bellyAccessory; @@ -655,19 +655,19 @@ App.Desc.brand = /** @param {App.Entity.SlaveState} slave */ function (slave) { return r; } -App.Desc.amputee = /**@param {App.Entity.SlaveState} slave */ function (slave) { +App.Desc.amputee = /** @param {App.Entity.SlaveState} slave */ function (slave) { "use strict"; const V = State.variables; let r = ``; - var pronouns = getPronouns(slave); - var he = pronouns.pronoun; - var him = pronouns.object; - var his = pronouns.possessive; - var hers = pronouns.possessivePronoun; - var himself = pronouns.objectReflexive; - var boy = pronouns.noun; - var He = capFirstChar(he); - var His = capFirstChar(his); + let pronouns = getPronouns(slave); + let he = pronouns.pronoun; + let him = pronouns.object; + let his = pronouns.possessive; + let hers = pronouns.possessivePronoun; + let himself = pronouns.objectReflexive; + let boy = pronouns.noun; + let He = capFirstChar(he); + let His = capFirstChar(his); if (slave.amp) { if (slave.amp === -1) { @@ -689,21 +689,21 @@ App.Desc.amputee = /**@param {App.Entity.SlaveState} slave */ function (slave) { return r; } -App.Desc.waist = /**@param {App.Entity.SlaveState} slave */ function (slave) { +App.Desc.waist = /** @param {App.Entity.SlaveState} slave */ function (slave) { "use strict"; const V = State.variables; let r = ``; let belly; let woman; - var pronouns = getPronouns(slave); - var he = pronouns.pronoun; - var him = pronouns.object; - var his = pronouns.possessive; - var hers = pronouns.possessivePronoun; - var himself = pronouns.objectReflexive; - var boy = pronouns.noun; - var He = capFirstChar(he); - var His = capFirstChar(his); + let pronouns = getPronouns(slave); + let he = pronouns.pronoun; + let him = pronouns.object; + let his = pronouns.possessive; + let hers = pronouns.possessivePronoun; + let himself = pronouns.objectReflexive; + let boy = pronouns.noun; + let He = capFirstChar(he); + let His = capFirstChar(his); (boy === "girl" ? woman = "woman" : woman = "man"); if (slave.belly >= 1500) {