From 0040002557f6a7a8a11e9e9f95e9bc750ad89720 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 4 Aug 2019 22:55:13 -0500
Subject: [PATCH] LimbAmpWork
---
devNotes/scene-guide.txt | 2 +-
src/js/generateMarketSlave.js | 4 ++--
src/pregmod/widgets/pregmodWidgets.tw | 4 ++--
src/uncategorized/industrialDairyAssignmentScene.tw | 2 +-
src/uncategorized/matchmaking.tw | 4 ++--
src/uncategorized/reBusyMasterSuite.tw | 2 +-
src/uncategorized/reNickname.tw | 2 +-
src/uncategorized/slaveSold.tw | 4 ++--
src/uncategorized/universalRules.tw | 8 ++++----
src/uncategorized/wardrobeUse.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 2 +-
src/utility/descriptionWidgetsPiercings.tw | 2 +-
src/utility/descriptionWidgetsStyle.tw | 2 +-
13 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/devNotes/scene-guide.txt b/devNotes/scene-guide.txt
index e54e87cfb7a..50fd149a186 100644
--- a/devNotes/scene-guide.txt
+++ b/devNotes/scene-guide.txt
@@ -54,7 +54,7 @@ Color is changed with YOUR @@.colorname;COLORED TEXT@@ HERE
So a random (really stupid) example might be:
<<if $activeSlave.fetish == 'mindbroken'>>
Special big block of mindbroken text here.
-<<elseif $activeSlave.amp == 1>>
+<<elseif isAmputee($activeSlave)>>
Special big block of amputee text here.
<<if $PC.dick > 0>>
<<set _wasVirgin = ''>>
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 02b59f35118..f790e300b54 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -1084,7 +1084,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
if (V.seeExtreme === 1) {
V.activeSlave.amp = jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1]);
}
- if (V.activeSlave.amp !== 1) {
+ if (!isAmputee(V.activeSlave)) {
V.activeSlave.heels = jsEither([0, 0, 0, 0, 0, 1, 1]);
} else {
V.activeSlave.missingArms = 3;
@@ -1142,7 +1142,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
if (V.seeExtreme === 1) {
V.activeSlave.amp = 1;
}
- if (V.activeSlave.amp !== 1) {
+ if (!isAmputee(V.activeSlave)) {
V.activeSlave.heels = 1;
} else {
V.activeSlave.missingArms = 3;
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 93b2f10a13b..e330ca7e46d 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -46,14 +46,14 @@
<</if>>
<</if>>
<<if ndef $args[0].missingArms>>
- <<if $args[0].amp == 1>>
+ <<if isAmputee($args[0])>>
<<set $args[0].missingArms = 3>>
<<else>>
<<set $args[0].missingArms = 0>>
<</if>>
<</if>>
<<if ndef $args[0].missingLegs>>
- <<if $args[0].amp == 1>>
+ <<if isAmputee($args[0])>>
<<set $args[0].missingLegs = 3>>
<<else>>
<<set $args[0].missingLegs = 0>>
diff --git a/src/uncategorized/industrialDairyAssignmentScene.tw b/src/uncategorized/industrialDairyAssignmentScene.tw
index 65b7fd36a65..ff08ab89362 100644
--- a/src/uncategorized/industrialDairyAssignmentScene.tw
+++ b/src/uncategorized/industrialDairyAssignmentScene.tw
@@ -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/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 32ffe5bcec7..f2933c6fc40 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -45,7 +45,7 @@ Of course, you could marry $him yourself, since you've decided to enable marriag
<<set $weddingSlaveID = $eventSlave.ID>>
-You tell $eventSlave.slaveName that you're going to marry $him. (A proposal, of course, would be inappropriate, even in so enlightened a place as your arcology.) You're not exactly lacking in ways to make <<if $eventSlave.actualAge > 30>>$women<<else>><<= $girl>>s<</if>> burst into tears, but this one is unusually effective. When $he's gotten $himself under control again, <<if $eventSlave.amp == 1>>looking somewhat embarrassed that $he can't wipe $his own tears<<else>>distractedly cuffing away $his tears<</if>> and consciously breathing deeply,
+You tell $eventSlave.slaveName that you're going to marry $him. (A proposal, of course, would be inappropriate, even in so enlightened a place as your arcology.) You're not exactly lacking in ways to make <<if $eventSlave.actualAge > 30>>$women<<else>><<= $girl>>s<</if>> burst into tears, but this one is unusually effective. When $he's gotten $himself under control again, <<if !hasAnyArms($eventSlave)>>looking somewhat embarrassed that $he can't wipe $his own tears<<else>>distractedly cuffing away $his tears<</if>> and consciously breathing deeply,
<<if canTalk($eventSlave)>>
$he says, "Thank you, <<Master>>. I am going to do my be<<s>>t to be a
<<if ($eventSlave.fetishKnown == 1) && ($eventSlave.fetishStrength > 60)>>
@@ -74,7 +74,7 @@ You tell $eventSlave.slaveName that you're going to marry $him. (A proposal, of
good <<wife>>,
<</if>>
<<Master>>. Oh, thank you, <<Master>>," $he blubbers, and starts crying again.
-<<elseif $eventSlave.amp != 1>>
+<<elseif hasAnyArms($eventSlave)>>
$he shakily signs $his thanks twice in a row before breaking down again.
<<else>>
$he painstakingly mouths $his thanks, since $he cannot speak or use hands to sign.
diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw
index 69ee55c7ef8..cf2e102f468 100644
--- a/src/uncategorized/reBusyMasterSuite.tw
+++ b/src/uncategorized/reBusyMasterSuite.tw
@@ -69,7 +69,7 @@ $He had to turn to greet you as you entered, since $he was facing away from the
who is bending to rub _his3 enormous hard nipples across _msSlaves[$i].slaveName's _msSlaves[$i].skin back.
<<elseif _msSlaves[$j].lips > 40>>
who is bending forward to nibble along _msSlaves[$i].slaveName's _msSlaves[$i].skin neck.
- <<elseif _msSlaves[$j].amp != 1>>
+ <<elseif hasAnyArms(_msSlaves[$j])>>
who is reaching around to grope _msSlaves[$i].slaveName's _msSlaves[$i].skin chest.
<<else>>
who is propped up against _msSlaves[$i].slaveName's _msSlaves[$i].skin butt.
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 3723f53ae8f..b8513904e64 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -179,7 +179,7 @@
<<if ($activeSlave.physicalAge > 59)>>
<<set $qualifiedNicknames.push("reallyold")>>
<</if>>
-<<if ($activeSlave.amp == 1)>>
+<<if (isAmputee($activeSlave))>>
<<set $qualifiedNicknames.push("amp")>>
<</if>>
<<if ($activeSlave.boobsImplant/$activeSlave.boobs) >= .60 || ($activeSlave.buttImplant/$activeSlave.butt) > .60>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 1c1048829c4..7df2595c502 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -566,7 +566,7 @@
<</if>>
<<case "womb filler">>
- $activeSlave.slaveName is seen in a drug report nine months later; $he is unrecognizable. $His gaunt body is completely bloated by $his enormous womb, leaving <<if $activeSlave.amp != 1>>what's left of $his arms and legs dangling<<else>>$his torso teetering<</if>> pathetically atop its quivering mass. The headline reads "New drug allows for upwards of seven hundred children carried at once". Live on stream, $his body loses stability and ruptures, flooding the room with fluid and children.
+ $activeSlave.slaveName is seen in a drug report nine months later; $he is unrecognizable. $His gaunt body is completely bloated by $his enormous womb, leaving <<if !isAmputee($activeSlave)>>what's left of $his arms and legs dangling<<else>>$his torso teetering<</if>> pathetically atop its quivering mass. The headline reads "New drug allows for upwards of seven hundred children carried at once". Live on stream, $his body loses stability and ruptures, flooding the room with fluid and children.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].vagina == 0)>>
<<if isFertile($slaves[_ss])>>
@@ -581,7 +581,7 @@
<</if>>
<<case "repopulationist arcology">>
- $activeSlave.slaveName is seen nine months later with an enormous pregnancy and the most content look on $his face. $He <<if $activeSlave.amp != 1>>gently pats $his quadruplet filled belly and lets off a moan as $his children kick in response<<else>>moans lewdly as $his children kick away in $his womb<</if>>.
+ $activeSlave.slaveName is seen nine months later with an enormous pregnancy and the most content look on $his face. $He <<if hasAnyArms($activeSlave)>>gently pats $his quadruplet filled belly and lets off a moan as $his children kick in response<<else>>moans lewdly as $his children kick away in $his womb<</if>>.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].vagina == 0)>>
<<if isFertile($slaves[_ss])>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index faee6d9f8fa..bcce725d487 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -206,14 +206,14 @@ One 'welcome' for a new slave is to have them branded. Where would you like such
| [[Cheeks|Universal Rules][$brandTarget.secondary = "cheek"]]
| [[Shoulders|Universal Rules][$brandTarget.secondary = "shoulder"]]
| [[Breasts|Universal Rules][$brandTarget.secondary = "breast"]]
- /*<<if $activeSlave.amp == 0>>
+ /*<<if hasAnyNaturalArms($activeSlave)>>
| [[Arm, upper|Universal Rules][$brandTarget.secondary = "upper arm"]]
| [[Arm, lower|Universal Rules][$brandTarget.secondary = "lower arm"]]
| [[Wrist|Universal Rules][$brandTarget.secondary = "wrist"]]
| [[Hand|Universal Rules][$brandTarget.secondary = "hand"]]
<</if>>*/
| [[Buttocks|Universal Rules][$brandTarget.secondary = "buttock"]]
- /*<<if $activeSlave.amp == 0>>
+ /*<<if hasAnyNaturalLegs($activeSlave)>>
| [[Thigh|Universal Rules][$brandTarget.secondary = "thigh"]]
| [[Calf|Universal Rules][$brandTarget.secondary = "calve"]]
| [[Ankle|Universal Rules][$brandTarget.secondary = "ankle"]]
@@ -381,14 +381,14 @@ One 'welcome' for a new slave is to have them scarred. Where would you like such
| [[Cheeks|Universal Rules][$scarTarget.secondary = "cheek"]]
| [[Shoulders|Universal Rules][$scarTarget.secondary = "shoulder"]]
| [[Breasts|Universal Rules][$scarTarget.secondary = "breast"]]
- /*<<if $activeSlave.amp == 0>>
+ /*<<if hasAnyNaturalArms($activeSlave)>>
| [[Arm, upper|Universal Rules][$scarTarget.secondary = "upper arm"]]
| [[Arm, lower|Universal Rules][$scarTarget.secondary = "lower arm"]]
| [[Wrist|Universal Rules][$scarTarget.secondary = "wrist"]]
| [[Hand|Universal Rules][$scarTarget.secondary = "hand"]]
<</if>>*/
| [[Buttocks|Universal Rules][$scarTarget.secondary = "buttock"]]
- /*<<if $activeSlave.amp == 0>>
+ /*<<if hasAnyNaturalLegs($activeSlave)>>
| [[Thigh|Universal Rules][$scarTarget.secondary = "thigh"]]
| [[Calf|Universal Rules][$scarTarget.secondary = "calve"]]
| [[Ankle|Universal Rules][$scarTarget.secondary = "ankle"]]
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 1f0eb75d7cc..782dc40f918 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -10,7 +10,7 @@
<h1>The Wardrobe</h1>
-//$activeSlave.slaveName <<if $activeSlave.amp != 1>>stands on<<else>>has been placed on a cushion atop<</if>> a small platform surrounded by mirrors and an array of clothing options. $He is awaiting your fashion choices.//
+//$activeSlave.slaveName <<if hasAnyLegs($activeSlave)>>stands on<<else>>has been placed on a cushion atop<</if>> a small platform surrounded by mirrors and an array of clothing options. $He is awaiting your fashion choices.//
<br><br>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 4b93429410a..3e5e0f6b106 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -16489,7 +16489,7 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<<if ($activeSlave.heels == 1)>>
$His @@.pink;legs have been altered@@ so that $he must wear heels in order to walk.
<<if ($showClothing == 1) && ($saleDescription == 0)>>
- <<if ($activeSlave.amp != 1)>>
+ <<if (!hasAnyLegs($activeSlave))>>
<<if ($activeSlave.shoes != "none") && ($activeSlave.shoes != "flats")>>
$He is, so $he can walk reasonably well.
<<else>>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index fb8a5fc00ed..7d7f35fbff2 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -576,7 +576,7 @@
<<if ($activeSlave.devotion > 20)>>
<<if ($activeSlave.energy > 90)>>
$His very special body allows $him to wear an incredibly lewd piece of jewelry: a thin golden chain that runs from nipple to nipple, through $his pierced cockhead. The chain is short, and any motion at all tugs at $his nipples and penis.
- <<if $activeSlave.amp != 1>>
+ <<if !hasAnyLegs($activeSlave)>>
The stimulation is almost unbearable, and the mere act of walking sometimes causes $him to cum.
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index a180bb36189..b82216afa3c 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -3469,7 +3469,7 @@ $His
<</widget>>
<<widget "nailsDescription">>
- <<if $activeSlave.amp == 1>>
+ <<if !hasAnyArms($activeSlave)>>
$He has no hands, and thus, no nails.
<<elseif $activeSlave.nails == 1>>
$His nails are long and elegant.
--
GitLab