diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index dc1895990c75a2078b0033a03c91ff1dfe2b35d8..b42678e08523059e055b58eb064fbb5ff43051ab 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -6616,6 +6616,12 @@ window.getPronouns = function getPronouns(slave) { noun: slave.noun }; }; +window.SlavePronouns = function SlavePronouns(slave) { + const V = State.variables; + var pronouns = getPronouns(slave); + V.pronoun = pronouns.pronoun, V.pronounCap = capFirstChar(pronouns.pronoun), V.possessive = pronouns.possessive, V.possessiveCap = capFirstChar(pronouns.possessive), V.object = pronouns.object; +} + window.WrittenMaster = function WrittenMaster(slave) { const V = State.variables; if (slave !== undefined) diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index 7afefac529f6df3853b06ce535587934ddcd1527..11c85931e88626db4e0d40fbccbae1ee30cdb89c 100644 --- a/src/js/assayJS.tw +++ b/src/js/assayJS.tw @@ -258,6 +258,12 @@ window.getPronouns = function getPronouns(slave) { noun: slave.noun }; }; +window.SlavePronouns = function SlavePronouns(slave) { + const V = State.variables; + var pronouns = getPronouns(slave); + V.pronoun = pronouns.pronoun, V.pronounCap = capFirstChar(pronouns.pronoun), V.possessive = pronouns.possessive, V.possessiveCap = capFirstChar(pronouns.possessive), V.object = pronouns.object; +} + window.WrittenMaster = function WrittenMaster(slave) { const V = State.variables; if (slave !== undefined) diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw index 20a1f2d9d02e1e426df1b26dd1827de3c84af182..645a77d250c6892256be81e3034f2fb92992be1f 100644 --- a/src/pregmod/fFeet.tw +++ b/src/pregmod/fFeet.tw @@ -1,7 +1,7 @@ :: FFeet [nobr] <<run clearSummaryCache($activeSlave)>> -<<SlavePronouns $activeSlave>> +<<run SlavePronouns($activeSlave)>> <<set _footSeed = random(1,100)>> diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw index c7f8b4e386794e200a5d90a91062292bd292cb5d..9f4ceed1fd414fa521d63205e869272819819a98 100644 --- a/src/pregmod/widgets/deathWidgets.tw +++ b/src/pregmod/widgets/deathWidgets.tw @@ -18,7 +18,7 @@ As $args[0].slaveName is going about her business with her overfilled $args[0].i <</widget>> <<widget "DeathOldAge">> - <<SlavePronouns $args[0]>> + <<run SlavePronouns($args[0])>> <<if $args[0].assignment == "be confined in the arcade">> You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died <<if $args[0].physicalAge >= 70>>naturally of old age despite<<else>>suddenly, unrelated to<</if>> $possessive living conditions. $pronounCap was a good unit; logs show $pronoun was taking dick up until the very end. <<elseif $args[0].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>> @@ -61,7 +61,7 @@ As $args[0].slaveName is going about her business with her overfilled $args[0].i <</widget>> <<widget "DeathOverdose">> - <<SlavePronouns $args[0]>> + <<run SlavePronouns($args[0])>> <<if $args[0].assignment == "be confined in the arcade">> You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died of an aphrodisiac overdose from the constant aphrodisiac injections. $pronounCap was a good unit; logs show $pronoun was taking dick up until the very end. <<elseif $args[0].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>> @@ -90,7 +90,7 @@ As $args[0].slaveName is going about her business with her overfilled $args[0].i <</widget>> <<widget "DeathUnhealthy">> - <<SlavePronouns $args[0]>> + <<run SlavePronouns($args[0])>> <<if $args[0].assignment == "be confined in the arcade">> You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died to poor health caused by $possessive living conditions. $pronounCap was a good unit; logs show $pronoun was taking dick up until the very end. <<elseif $args[0].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 2d9c0c027334bff99fa420ec771b94607f9df8da..89f7c58892f43ecb72dc8e581560aab2f8a7ec72 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -2,7 +2,7 @@ <<widget "seBirthPreChek">> -<<SlavePronouns $slaves[$i]>> +<<run SlavePronouns($slaves[$i])>> <<set $humiliation = 0>> <<set $suddenBirth = 1>> diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw index a4dc6975517f03ce8a8f05ce366212345dfd68bd..4ae38215578412bf54286dc0e9e2d39e1a940c24 100644 --- a/src/societies/aztec/slaveSacrifice.tw +++ b/src/societies/aztec/slaveSacrifice.tw @@ -1,7 +1,7 @@ :: Aztec Slave Sacrifice [nobr] <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Main", $showEncyclopedia = 1, $encyclopedia = "Aztec Revivalism">> -<<SlavePronouns $activeSlave>> +<<run SlavePronouns($activeSlave)>> <<Enunciate $activeSlave>> <<set _activeSlaveRepSacrifice = repGainSacrifice()>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 190faad1cbd905140e622a7e73de350c0bbc540f..3324fdfda952d6b13df759b9fa9d2d179fd6143e 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -2,7 +2,7 @@ <<set $nextButton = "Continue", $nextLink = "Slave Interact">> <<run clearSummaryCache($activeSlave)>> -<<SlavePronouns $activeSlave>> +<<run SlavePronouns($activeSlave)>> <<Enunciate $activeSlave>> <<set $showEncyclopedia = 1, $encyclopedia = "The Studio">> diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw index b8468bbfb19ee324e2f6ad4e1af9ce2282cee7e9..1c7c84b98ed61579641807ff1e0b1a6261f62698 100644 --- a/src/uncategorized/fullReport.tw +++ b/src/uncategorized/fullReport.tw @@ -8,7 +8,7 @@ <</if>> /* 000-250-006 */ -<<SlavePronouns $slaves[$i]>> +<<run SlavePronouns($slaves[$i])>> <<switch $slaves[$i].assignment>> <<case "rest">> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 37b7c5fe31d8c53fbbc2ee4317c3475b5ec48a1b..2a18d53c0b377f95d7a7f476ab21ed0d8e3cca55 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1,7 +1,7 @@ :: Long Slave Description [nobr] -<<SlavePronouns $activeSlave>> -<<SlaveStatClamp $activeSlave>> +<<run SlavePronouns($activeSlave)>> +<<run SlaveStatClamp($activeSlave)>> <<Beauty $activeSlave>> <<setLocalPronouns $activeSlave>> diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index 9700e8529920d878310f02da00c2e3bc84663e27..92faac3763fe5c4cc4f75704377b9555d89943d0 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -77,7 +77,7 @@ <<set $slaves[_i].dickAccessory = "none">> <</if>> /% Fix some possible floating point rounding errors, and bring precision to one decimal place. %/ - <<SlaveStatClamp $slaves[_i]>> + <<run SlaveStatClamp($slaves[_i])>> <<set $slaves[_i].energy = Math.clamp($slaves[_i].energy.toFixed(1), 0, 100)>> <<if $slaves[_i].fetishStrength > 95>> <<set $slaves[_i].fetishStrength = 100>> diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw index dc8a1b0aa971b05e5936b7606c48463572611e90..f0bc897270ee9c6b8b44285898ecf6434fcbc35f 100644 --- a/src/uncategorized/saChoosesOwnJob.tw +++ b/src/uncategorized/saChoosesOwnJob.tw @@ -6,7 +6,7 @@ <<elseif ($slaves[$i].choosesOwnAssignment == 2)>> /* second pass happens visibly during weekly report for the location where this slave decided to go (or stay) */ /* display text but don't change assignment (already done) */ - <<SlavePronouns $slaves[$i]>> + <<run SlavePronouns($slaves[$i])>> <<SlaveTitle $slaves[$i]>> <<set _oself = $object + "self">> <<print $slaves[$i].choosesOwnAssignmentText>> diff --git a/src/uncategorized/saStayConfined.tw b/src/uncategorized/saStayConfined.tw index 43d7171f67cb5de62c5898851771400359e04c7a..98f63508e92f840132d688555657f60777dd5c97 100644 --- a/src/uncategorized/saStayConfined.tw +++ b/src/uncategorized/saStayConfined.tw @@ -1,6 +1,6 @@ :: SA stay confined [nobr] -<<SlavePronouns $slaves[$i]>> +<<run SlavePronouns($slaves[$i])>> <<if $slaves[$i].fetish != "mindbroken">> <<if ($slaves[$i].devotion < -50)>> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index fe6d768cd7826490f2043602ff3571a39ac23ca0..1e378b8b4c46fe9691b3d9503165026098bc2d12 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -1,6 +1,6 @@ :: SA take classes [nobr] -<<SlavePronouns $slaves[$i]>> +<<run SlavePronouns($slaves[$i])>> <<set _learning = 1>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 5c97ff37267ac8dc5667f6859b66b53b20456fca..76a5f6fccbfe0aaf476f4a4fdd74f6103a1f22cb 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -5,6 +5,7 @@ <</if>> <<set $nextButton = "Confirm changes", $nextLink = "AS Dump", $returnTo = "Main", _SL = $slaves.length>> +<<setLocalPronouns $activeSlave>> <<if ($activeSlave.assignmentVisible == 0)>> <<switch $activeSlave.assignment>> diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw index ba6957b738ec5fe9872b0298c4e52494f43956f1..e31f3db45b7452f14c97d863cc66d2f31801bb1a 100644 --- a/src/uncategorized/walkPast.tw +++ b/src/uncategorized/walkPast.tw @@ -31,7 +31,7 @@ <<set _seed = random(1,100), $partner = "">> <</if>> -<<SlavePronouns $activeSlave>> +<<run SlavePronouns($activeSlave)>> /* are we including passages that need this? */ <<setLocalPronouns $activeSlave>> <span id="walk"> diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw index 681c9acd08043b2124f3b4dd8cf0e4e67b16d262..061c3cea15e87e6e83e4d6bf84df0fa9938c635b 100644 --- a/src/utility/descriptionWidgets.tw +++ b/src/utility/descriptionWidgets.tw @@ -259,27 +259,14 @@ <</widget>> -<<widget "SlavePronouns">> - -<<if $args[0].fuckdoll > 0>> - <<set $pronoun = "it", $pronounCap = "It", $possessive = "its", $possessiveCap = "Its", $object = "it">> -<<elseif $args[0].dick < 0 && $args[0].vagina == -1>> /*impossible condition to keep it from running but saving it for future use*/ - <<set $pronoun = "he", $pronounCap = "He", $possessive = "his", $possessiveCap = "His", $object = "him">> -<<else>> - <<set $pronoun = "she", $pronounCap = "She", $possessive = "her", $possessiveCap = "Her", $object = "her">> -<</if>> - -<</widget>> - - <<widget "brandDescription">> <<if ($activeSlave.brand != 0)>> <<set $bellyAccessory = $activeSlave.bellyAccessory>> <<if setup.fakeBellies.includes($bellyAccessory) && ($activeSlave.brandLocation == "belly")>> - $possessiveCap fake belly has $activeSlave.brand branded on it. + $His fake belly has $activeSlave.brand branded on it. <<else>> - $pronounCap has $activeSlave.brand branded into the flesh of $possessive $activeSlave.brandLocation. + $He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation. <</if>> <</if>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 7d398aa41e9044e90aa446300df0e6fe4b754da4..fba47a67c0418de739517e00007708e90c0d8b23 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -3,8 +3,6 @@ <<widget "BoobsDescription">> -<<SlavePronouns $activeSlave>> - <<if ($showClothing == 1) && ($saleDescription == 0)>> <<if $surgeryDescription == 0>> <<if ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>> @@ -1227,8 +1225,6 @@ $His <<widget "ButtDescription">> -<<SlavePronouns $activeSlave>> - <<if ($showClothing == 1) && ($saleDescription == 0)>> <<if $surgeryDescription == 0>> @@ -2089,8 +2085,6 @@ $He's got a <<widget "AnusDescription">> -<<SlavePronouns $activeSlave>> - <<buttplugDescription>> <<if ($activeSlave.skin == "tanned") || ($activeSlave.skin == "fair") || ($activeSlave.skin == "pale") || ($activeSlave.race == "white")>> @@ -2198,8 +2192,6 @@ $He's got a <<widget "crotchDescription">> -<<SlavePronouns $activeSlave>> - <<if ($showClothing == 1) && ($saleDescription == 0)>> <<if ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>> @@ -2991,9 +2983,6 @@ $He's got a <<widget "dickDescription">> -<<SlavePronouns $activeSlave>> - - <<if $activeSlave.dick > 0>> <<switch $activeSlave.dick>> @@ -4015,9 +4004,6 @@ $He's got a <<widget "vaginaDescription">> -<<SlavePronouns $activeSlave>> - - <<if $activeSlave.dick > 0>> <<if $activeSlave.vagina > -1>> $His @@ -4615,8 +4601,6 @@ $He's got a <<widget "faceDescription">> -<<SlavePronouns $activeSlave>> - $His @@.pink;face is <<switch $activeSlave.faceShape>> @@ -4899,8 +4883,6 @@ $He has <<widget "BellyDescription">> -<<SlavePronouns $activeSlave>> - <<set $bellyAccessory = $activeSlave.bellyAccessory>> <<if $activeSlave.belly >= 30000>> <<if ($activeSlave.belly >= 400000+($activeSlave.muscles*2000) && $activeSlave.physicalAge >= 18)>> @@ -13213,23 +13195,23 @@ $He has <<else>><<set _bodyNCS = 'loli/shota'>> <</if>> - $pronounCap appears to be $activeSlave.visualAge years old + $He appears to be $activeSlave.visualAge years old <<if $activeSlave.visualAge <= 8>> - and $pronoun has induced @@.orange;NCS,@@ and will alway have a <<= _bodyNCS>> body, no matter how long $pronoun lives. + and $he has induced @@.orange;NCS,@@ and will alway have a <<= _bodyNCS>> body, no matter how long $he lives. <<elseif ($activeSlave.visualAge < 13)>> - and $pronoun has induced @@.orange;NCS@@ and will have a <<= _bodyNCS>> body for the rest of $possessive life. + and $he has induced @@.orange;NCS@@ and will have a <<= _bodyNCS>> body for the rest of $his life. <<elseif ($activeSlave.visualAge < 20)>> - and $pronoun still has a teen body for now, but with $possessive @@.orange;NCS,@@ $pronoun will eventually regress in age to look like a little girl again. + and $he still has a teen body for now, but with $his @@.orange;NCS,@@ $he will eventually regress in age to look like a little girl again. <<else>> - and $pronoun still has the body of an adult, but $possessive @@.orange;NCS@@ has + and $he still has the body of an adult, but $his @@.orange;NCS@@ has <<if ($activeSlave.physicalAge - $activeSlave.visualAge <= 5)>> - not really begun to youthen $possessive appearance yet. + not really begun to youthen $his appearance yet. <<elseif ($activeSlave.physicalAge - $activeSlave.visualAge <= 10)>> - clearly been at work on $object, making $possessive appear younger. + clearly been at work on $him, making $his appear younger. <<elseif ($activeSlave.physicalAge -$activeSlave.visualAge <= 20)>> - obviously helped take more than a decade off of $possessive age. + obviously helped take more than a decade off of $his age. <<else>> - intensely youthened $object. + intensely youthened $him. <</if>> <</if>> <<elseif $activeSlave.physicalAge != $activeSlave.visualAge>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 409613f38e19d204385c587f1cd22110278ee41f..b650f21c1a7b6130de9fce4eb8f6fe8a94a8cb6d 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -706,8 +706,6 @@ $activeSlave.slaveName is <<widget "HairDescription">> -<<SlavePronouns $activeSlave>> - $His <<if $activeSlave.fuckdoll == 0>> <<switch $activeSlave.hStyle>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index a05ed87f3f01186845979856aec73a13081a4f1e..0ea8243bb8f1a2420d8fa94195315ffa827f8013 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -18,50 +18,6 @@ <</replace>> <</widget>> -/% - Call as <<AssayedSlaveAvailable>> - Checks $assayedSlave for availability, e.g. not strapped to a machine or distant. -%/ -<<widget "AssayedSlaveAvailable">> -<<if $assayedSlave.assignment == "be your agent">> - <<set $assayedSlaveAvailable = 0>> -<<elseif $assayedSlave.assignment == "live with your agent">> - <<set $assayedSlaveAvailable = 0>> -<<elseif ($assayedSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting >= 2)>> - <<set $assayedSlaveAvailable = 0>> -<<else>> - <<set $assayedSlaveAvailable = 1>> -<</if>> -<</widget>> - -/% - Call as <<SimpleVaginaFuck slave 5>> or <<SimpleVaginaFuck slave>> - $arg[1] is how many times to increment either the Vaginal count. - If left undefined it will assume it to be 1. - Intended to be a simple "x got fucked vaginally y times and I don't want to keep coding it". -%/ -<<widget "SimpleVaginaFuck">> -<<if $args[1]>> - <<set $vaginalTotal += $args[1], $args[0].vaginalCount += $args[1]>> -<<else>> - <<set $vaginalTotal++, $args[0].vaginalCount++>> -<</if>> -<</widget>> - -/% - Call as <<SimpleAssFuck slave 5>> or <<SimpleAssFuck slave>> - $arg[1] is how many times to increment either the Vaginal count. - If left undefined it will assume it to be 1. - Intended to be a simple "x got fucked vaginally y times and I don't want to keep coding it". -%/ -<<widget "SimpleAssFuck">> -<<if $args[1]>> - <<set $analTotal += $args[1], $args[0].analCount += $args[1]>> -<<else>> - <<set $analTotal++, $args[0].analCount++>> -<</if>> -<</widget>> - /% Call as <<SlaveInteractImpreg>> %/ @@ -1157,7 +1113,7 @@ %/ <<widget "OralSkillIncrease">> -<<SlavePronouns $args[0]>> +<<run SlavePronouns($args[0])>> <<if $args[0].oralSkill <= 10>> <<if $args[0].oralSkill+$skillIncrease > 10>> @@.green;$pronounCap now has basic knowledge about oral sex,@@ and can at least suck a dick without constant gagging. @@ -1186,7 +1142,7 @@ %/ <<widget "VaginalSkillIncrease">> -<<SlavePronouns $args[0]>> +<<run SlavePronouns($args[0])>> <<if $args[0].vaginalSkill <= 10>> <<if $args[0].vaginalSkill+$skillIncrease > 10>> @@.green;$pronounCap now has basic knowledge about vaginal sex,@@ and can avoid some of the common pitfalls and turnoffs. @@ -1215,7 +1171,7 @@ %/ <<widget "AnalSkillIncrease">> -<<SlavePronouns $args[0]>> +<<run SlavePronouns($args[0])>> <<if $args[0].analSkill <= 10>> <<if $args[0].analSkill+$skillIncrease > 10>> @@.green;$pronounCap now has basic knowledge about anal sex,@@ and can accept penetration of her anus without danger. @@ -1244,7 +1200,7 @@ %/ <<widget "WhoreSkillIncrease">> -<<SlavePronouns $args[0]>> +<<run SlavePronouns($args[0])>> <<if $args[0].whoreSkill <= 10>> <<if $args[0].whoreSkill+$skillIncrease > 10>> @@.green;$pronounCap now has basic knowledge about how to whore,@@ and can avoid some potentially dangerous situations. @@ -1273,7 +1229,7 @@ %/ <<widget "EntertainSkillIncrease">> -<<SlavePronouns $args[0]>> +<<run SlavePronouns($args[0])>> <<if $args[0].entertainSkill <= 10>> <<if $args[0].entertainSkill+$skillIncrease > 10>> @@.green;$pronounCap now has basic knowledge about how to be entertaining,@@ and can usually avoid serious faux pas. @@ -1302,7 +1258,7 @@ %/ <<widget "FaceIncrease">> -<<SlavePronouns $args[0]>> +<<run SlavePronouns($args[0])>> <<if $args[0].face <= -95>> @@.green;$possessiveCap face is no longer horrifying,@@ and is now merely ugly. <<elseif $args[0].face <= -40>> diff --git a/src/utility/summaryWidgets.tw b/src/utility/summaryWidgets.tw deleted file mode 100644 index 366e4ed72bee24e60e7a9127c9a38adf2d02495e..0000000000000000000000000000000000000000 --- a/src/utility/summaryWidgets.tw +++ /dev/null @@ -1,8 +0,0 @@ -:: Summary Widgets [widget nobr] - -/% - Call as <<SlaveStatClamp $slave>> -%/ -<<widget "SlaveStatClamp">> -<<run SlaveStatClamp($args[0]) >> -<</widget>>