From 36a07d80a1e58bbdb69d4de834f6df042727726c Mon Sep 17 00:00:00 2001 From: Arkerthan <arkerthan@gmail.com> Date: Mon, 5 Aug 2019 14:22:58 +0200 Subject: [PATCH] partly convert limb access in src/uncategorized/ --- src/uncategorized/PESS.tw | 2 +- src/uncategorized/costsWidgets.tw | 24 ++++++++++--------- .../industrialDairyAssignmentScene.tw | 24 +++++++++---------- src/uncategorized/masterSuiteReport.tw | 12 +++++++--- src/uncategorized/ptWorkaround.tw | 4 ++-- 5 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw index f7bec979ecd..93e4b46819e 100644 --- a/src/uncategorized/PESS.tw +++ b/src/uncategorized/PESS.tw @@ -154,7 +154,7 @@ The business is brief and inconsequential, but it's good to speak with $him. Whe <<case "worshipful impregnatrix">> -<<EventNameLink>> comes wearily into your office at the end of $his day to check in with you, like a good Head Girl should. You're busy at the moment, so $he waits quietly, not wanting to interrupt you. $He seems tired, and leans <<if $activeSlave.physicalAge > 35>>heavily<<else>>lightly<</if>> against the back of the office couch<<if $activeSlave.amp < 0>>, $his mechanical hand hard against the leather<</if>>. Your Head Girl is a <<if $activeSlave.fetish == "dom">>very dominant $desc<<elseif $activeSlave.fetish == "sadist">>sadistic and dominant $desc<<else>>dutiful $desc and takes $his leadership position seriously<</if>>, but $he knows $he doesn't have to pretend to be invincible around you. +<<EventNameLink>> comes wearily into your office at the end of $his day to check in with you, like a good Head Girl should. You're busy at the moment, so $he waits quietly, not wanting to interrupt you. $He seems tired, and leans <<if $activeSlave.physicalAge > 35>>heavily<<else>>lightly<</if>> against the back of the office couch<<if hasAnyProstheticArms($activeSlave)>>, $his mechanical hand hard against the leather<</if>>. Your Head Girl is a <<if $activeSlave.fetish == "dom">>very dominant $desc<<elseif $activeSlave.fetish == "sadist">>sadistic and dominant $desc<<else>>dutiful $desc and takes $his leadership position seriously<</if>>, but $he knows $he doesn't have to pretend to be invincible around you. <br><br> When you've finished your task, you raise your eyes to examine $him. $He's standing with $his <<if $activeSlave.hips > 1>>broad<<elseif $activeSlave.hips < -1>>narrow<<else>>womanly<</if>> hips slightly cocked and $his <<if $activeSlave.muscles > 95>>incredibly muscular<<elseif $activeSlave.weight > 10>>soft<<elseif $activeSlave.muscles > 10>>hard<<else>>trim<</if>> thighs bowed a bit wide. You immediately understand why: it's $his job to impregnate fertile slaves, a duty $he takes very seriously, and $his dick must be very sore. <<if $activeSlave.clothes == "no clothing">> diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw index b4ea2860b93..c50cad90d79 100644 --- a/src/uncategorized/costsWidgets.tw +++ b/src/uncategorized/costsWidgets.tw @@ -251,20 +251,22 @@ <<set _individualCosts += 5>> <</if>> <<if ($args[0].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($args[0].assignment != "be confined in the arcade")>> - <<if ($args[0].amp != 0)>> - <<if ($args[0].amp == 1)>> - <br> <i>Increased living expenses due to limblessness:</i> - @@.yellowgreen;<<print cashFormat($rulesCost)>>@@ - <<set _individualCosts += $rulesCost>> - <<else>> - <br> <i>Increased living expenses due to prosthetics:</i> - @@.yellowgreen;<<print cashFormat($rulesCost/2)>>@@ - <<set _individualCosts += $rulesCost/2>> - <</if>> - <<elseif !canWalk($args[0])>> + <<if !canWalk($args[0])>> <br> <i>Increased living expenses due to immobility:</i> @@.yellowgreen;<<print cashFormat($rulesCost)>>@@ <<set _individualCosts += $rulesCost>> + <<else>> + <<if !hasAllLimbs($args[0])>> + <br> <i>Increased living expenses due to limblessness:</i> + @@.yellowgreen;<<print cashFormat($rulesCost * 0.25 * getLimbCount(getLimbCount(s, 0), 0))>>@@ + <<set _individualCosts += $rulesCost * 0.25 * getLimbCount(getLimbCount(s, 0), 0)>> + <</if>> + <<if hasAnyProstheticLimbs($args[0])>> + <<set _prostheticCount = getLimbCount($args[0], 2) + getLimbCount($args[0], 3) + getLimbCount($args[0], 4) + getLimbCount($args[0], 5) + getLimbCount($args[0], 6)>> + <br> <i>Increased living expenses due to prosthetics:</i> + @@.yellowgreen;<<print cashFormat($rulesCost * 0.125 * _prostheticCount)>>@@ + <<set _individualCosts += $rulesCost * 0.125 * _prostheticCount>> + <</if>> <</if>> <</if>> <<if $args[0].boobs > 10000>> diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw index 65b7fd36a65..0624ab49c74 100644 --- a/src/uncategorized/industrialDairyAssignmentScene.tw +++ b/src/uncategorized/industrialDairyAssignmentScene.tw @@ -44,7 +44,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu <</if>> <</if>> <br><br> - <<if ($activeSlave.amp != 1)>> + <<if (hasAnyArms($activeSlave))>> $He strips and climbs into the machine's embrace, <<else>> Another slave helps $him strip and lays $him in the machine, @@ -77,7 +77,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu $He strokes the dildo that will keep $him pregnant like a lover, which, of course, it's about to be. <</if>> <br><br> - <<if ($activeSlave.amp != 1)>> + <<if (hasAnyArms($activeSlave))>> $He strips and climbs into the machine's embrace, shaking with nerves. <<else>> Another slave helps $him strip and lays $him in the machine. $He shakes with nerves. @@ -102,7 +102,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu As $he realizes $his fate, the worshipful slave squares $his shoulders, steeling $himself. "<<Master>>," $he <<if !canTalk($activeSlave)>>signs<<else>><<say>>s<</if>>, "I will do my best to <<s>>erve you." $He steps over to the machine. $He looks it over clinically, getting $himself into the right mindset. - <<if ($activeSlave.amp != 1)>> + <<if (hasAnyArms($activeSlave))>> <<if ($dairyStimulatorsSetting > 1)>> $He gauges the size of the massive phallus that will soon penetrate $his anus. It's broader than $his fist. "I think I can take this. It'll be tough, but I'll need all the hydration I can get." <</if>> @@ -114,7 +114,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu <</if>> <</if>> <br><br> - <<if ($activeSlave.amp != 1)>> + <<if (hasAnyArms($activeSlave))>> $He strips and climbs into the machine's embrace. <<else>> Another slave helps $him strip and lays $him in the machine. @@ -124,7 +124,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu <<elseif $activeSlave.devotion > 60>> As $he realizes $his fate, the tears come quickly. "<<Master>>," $he <<if !canTalk($activeSlave)>>signs<<else>><<say>>s quietly<</if>>, "i<<s>> thi<<s>> for me?" You nod, and $he steps over to the machine. $He lightly traces its gleaming metal, looking wistful. - <<if ($activeSlave.amp != 1)>> + <<if (hasAnyArms($activeSlave))>> <<if ($dairyStimulatorsSetting > 1)>> $He gently touches the head of the massive phallus that will soon penetrate $his anus. It's broader than $his fist. "M-my butthole i<<s>>n't going to be any good for anal after thi<<s>>." <</if>> @@ -136,13 +136,13 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu <</if>> <</if>> <br><br> - <<if ($activeSlave.amp != 1)>> + <<if (hasAnyArms($activeSlave))>> $He strips and climbs into the machine's embrace. <<else>> Another slave helps $him strip and lays $him in the machine. <</if>> "<<Master>>," $he <<if !canTalk($activeSlave)>>signs<<else>>gasps out<</if>>, the tears coming fast now. "C-can you - <<if ($activeSlave.amp != 1)>> + <<if (hasAnyArms($activeSlave))>> h-hold my h-hand while it a-activate<<s>>? Plea<<s>>e?" You take $his hand as the straps automatically tighten, robbing $him of the ability to move. $He grips your hand tightly. <<else>> <<S>>-<<s>>tay with me while it activate<<s>>? Plea<<s>>e?" You stand by as the straps automatically tighten, robbing $him of the ability to move. @@ -151,7 +151,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu <<elseif $activeSlave.devotion > 20>> $He desperately tries to be brave and obey, but as $his fate dawns on $him, $his courage and conditioning fail $him. - <<if ($activeSlave.amp != 1)>> + <<if (!hasAnyLegs($activeSlave))>> $He tries to wriggle away from the machine, so <<else>> $He turns and tries to run, so @@ -162,7 +162,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu $Milkmaid.slaveName is <</if>> obliged to - <<if ($activeSlave.amp != 1)>> + <<if (!isAmputee($activeSlave))>> subdue $him and strap $him, <<else>> place $him, @@ -185,7 +185,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu <<if $activeSlave.trust >= -20>> $He is afraid of you, but not afraid enough that $he will not resist this. <</if>> - <<if ($activeSlave.amp == 1)>> + <<if (hasAnyLegs($activeSlave))>> $He tries to wriggle away from the machine, so <<else>> $He turns and tries to run, so @@ -196,7 +196,7 @@ When $activeSlave.slaveName reports to the dairy, it's to the sight of an unoccu $Milkmaid.slaveName is <</if>> obliged to - <<if ($activeSlave.amp != 1)>> + <<if (!isAmputee($activeSlave))>> subdue $him and strap $him, <<else>> place $him, @@ -406,7 +406,7 @@ The machine continues fucking $him despite $his climax. To allow $him some rest despite $his terror, the drug cocktail is adjusted as $his orgasm fades, <</if>> to put $him to sleep. $He slumps against the machine as $he drops off. -<<if ($activeSlave.amp != 1)>>$His painfully tight grip on your hand finally loosens<</if>>. +<<if (hasAnyArms($activeSlave))>>$His painfully tight grip on your hand finally loosens<</if>>. <<if ($dairyStimulatorsSetting > 1)>> $His anus has not yet stretched to take the necessary full power setting, so $he is gently sodomized as $he sleeps to get $his sphincter used to its permanent occupier. <</if>> diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index b625903e3be..6572a48ac01 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -367,9 +367,11 @@ <<if $verboseDescriptions == 1>> <br> $He <<include "SA please you">> <br> - <<if $servantMilkers == 1 && $slaves[$i].lactation > 0 && $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken" && $slaves[$i].amp != 1 && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant >= -90>> + <<if $servantMilkers == 1 && $slaves[$i].lactation > 0 && $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken" && canWalk($slaves[$i]) && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant >= -90>> When $his breasts begin to feel full and you aren't around, $he avails $himself to the penthouse milkers and - <<set $servantMilkersMultiplier = 0.25>><<silently>><<include "SA get milked">><</silently>><<set $servantMilkersMultiplier = 1>> + <<set $servantMilkersMultiplier = 0.25>> + <<silently>><<include "SA get milked">><</silently>> + <<set $servantMilkersMultiplier = 1>> gives $milk liters of milk over the week, which is sold for @@.yellowgreen;<<print cashFormat($milkSale)>>.@@ <</if>> <br> @@ -385,7 +387,11 @@ <<silently>> <<include "SA chooses own job">> <<include "SA please you">> - <<if $servantMilkers == 1 && $slaves[$i].lactation > 0 && $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken" && $slaves[$i].amp != 1 && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant >= -90>><<set $servantMilkersMultiplier = 0.25>><<silently>><<include "SA get milked">><</silently>><<set $servantMilkersMultiplier = 1>><</if>> + <<if $servantMilkers == 1 && $slaves[$i].lactation > 0 && $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken" && canWalk($slaves[$i]) && $slaves[$i].intelligence+$slaves[$i].intelligenceImplant >= -90>> + <<set $servantMilkersMultiplier = 0.25>> + <<silently>><<include "SA get milked">><</silently>> + <<set $servantMilkersMultiplier = 1>> + <</if>> <<set _chosenClothes = saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> <<include "SA diet">> diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw index 637629dae54..ff46434af14 100644 --- a/src/uncategorized/ptWorkaround.tw +++ b/src/uncategorized/ptWorkaround.tw @@ -36,14 +36,14 @@ <<= VCheck.Both(4, 2)>> <<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish == "humiliation")>> Since $activeSlave.slaveName has an unusual sexuality, you @@.hotpink;build $his devotion to you@@ by indulging $his perversions. Since $he's an absolute slut for humiliation, you let $him whore around inside the special camera room whenever possible. When you're going out and feel like putting on a show, you - <<if ($activeSlave.amp != 1)>> + <<if canWalk($activeSlave)>> bring $him on a leash and have $him service you in public. $He comes harder than ever when you push $him down on $his knees in a crowded public arcology elevator and facefuck $him while $he masturbates fervently. <<else>> carry $him out and have $him service you in public. $He comes harder than ever when you push $his face to your <<if $PC.dick == 1>>dick<<else>>pussy<</if>> in a crowded public arcology elevator and facefuck $him while $he tries $his hardest to masturbate. <</if>> <<set $activeSlave.counter.oral += 8, $oralTotal += 8>> <<elseif ($activeSlave.anus == 3) && ($activeSlave.vagina == 3) && $activeSlave.geneMods.rapidCellGrowth != 1>> - $activeSlave.slaveName is a stretched-out, well-traveled slut. Some like their holes loose, but most prefer cunts and butts that don't make sloppy noises when fucked. So, you spend some quality care time with $him, carefully massaging $his abused holes with oils and lotions. $He comes, of course, but $his pussy and asshole do benefit from the treatment. You allow $him to service you with $his mouth to avoid spoiling your work right away. Afterward, $he <<if ($activeSlave.amp != 1)>>@@.hotpink;hugs you and gives you a kiss@@<<else>>@@.hotpink;gives you a kiss and tries to hug you,@@ but without arms, all $he manages is a sort of nuzzle<</if>>. + $activeSlave.slaveName is a stretched-out, well-traveled slut. Some like their holes loose, but most prefer cunts and butts that don't make sloppy noises when fucked. So, you spend some quality care time with $him, carefully massaging $his abused holes with oils and lotions. $He comes, of course, but $his pussy and asshole do benefit from the treatment. You allow $him to service you with $his mouth to avoid spoiling your work right away. Afterward, $he <<if hasAnyArms($activeSlave)>>@@.hotpink;hugs you and gives you a kiss@@<<else>>@@.hotpink;gives you a kiss and tries to hug you,@@ but without arms, all $he manages is a sort of nuzzle<</if>>. <<set $activeSlave.vagina--, $activeSlave.anus--, $activeSlave.counter.oral += 5, $oralTotal += 5>> <<elseif $activeSlave.vagina == 0>> -- GitLab