diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw
index 3a589a4e3ee9ac1a22aa014bff8816144d98dfb2..e2ce8a3ff96d398c31db4a422023da1d689da52a 100644
--- a/src/facilities/brothel/brothelAssignmentScene.tw
+++ b/src/facilities/brothel/brothelAssignmentScene.tw
@@ -18,17 +18,17 @@
You could direct $assistantName to relay your orders to $activeSlave.slaveName, but you've decided to avoid relying too much on machine assistance. So, $he is merely directed to report to your office. The
<<if $activeSlave.devotion > 95>>
- worshipful $girl <<if $activeSlave.amp != 1>>hurries in as soon as $he possibly can<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, happy $his beloved <<= WrittenMaster($activeSlave)>> is taking an interest in $him.
+ worshipful $girl <<if hasAnyLegs($activeSlave)>>hurries in as soon as $he possibly can<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, happy $his beloved <<= WrittenMaster($activeSlave)>> is taking an interest in $him.
<<elseif $activeSlave.devotion > 50>>
- devoted $girl <<if $activeSlave.amp != 1>>hurries in promptly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, eager to do whatever you demand of $him.
+ devoted $girl <<if hasAnyLegs($activeSlave)>>hurries in promptly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, eager to do whatever you demand of $him.
<<elseif $activeSlave.devotion > 20>>
- $girl, broken to your will, <<if $activeSlave.amp != 1>>comes in promptly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, clearly ready to follow orders.
+ $girl, broken to your will, <<if hasAnyLegs($activeSlave)>>comes in promptly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, clearly ready to follow orders.
<<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
- fearful slave <<if $activeSlave.amp != 1>>comes in promptly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, afraid of what will happen to $him if $he doesn't.
+ fearful slave <<if hasAnyLegs($activeSlave)>>comes in promptly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, afraid of what will happen to $him if $he doesn't.
<<elseif ($activeSlave.trust < -50)>>
- terrified slave <<if $activeSlave.amp != 1>>comes in hurriedly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, almost paralyzed by terror of what will happen to $him if $he doesn't.
+ terrified slave <<if hasAnyLegs($activeSlave)>>comes in hurriedly<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, almost paralyzed by terror of what will happen to $him if $he doesn't.
<<else>>
- rebellious slave <<if $activeSlave.amp != 1>>comes in slowly, having decided that $he can always decide to resist once $he hears what you want<<else>>comes in as soon as you order another slave to carry $him in, since $he can't exactly resist this without limbs<</if>>.
+ rebellious slave <<if hasAnyLegs($activeSlave)>>comes in slowly, having decided that $he can always decide to resist once $he hears what you want<<else>>comes in as soon as you order another slave to carry $him in, since $he can't exactly resist this without <<if isAmputee($activeSlave)>>limbs<<else>>legs<</if>><</if>>.
<</if>>
You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately, to serve in $brothelName<<else>>$brothelName immediately, to serve there<</if>> until further notice.
@@ -209,9 +209,9 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<case "hates oral">>
"I — I'm going to h-have to <<s>>uck a lot of dick there, aren't I." $He swallows nervously. $His lower lip quivers, and $he does $his best not to cry in front of you.
<<case "hates anal">>
- "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers, and $he does $his best not to cry in front of you.
<<case "hates penetration">>
- "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<elseif $activeSlave.vagina > 0>>unconsciously lets $his hand<<if hasBothArms($activeSlave)>>s<</if>> fall to $his crotch, but catches $himself and doesn't quite shield $his pussy<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers, and $he does $his best not to cry in front of you.
<<case "repressed">>
"Being a whore i<<s>> a <<s>>in," $he <<say>>s quietly, half to $himself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t."
<<case "idealistic">>
@@ -286,9 +286,9 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<case "hates oral">>
$He slowly gestures if blowjobs are popular there while swallowing nervously. $His lower lip starts to quiver, and $he does $his best not to cry in front of you.
<<case "hates anal">>
- $He slowly gestures if anal is popular there and <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ $He slowly gestures if anal is popular there and <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers, and $he does $his best not to cry in front of you.
<<case "hates penetration">>
- $He slowly gestures that $he understands that customers will expect to fuck $him and <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he does $his best not to cry in front of you.
+ $He slowly gestures that $he understands that customers will expect to fuck $him and <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<elseif $activeSlave.vagina > 0>>unconsciously lets $his hand<<if hasBothArms($activeSlave)>>s<</if>> fall to $his crotch, but catches $himself and doesn't quite shield $his pussy<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers, and $he does $his best not to cry in front of you.
<<case "repressed">>
$He shakily gestures that $he'll be a sinner, but if that's what you want, $he'll do it. $He starts to cry quietly.
<<case "idealistic">>
@@ -316,9 +316,9 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<case "hates oral">>
"I — I'm going to h-have to <<s>>uck a lot of dick, aren't I." $He swallows and tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
<<case "hates anal">>
- "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
+ "C-cu<<s>>tomer<<s>> are really going to ream me up the butt hole, aren't they." $He <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
<<case "hates penetration">>
- "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
+ "C-cu<<s>>tomer<<s>> are really going to fuck me <<s>>ore, aren't they." $He <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<elseif $activeSlave.vagina > 0>>unconsciously lets $his hand<<if hasBothArms($activeSlave)>>s<</if>> fall to $his crotch, but catches $himself and doesn't quite shield $his pussy<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers, and $he tries to control $himself out of fear, but finally gasps out, "Oh God, I'm <<s>>cared," and bursts into tears.
<<case "repressed">>
"Being a whore i<<s>> a <<s>>in," $he <<say>>s quietly, half to $himself. "I'm going t-to b-be <<s>>o dirty. I'm going to h-hell." $He starts to cry quietly. $He tries to get $himself back under control, out of fear, but finally wails, "Oh God, I'm <<s>>orry, p-plea<<s>>e forgive me God," and dissolves into sobbing.
<<case "idealistic">>
@@ -342,9 +342,9 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
<<case "hates oral">>
by asking if $he'll have to suck a lot of dick. $He swallows and tries to control $himself out of fear, but finally loses composure and bursts into tears.
<<case "hates anal">>
- by asking if $he'll be assfucked a lot. $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers and $he tries to control $himself out of fear, but finally loses composure and bursts into tears.
+ by asking if $he'll be assfucked a lot. $He <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers and $he tries to control $himself out of fear, but finally loses composure and bursts into tears.
<<case "hates penetration">>
- by asking if $he's going to be constantly fucked. $He <<if $activeSlave.amp == 1>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without limbs.<<elseif $activeSlave.vagina > 0>>unconsciously lets $his hands fall to $his crotch, but catches $himself and doesn't quite shield $his pussy.<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hands.<</if>> $His lower lip quivers, and $he tries to control $himself out of fear, but finally loses composure and bursts into tears.
+ by asking if $he's going to be constantly fucked. $He <<if !hasAnyArms($activeSlave)>>shifts uncomfortably, unconsciously trying to shield $his rear as best $he can manage without <<if isAmputee($activeSlave)>>limbs<<else>>hands<</if>><<elseif $activeSlave.vagina > 0>>unconsciously lets $his hand<<if hasBothArms($activeSlave)>>s<</if>> fall to $his crotch, but catches $himself and doesn't quite shield $his pussy<<else>>unconsciously reaches around behind $himself, not quite shielding $his anus with $his hand<<if hasBothArms($activeSlave)>>s<</if>><</if>>. $His lower lip quivers, and $he tries to control $himself out of fear, but finally loses composure and bursts into tears.
<<case "repressed">>
that being a whore is a sin. $He starts to cry quietly. $He tries to get $himself back under control, out of fear, but finally wails and dissolves into prayers intermixed with sobbing.
<<case "idealistic">>
@@ -368,7 +368,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
$He manages to
<<if canTalk($activeSlave)>>
get "Oh fuck n-" out
- <<elseif $activeSlave.amp != 1>>
+ <<elseif hasAnyArms($activeSlave)>>
flip you an incredibly rude gesture
<<else>>
get an incredibly rude gesture out
diff --git a/src/facilities/dairy/dairyFramework.js b/src/facilities/dairy/dairyFramework.js
index 25e92e35c815c3c2713e90b1c767dcf7c6697511..cd3e1d760440065a45e67423b92f098a16326d41 100644
--- a/src/facilities/dairy/dairyFramework.js
+++ b/src/facilities/dairy/dairyFramework.js
@@ -50,7 +50,7 @@ App.Entity.Facilities.DairyCowJob = class extends App.Entity.Facilities.Facility
r.push(`${slave.slaveName}'s womb cannot accommodate current machine settings.`);
}
- if ((slave.amp !== 1) && (this.facility.option("RestraintsUpgrade") !== 1) &&
+ if (!isAmputee(slave) && (this.facility.option("RestraintsUpgrade") !== 1) &&
!App.Entity.Facilities.Job._isBrokenEnough(slave, 20, -50, -20, -50)) {
r.push(`${slave.slaveName} must be obedient in order to be milked at ${this.facility.name}.`);
}
diff --git a/src/facilities/masterSuite/masterSuiteFramework.js b/src/facilities/masterSuite/masterSuiteFramework.js
index e2cd09cac5bb4ff3b4999e5d439505fe3f55d507..f9e5a3c6c79b5b7acbf2158503acdf943c5d56c1 100644
--- a/src/facilities/masterSuite/masterSuiteFramework.js
+++ b/src/facilities/masterSuite/masterSuiteFramework.js
@@ -49,7 +49,7 @@ App.Entity.Facilities.MasterSuiteFuckToyJob = class extends App.Entity.Facilitie
App.Entity.Facilities.ConcubineJob = class extends App.Entity.Facilities.ManagingJob {
canEmploy(slave) {
let r = super.canEmploy(slave);
- if (slave.amp === 1) {
+ if (isAmputee(slave)) {
r.push(`${slave.slaveName} can't serve as your Concubine without limbs.`);
}
return r;