From 3ce59bb137ea986fe751a4426b0077b8fe9a47fb Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Tue, 11 May 2021 22:45:36 -0400 Subject: [PATCH 1/3] slavename fixes --- src/endWeek/saLiveWithHG.js | 4 ++-- src/interaction/sellSlave.js | 2 +- src/uncategorized/reBusyMasterSuite.tw | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/endWeek/saLiveWithHG.js b/src/endWeek/saLiveWithHG.js index 434fa9aad5a..6e6f8a45b51 100644 --- a/src/endWeek/saLiveWithHG.js +++ b/src/endWeek/saLiveWithHG.js @@ -448,7 +448,7 @@ App.SlaveAssignment.liveWithHG = (function() { */ function HGTrainsSlave(slave, HG) { if (slave.skill.oral <= 30) { - r.push(`${HG.slaveName} wants to come home to a talented tongue, so ${he2} trains slave.slaveName's oral skills.`); + r.push(`${HG.slaveName} wants to come home to a talented tongue, so ${he2} trains ${slave.slaveName}'s oral skills.`); r.push(slaveSkillIncrease('oral', slave, 10)); } else if (slave.vagina > 0 && canDoVaginal(slave) && slave.skill.vaginal <= 30) { r.push(`${HG.slaveName} wants ${his2} personal sex slave to be as skilled with ${his} pussy as possible, so ${he2} trains ${slave.slaveName}'s vaginal skills.`); @@ -518,7 +518,7 @@ App.SlaveAssignment.liveWithHG = (function() { } } else if (slave.anus === 3) { if (HG.dick > 5 && HG.energy > 95 && random(1, 100) > 80) { - r.push(`${HG.slaveName} uses slave.slaveName's loose anus to vent ${his2} sexual addiction. Constant assrape from the Head Girl's monster cock eventually leaves it <span class="change positive">gaping.</span>`); + r.push(`${HG.slaveName} uses ${slave.slaveName}'s loose anus to vent ${his2} sexual addiction. Constant assrape from the Head Girl's monster cock eventually leaves it <span class="change positive">gaping.</span>`); slave.anus += 1; } } diff --git a/src/interaction/sellSlave.js b/src/interaction/sellSlave.js index c26c996e036..3c9a10fcabf 100644 --- a/src/interaction/sellSlave.js +++ b/src/interaction/sellSlave.js @@ -1225,7 +1225,7 @@ new App.DomPassage("Sell Slave", () => { } if (slaveImpact === 1) { r.push(`Your more idiotic slaves are <span class="mediumorchid">deeply jealous</span> of - slave.slaveName's new pampered lifestyle, oblivious to the demanding nature of eugenics.`); + ${slave.slaveName}'s new pampered lifestyle, oblivious to the demanding nature of eugenics.`); } App.Events.addNode(el, r); return el; diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw index 16a1aafe364..ce1afa1c077 100644 --- a/src/uncategorized/reBusyMasterSuite.tw +++ b/src/uncategorized/reBusyMasterSuite.tw @@ -150,7 +150,7 @@ <<else>> trim <</if>> - buttocks as wide as $he can without disentangling $himself from the sex train. Up on the bed $he's at just the right height, and $he winks $his _concubineHole invitingly<<if canTalk(_S.Concubine)>>, laughing at the sheer decadence of it<</if>>. <<if ($PC.dick == 0)>>You pull on a strap-on and push it<<else>>You push yourself<</if>> home with some force, your concubine's extreme state of arousal leaving $his ass very relaxed and welcoming; the thrust shoves $him forward to hilt $himself in _top.slave.slaveName, and so on down the line, producing more giggling, some squealing, and much scrabbling for balance. It takes a while to find the rhythm, and while you wait for the inevitable tangles to be fixed you decide to challenge yourself. You reach around and <<if (_S.Concubine.boobs > 10000)>>sink your hands into _S.Concubine.slaveName's massive boobs<<elseif (_S.Concubine.boobs > 1000)>>heft _S.Concubine.slaveName's heavy boobs<<elseif (_S.Concubine.boobs > 300)>>tease _S.Concubine.slaveName's healthy breasts<<else>>massage _S.Concubine.slaveName's flat chest<</if>>, nibbling $his _S.Concubine.skin neck, and generally torturing $him with stimulation until $he climaxes to $his beloved <<= getWrittenTitle(_S.Concubine)>>. When $he does, you extract yourself and pull $him unceremoniously off _top.slave.slaveName, replacing $him in _top.slave.slaveName's <<if _top.mode === "anal">>butt<<else>>pussy<</if>>. You work your way down the line, orgasm by orgasm, delaying your own climax until the exhausted _bottomSlave.slaveName manages yet another orgasm by heroic efforts, and you're done. As you roll off _him2, panting, there is scattered applause and much congratulation from your harem of @@.mediumaquamarine;trusting slaves.@@ + buttocks as wide as $he can without disentangling $himself from the sex train. Up on the bed $he's at just the right height, and $he winks $his _concubineHole invitingly<<if canTalk(_S.Concubine)>>, laughing at the sheer decadence of it<</if>>. <<if ($PC.dick == 0)>>You pull on a strap-on and push it<<else>>You push yourself<</if>> home with some force, your concubine's extreme state of arousal leaving $his ass very relaxed and welcoming; the thrust shoves $him forward to hilt $himself in _top.slave.slaveName, and so on down the line, producing more giggling, some squealing, and much scrabbling for balance. It takes a while to find the rhythm, and while you wait for the inevitable tangles to be fixed you decide to challenge yourself. You reach around and <<if (_S.Concubine.boobs > 10000)>>sink your hands into _S.Concubine.slaveName's massive boobs<<elseif (_S.Concubine.boobs > 1000)>>heft _S.Concubine.slaveName's heavy boobs<<elseif (_S.Concubine.boobs > 300)>>tease _S.Concubine.slaveName's healthy breasts<<else>>massage _S.Concubine.slaveName's flat chest<</if>>, nibbling $his _S.Concubine.skin neck, and generally torturing $him with stimulation until $he climaxes to $his beloved <<= getWrittenTitle(_S.Concubine)>>. When $he does, you extract yourself and pull $him unceremoniously off <<= _top.slave.slaveName>>, replacing $him in <<= _top.slave.slaveName>>'s <<if _top.mode === "anal">>butt<<else>>pussy<</if>>. You work your way down the line, orgasm by orgasm, delaying your own climax until the exhausted _bottomSlave.slaveName manages yet another orgasm by heroic efforts, and you're done. As you roll off _him2, panting, there is scattered applause and much congratulation from your harem of @@.mediumaquamarine;trusting slaves.@@ <<set _S.Concubine.trust += 5>> <<run seX($PC, "penetrative", _S.Concubine, _concubineMode)>> <<run _msSlaves.forEach((s) => { -- GitLab From d44e761c5a348143fcf5dfb9e7d7363a0fa36be6 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Tue, 11 May 2021 22:52:58 -0400 Subject: [PATCH 2/3] fixes --- src/endWeek/events/retire.js | 2 +- src/endWeek/saLongTermPhysicalEffects.js | 2 +- src/uncategorized/reBusyMasterSuite.tw | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/endWeek/events/retire.js b/src/endWeek/events/retire.js index 62872652fdb..132c21a7be8 100644 --- a/src/endWeek/events/retire.js +++ b/src/endWeek/events/retire.js @@ -412,7 +412,7 @@ globalThis.retireScene = function(originalSlave) { r.push(`The suit has a pair of gaps for its monstrous breasts, bare expanses of ${slave.skin} skin.`); } if (slave.belly >= 5000) { - r.push(`The suit has a gap for its big belly; a round dome of slave.skin skin.`); + r.push(`The suit has a gap for its big belly; a round dome of ${slave.skin} skin.`); } if (slave.lips > 40) { r.push(`Its upper hole is surrounded by a ludicrous set of swollen lips.`); diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js index 3fa1aeb9b5c..b086f7dee76 100644 --- a/src/endWeek/saLongTermPhysicalEffects.js +++ b/src/endWeek/saLongTermPhysicalEffects.js @@ -1425,7 +1425,7 @@ App.SlaveAssignment.longTermPhysicalEffects = (function() { slave.sexualFlaw = "none"; slave.behavioralFlaw = "none"; } else if (slave.weight <= -95 && slave.boobs < 100 && slave.butt < 1 && slave.muscles < -95) { - r.push(`Watching ${his} body sacrifice itself for a pregnancy ${he} hates takes its toll on ${slave.slaveName}'s mind. Feeling that ${he} is nothing more than a host for ${his} brood has destroyed any hopes ${he} had left. slave.slaveName has become <span class="mindbreak">completely broken.</span>`); + r.push(`Watching ${his} body sacrifice itself for a pregnancy ${he} hates takes its toll on ${slave.slaveName}'s mind. Feeling that ${he} is nothing more than a host for ${his} brood has destroyed any hopes ${he} had left. ${slave.slaveName} has become <span class="mindbreak">completely broken.</span>`); slave.fetish = "mindbroken"; slave.sexualFlaw = "none"; slave.behavioralFlaw = "none"; diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw index ce1afa1c077..79e3d5a2bd8 100644 --- a/src/uncategorized/reBusyMasterSuite.tw +++ b/src/uncategorized/reBusyMasterSuite.tw @@ -136,7 +136,7 @@ <<link "Slide in behind the concubine for some action">> <<replace "#result">> <<setLocalPronouns _top.slave 2>> - _S.Concubine.slaveName anticipates you, and is already sliding $himself partway out of _top.slave.slaveName and cocking $his hips to spread $his + _S.Concubine.slaveName anticipates you, and is already sliding $himself partway out of <<=_top.slave.slaveName>> and cocking $his hips to spread $his <<if _S.Concubine.butt > 15>> immeasurable <<elseif _S.Concubine.butt > 10>> @@ -150,7 +150,7 @@ <<else>> trim <</if>> - buttocks as wide as $he can without disentangling $himself from the sex train. Up on the bed $he's at just the right height, and $he winks $his _concubineHole invitingly<<if canTalk(_S.Concubine)>>, laughing at the sheer decadence of it<</if>>. <<if ($PC.dick == 0)>>You pull on a strap-on and push it<<else>>You push yourself<</if>> home with some force, your concubine's extreme state of arousal leaving $his ass very relaxed and welcoming; the thrust shoves $him forward to hilt $himself in _top.slave.slaveName, and so on down the line, producing more giggling, some squealing, and much scrabbling for balance. It takes a while to find the rhythm, and while you wait for the inevitable tangles to be fixed you decide to challenge yourself. You reach around and <<if (_S.Concubine.boobs > 10000)>>sink your hands into _S.Concubine.slaveName's massive boobs<<elseif (_S.Concubine.boobs > 1000)>>heft _S.Concubine.slaveName's heavy boobs<<elseif (_S.Concubine.boobs > 300)>>tease _S.Concubine.slaveName's healthy breasts<<else>>massage _S.Concubine.slaveName's flat chest<</if>>, nibbling $his _S.Concubine.skin neck, and generally torturing $him with stimulation until $he climaxes to $his beloved <<= getWrittenTitle(_S.Concubine)>>. When $he does, you extract yourself and pull $him unceremoniously off <<= _top.slave.slaveName>>, replacing $him in <<= _top.slave.slaveName>>'s <<if _top.mode === "anal">>butt<<else>>pussy<</if>>. You work your way down the line, orgasm by orgasm, delaying your own climax until the exhausted _bottomSlave.slaveName manages yet another orgasm by heroic efforts, and you're done. As you roll off _him2, panting, there is scattered applause and much congratulation from your harem of @@.mediumaquamarine;trusting slaves.@@ + buttocks as wide as $he can without disentangling $himself from the sex train. Up on the bed $he's at just the right height, and $he winks $his _concubineHole invitingly<<if canTalk(_S.Concubine)>>, laughing at the sheer decadence of it<</if>>. <<if ($PC.dick == 0)>>You pull on a strap-on and push it<<else>>You push yourself<</if>> home with some force, your concubine's extreme state of arousal leaving $his ass very relaxed and welcoming; the thrust shoves $him forward to hilt $himself in <<= _top.slave.slaveName>>, and so on down the line, producing more giggling, some squealing, and much scrabbling for balance. It takes a while to find the rhythm, and while you wait for the inevitable tangles to be fixed you decide to challenge yourself. You reach around and <<if (_S.Concubine.boobs > 10000)>>sink your hands into _S.Concubine.slaveName's massive boobs<<elseif (_S.Concubine.boobs > 1000)>>heft _S.Concubine.slaveName's heavy boobs<<elseif (_S.Concubine.boobs > 300)>>tease _S.Concubine.slaveName's healthy breasts<<else>>massage _S.Concubine.slaveName's flat chest<</if>>, nibbling $his _S.Concubine.skin neck, and generally torturing $him with stimulation until $he climaxes to $his beloved <<= getWrittenTitle(_S.Concubine)>>. When $he does, you extract yourself and pull $him unceremoniously off <<= _top.slave.slaveName>>, replacing $him in <<= _top.slave.slaveName>>'s <<if _top.mode === "anal">>butt<<else>>pussy<</if>>. You work your way down the line, orgasm by orgasm, delaying your own climax until the exhausted _bottomSlave.slaveName manages yet another orgasm by heroic efforts, and you're done. As you roll off _him2, panting, there is scattered applause and much congratulation from your harem of @@.mediumaquamarine;trusting slaves.@@ <<set _S.Concubine.trust += 5>> <<run seX($PC, "penetrative", _S.Concubine, _concubineMode)>> <<run _msSlaves.forEach((s) => { @@ -176,7 +176,7 @@ <<else>> lips <</if>> - around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina != -1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as _msSlaves[1].slave.slaveName goes back to fucking _him2. The sex train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _bottomSlave.slaveName is still getting enough stimulation that _he2 whimpers quietly into your <<if ($PC.vagina != -1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_bottomSlave.skill.oral >= 100)>>masterful, despite the distraction<<elseif (_bottomSlave.skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _bottomSlave.slaveName start groping your concubine _S.Concubine.slaveName's + around your <<if ($PC.dick == 0)>>clit<<else>>cock<<if $PC.vagina != -1>> and starts stroking your pussy<</if>><</if>> eagerly enough, even as <<=_msSlaves[1].slave.slaveName>> goes back to fucking _him2. The sex train is fairly gentle, since anything too fast would disintegrate the gymnastic arrangement, but _bottomSlave.slaveName is still getting enough stimulation that _he2 whimpers quietly into your <<if ($PC.vagina != -1)>>pussy<<else>>dick<</if>>, a nice feeling. The blowjob is <<if (_bottomSlave.skill.oral >= 100)>>masterful, despite the distraction<<elseif (_bottomSlave.skill.oral > 10)>>serviceable, despite the distraction<<else>>only mediocre, but serviceable enough<</if>>, so you let _him2 work for a while before gently shoving _him2 off the side of the bed and telling _him2 to get to the back of the line. The slaves all shuffle forward awkwardly, and inadvertently block your view so that you hear rather than see _bottomSlave.slaveName start groping your concubine _S.Concubine.slaveName's <<if _S.Concubine.butt > 15>> immeasurable <<elseif _S.Concubine.butt > 10>> -- GitLab From 4711ac2d87da4eafbdbff18efd786f536bd5a41c Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Tue, 11 May 2021 23:10:40 -0400 Subject: [PATCH 3/3] fix --- src/interaction/sellSlave.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/interaction/sellSlave.js b/src/interaction/sellSlave.js index 3c9a10fcabf..fbc7f53e2f6 100644 --- a/src/interaction/sellSlave.js +++ b/src/interaction/sellSlave.js @@ -1224,8 +1224,7 @@ new App.DomPassage("Sell Slave", () => { } } if (slaveImpact === 1) { - r.push(`Your more idiotic slaves are <span class="mediumorchid">deeply jealous</span> of - ${slave.slaveName}'s new pampered lifestyle, oblivious to the demanding nature of eugenics.`); + r.push(`Your more idiotic slaves are <span class="mediumorchid">deeply jealous</span> of ${slave.slaveName}'s new pampered lifestyle, oblivious to the demanding nature of eugenics.`); } App.Events.addNode(el, r); return el; -- GitLab