Merge branch 'limbFunction' into 'pregmod-master'

convert limb access in src/npc/

See merge request pregmodfan/fc-pregmod!5077

src/npc/acquisition.tw

@@ -629,7 +629,7 @@ The previous owner seems to have left in something of a hurry.
 			<<setLocalPronouns $activeSlave>>
 			<<if $activeSlave.fetish == "mindbroken">>
 				$activeSlave.slaveName is, sadly, not mentally competent, and is wandering through the penthouse at the moment.
-			<<elseif $activeSlave.amp == 1>>
+			<<elseif isAmputee($activeSlave)>>
 				$activeSlave.slaveName is a quadruple amputee and is quite helpless, so you can attend to $him at your leisure.
 			<<elseif $activeSlave.devotion < -50>>
 				$activeSlave.slaveName is quite rebellious and was attempting to escape, so I have locked $him in the slave quarters.
@@ -751,4 +751,4 @@ The previous owner seems to have left in something of a hurry.
 	<</if>>
 	<<script>>Save.autosave.save("Week Start Autosave")<</script>>
 	<<goto "Main">>
-<</link>>
\ No newline at end of file
+<</link>>

src/npc/fAbuse.tw

@@ -20,7 +20,7 @@
 
 <<set _asspain = 0>>
 
-<<if ($activeSlave.amp == 1)>>
+<<if isAmputee($activeSlave)>>
 	You set $his helpless form down for abuse. Brutalizing $him is almost childishly easy; $his limbless torso leaves $him at your mercy.
 <<else>>
 	You call $him over so you can abuse the <<if $seeRace == 1>>$activeSlave.race <</if>>bitch. You get things started with an open-handed slap across the face<<if !canSee($activeSlave)>>; $he never saw it coming<</if>>. As $he reels in shock and pain, you follow up with
@@ -282,7 +282,7 @@
 	<<case "a Santa dress">>
 		$He tears off some of $his dress's white fur trim in $his struggle to remove it.
 	<<case "slutty jewelry">>
-		$He hurriedly strips fine jewelry from $his neck, wrists, and ankles.
+		$He hurriedly strips fine jewelry from $his neck, wrist<<if hasBothArms($activeSlave)>>s<</if>> and ankle<<if hasBothLegs($activeSlave)>>s<</if>>.
 	<<case "a corset">>
 		$His fingers fumble desperately with the straps of $his corset.
 	<<case "an extreme corset">>
@@ -297,9 +297,9 @@
 <</if>>
 
 <<if ($PC.dick == 1)>>
-	<<if ($activeSlave.amp != 1) && ($activeSlave.clothes !== "no clothing")>>While $he strips, your<<else>>Your<</if>> stiffening cock rises<<if $PC.vagina == 1>>, revealing your pussy and<</if>> earning
+	<<if hasAnyArms($activeSlave) && ($activeSlave.clothes !== "no clothing")>>While $he strips, your<<else>>Your<</if>> stiffening cock rises<<if $PC.vagina == 1>>, revealing your pussy and<</if>> earning
 <<else>>
-	<<if ($activeSlave.amp != 1) && ($activeSlave.clothes !== "no clothing")>>While $he strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
+	<<if hasAnyArms($activeSlave) && ($activeSlave.clothes !== "no clothing")>>While $he strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
 <</if>>
 <<if ($activeSlave.fetish == "masochist") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 	a shy look
@@ -310,7 +310,7 @@
 <</if>>
 from your victim.
 
-<<if ($activeSlave.amp == 1)>>
+<<if isAmputee($activeSlave)>>
 	<<if ($activeSlave.clothes !== "no clothing")>>Growing impatient, you rip the clothes off $his limbless torso<<else>>You walk up to $him<</if>> and spank $his brutally; spinning $him to present
 	<<if ($activeSlave.vagina > -1)>>
 		$his holes

src/npc/fFeelings.tw

@@ -3,7 +3,7 @@
 <<run Enunciate($activeSlave)>>
 <<setLocalPronouns $activeSlave>>
 <<set _lisping = 0>>
-<<if ($activeSlave.amp != 1) && canTalk($activeSlave) && SlaveStatsChecker.checkForLisp($activeSlave)>>
+<<if hasAnyArms($activeSlave) && canTalk($activeSlave) && SlaveStatsChecker.checkForLisp($activeSlave)>>
 	<<set _lisping = 1>>
 <</if>>
 
@@ -23,9 +23,9 @@
 	$He
 	<<if !canTalk($activeSlave)>>gestures<<elseif (_lisping == 1)>>lisps<<else>>mutters<</if>>
 	<<if ($activeSlave.trust >= -20)>>
-		hesitantly that $he does not like being a slave, and then <<if !canTalk($activeSlave)>>lets $his hands fall to $his sides<<else>>falls silent<</if>>.
+		hesitantly that $he does not like being a slave, and then <<if !canTalk($activeSlave)>>lets $his hand<<if hasBothArms($activeSlave)>>s<</if>> fall to $his sides<<else>>falls silent<</if>>.
 	<<elseif ($activeSlave.trust >= -50)>>
-		fearfully that $he does not like being a slave, and then <<if !canTalk($activeSlave)>>lets $his hands fall to $his sides, shaking a little<<else>>falls silent, shaking a little<</if>>.
+		fearfully that $he does not like being a slave, and then <<if !canTalk($activeSlave)>>lets $his hand<<if hasBothArms($activeSlave)>>s<</if>> fall to $his sides, shaking a little<<else>>falls silent, shaking a little<</if>>.
 	<<else>>
 		a perfunctory <<if !canTalk($activeSlave)>>plea not to hurt $him<<else>>"Plea<<s>>e don't hurt me, <<Master>>."<</if>>
 	<</if>>
@@ -405,7 +405,7 @@ My favorite part of my body i<<s>>
 <</if>>
 
 <<if $activeSlave.need>>
-	<<if $activeSlave.amp != 1>>
+	<<if hasAnyArms($activeSlave)>>
 		<<if _lisping == 0>>
 			<<set _Amp = "touch myself,">>
 		<<else>>
@@ -1064,7 +1064,7 @@ My favorite part of my body i<<s>>
 		<<if $PC.balls > 2>>
 			every opportunity I get to wor<<sh>>ip your ball<<s>>, they're <<s>>o huge and make <<s>>o much cum and I ju<<s>>t want to <<s>>pend my life ki<<ss>>ing your ball<<s>> and <<s>>ucking your cock, and live off your cum...
 		<<elseif $PC.balls > 1>>
-			wor<<sh>>ipping your ma<<ss>>ive ball<<s>>. <<if $activeSlave.amp != 1>>Your ball<<s>> are <<s>>o big that one te<<s>>ticle fill<<s>> my hand, I even cum without touching my<<s>>elf <<s>>o I can properly <<s>>erve you.<<else>>Feeling you re<<s>>t your ball<<s>> on my fa<<c>>e in between fa<<c>>efuck<<s>> i<<s>> heaven for me.<</if>>
+			wor<<sh>>ipping your ma<<ss>>ive ball<<s>>. <<if hasAnyArms($activeSlave)>>Your ball<<s>> are <<s>>o big that one te<<s>>ticle fill<<s>> my hand, I even cum without touching my<<s>>elf <<s>>o I can properly <<s>>erve you.<<else>>Feeling you re<<s>>t your ball<<s>> on my fa<<c>>e in between fa<<c>>efuck<<s>> i<<s>> heaven for me.<</if>>
 		<<elseif $PC.balls > 0>>
 			plea<<s>>uring your big ball<<s>> too. They're the perfect <<s>>i<<z>>e to fill my mouth a<<s>> I <<s>>uck on them, and I love feeling them ten<<s>>e again<<s>>t my chin when you <<sh>>oot cum down my throat.
 		<<else>>
@@ -1161,20 +1161,29 @@ My favorite part of my body i<<s>>
 		<<if (($activeSlave.actualAge - 5) > $slaves[_partner].actualAge) && (20 > $slaves[_partner].actualAge)>>
 			<<He 2>>'<<s>> a little immature at time<<s>>, but having <<s>>e<<x>> with a teenager i<<s>> <<s>>o awe<<s>>ome, it'<<s>> worth it.
 		<</if>>
-		<<if $slaves[_partner].amp != 0>>
-			<<if $slaves[_partner].amp == -1>>
-				I really do like <<his 2>> P-Limb<<s>>. They're a little awkward, and kind of cold, but that'<<s>> ju<<s>>t how <<he 2>> i<<s>>.
-			<<elseif $slaves[_partner].amp == -2>>
+		<<if hasAnyProstheticLimbs($slaves[_partner])>>
+			<<set _sex = getLimbCount($slaves[_partner], 3) + getLimbCount($slaves[_partner], 6)>>
+			<<set _beauty = getLimbCount($slaves[_partner], 4) + getLimbCount($slaves[_partner], 6)>>
+			<<set _combat = getLimbCount($slaves[_partner], 5) + getLimbCount($slaves[_partner], 6)>>
+			<<if _sex > 0 && _beauty > 0 && _combat > 0>>
+				<<His 2>> P-Limb<<s>> do look cool and I like how <<s>>trong they can make _him2 but they <<s>>care me a little, <<s>>ometime<<s>>. Though of cour<<s>>e <<he 2>> di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "<<He 2>> ha<<s>> vibe finger<<s>>, <<s>>o that'<<s>> awe<<s>>ome.
+			<<elseif _sex > 0 && _beauty > 0>>
+				I really like <<his 2>> P-Limb<<s>>. They're very pretty, but kind of cold. That'<<s>> ju<<s>>t how <<he 2>> i<<s>>." $He giggles. "<<He 2>> ha<<s>> vibe finger<<s>>. <<S>>o that'<<s>> awe<<s>>ome.
+			<<elseif _beauty > 0 && _combat > 0>>
+				<<His 2>> P-Limb<<s>> do look cool and I like how <<s>>trong they can make _him2 but they <<s>>care me a little, <<s>>ometime<<s>>. Though of cour<<s>>e <<he 2>> di<<s>>able<<s>> the weapon<<s>> when we're together.
+			<<elseif _sex > 0 && _combat > 0>>
+				<<His 2>> P-Limb<<s>> do <<s>>care me a little, <<s>>ometime<<s>>. Though of course <<he 2>> di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "<<He 2>> ha<<s>> vibe finger<<s>>. <<S>>o that'<<s>> awe<<s>>ome.
+			<<elseif _sex > 0>>
 				And, um." $He giggles. "<<He 2>> ha<<s>> vibe finger<<s>>. <<S>>o that'<<s>> awe<<s>>ome.
-			<<elseif $slaves[_partner].amp == -3>>
+			<<elseif _beauty > 0>>
 				I really like <<his 2>> P-Limb<<s>>. They're very pretty, but kind of cold. That'<<s>> ju<<s>>t how <<he 2>> i<<s>>.
-			<<elseif $slaves[_partner].amp == -4>>
+			<<elseif _combat > 0>>
 				<<His 2>> P-Limb<<s>> do <<s>>care me a little, <<s>>ometime<<s>>. Though of course <<he 2>> di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "Though I did get _him2 to e<<x>>tend <<his 2>> blade<<s>> on<<c>>e, <<s>>o I could ki<<ss>> them for luck.
-			<<elseif $slaves[_partner].amp == -5>>
-				<<His 2>> P-Limb<<s>> do look cool and I like how <<s>>trong they can make _him2 but they <<s>>care me a little, <<s>>ometime<<s>>. Though of cour<<s>>e <<he 2>> di<<s>>able<<s>> the weapon<<s>> when we're together." $He giggles. "<<He 2>> ha<<s>> vibe finger<<s>>, <<s>>o that'<<s>> awe<<s>>ome.
 			<<else>>
-				<<He 2>>'<<s>> an amputee, of cour<<s>>e, <<s>>o that'<<s>> a little <<s>>ad.
+				I really do like <<his 2>> P-Limb<<s>>. They're a little awkward, and kind of cold, but that'<<s>> ju<<s>>t how <<he 2>> i<<s>>.
 			<</if>>
+		<<elseif getLimbCount($slaves[_partner], 0) > 0>>
+			<<He 2>>'<<s>> an amputee, of cour<<s>>e, <<s>>o that'<<s>> a little <<s>>ad.
 		<</if>>
 	<</if>>
 <<elseif ($activeSlave.relationship == -3)>>

src/npc/fKiss.tw

@@ -5,21 +5,21 @@
 You tell $activeSlave.slaveName to
 <<switch $activeSlave.collar>>
 <<case "dildo gag">>
-	<<if ($activeSlave.amp != 1)>>
+	<<if hasAnyArms($activeSlave)>>
 		remove $his dildo gag and approach you.
 	<<else>>
 		have another slave remove $his dildo gag and set $him down on your desk.
 	<</if>>
 	<<set _tempGag = $activeSlave.collar, $activeSlave.collar = "none">>
 <<case "massive dildo gag">>
-	<<if ($activeSlave.amp != 1)>>
+	<<if hasAnyArms($activeSlave)>>
 		pull $his enormous dildo gag out of the depths of $his throat and approach you.
 	<<else>>
 		have another slave pull the enormous dildo gag out of the depths of $his throat and set $him down on your desk.
 	<</if>>
 	<<set _tempGag = $activeSlave.collar, $activeSlave.collar = "none">>
 <<case "ball gag" "bit gag">>
-	<<if ($activeSlave.amp != 1)>>
+	<<if hasAnyArms($activeSlave)>>
 		undo $his gag and approach you.
 	<<else>>
 		have another slave undo $his gag and set $him down on your desk.
@@ -140,10 +140,10 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 			$he exposes $himself to you, awaiting further use of $his body.
 		<</if>>
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
-		$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
+		$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if hasAnyArms($activeSlave)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
 		<<if ($activeSlave.accent >= 3)>>
 			$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
-		<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+		<<elseif !hasAnyArms($activeSlave) && (!canTalk($activeSlave))>>
 			$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 		<<elseif !canTalk($activeSlave)>>
 			$He signs that $he loves you.
@@ -152,7 +152,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 		<</if>>
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
 		$He reflexively turns $his head away from you, but you catch your $wife by $his jaw and kiss $him harder. You wrap your arms around $him so $he cannot escape. $He wriggles desperately, but $his struggles slowly subside as $he realizes that you're not taking this any farther. When you bore of it and pull away, $he glares at you.
-		<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+		<<if (!hasAnyArms($activeSlave) && (!canTalk($activeSlave)))>>
 			$His <<if canSee($activeSlave)>>eyes demand<<else>>expression demands<</if>> an answer: are you done?
 		<<elseif !canTalk($activeSlave)>>
 			$He signs irritably, asking if you're done.
@@ -161,7 +161,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 		<</if>>
 	<<elseif $activeSlave.devotion < -20>>
 		$He is nearly frozen with fear, and does not resist as you kiss $him deeply. In fact, $he barely reacts at all. $He opens $his mouth mechanically in response to your insistent tongue, but it's like kissing a doll. $He is so filled with terror that $he remains stiff even as it becomes clear to $him you're not going to hurt $him. When you bore of making out with your $wife and pull away, $he stares at you in utter incomprehension.
-		<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+		<<if (!hasAnyArms($activeSlave) && (!canTalk($activeSlave)))>>
 			$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 		<<elseif !canTalk($activeSlave)>>
 			$He signs spastically, begging fearfully to know if that's it.
@@ -170,7 +170,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 		<</if>>
 	<<else>>
 		$He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a $wife by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor($activeSlave)>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
-		<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+		<<if (!hasAnyArms($activeSlave) && (!canTalk($activeSlave)))>>
 			$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 		<<elseif !canTalk($activeSlave)>>
 			$He signs hesitantly, asking if that's it.
@@ -186,10 +186,10 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 		$he exposes $himself to you, awaiting further use of $his body.
 	<</if>>
 <<elseif ($activeSlave.relationship == -2)>>
-	$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if ($activeSlave.amp != 1)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
+	$His mouth accepts yours with love, matching itself perfectly to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> (Though you're quite careful around $his sharp dentition.)<</if>> $He melts into you, sighing ever so gently. When you finally break the kiss, $his mouth freezes in the shape it was in when last your lips touched, and a momentary look of longing crosses $his face.<<if hasAnyArms($activeSlave)>> A hand reaches dumbly up to $his mouth to trace $his lips where yours last touched.<</if>>
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif !hasAnyArms($activeSlave) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate love with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
@@ -200,7 +200,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 	$He giggles into you and kisses you back with vigor, $his head pressing insistently forward. The two of you make out rather aggressively<<if ($activeSlave.teeth == "pointy")>>, $his sharp teeth drawing a bit of blood from your lips and tongue<</if>>. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, $his active tongue only retreating when yours presses against it. When you finally shove $him away, $he's breathing hard through $his grin.
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif !hasAnyArms($activeSlave) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate excitement with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that.
@@ -211,7 +211,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 	$He stiffens with arousal. $His sexuality is complex, focusing on cum, but with a heavy layer of oral fixation. As your tongue plunders $his mouth, $he reacts almost as though $he's receiving oral, whimpering and moaning into you and pressing $himself lewdly against your <<if $PC.boobs == 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you tire of making out with $him.
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif !hasAnyArms($activeSlave) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he liked that.
@@ -219,10 +219,10 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 		"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully.
 	<</if>>
 <<elseif ($activeSlave.devotion > 50)>>
-	$His mouth accepts yours with devotion, matching itself carefully to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> $He is exquisitely careful to keep $his sharp teeth clear of you.<</if>> $He presses $himself against you, $his warmth wonderful against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally break the kiss, $he runs $his tongue rapturously across $his moistened lips<<if ($activeSlave.amp != 1)>> and then runs a finger across them as well<</if>>, an openly sexual look on $his $activeSlave.skin face.
+	$His mouth accepts yours with devotion, matching itself carefully to your insistent lips and tongue.<<if ($activeSlave.teeth == "pointy")>> $He is exquisitely careful to keep $his sharp teeth clear of you.<</if>> $He presses $himself against you, $his warmth wonderful against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally break the kiss, $he runs $his tongue rapturously across $his moistened lips<<if hasAnyArms($activeSlave)>> and then runs a finger across them as well<</if>>, an openly sexual look on $his $activeSlave.skin face.
 	<<if ($activeSlave.accent >= 3)>>
 		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>, since $he's not confident in $his ability to express it in $language.
-	<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave))>>
+	<<elseif !hasAnyArms($activeSlave) && (!canTalk($activeSlave))>>
 		$He does $his best to communicate devotion with $his <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>facial expressions<</if>>.
 	<<elseif !canTalk($activeSlave)>>
 		$He signs that $he loves you.
@@ -231,7 +231,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 	<</if>>
 <<elseif ($activeSlave.devotion > 20)>>
 	$He accepts the kiss willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your lips and tongue. When you finally break the kiss, <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor($activeSlave)>> eyes gaze into yours searchingly<<else>>$he gazes at you<</if>>, looking for answers that are not there.
-	<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+	<<if (!hasAnyArms($activeSlave) && (!canTalk($activeSlave)))>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs hesitantly, asking if that's it.
@@ -240,7 +240,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 	<</if>>
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
 	$He accepts the kiss fearfully. As you kiss $his unresisting mouth, $his eagerness to avoid punishment leads $him to kiss you back, though nervousness makes $him mechanical. You kiss $him harder, enjoying $his fear, and the physical intimacy slowly does its work. $He becomes softer and more natural, $his resistance easing. When you pull away from $him for a moment, $he <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you for a long moment, $his mouth still hanging open, before visibly catching $himself with a reminder that $he's a slave and you're $his owner.
-	<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+	<<if (!hasAnyArms($activeSlave) && (!canTalk($activeSlave)))>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs hesitantly, asking if that's it.
@@ -249,7 +249,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 	<</if>>
 <<elseif ($activeSlave.trust < -50)>>
 	$He is nearly frozen with fear, and does not resist as you kiss $him. In fact, $he barely reacts at all. $He opens $his mouth mechanically in response to your insistent tongue, but it's like kissing a doll. $He is so filled with terror that $he remains stiff even as it becomes clear to $him you're not going to hurt $him. When you bore of making out with the poor <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>> and pull away, $he stares at you in utter incomprehension.
-	<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+	<<if (!hasAnyArms($activeSlave) && (!canTalk($activeSlave)))>>
 		$His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> for an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs spastically, begging fearfully to know if that's it.
@@ -258,7 +258,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 	<</if>>
 <<else>>
 	$He reflexively turns $his head away from you, but you catch $his jaw and kiss $him harder. Spluttering, $he flees backwards, but you tip forward with $him and pin $him against your desk, plundering $his mouth without mercy. $He wriggles desperately, but $his struggles slowly subside as $he realizes that you're not taking this any farther. When you bore of it and pull away, $he stares at you in utter incomprehension.
-	<<if (($activeSlave.amp == 1) && (!canTalk($activeSlave)))>>
+	<<if (!hasAnyArms($activeSlave) && (!canTalk($activeSlave)))>>
 		$His <<if canSee($activeSlave)>>eyes demand<<else>>expression demands<</if>> an answer: is that it?
 	<<elseif !canTalk($activeSlave)>>
 		$He signs irritably, asking whether that's it.
@@ -269,4 +269,4 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
 
 <<if def _tempGag>>
 	<<set $activeSlave.collar = _tempGag>>
-<</if>>
\ No newline at end of file
+<</if>>

src/npc/fPCImpreg.tw

@@ -98,7 +98,7 @@ You call $him over so you can
 	<</if>>
 	<<set $activeSlave.devotion += 4>>
 <<elseif ($activeSlave.vagina == 0 || ($activeSlave.anus == 0 && $activeSlave.mpreg == 1))>>
-	As you anticipated, $he refuses to give you $his virginity. And as you expected, $he is unable to resist you. $He cries as your cock opens $his fresh, tight hole. Afterward, $he <<if $activeSlave.amp != 1>>clutches $his _belly stomach<<else>>lies there<</if>> and sobs, horrified by the knowledge that
+	As you anticipated, $he refuses to give you $his virginity. And as you expected, $he is unable to resist you. $He cries as your cock opens $his fresh, tight hole. Afterward, $he <<if hasAnyArms($activeSlave)>>clutches $his _belly stomach<<else>>lies there<</if>> and sobs, horrified by the knowledge that
 	<<if _superfetation == 1>>
 		$his unborn <<if $activeSlave.pregType == 1>>child is<<else>>children are<</if>> now sharing quarters with $his rapist's child.
 	<<else>>
@@ -111,7 +111,7 @@ You call $him over so you can
 	<<else>>
 		<<set $activeSlave.vagina = 1>>
 	<</if>>
-<<elseif ($activeSlave.amp == 1)>>
+<<elseif isAmputee($activeSlave)>>
 	You have $his limbless torso set on the end of the couch, face-<<if _superfetation == 1>>up<<else>>down<</if>>, with $his hips up in the air. This way, you get the greatest degree of penetration into $his fertile <<if $activeSlave.mpreg == 1>>ass<<else>>pussy<</if>> you can manage. $He moans <<if _superfetation == 1>>openly<<else>>into the cushions<</if>>, knowing that when $he feels the hot flow of semen<<if $PC.balls >= 3>> filling $him until $his stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into $him until $he is stuffed with your cum<<elseif $PC.balls == 1>> pouring into $him<</if>>, $he has probably <<if _superfetation == 1>>got another bun in the oven<<else>>gotten pregnant<</if>>.
 <<elseif tooBigBelly($activeSlave)>>
 	Since $he already has trouble moving with $his _belly belly, you just tip $him onto it; this leaves $his fertile <<if $activeSlave.mpreg == 1>>ass<<else>>pussy<</if>> exposed and vulnerable. $He moans as $he clutches the sides of $his stomach, knowing that when $he feels the hot flow of semen<<if $PC.balls >= 3>> filling $him until $his the pressure forces it to spray around your shaft<<elseif $PC.balls == 2>> pouring into $him until $he is stuffed with your cum<<elseif $PC.balls == 1>> pouring into $him<</if>>, $he has probably gotten <<if _superfetation == 1>> another bun added to the oven<<else>>pregnant<</if>>.
@@ -136,7 +136,7 @@ You call $him over so you can
 <<elseif $activeSlave.devotion < -20>>
 	$He tries to refuse, so you bend the disobedient slave over your desk and take $him hard from behind. $His breasts slide back and forth across the desk. You give $his buttocks some nice hard swats as you pound $him. $He grunts and moans but knows better than to try to get away. $He begs you not to cum inside $him, knowing $he's fertile, and sobs when $he feels you<<if $PC.balls >= 3>> filling $him until $his stomach is distended and wobbling with your cum<<elseif $PC.balls == 2>> pouring into $him until $he is stuffed with your cum<<elseif $PC.balls == 1>> pouring into $him<<else>> blow your load<</if>> despite $his pleas.
 <<elseif $activeSlave.devotion <= 20>>
-	$He obeys, lying on the couch next to your desk with $his legs spread. You kneel on the ground and enter $him, a hand on each of $his legs to give you purchase. The pounding is hard and fast, and $he gasps and whines.
+	$He obeys, lying on the couch next to your desk<<if hasAnyLegs($activeSlave)>> with $his leg<<if hasBothLegs($activeSlave)>>s spread<<else>> moved aside<</if>><</if>>. You kneel on the ground and enter $him<<if hasAnyLegs($activeSlave)>>, a hand on <<if hasBothLegs($activeSlave)>>each of $his legs<<else>>$his leg<</if>> to give you purchase<</if>>. The pounding is hard and fast, and $he gasps and whines.
 	<<if $activeSlave.belly >= 100000>>
 		You reach a hand up to tease $his already taut dome of a pregnancy.
 	<<else>>

src/npc/fSlaveImpregConsummate.tw

@@ -116,7 +116,7 @@ Next, you see to $activeSlave.slaveName.
 		<<set $activeSlave.vagina = 1>>
 	<</if>>
 
-<<elseif ($activeSlave.amp == 1)>>
+<<elseif isAmputee($activeSlave)>>
 	You set $his limbless torso up for $impregnatrix.slaveName.
 <<elseif tooBigBelly($activeSlave)>>
 	You set $him up for $impregnatrix.slaveName, face-down so $he may rest helplessly against $his _belly belly.