From cae376a89bc216cbb895cacecda7539834bdf728 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Wed, 5 Dec 2018 00:04:50 -0500 Subject: [PATCH] Pronoun work --- devNotes/twine JS.txt | 44 ++++++++++++++++++++++++++ src/facilities/farmyard/farmyardLab.tw | 2 ++ src/js/sexActsJS.tw | 44 ++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 374ac78d0a6..b43bf5c0bb3 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -20901,6 +20901,17 @@ window.rulesAutosurgery = (function() { if left undefined it will assume it to be 1. */ window.AnalVCheck = function AnalVCheck(times) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const slave = V.activeSlave; let r = ``; @@ -20951,6 +20962,17 @@ window.AnalVCheck = function AnalVCheck(times) { if left undefined it will assume it to be 1. */ window.VaginalVCheck = function VaginalVCheck(times) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const slave = V.activeSlave; let r = ``; @@ -21004,6 +21026,17 @@ window.VaginalVCheck = function VaginalVCheck(times) { In both cases if left undefined it will assume it to be 1. */ window.BothVCheck = function BothVCheck(analTimes, bothTimes) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const slave = V.activeSlave; let r = ``; @@ -21155,6 +21188,17 @@ window.SimpleVCheck = function SimpleVCheck(times) { never know when someone might use the routine and forget to do such. */ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const partner = V.slaves[V.partner]; let r = ``; diff --git a/src/facilities/farmyard/farmyardLab.tw b/src/facilities/farmyard/farmyardLab.tw index 89df04f3e74..821ba34c44c 100644 --- a/src/facilities/farmyard/farmyardLab.tw +++ b/src/facilities/farmyard/farmyardLab.tw @@ -4,6 +4,8 @@ //This is currently under development.// +/* TODO: add plant types and research for them */ + <br> $farmyardNameCaps Research Lab <hr> diff --git a/src/js/sexActsJS.tw b/src/js/sexActsJS.tw index fb915b7914a..af94067ff7d 100644 --- a/src/js/sexActsJS.tw +++ b/src/js/sexActsJS.tw @@ -5,6 +5,17 @@ if left undefined it will assume it to be 1. */ window.AnalVCheck = function AnalVCheck(times) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const slave = V.activeSlave; let r = ``; @@ -61,6 +72,17 @@ window.AnalVCheck = function AnalVCheck(times) { if left undefined it will assume it to be 1. */ window.VaginalVCheck = function VaginalVCheck(times) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const slave = V.activeSlave; let r = ``; @@ -120,6 +142,17 @@ window.VaginalVCheck = function VaginalVCheck(times) { In both cases if left undefined it will assume it to be 1. */ window.BothVCheck = function BothVCheck(analTimes, bothTimes) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const slave = V.activeSlave; let r = ``; @@ -293,6 +326,17 @@ window.SimpleVCheck = function SimpleVCheck(times) { never know when someone might use the routine and forget to do such. */ window.PartnerVCheck = function PartnerVCheck(analTimes, bothTimes) { + var pronouns = getPronouns(slave); + var he = pronouns.pronoun, + him = pronouns.object, + his = pronouns.possessive, + hers = pronouns.possessivePronoun, + himself = pronouns.objectReflexive, + boy = pronouns.noun; + var He = capFirstChar(he), + His = capFirstChar(his); + var V = State.variables; + const V = State.variables; const partner = V.slaves[V.partner]; let r = ``; -- GitLab