diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index a7d7b943d94dea630d361bccf193f7cb190d224e..5f485c7a51790a4abc58035b56b62ad2c73f1b20 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -40,7 +40,7 @@ window.VectorArt = (function () {
ArtVectorAnalAccessories();
ArtVectorButt();
ArtVectorLeg();
- if (slave.amp !== 1)
+ if (slave.missingLegs !== 3)
ArtVectorFeet(); /* includes shoes and leg outfits*/
ArtVectorTorso();
ArtVectorPussy();
@@ -135,7 +135,7 @@ window.VectorArt = (function () {
}
function setArmType() {
- if (slave.amp === 1) {
+ if (slave.missingArms === 3) {
leftArmType = "None";
rightArmType = "None";
} else {
@@ -158,6 +158,11 @@ window.VectorArt = (function () {
rightArmType = "Mid";
}
}
+ if (slave.missingArms === 1) {
+ leftArmType = "None";
+ } else if (slave.missingArms === 2) {
+ rightArmType = "None";
+ }
}
function setBoobScaling() {
@@ -476,7 +481,7 @@ window.VectorArt = (function () {
r += jsInclude("Art_Vector_Arm_Left_None");
*/
} else { /* is not amputee or has limbs equipped so running arm calculation block */
- if (slave.amp === 0) {
+ if (slave.amp === 0 && slave.missingArms !== 3) {
r += jsInclude(`Art_Vector_Arm_Right_${rightArmType}`);
r += jsInclude(`Art_Vector_Arm_Left_${leftArmType}`);
if (slave.muscles >= 6) {
@@ -1498,7 +1503,7 @@ window.VectorArt = (function () {
} else if (slave.shoes === "flats") {
r += jsInclude("Art_Vector_Shoes_Flat");
} else {
- if (slave.amp === 0) {
+ if ((slave.amp === 0) && (slave.missingLegs !== 3) {
r += jsInclude("Art_Vector_Feet_Normal");
} else if (slave.PLimb === 1 || slave.PLimb === 2) {
if (slave.amp === -1)
@@ -1513,7 +1518,7 @@ window.VectorArt = (function () {
r += jsInclude("Art_Vector_Feet_ProstheticSwiss");
}
}
- if (stockings !== undefined && slave.amp !== 1) {
+ if (stockings !== undefined && slave.missingLegs !== 3) {
if (slave.shoes === "heels") {
r += jsInclude(`Art_Vector_Shoes_Heel_${stockings}_${legSize}`);
} else if (slave.shoes === "pumps") {
@@ -1581,7 +1586,7 @@ window.VectorArt = (function () {
outfit = clothing2artSuffix(slave.clothes);
}
if (outfit !== undefined) {
- if (slave.amp !== 1) {
+ if (slave.missingLegs !== 3) {
if (slave.clothes !== "a slutty qipao" && slave.clothes !== "harem gauze" && slave.clothes !== "slutty jewelry" && slave.clothes !== "Western clothing") /* these clothes have a stump/leg outfit, but no butt outfit */
r += jsInclude(`Art_Vector_Butt_Outfit_${outfit}_${buttSize}`);
if (slave.clothes !== "a schoolgirl outfit") /* file is there, but contains no artwork */
@@ -2200,7 +2205,9 @@ window.VectorArt = (function () {
function ArtVectorLeg() {
/* Selection of matching SVG based on amputee level */
- if (slave.amp === 0) {
+ if (slave.missingLegs === 3) {
+ r += jsInclude("Art_Vector_Stump");
+ } else if (slave.amp === 0) {
r += jsInclude(`Art_Vector_Leg_${legSize}`);
if (slave.muscles >= 97)
r += jsInclude(`Art_Vector_Leg_${legSize}_MHeavy`);
@@ -2208,8 +2215,6 @@ window.VectorArt = (function () {
r += jsInclude(`Art_Vector_Leg_${legSize}_MMedium`);
else if (slave.muscles >= 30)
r += jsInclude(`Art_Vector_Leg_${legSize}_MLight`);
- } else if (slave.amp === 1) {
- r += jsInclude("Art_Vector_Stump");
} else if (slave.PLimb === 1 || slave.PLimb === 2) { /* slave is an amputee and has PLimbs equipped */
if (slave.amp === -1)
r += jsInclude(`Art_Vector_Leg_ProstheticBasic_${legSize}`);
@@ -2402,7 +2407,7 @@ window.VectorArt = (function () {
if (V.seeVectorArtHighlights === 1) {
if (wearingLatex === true) {
if (slave.amp !== 0)
- r += jsInclude("Art_Vector_Torso_Outfit_Shine_Shoulder");
+ r += jsInclude(`Art_Vector_Torso_Outfit_Shine_Shoulder`);
if (slave.preg <= 0)
r += jsInclude(`Art_Vector_Torso_Outfit_Shine_${torsoSize}`);
}
@@ -2519,16 +2524,16 @@ window.LegacyVectorArt = function(slave, artSize) {
} else {
legSize = "wide";
}
- if (slave.amp === 1)
+ if (slave.missingLegs === 3)
legSize = "stump " + legSize;
- if (wearingLatex === true && slave.amp !== 1)
+ if (wearingLatex === true && slave.missingLegs !== 3)
r += `<img class='paperdoll' src=${filePath}/outfit/leg ${legSize} latex.svg'/>`;
else
r += `<img class='paperdoll' src=${skinFilePath}/leg ${legSize}.svg' style='${skinFilter}'>`;
/* Feet */
- if (slave.amp !== 1) {
+ if (slave.missingLegs !== 3) {
if (slave.shoes === "heels") {
shoesType = "heel";
} else if (slave.shoes === "extreme heels") {
@@ -2579,7 +2584,7 @@ window.LegacyVectorArt = function(slave, artSize) {
else if (slave.clothes === "uncomfortable straps")
r += `<img class='paperdoll' src=${filePath}/outfit/torso ${torsoSize} straps.svg'/>`;
- if (slave.amp !== 1) {
+ if (slave.missingArms !== 1 && slave.missingArms !== 3) {
if (wearingLatex === false) {
if (leftArmType === "high") {
r += `<img class='paperdoll' src=${skinFilePath}/arm left ${leftArmType}.svg' style='${skinFilter}'>`;
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index 7e1f419ffc7738643f55f1af0db7ad24b7a657ed..cd3bd55b0260dd47b2f958d7cc2368f1747dfebb 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -877,7 +877,7 @@ class RevampedArtControl {
var leftArmType = "";
var rightArmType = "";
- if (this.artSlave.amp === 1) {
+ if (this.artSlave.missingArms === 3) {
result.push("Art_Vector_Revamp_Arm_Stump");
}
else {
@@ -885,7 +885,7 @@ class RevampedArtControl {
result.push("Art_Vector_Revamp_Arm_Left_"+this.leftArmType);
}
- if (this.showArmHair && (this.artSlave.amp === 1 || (this.leftArmType === "High" && this.artSlave.amp !== 1)))
+ if (this.showArmHair && (this.artSlave.missingArms === 3 || (this.leftArmType === "High" && this.artSlave.amp !== 1)))
{
switch(this.artSlave.underArmHStyle)
{
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 6b33b8d77be4e46282a7b0ea5666a71396d0011b..fad696fbfc3c97c478d5ec2646b24cee701d1feb 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -485,7 +485,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.devotion > 50) {
if (eventSlave.speechRules !== "restrictive") {
if (eventSlave.birthWeek >= 51) {
- /* lets give this a much higher chance of appearing */
+ /* let's give this a much higher chance of appearing */
State.variables.RESSevent.push("birthday");
State.variables.RESSevent.push("birthday");
State.variables.RESSevent.push("birthday");
@@ -2073,7 +2073,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (eventSlave.devotion > 50) {
if (eventSlave.speechRules !== "restrictive") {
if (eventSlave.birthWeek >= 51) {
- /* lets give this a much higher chance of appearing */
+ /* let's give this a much higher chance of appearing */
State.variables.RESSevent.push("birthday");
State.variables.RESSevent.push("birthday");
State.variables.RESSevent.push("birthday");
diff --git a/src/js/food.js b/src/js/food.js
index 6286f78f796a6a2a4f056d98479dde4267c3b328..219bbd19685c878d5b1e892dbc0bcea211e39164 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -74,7 +74,7 @@ window.farmShowsIncome = function (slave) {
if (arcology.FSSupremacist !== "unset") {
if (slave.race === arcology.FSSupremacistRace) { // slave is of supreme race
cash *= 0.9; // TODO: should supreme race slaves receive a penalty?
- repX(-10, "food"); // TODO: should this cause a rep loss
+ repX(forceNeg(10), "food"); // TODO: should this cause a rep loss
}
}
if (arcology.FSSubjugationist !== "unset") {
@@ -99,10 +99,10 @@ window.farmShowsIncome = function (slave) {
if (slave.pregWeek > 16) { // slave is visibly pregnant
if (slave.eggType !== "human") { // with a non-human
cash *= 0.9;
- repX(-15, "food");
+ repX(forceNeg(15), "food");
}
cash *= 0.6;
- repX(-10, "food");
+ repX(forceNeg(10), "food");
}
}
if (arcology.FSGenderRadicalist !== "unset") {
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index 6381032237a4fbe06a9d0374a27e8fb43b545629..211959cbdb8223be41e30bebec94b5b7206482de 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -357,6 +357,8 @@ window.canWalk = /** @param {App.Entity.SlaveState} slave */ function(slave) {
return null;
} else if (slave.amp === 1) {
return false;
+ } else if (slave.missingLegs === 3) {
+ return false;
} else if (tooFatSlave(slave)) {
return false;
} else if (tooBigBreasts(slave)) {