diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js index 5253093cfd16e45ba9e71611a46c8f7c2bcbaf61..ae7fab685de331b70ef59d9f03db61a4d0a09a22 100644 --- a/src/interaction/main/mainLinks.js +++ b/src/interaction/main/mainLinks.js @@ -5,20 +5,7 @@ App.UI.View.MainLinks = function() { const PA = Array.isArray(V.personalAttention) ? V.personalAttention.map(function(x) { return getSlave(x.ID); }) : []; - let r = ``; - if (V.HeadGirl) { - /* eslint-disable */ - const pronouns = getPronouns(V.HeadGirl); - const he = pronouns.pronoun; - const him = pronouns.object; - const his = pronouns.possessive; - const hers = pronouns.possessivePronoun; - const himself = pronouns.objectReflexive; - const boy = pronouns.noun; - const He = capFirstChar(he); - const His = capFirstChar(his); - /* eslint-enable */ - } + let r = ''; if (V.PCWounded === 1) { r += `The injuries received in the recent battle prevent you from undertaking tiring efforts.`; @@ -39,7 +26,8 @@ App.UI.View.MainLinks = function() { case "HG": r += `You plan to support your Head Girl this week, `; if (V.HeadGirl) { - r += `so ${he} can give more slaves ${his} attention.`; + const pronouns = getPronouns(V.HeadGirl); + r += `so ${pronouns.pronoun} can give more slaves ${pronouns.possessive} attention.`; } else { r += `should you assign one.`; } diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js index c46ff5da7655b6a956209da3a5c740121258bd1e..6e0dbc0d0d254323723acc192e1e752aa24abde7 100644 --- a/src/js/walkPastJS.js +++ b/src/js/walkPastJS.js @@ -1241,7 +1241,7 @@ window.relatedSlave = function(activeSlave) { const he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun; const He = capFirstChar(he), His = capFirstChar(his); let t = ""; - let partnerSlave; + let partnerSlave, activeSlaveRel; let fuckseed = jsRandom(1, 100); @@ -1252,12 +1252,11 @@ window.relatedSlave = function(activeSlave) { partnerSlave = getSlave(activeSlave.relationTarget); } } else { - let activeSlaveRel = relationshipTerm(activeSlave); + activeSlaveRel = relationshipTerm(activeSlave); partnerSlave = getSlave(activeSlave.relationshipTarget); } if (partnerSlave !== undefined) { /* potential problem point */ - t += ` ${His} `; if (V.partner === "relation") { if (V.familyTesting === 1) {