diff --git a/src/art/artJS.js b/src/art/artJS.js
index 4a0e199227513fef8c6e163605f7fcfb420a6afc..95075883a7e6d33982026bfa984cb1e62cce83ce 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -113,8 +113,14 @@ window.CustomArt = function(slave, imageSize) {
const displayTypeStart = (fileType === "webm" ? "video loop autoplay" : "img");
const displayTypeEnd = (fileType === "webm" ? "</video>" : "");
- if (imageSize === 3) { return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden'>${displayTypeEnd}`; } else if (imageSize === 2) { return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden' width='300' height='300'>${displayTypeEnd}`; } else if (imageSize === 1) { return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden' width='150' height='150'>${displayTypeEnd}`; } else { return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden' width='120' height='120'>${displayTypeEnd}`; }
-};
+ if (imageSize === 3) {
+ return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden'>${displayTypeEnd}`;
+ } else if (imageSize === 2) {
+ return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden' width='300' height='300'>${displayTypeEnd}`;
+ } else if (imageSize === 1) {
+ return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden' width='150' height='150'>${displayTypeEnd}`;
+ } else { return `<${displayTypeStart} src=${fileName} style='float:right; border:3px hidden' width='120' height='120'>${displayTypeEnd}`; }
+ };
/*
This takes a textual hair color description and tries to guess the appropriate HTML compliant color code.
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index ea0fa3052db843086d847647166cf7c440a6bc1b..74618f9c8e545fd3fe483b4c2499940d2e6936f5 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -1,9 +1,12 @@
+/* eslint-disable camelcase */
window.RevampedVectorArt = function(slave) {
const V = State.variables;
const T = State.temporary;
let r;
- if (T.art_display_id > 0) { T.art_display_id++; } else { T.art_display_id = 1; }
+ if (T.art_display_id > 0) {
+ T.art_display_id++;
+ } else { T.art_display_id = 1; }
T.art_display_class = `ad${T.art_display_id}`;
/* Using JS from vectorRevampedArtControl.tw*/
@@ -45,7 +48,7 @@ class ArtStyleEntry {
let styleValue = `${styleArray.join(";")};`;
- let cssDef = `{ ${styleValue} }`; // not sure if there should be padding here
+ let cssDef = `{ ${styleValue} }`; // not sure if there should be padding here
if (this.name.length > 0) { cssDef = `.${this.name}${cssDef}`; }
@@ -122,7 +125,7 @@ class ArtStyleControl {
applyCalcMuscleTone() {
let musclesValue = this.artSlave.muscles + 101;
- let musclesVisibility = 0.910239*Math.log(0.02*musclesValue);
+ let musclesVisibility = 0.910239 * Math.log(0.02 * musclesValue);
this.muscleTone["fill-opacity"] = musclesVisibility;
}
@@ -312,7 +315,7 @@ class ArtStyleControl {
get StylesCss() {
let mainStyle = new ArtStyleEntry("");
mainStyle.position = "absolute";
- mainStyle.height= "100%";
+ mainStyle.height = "100%";
mainStyle["margin-left"] = "auto";
mainStyle["margin-right"] = "auto";
mainStyle.left = "0";
@@ -694,8 +697,11 @@ class RevampedArtControl {
get getHairLength() {
let result = "Short";
-
- if (this.artSlave.hLength >= 80) { result = "Long"; } else if (this.artSlave.hLength >= 40) { result = "Medium"; } else { result = "Short"; }
+ if (this.artSlave.hLength >= 80) {
+ result = "Long";
+ } else if (this.artSlave.hLength >= 40) {
+ result = "Medium";
+ } else { result = "Short"; }
return result;
}
@@ -752,7 +758,25 @@ class RevampedArtControl {
get getBellyLevel() {
let bellyLevel = 0;
- if (this.artSlave.belly >= 120000) { bellyLevel = 9; } else if (this.artSlave.belly >= 90000) { bellyLevel = 8; } else if (this.artSlave.belly >= 50000) { bellyLevel = 7; } else if (this.artSlave.belly >= 30000) { bellyLevel = 6; } else if (this.artSlave.belly >= 15000) { bellyLevel = 5; } else if (this.artSlave.belly >= 10000) { bellyLevel = 4; } else if (this.artSlave.belly >= 5000) { bellyLevel = 3; } else if (this.artSlave.belly >= 1500) { bellyLevel = 2; } else if (this.artSlave.belly >= 500) { bellyLevel = 1; } else { bellyLevel = 0; }
+ if (this.artSlave.belly >= 120000) {
+ bellyLevel = 9;
+ } else if (this.artSlave.belly >= 90000) {
+ bellyLevel = 8;
+ } else if (this.artSlave.belly >= 50000) {
+ bellyLevel = 7;
+ } else if (this.artSlave.belly >= 30000) {
+ bellyLevel = 6;
+ } else if (this.artSlave.belly >= 15000) {
+ bellyLevel = 5;
+ } else if (this.artSlave.belly >= 10000) {
+ bellyLevel = 4;
+ } else if (this.artSlave.belly >= 5000) {
+ bellyLevel = 3;
+ } else if (this.artSlave.belly >= 1500) {
+ bellyLevel = 2;
+ } else if (this.artSlave.belly >= 500) {
+ bellyLevel = 1;
+ } else { bellyLevel = 0; }
return bellyLevel;
}
@@ -842,7 +866,13 @@ class RevampedArtControl {
let buttSize = 0;
if (this.artSlave.amp) { return result; }
- if (this.artSlave.butt > 6) { buttSize = 3; } else if (this.artSlave.butt > 4) { buttSize = 2; } else if (this.artSlave.butt > 2) { buttSize = 1; } else { buttSize = 0; }
+ if (this.artSlave.butt > 6) {
+ buttSize = 3;
+ } else if (this.artSlave.butt > 4) {
+ buttSize = 2;
+ } else if (this.artSlave.butt > 2) {
+ buttSize = 1;
+ } else { buttSize = 0; }
result.push(`Art_Vector_Revamp_Butt_${buttSize}`);
@@ -973,9 +1003,15 @@ class RevampedArtControl {
if (!this.showPussyPiercings) { return result; }
- if (this.artSlave.vaginaPiercing === 1) { result.push("Art_Vector_Revamp_Pussy_Piercing"); } else if (this.artSlave.vaginaPiercing === 2) { result.push("Art_Vector_Revamp_Pussy_Piercing_Heavy"); }
+ if (this.artSlave.vaginaPiercing === 1) {
+ result.push("Art_Vector_Revamp_Pussy_Piercing");
+ } else if (this.artSlave.vaginaPiercing === 2) { result.push("Art_Vector_Revamp_Pussy_Piercing_Heavy"); }
- if (this.artSlave.clitPiercing === 1) { result.push("Art_Vector_Revamp_Clit_Piercing"); } else if (this.artSlave.clitPiercing === 2) { result.push("Art_Vector_Revamp_Clit_Piercing_Heavy"); } else if (this.artSlave.clitPiercing === 3) { result.push("Art_Vector_Revamp_Clit_Piercing_Smart"); }
+ if (this.artSlave.clitPiercing === 1) {
+ result.push("Art_Vector_Revamp_Clit_Piercing");
+ } else if (this.artSlave.clitPiercing === 2) {
+ result.push("Art_Vector_Revamp_Clit_Piercing_Heavy");
+ } else if (this.artSlave.clitPiercing === 3) { result.push("Art_Vector_Revamp_Clit_Piercing_Smart"); }
return result;
}
@@ -1026,7 +1062,15 @@ class RevampedArtControl {
let ballsSize = 0;
- if (this.artSlave.scrotum >= 6) { ballsSize = 4; } else if (this.artSlave.scrotum >= 4) { ballsSize = 3; } else if (this.artSlave.scrotum >= 3) { ballsSize = 2; } else if (this.artSlave.scrotum >= 2) { ballsSize = 1; } else { ballsSize = 0; }
+ if (this.artSlave.scrotum >= 6) {
+ ballsSize = 4;
+ } else if (this.artSlave.scrotum >= 4) {
+ ballsSize = 3;
+ } else if (this.artSlave.scrotum >= 3) {
+ ballsSize = 2;
+ } else if (this.artSlave.scrotum >= 2) {
+ ballsSize = 1;
+ } else { ballsSize = 0; }
result.push(`Art_Vector_Revamp_Balls_${ballsSize}`);
@@ -1062,7 +1106,21 @@ class RevampedArtControl {
let penisSize = -1;
- if (this.artSlave.dick >= 8) { penisSize = 6; } else if (this.artSlave.dick >= 7) { penisSize = 5; } else if (this.artSlave.dick >= 6) { penisSize = 4; } else if (this.artSlave.dick >= 5) { penisSize = 3; } else if (this.artSlave.dick >= 4) { penisSize = 2; } else if (this.artSlave.dick >= 2) { penisSize = 1; } else if (this.artSlave.dick >= 1) { penisSize = 0; } else { penisSize = -1; }
+ if (this.artSlave.dick >= 8) {
+ penisSize = 6;
+ } else if (this.artSlave.dick >= 7) {
+ penisSize = 5;
+ } else if (this.artSlave.dick >= 6) {
+ penisSize = 4;
+ } else if (this.artSlave.dick >= 5) {
+ penisSize = 3;
+ } else if (this.artSlave.dick >= 4) {
+ penisSize = 2;
+ } else if (this.artSlave.dick >= 2) {
+ penisSize = 1;
+ } else if (this.artSlave.dick >= 1) {
+ penisSize = 0;
+ } else { penisSize = -1; }
if (!this.showPenis || penisSize < 0) { return result; }
@@ -1071,7 +1129,9 @@ class RevampedArtControl {
if (!this.showPenisPiercings) { return result; }
- if (this.artSlave.dickPiercing === 1) { result.push(`Art_Vector_Revamp_Penis_${penisSize}_Piercing`); } else if (this.artSlave.dickPiercing === 2) { result.push(`Art_Vector_Revamp_Penis_${penisSize}_Piercing_Heavy`); }
+ if (this.artSlave.dickPiercing === 1) {
+ result.push(`Art_Vector_Revamp_Penis_${penisSize}_Piercing`);
+ } else if (this.artSlave.dickPiercing === 2) { result.push(`Art_Vector_Revamp_Penis_${penisSize}_Piercing_Heavy`); }
} else {
result.push(`Art_Vector_Revamp_Flaccid_${penisSize}`);
@@ -1118,12 +1178,12 @@ class RevampedArtControl {
result.push(`Art_Vector_Revamp_Boob_None_Areola_${areolaeShape}`);
}
} else {
- let artScaleFactor = 0.804354*Math.log(0.00577801*this.artSlave.boobs);
+ let artScaleFactor = 0.804354 * Math.log(0.00577801 * this.artSlave.boobs);
- let boobRightArtTranslationX = 270*((-1*artScaleFactor) + 1);
- let boobLeftArtTranslationX = 320*((-1*artScaleFactor) + 1);
- let artTranslationX = -283.841*artScaleFactor+285.349;
- let artTranslationY = 198*((-1*artScaleFactor) + 1);
+ let boobRightArtTranslationX = 270 * ((-1 * artScaleFactor) + 1);
+ let boobLeftArtTranslationX = 320 * ((-1 * artScaleFactor) + 1);
+ let artTranslationX = -283.841 * artScaleFactor + 285.349;
+ let artTranslationY = 198 * ((-1 * artScaleFactor) + 1);
let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.artTransform = artBoobTransform;
@@ -1133,18 +1193,18 @@ class RevampedArtControl {
let size = "Small";
if (this.artSlave.boobs < 600) {
- artScaleFactor = 0.360674*Math.log(0.0266667*this.artSlave.boobs);
+ artScaleFactor = 0.360674 * Math.log(0.0266667 * this.artSlave.boobs);
- boobRightArtTranslationX = 240*((-1*artScaleFactor) + 1);
- boobLeftArtTranslationX = 300*((-1*artScaleFactor) + 1);
- artTranslationY = 250*((-1*artScaleFactor) + 1);
+ boobRightArtTranslationX = 240 * ((-1 * artScaleFactor) + 1);
+ boobLeftArtTranslationX = 300 * ((-1 * artScaleFactor) + 1);
+ artTranslationY = 250 * ((-1 * artScaleFactor) + 1);
size = "Small";
} else if (this.artSlave.boobs < 15000) {
size = "Medium";
} else {
size = "Huge";
- boobRightArtTranslationX = 252*((-1*artScaleFactor) + 1);
- boobLeftArtTranslationX = 315*((-1*artScaleFactor) + 1);
+ boobRightArtTranslationX = 252 * ((-1 * artScaleFactor) + 1);
+ boobLeftArtTranslationX = 315 * ((-1 * artScaleFactor) + 1);
}
this.boobRightArtTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${boobRightArtTranslationX},${artTranslationY})`;
@@ -1206,15 +1266,23 @@ class RevampedArtControl {
}
if (this.artSlave.nipplesPiercing === 1) {
- if (this.artSlave.boobs < 300) { result.push("Art_Vector_Revamp_Boob_None_Piercing"); } else { result.push(`Art_Vector_Revamp_Boob_${size}_Piercing`); }
+ if (this.artSlave.boobs < 300) {
+ result.push("Art_Vector_Revamp_Boob_None_Piercing");
+ } else { result.push(`Art_Vector_Revamp_Boob_${size}_Piercing`); }
} else if (this.artSlave.nipplesPiercing === 2) {
- if (this.artSlave.boobs < 300) { result.push("Art_Vector_Revamp_Boob_None_Piercing_Heavy"); } else { result.push(`Art_Vector_Revamp_Boob_${size}_Piercing_Heavy`); }
+ if (this.artSlave.boobs < 300) {
+ result.push("Art_Vector_Revamp_Boob_None_Piercing_Heavy");
+ } else { result.push(`Art_Vector_Revamp_Boob_${size}_Piercing_Heavy`); }
}
if (this.artSlave.areolaePiercing === 1) {
- if (this.artSlave.boobs < 300) { result.push("Art_Vector_Revamp_Boob_None_Areola_Piercing"); } else { result.push(`Art_Vector_Revamp_Boob_${size}_Areola_Piercing`); }
+ if (this.artSlave.boobs < 300) {
+ result.push("Art_Vector_Revamp_Boob_None_Areola_Piercing");
+ } else { result.push(`Art_Vector_Revamp_Boob_${size}_Areola_Piercing`); }
} else if (this.artSlave.areolaePiercing === 2) {
- if (this.artSlave.boobs < 300) { result.push("Art_Vector_Revamp_Boob_None_Areola_Piercing_Heavy"); } else { result.push(`Art_Vector_Revamp_Boob_${size}_Areola_Piercing_Heavy`); }
+ if (this.artSlave.boobs < 300) {
+ result.push("Art_Vector_Revamp_Boob_None_Areola_Piercing_Heavy");
+ } else { result.push(`Art_Vector_Revamp_Boob_${size}_Areola_Piercing_Heavy`); }
}
}
@@ -1226,26 +1294,26 @@ class RevampedArtControl {
case "a nice maid outfit":
if (this.artSlave.boobs >= 300) {
if (this.artSlave.boobs < 600) {
- let artScaleFactor = 0.288539*Math.log(0.106667*this.artSlave.boobs);
- let artTranslationX = 270*((-1*artScaleFactor) + 1);
- let artTranslationY = 198*((-1*artScaleFactor) + 1);// -198.438*artScaleFactor+203.274;
+ let artScaleFactor = 0.288539 * Math.log(0.106667 * this.artSlave.boobs);
+ let artTranslationX = 270 * ((-1 * artScaleFactor) + 1);
+ let artTranslationY = 198 * ((-1 * artScaleFactor) + 1); // -198.438*artScaleFactor+203.274;
let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.boobOutfitArtTransform = artBoobTransform;
result.push("Art_Vector_Revamp_Boob_Small_Outfit_Maid");
} else if (this.artSlave.boobs < 15000) {
- let artScaleFactor = 0.155334*Math.log(1.04167*this.artSlave.boobs);
- let artTranslationX = 270*((-1.25*artScaleFactor) + 1.25);
- let artTranslationY = 198*((-0.8*artScaleFactor) + 0.8);// -198.438*artScaleFactor+203.274;
+ let artScaleFactor = 0.155334 * Math.log(1.04167 * this.artSlave.boobs);
+ let artTranslationX = 270 * ((-1.25 * artScaleFactor) + 1.25);
+ let artTranslationY = 198 * ((-0.8 * artScaleFactor) + 0.8); // -198.438*artScaleFactor+203.274;
let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.boobOutfitArtTransform = artBoobTransform;
result.push("Art_Vector_Revamp_Boob_Medium_Outfit_Maid");
} else {
- let artScaleFactor = 1.56609*Math.log(0.00017373*this.artSlave.boobs);
- let artTranslationX = 340*((-1*artScaleFactor) + 1);
- let artTranslationY = 153*((-1*artScaleFactor) + 1);// -198.438*artScaleFactor+203.274;
+ let artScaleFactor = 1.56609 * Math.log(0.00017373 * this.artSlave.boobs);
+ let artTranslationX = 340 * ((-1 * artScaleFactor) + 1);
+ let artTranslationY = 153 * ((-1 * artScaleFactor) + 1); // -198.438*artScaleFactor+203.274;
let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.boobOutfitArtTransform = artBoobTransform;
@@ -1317,9 +1385,13 @@ class RevampedArtControl {
if (!this.showHeadPiercings) { return result; }
- if (this.artSlave.earPiercing === 1) { result.push("Art_Vector_Revamp_Head_Ear_Piercing"); } else if (this.artSlave.earPiercing === 2) { result.push("Art_Vector_Revamp_Head_Ear_Piercing_Heavy"); }
+ if (this.artSlave.earPiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Ear_Piercing");
+ } else if (this.artSlave.earPiercing === 2) { result.push("Art_Vector_Revamp_Head_Ear_Piercing_Heavy"); }
- if (this.artSlave.nosePiercing === 1) { result.push("Art_Vector_Revamp_Head_Nose_Piercing"); } else if (this.artSlave.nosePiercing === 2) { result.push("Art_Vector_Revamp_Head_Nose_Piercing_Heavy"); }
+ if (this.artSlave.nosePiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Nose_Piercing");
+ } else if (this.artSlave.nosePiercing === 2) { result.push("Art_Vector_Revamp_Head_Nose_Piercing_Heavy"); }
return result;
}
@@ -1334,26 +1406,34 @@ class RevampedArtControl {
result.push("Art_Vector_Revamp_Eyes_Happy_Highlights");
if (this.showHeadPiercings) {
- if (this.artSlave.eyebrowPiercing === 1) { result.push("Art_Vector_Revamp_Head_Eyebrow_Happy_Piercing"); } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Happy_Piercing_Heavy"); }
+ if (this.artSlave.eyebrowPiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Eyebrow_Happy_Piercing");
+ } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Happy_Piercing_Heavy"); }
}
} else if (this.artSlave.devotion >= 0) {
result.push("Art_Vector_Revamp_Eyes_Shy");
result.push("Art_Vector_Revamp_Eyes_Shy_Highlights");
if (this.showHeadPiercings) {
- if (this.artSlave.eyebrowPiercing === 1) { result.push("Art_Vector_Revamp_Head_Eyebrow_Shy_Piercing"); } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Shy_Piercing_Heavy"); }
+ if (this.artSlave.eyebrowPiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Eyebrow_Shy_Piercing");
+ } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Shy_Piercing_Heavy"); }
}
} else if (this.artSlave.devotion >= -50) {
result.push("Art_Vector_Revamp_Eyes_Closed");
if (this.showHeadPiercings) {
- if (this.artSlave.eyebrowPiercing === 1) { result.push("Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing"); } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing_Heavy"); }
+ if (this.artSlave.eyebrowPiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing");
+ } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing_Heavy"); }
}
} else {
result.push("Art_Vector_Revamp_Eyes_Angry");
result.push("Art_Vector_Revamp_Eyes_Angry_Highlights");
if (this.showHeadPiercings) {
- if (this.artSlave.eyebrowPiercing === 1) { result.push("Art_Vector_Revamp_Head_Eyebrow_Angry_Piercing"); } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Angry_Piercing_Heavy"); }
+ if (this.artSlave.eyebrowPiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Eyebrow_Angry_Piercing");
+ } else if (this.artSlave.eyebrowPiercing === 2) { result.push("Art_Vector_Revamp_Head_Eyebrow_Angry_Piercing_Heavy"); }
}
}
@@ -1366,21 +1446,35 @@ class RevampedArtControl {
if (!this.showMouth) { return result; }
- if (this.artSlave.lips > 95) { lipsSize = "Enormous"; } else if (this.artSlave.lips > 70) { lipsSize = "Huge"; } else if (this.artSlave.lips > 50) { lipsSize = "Big"; } else if (this.artSlave.lips > 30) { lipsSize = "Plush"; } else if (this.artSlave.lips > 10) { lipsSize = "Normal"; } else { lipsSize = "Thin"; }
+ if (this.artSlave.lips > 95) {
+ lipsSize = "Enormous";
+ } else if (this.artSlave.lips > 70) {
+ lipsSize = "Huge";
+ } else if (this.artSlave.lips > 50) {
+ lipsSize = "Big";
+ } else if (this.artSlave.lips > 30) {
+ lipsSize = "Plush";
+ } else if (this.artSlave.lips > 10) {
+ lipsSize = "Normal";
+ } else { lipsSize = "Thin"; }
if (this.artSlave.trust > 20) {
result.push(`Art_Vector_Revamp_Makeup_Mouth_Happy_${lipsSize}`);
result.push(`Art_Vector_Revamp_Mouth_Happy_${lipsSize}`);
if (this.showHeadPiercings) {
- if (this.artSlave.lipsPiercing === 1) { result.push("Art_Vector_Revamp_Head_Mouth_Happy_Piercing"); } else if (this.artSlave.lipsPiercing === 2) { result.push("Art_Vector_Revamp_Head_Mouth_Happy_Piercing_Heavy"); }
+ if (this.artSlave.lipsPiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Mouth_Happy_Piercing");
+ } else if (this.artSlave.lipsPiercing === 2) { result.push("Art_Vector_Revamp_Head_Mouth_Happy_Piercing_Heavy"); }
}
} else {
result.push(`Art_Vector_Revamp_Makeup_Mouth_Angry_${lipsSize}`);
result.push(`Art_Vector_Revamp_Mouth_Angry_${lipsSize}`);
if (this.showHeadPiercings) {
- if (this.artSlave.lipsPiercing === 1) { result.push("Art_Vector_Revamp_Head_Mouth_Angry_Piercing"); } else if (this.artSlave.lipsPiercing === 2) { result.push("Art_Vector_Revamp_Head_Mouth_Angry_Piercing_Heavy"); }
+ if (this.artSlave.lipsPiercing === 1) {
+ result.push("Art_Vector_Revamp_Head_Mouth_Angry_Piercing");
+ } else if (this.artSlave.lipsPiercing === 2) { result.push("Art_Vector_Revamp_Head_Mouth_Angry_Piercing_Heavy"); }
}
}
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index de143fd63b4759cb0e56bd26301c2a8e917fd607..2dc7b93fbd178da22da40df6e70131d3d6af5d8f 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -53,13 +53,21 @@ window.isLeaderP = function isLeaderP(slave) {
// helper function returning PC's title
window.properTitle = function properTitle() {
const PC = State.variables.PC;
- if (PC.customTitle) { return PC.customTitle; } else if (PC.title !== 0) { return "Sir"; } else { return "Ma'am"; }
+ if (PC.customTitle) {
+ return PC.customTitle;
+ } else if (PC.title !== 0) {
+ return "Sir";
+ } else { return "Ma'am"; }
};
// helper function returning slave's title for PC in situations where WrittenMaster() is inappropriate
window.properMaster = function properMaster() {
const PC = State.variables.PC;
- if (PC.customTitle) { return PC.customTitle; } else if (PC.title !== 0) { return "Master"; } else { return "Mistress"; }
+ if (PC.customTitle) {
+ return PC.customTitle;
+ } else if (PC.title !== 0) {
+ return "Master";
+ } else { return "Mistress"; }
};
/**
@@ -408,7 +416,9 @@ window.SlavePronouns = function SlavePronouns(slave) {
*/
window.WrittenMaster = function WrittenMaster(slave) {
const V = State.variables;
- if (slave !== undefined) { Enunciate(slave); } else if (V.titleEnunciate === undefined) { Enunciate(V.activeSlave); }
+ if (slave !== undefined) {
+ Enunciate(slave);
+ } else if (V.titleEnunciate === undefined) { Enunciate(V.activeSlave); }
return V.writtenTitle;
};
@@ -418,19 +428,37 @@ window.WrittenMaster = function WrittenMaster(slave) {
window.Enunciate = function Enunciate(slave) {
const V = State.variables;
if (SlaveStatsChecker.checkForLisp(slave)) {
- if (V.PC.customTitleLisp !== undefined) { V.titleEnunciate = V.PC.customTitleLisp; } else if (V.PC.title !== 0) { V.titleEnunciate = "Mathter"; } else { V.titleEnunciate = "Mithtreth"; }
+ if (V.PC.customTitleLisp !== undefined) {
+ V.titleEnunciate = V.PC.customTitleLisp;
+ } else if (V.PC.title !== 0) {
+ V.titleEnunciate = "Mathter";
+ } else { V.titleEnunciate = "Mithtreth"; }
if (V.allowFamilyTitles === 1) {
if (slave.father === -1) {
- if (slave.actualAge < 4 && slave.physicalAge < 4) { V.titleEnunciate = "Dadda"; } else if (slave.actualAge < 9) { V.titleEnunciate = "Daddy"; } else { V.titleEnunciate = "Dad"; }
+ if (slave.actualAge < 4 && slave.physicalAge < 4) {
+ V.titleEnunciate = "Dadda";
+ } else if (slave.actualAge < 9) {
+ V.titleEnunciate = "Daddy";
+ } else { V.titleEnunciate = "Dad"; }
} else if (slave.mother === -1) {
- if (slave.actualAge < 4 && slave.physicalAge < 4) { V.titleEnunciate = "Mama"; } else if (slave.actualAge < 9) { V.titleEnunciate = "Mommy"; } else { V.titleEnunciate = "Mom"; }
+ if (slave.actualAge < 4 && slave.physicalAge < 4) {
+ V.titleEnunciate = "Mama";
+ } else if (slave.actualAge < 9) {
+ V.titleEnunciate = "Mommy";
+ } else { V.titleEnunciate = "Mom"; }
} else if (V.PC.mother === slave.ID || V.PC.father === slave.ID) {
- if (V.PC.title === 1) { V.titleEnunciate = "Thon"; } else if (V.PC.title === 0) { V.titleEnunciate = "Daughter"; }
+ if (V.PC.title === 1) {
+ V.titleEnunciate = "Thon";
+ } else if (V.PC.title === 0) { V.titleEnunciate = "Daughter"; }
} else if (areSisters(slave, V.PC) > 0) {
if (V.PC.title === 1) {
- if (slave.actualAge < 18) { V.titleEnunciate = "Bro"; } else { V.titleEnunciate = "Brother"; }
+ if (slave.actualAge < 18) {
+ V.titleEnunciate = "Bro";
+ } else { V.titleEnunciate = "Brother"; }
} else if (V.PC.title === 0) {
- if (slave.actualAge < 18) { V.titleEnunciate = "Thith"; } else { V.titleEnunciate = "Thithter"; }
+ if (slave.actualAge < 18) {
+ V.titleEnunciate = "Thith";
+ } else { V.titleEnunciate = "Thithter"; }
}
}
}
@@ -457,24 +485,46 @@ window.Enunciate = function Enunciate(slave) {
V.xEnunciate = "kth";
V.XEnunciate = "Th";
} else {
- if (V.PC.customTitle !== undefined) { V.titleEnunciate = V.PC.customTitle; } else if (V.PC.title !== 0) { V.titleEnunciate = "Master"; } else { V.titleEnunciate = "Mistress"; }
+ if (V.PC.customTitle !== undefined) {
+ V.titleEnunciate = V.PC.customTitle;
+ } else if (V.PC.title !== 0) {
+ V.titleEnunciate = "Master";
+ } else { V.titleEnunciate = "Mistress"; }
if (V.allowFamilyTitles === 1) {
if (slave.father === -1) {
- if (slave.actualAge < 4 && slave.physicalAge < 4) { V.titleEnunciate = "Dadda"; } else if (slave.actualAge < 9) { V.titleEnunciate = "Daddy"; } else { V.titleEnunciate = "Dad"; }
+ if (slave.actualAge < 4 && slave.physicalAge < 4) {
+ V.titleEnunciate = "Dadda";
+ } else if (slave.actualAge < 9) {
+ V.titleEnunciate = "Daddy";
+ } else { V.titleEnunciate = "Dad"; }
} else if (slave.mother === -1) {
- if (slave.actualAge < 4 && slave.physicalAge < 4) { V.titleEnunciate = "Mama"; } else if (slave.actualAge < 9) { V.titleEnunciate = "Mommy"; } else { V.titleEnunciate = "Mom"; }
+ if (slave.actualAge < 4 && slave.physicalAge < 4) {
+ V.titleEnunciate = "Mama";
+ } else if (slave.actualAge < 9) {
+ V.titleEnunciate = "Mommy";
+ } else { V.titleEnunciate = "Mom"; }
} else if (V.PC.mother === slave.ID || V.PC.father === slave.ID) {
- if (V.PC.title === 1) { V.titleEnunciate = "Son"; } else if (V.PC.title === 0) { V.titleEnunciate = "Daughter"; }
+ if (V.PC.title === 1) {
+ V.titleEnunciate = "Son";
+ } else if (V.PC.title === 0) { V.titleEnunciate = "Daughter"; }
} else if (areSisters(slave, V.PC) > 0) {
if (V.PC.title === 1) {
- if (slave.actualAge < 18) { V.titleEnunciate = "Bro"; } else { V.titleEnunciate = "Brother"; }
+ if (slave.actualAge < 18) {
+ V.titleEnunciate = "Bro";
+ } else { V.titleEnunciate = "Brother"; }
} else if (V.PC.title === 0) {
- if (slave.actualAge < 18) { V.titleEnunciate = "Sis"; } else { V.titleEnunciate = "Sister"; }
+ if (slave.actualAge < 18) {
+ V.titleEnunciate = "Sis";
+ } else { V.titleEnunciate = "Sister"; }
}
}
}
if (slave.custom.title !== undefined && slave.custom.title !== "") { V.titleEnunciate = slave.custom.title; }
- if (V.PC.customTitle !== undefined) { V.writtenTitle = V.PC.customTitle; } else if (V.PC.title !== 0) { V.writtenTitle = "Master"; } else { V.writtenTitle = "Mistress"; }
+ if (V.PC.customTitle !== undefined) {
+ V.writtenTitle = V.PC.customTitle;
+ } else if (V.PC.title !== 0) {
+ V.writtenTitle = "Master";
+ } else { V.writtenTitle = "Mistress"; }
if (slave.custom.title !== undefined && slave.custom.title !== "" && slave.rudeTitle === 0) { V.writtenTitle = slave.custom.title; }
V.sayEnunciate = "say";
V.sEnunciate = "s";
@@ -626,13 +676,25 @@ window.PCTitle = function PCTitle() {
}
if (V.SF.Toggle && V.SF.FS.Tension > 100) {
- switch(V.SF.FS.BadOutcome) {
- case 'MIGRATION': titles.push("The Abandoned"); break;
- case 'Revolt': titles.push("The Betrayed"); break;
- case 'ANNIHILATION': titles.push("The Runner"); break;
- case 'OCCUPATION': titles.push("The Occupied"); break;
- case 'ASSIMILATION': titles.push("The Deceived"); break;
- case 'ISOLATION': titles.push("The Ignored"); break;
+ switch (V.SF.FS.BadOutcome) {
+ case 'MIGRATION':
+ titles.push("The Abandoned");
+ break;
+ case 'Revolt':
+ titles.push("The Betrayed");
+ break;
+ case 'ANNIHILATION':
+ titles.push("The Runner");
+ break;
+ case 'OCCUPATION':
+ titles.push("The Occupied");
+ break;
+ case 'ASSIMILATION':
+ titles.push("The Deceived");
+ break;
+ case 'ISOLATION':
+ titles.push("The Ignored");
+ break;
}
}
@@ -1893,7 +1955,7 @@ window.DegradingName = function DegradingName(slave) {
slave.slaveSurname = surname;
};
-window.SlaveSort = function(){
+window.SlaveSort = function() {
const comparators = {
Aassignment: (a, b) => a.assignment < b.assignment ? -1 : 1,
Dassignment: (a, b) => a.assignment > b.assignment ? -1 : 1,
@@ -2030,7 +2092,17 @@ window.faceIncrease = function faceIncrease(slave, amount) {
const his = pronouns.possessive;
const His = capFirstChar(his);
let r = "";
- if (slave.face <= -95) { r += `<span class="green">${His} face is no longer horrifying,</span> and is now merely ugly.`; } else if (slave.face <= -40 && slave.face + amount > -40) { r += `<span class="green">${His} face is no longer ugly,</span> and is now merely unattractive.`; } else if (slave.face <= -10 && slave.face + amount > -10) { r += `<span class="green">${His} face is no longer unattractive,</span> and is now somewhat tolerable.`; } else if (slave.face <= 10 && slave.face + amount > 10) { r += `<span class="green">${His} face is now decently attractive,</span> rather than merely tolerable.`; } else if (slave.face <= 40 && slave.face + amount > 40) { r += `<span class="green">${His} face is now quite beautiful,</span> rather than merely pretty.`; } else if (slave.face <= 95 && slave.face + amount > 95) { r += `<span class="green">${His} face is now perfect.</span> It's difficult to imagine how it could be any more beautiful.`; }
+ if (slave.face <= -95) {
+ r += `<span class="green">${His} face is no longer horrifying,</span> and is now merely ugly.`;
+ } else if (slave.face <= -40 && slave.face + amount > -40) {
+ r += `<span class="green">${His} face is no longer ugly,</span> and is now merely unattractive.`;
+ } else if (slave.face <= -10 && slave.face + amount > -10) {
+ r += `<span class="green">${His} face is no longer unattractive,</span> and is now somewhat tolerable.`;
+ } else if (slave.face <= 10 && slave.face + amount > 10) {
+ r += `<span class="green">${His} face is now decently attractive,</span> rather than merely tolerable.`;
+ } else if (slave.face <= 40 && slave.face + amount > 40) {
+ r += `<span class="green">${His} face is now quite beautiful,</span> rather than merely pretty.`;
+ } else if (slave.face <= 95 && slave.face + amount > 95) { r += `<span class="green">${His} face is now perfect.</span> It's difficult to imagine how it could be any more beautiful.`; }
slave.face = Math.clamp(slave.face + amount, -100, 100);
if (slave.face > 95) { slave.face = 100; }
return r;
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 3211b3bc5cda32fe2be1efa714fcf92133e40aab..3c264c3c2f253efcf51b9d24f669025b0bf6e0de 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -169,7 +169,9 @@ window.assignJob = function assignJob(slave, job) {
slave.assignmentVisible = 0;
V.masterSuiteSlaves++;
V.MastSiIDs.push(slave.ID);
- if (V.masterSuiteUpgradeLuxury > 0) { slave.livingRules = "luxurious"; } else { slave.livingRules = "spare"; }
+ if (V.masterSuiteUpgradeLuxury > 0) {
+ slave.livingRules = "luxurious";
+ } else { slave.livingRules = "spare"; }
break;
case "learn in the schoolroom":
@@ -254,7 +256,9 @@ window.assignJob = function assignJob(slave, job) {
case "be your concubine":
slave.assignment = job;
slave.assignmentVisible = 0; /* non-visible leadership roles */
- if (V.masterSuiteUpgradeLuxury > 0) { slave.livingRules = "luxurious"; } else { slave.livingRules = "normal"; }
+ if (V.masterSuiteUpgradeLuxury > 0) {
+ slave.livingRules = "luxurious";
+ } else { slave.livingRules = "normal"; }
break;
case "be your head girl":
@@ -299,7 +303,11 @@ window.assignJob = function assignJob(slave, job) {
if (awi !== -1) {
V.personalAttention.deleteAt(awi);
if (V.personalAttention.length === 0) {
- if (V.PC.career === "escort") { V.personalAttention = "whoring"; } else if (V.PC.career === "servant") { V.personalAttention = "upkeep"; } else { V.personalAttention = "business"; }
+ if (V.PC.career === "escort") {
+ V.personalAttention = "whoring";
+ } else if (V.PC.career === "servant") {
+ V.personalAttention = "upkeep";
+ } else { V.personalAttention = "business"; }
r += `${slave.slaveName} no longer has your personal attention; you plan to focus on ${V.personalAttention}.`;
} else { r += `${slave.slaveName} no longer has your personal attention.`; }
}
@@ -317,8 +325,40 @@ window.removeJob = function removeJob(slave, assignment) {
const idx = V.slaveIndices[slave.ID];
- if (assignment === "Pit") { V.fighterIDs.delete(slave.ID); } else if (assignment === "Coursing Association") { V.Lurcher = 0; } else {
- if (V.HeadGirl !== 0 && slave.ID === V.HeadGirl.ID) { V.HeadGirl = 0; } else if (V.Recruiter !== 0 && slave.ID === V.Recruiter.ID) { V.Recruiter = 0; } else if (V.Bodyguard !== 0 && slave.ID === V.Bodyguard.ID) { V.Bodyguard = 0; } else if (V.Madam !== 0 && slave.ID === V.Madam.ID) { V.Madam = 0; } else if (V.DJ !== 0 && slave.ID === V.DJ.ID) { V.DJ = 0; } else if (V.Milkmaid !== 0 && slave.ID === V.Milkmaid.ID) { V.Milkmaid = 0; } else if (V.Farmer !== 0 && slave.ID === V.Farmer.ID) { V.Farmer = 0; } else if (V.Schoolteacher !== 0 && slave.ID === V.Schoolteacher.ID) { V.Schoolteacher = 0; } else if (V.Attendant !== 0 && slave.ID === V.Attendant.ID) { V.Attendant = 0; } else if (V.Matron !== 0 && slave.ID === V.Matron.ID) { V.Matron = 0; } else if (V.Nurse !== 0 && slave.ID === V.Nurse.ID) { V.Nurse = 0; } else if (V.Stewardess !== 0 && slave.ID === V.Stewardess.ID) { V.Stewardess = 0; } else if (V.Wardeness !== 0 && slave.ID === V.Wardeness.ID) { V.Wardeness = 0; } else if (V.Concubine !== 0 && slave.ID === V.Concubine.ID) { V.Concubine = 0; } else if (V.Collectrix !== 0 && slave.ID === V.Collectrix.ID) { V.Collectrix = 0; }
+ if (assignment === "Pit") {
+ V.fighterIDs.delete(slave.ID);
+ } else if (assignment === "Coursing Association") {
+ V.Lurcher = 0;
+ } else {
+ if (V.HeadGirl !== 0 && slave.ID === V.HeadGirl.ID) {
+ V.HeadGirl = 0;
+ } else if (V.Recruiter !== 0 && slave.ID === V.Recruiter.ID) {
+ V.Recruiter = 0;
+ } else if (V.Bodyguard !== 0 && slave.ID === V.Bodyguard.ID) {
+ V.Bodyguard = 0;
+ } else if (V.Madam !== 0 && slave.ID === V.Madam.ID) {
+ V.Madam = 0
+ } else if (V.DJ !== 0 && slave.ID === V.DJ.ID) {
+ V.DJ = 0;
+ } else if (V.Milkmaid !== 0 && slave.ID === V.Milkmaid.ID) {
+ V.Milkmaid = 0;
+ } else if (V.Farmer !== 0 && slave.ID === V.Farmer.ID) {
+ V.Farmer = 0;
+ } else if (V.Schoolteacher !== 0 && slave.ID === V.Schoolteacher.ID) {
+ V.Schoolteacher = 0;
+ } else if (V.Attendant !== 0 && slave.ID === V.Attendant.ID) {
+ V.Attendant = 0;
+ } else if (V.Matron !== 0 && slave.ID === V.Matron.ID) {
+ V.Matron = 0;
+ } else if (V.Nurse !== 0 && slave.ID === V.Nurse.ID) {
+ V.Nurse = 0;
+ } else if (V.Stewardess !== 0 && slave.ID === V.Stewardess.ID) {
+ V.Stewardess = 0
+ } else if (V.Wardeness !== 0 && slave.ID === V.Wardeness.ID) {
+ V.Wardeness = 0;
+ } else if (V.Concubine !== 0 && slave.ID === V.Concubine.ID) {
+ V.Concubine = 0;
+ } else if (V.Collectrix !== 0 && slave.ID === V.Collectrix.ID) { V.Collectrix = 0; }
/* use .toLowerCase() to get rid of a few dupe conditions. */
switch (assignment.toLowerCase()) {
@@ -425,7 +465,11 @@ window.removeJob = function removeJob(slave, assignment) {
case "be your head girl":
slave.assignment = "rest";
if (V.HGSuiteEquality === 0 && V.personalAttention === "HG") {
- if (V.PC.career === "escort") { V.personalAttention = "whoring"; } else if (V.PC.career === "servant") { V.personalAttention = "upkeep"; } else { V.personalAttention = "business"; }
+ if (V.PC.career === "escort") {
+ V.personalAttention = "whoring";
+ } else if (V.PC.career === "servant") {
+ V.personalAttention = "upkeep";
+ } else { V.personalAttention = "business"; }
r += `You no longer have a slave assigned to be your Head Girl, so you turn your personal attention to focus on ${V.personalAttention}.`;
}
@@ -511,7 +555,7 @@ App.UI.jobLinks = function() {
App.Entity.facilities.servantsQuarters
];
- return {assignments: assignmentLinks, transfers: transferLinks};
+ return { assignments: assignmentLinks, transfers: transferLinks };
/**
* Generates assignment links
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index f9f55a9e04357be2f0e950e57e010c087fee6150..25d61249ed8bd5a3160199142c87ae452d60fa88 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -18,7 +18,9 @@ window.rulesAssistantOptions = (function() {
V.encyclopedia = "Personal Assistant";
if (V.currentRule !== null) {
const idx = V.defaultRules.findIndex(rule => rule.ID === V.currentRule);
- if (idx === -1) { current_rule = V.defaultRules[0]; } else { current_rule = V.defaultRules[idx]; }
+ if (idx === -1) {
+ current_rule = V.defaultRules[0];
+ } else { current_rule = V.defaultRules[idx]; }
}
const root = new Root(element);
}
@@ -195,11 +197,13 @@ window.rulesAssistantOptions = (function() {
}
setValue(what) {
- if (this.value.tagName === "INPUT") { this.value.value = `${what}`; } else { this.value.innerHTML = `${what}`; }
+ if (this.value.tagName === "INPUT") {
+ this.value.value = `${what}`;
+ } else { this.value.innerHTML = `${what}`; }
}
getData(what) {
- return (this.value.tagName === "INPUT" ? this.parse(this.value.value): this.selectedItem.data);
+ return (this.value.tagName === "INPUT" ? this.parse(this.value.value) : this.selectedItem.data);
}
// customizable input field parser / sanity checker
@@ -421,7 +425,9 @@ window.rulesAssistantOptions = (function() {
const text = this.textarea.value;
try {
const rule = JSON.parse(text);
- if (rule instanceof Array) { rule.forEach(r => V.defaultRules.push(r)); } else { V.defaultRules.push(rule); }
+ if (rule instanceof Array) {
+ rule.forEach(r => V.defaultRules.push(r));
+ } else { V.defaultRules.push(rule); }
reload(this.root);
} catch (e) {
alert(`Couldn't import that rule:\n${e.message}`);
@@ -659,11 +665,11 @@ window.rulesAssistantOptions = (function() {
this.show_custom_editor(CustomEditor, current_rule.condition.data);
} else if (this.betweenP(value)) {
current_rule.condition.function = "between";
- current_rule.condition.data = {attribute: value, value: [null, null]};
+ current_rule.condition.data = { attribute: value, value: [null, null] };
this.show_custom_editor(RangeEditor, current_rule.condition.function, current_rule.condition.data);
} else if (this.belongsP(value)) {
current_rule.condition.function = "belongs";
- current_rule.condition.data = {attribute: value, value: []};
+ current_rule.condition.data = { attribute: value, value: [] };
this.show_custom_editor(ItemEditor, current_rule.condition.function, current_rule.condition.data);
}
}
@@ -727,7 +733,9 @@ window.rulesAssistantOptions = (function() {
parse(value) {
value = value.trim();
- if (value === "null") { value = null; } else {
+ if (value === "null") {
+ value = null;
+ } else {
value = parseInt(value);
if (isNaN(value)) { value = null; }
}
@@ -1274,7 +1282,13 @@ window.rulesAssistantOptions = (function() {
const hcollars = [];
setup.harshCollars.forEach(item => {
- if (item.fs === "seeAge" && V.seeAge === 0) { return; } else if (item.fs === "seePreg" && V.seePreg === 0) { return; } else if (item.rs === "buyGag" && V.toysBoughtGags !== 1) { return; } else { hcollars.push([item.name, item.value]); }
+ if (item.fs === "seeAge" && V.seeAge === 0) {
+ return;
+ } else if (item.fs === "seePreg" && V.seePreg === 0) {
+ return;
+ } else if (item.rs === "buyGag" && V.toysBoughtGags !== 1) {
+ return;
+ } else { hcollars.push([item.name, item.value]); }
});
const harsh = new ListSubSection(this, "Harsh", hcollars);
this.appendChild(harsh);
@@ -1296,7 +1310,11 @@ window.rulesAssistantOptions = (function() {
constructor() {
const bellies = [];
setup.bellyAccessories.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { bellies.push([acc.name, acc.value]); } else if (acc.fs === "repopulation" && V.arcologies[0].FSRepopulationFocus !== "unset") { bellies.push([`${acc.name} (FS)`, acc.value]); } else if (acc.rs === "boughtBelly" && V.clothesBoughtBelly === 1) { bellies.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ bellies.push([acc.name, acc.value])
+ } else if (acc.fs === "repopulation" && V.arcologies[0].FSRepopulationFocus !== "unset") {
+ bellies.push([`${acc.name} (FS)`, acc.value]);
+ } else if (acc.rs === "boughtBelly" && V.clothesBoughtBelly === 1) { bellies.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Corsetage", bellies);
this.setValue(current_rule.set.bellyAccessory);
@@ -1335,7 +1353,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const accs = [];
setup.vaginalAccessories.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ accs.push([acc.name, acc.value])
+ } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Vaginal accessories for virgins", accs);
this.setValue(current_rule.set.virginAccessory);
@@ -1347,7 +1367,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const accs = [];
setup.vaginalAccessories.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ accs.push([acc.name, acc.value])
+ } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Vaginal accessories for anal virgins", accs);
this.setValue(current_rule.set.aVirginAccessory);
@@ -1359,7 +1381,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const accs = [];
setup.vaginalAccessories.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ accs.push([acc.name, acc.value])
+ } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Vaginal accessories for other slaves", accs);
this.setValue(current_rule.set.vaginalAccessory);
@@ -1371,7 +1395,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const accs = [];
setup.vaginalAttachments.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { accs.push([acc.name, acc.value]); } else if (acc.rs === "buyVaginalAttachments" && V.toysBoughtVaginalAttachments === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ accs.push([acc.name, acc.value])
+ } else if (acc.rs === "buyVaginalAttachments" && V.toysBoughtVaginalAttachments === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Vaginal attachments for slaves with vaginal accessories", accs);
this.setValue(current_rule.set.vaginalAttachment);
@@ -1425,7 +1451,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const accs = [];
setup.buttplugs.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ accs.push([acc.name, acc.value])
+ } else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Buttplugs for anal virgins", accs);
this.setValue(current_rule.set.aVirginButtplug);
@@ -1437,7 +1465,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const accs = [];
setup.buttplugs.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ accs.push([acc.name, acc.value])
+ } else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Buttplugs for other slaves", accs);
this.setValue(current_rule.set.buttplug);
@@ -1449,7 +1479,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const accs = [];
setup.buttplugAttachments.forEach(acc => {
- if (acc.fs === undefined && acc.rs === undefined) { accs.push([acc.name, acc.value]); } else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
+ if (acc.fs === undefined && acc.rs === undefined) {
+ accs.push([acc.name, acc.value])
+ } else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); }
});
super("Buttplug attachments for slaves with buttplugs", accs);
this.setValue(current_rule.set.buttplugAttachment);
@@ -1905,13 +1937,13 @@ window.rulesAssistantOptions = (function() {
constructor() {
// TODO: better data structure?
const pairs = [
- ["No default setting", {cum: "no default setting", milk: "no default setting"}],
- ["Normal Diet", {cum: 0, milk: 0}],
- ["Cum Added", {cum: 1, milk: 0}],
- ["Milk Added", {cum: 0, milk: 1}],
- ["Cum & Milk Added", {cum: 1, milk: 1}],
- ["Cum-Based", {cum: 2, milk: 0}],
- ["Milk-Based", {cum: 0, milk: 2}],
+ ["No default setting", { cum: "no default setting", milk: "no default setting" }],
+ ["Normal Diet", { cum: 0, milk: 0 }],
+ ["Cum Added", { cum: 1, milk: 0 }],
+ ["Milk Added", { cum: 0, milk: 1 }],
+ ["Cum & Milk Added", { cum: 1, milk: 1 }],
+ ["Cum-Based", { cum: 2, milk: 0 }],
+ ["Milk-Based", { cum: 0, milk: 2 }],
];
super("Diet base", pairs);
this.setValue(this.value2string(current_rule.set.dietCum, current_rule.set.dietMilk));
@@ -2214,7 +2246,9 @@ window.rulesAssistantOptions = (function() {
const lst = [];
if (this.colorlist.value !== "no default setting") { lst.push(this.colorlist.value); }
if (this.shapelist.value !== "no default setting") { lst.push(this.shapelist.value); }
- if (lst.length === 0) { return "no default setting"; } else { return lst.join(" "); }
+ if (lst.length === 0) {
+ return "no default setting";
+ } else { return lst.join(" "); }
}
setValue(val) {
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 4d10d598c5bea52275ce9778a294ded6fe2bd8d1..e49c7b7bacada7d3a42da442372a5df6d5f99ac7 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -154,42 +154,58 @@ window.rulesAutosurgery = (function() {
surgeries.push("surgery to correct her vision");
slave.eyes = 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.eyes === 1 && thisSurgery.surgery_eyes === -1) {
surgeries.push("surgery to blur her vision");
slave.eyes = -1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.hears === -1 && thisSurgery.surgery_hears === 0) {
surgeries.push("surgery to correct her hearing");
slave.hears = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.hears === 0 && thisSurgery.surgery_hears === -1) {
surgeries.push("surgery to muffle her hearing");
slave.hears = -1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.smells === -1 && thisSurgery.surgery_smells === 0) {
surgeries.push("surgery to correct her sense of smell");
slave.smells = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.smells === 0 && thisSurgery.surgery_smells === -1) {
surgeries.push("surgery to muffle her sense of smell");
slave.smells = -1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.tastes === -1 && thisSurgery.surgery_tastes === 0) {
surgeries.push("surgery to correct her sense of taste");
slave.tastes = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.tastes === 0 && thisSurgery.surgery_tastes === -1) {
surgeries.push("surgery to muffle her sense of taste");
slave.tastes = -1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
}
}
if (slave.health > 20 && surgeries.length < 3) {
@@ -197,17 +213,23 @@ window.rulesAutosurgery = (function() {
surgeries.push("surgery to remove her lactation implants");
slave.lactation = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.lactation !== 2 && (thisSurgery.surgery_lactation === 1)) {
surgeries.push("lactation inducing implanted drugs");
slave.lactation = 2;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if ((slave.boobShape === "saggy" || slave.boobShape === "downward-facing") && thisSurgery.surgery_cosmetic > 0 && slave.breastMesh !== 1) {
surgeries.push("a breast lift");
slave.boobShape = "normal";
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if ((slave.boobShape === "normal" || slave.boobShape === "wide-set") && thisSurgery.surgery_cosmetic > 0 && slave.breastMesh !== 1) {
if (slave.boobs > 800) {
slave.boobShape = "torpedo-shaped";
@@ -216,38 +238,50 @@ window.rulesAutosurgery = (function() {
}
surgeries.push("more interestingly shaped breasts");
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (thisSurgery.surgery_boobs === 0 && slave.boobsImplant > 0) {
surgeries.push("surgery to remove her boob implants");
slave.boobs -= slave.boobsImplant;
slave.boobsImplant = 0;
slave.boobsImplantType = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.boobs <= 600 && slave.lactation < 2 && (slave.boobs + 400 <= thisSurgery.surgery_boobs)) {
surgeries.push("bigger boobs");
slave.boobsImplant += 400;
slave.boobs += 400;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.boobs <= 600 && slave.lactation < 2 && (slave.boobs + 200 <= thisSurgery.surgery_boobs)) {
surgeries.push("modestly bigger boobs");
slave.boobsImplant += 200;
slave.boobs += 200;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.boobs <= 2000 && slave.lactation < 2 && (slave.boobs + 400 < thisSurgery.surgery_boobs)) {
surgeries.push("bigger boobs");
slave.boobsImplant += 400;
slave.boobs += 400;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.boobs <= 9000 && slave.lactation < 2 && (slave.boobs < thisSurgery.surgery_boobs)) {
surgeries.push("bigger boobs");
slave.boobsImplant += 200;
slave.boobs += 200;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
}
}
if (slave.health > 20 && surgeries.length < 3) {
@@ -257,25 +291,33 @@ window.rulesAutosurgery = (function() {
slave.buttImplant = 0;
slave.buttImplantType = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.butt <= 3 && (slave.butt < thisSurgery.surgery_butt)) {
surgeries.push("a bigger butt");
slave.buttImplant = 1;
slave.butt += 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.butt <= 5 && (slave.butt < thisSurgery.surgery_butt)) {
surgeries.push("a bigger butt");
slave.buttImplant = 1;
slave.butt += 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.butt <= 8 && (slave.butt < thisSurgery.surgery_butt)) {
surgeries.push("a bigger butt");
slave.buttImplant = 1;
slave.butt += 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
}
}
if (slave.health > 20 && surgeries.length < 3) {
@@ -286,7 +328,9 @@ window.rulesAutosurgery = (function() {
slave.skill.anal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.vagina > 3 && thisSurgery.surgery_cosmetic > 0) {
surgeries.push("a restored pussy");
slave.vagina = 3;
@@ -294,7 +338,9 @@ window.rulesAutosurgery = (function() {
slave.skill.vaginal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.anus > 0 && V.surgeryUpgrade === 1 && thisSurgery.surgery_holes === 2) {
surgeries.push("a virgin anus");
slave.anus = 0;
@@ -302,7 +348,9 @@ window.rulesAutosurgery = (function() {
slave.skill.anal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.vagina > 0 && V.surgeryUpgrade === 1 && thisSurgery.surgery_holes === 2) {
surgeries.push("a virgin pussy");
slave.vagina = 0;
@@ -310,7 +358,9 @@ window.rulesAutosurgery = (function() {
slave.skill.vaginal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.anus > 1 && thisSurgery.surgery_holes === 1) {
surgeries.push("a tighter anus");
slave.anus = 1;
@@ -318,7 +368,9 @@ window.rulesAutosurgery = (function() {
slave.skill.anal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.vagina > 1 && thisSurgery.surgery_holes === 1) {
surgeries.push("a tighter pussy");
slave.vagina = 1;
@@ -326,7 +378,9 @@ window.rulesAutosurgery = (function() {
slave.skill.vaginal -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
}
}
if (slave.health > 20 && surgeries.length < 3) {
@@ -334,12 +388,16 @@ window.rulesAutosurgery = (function() {
surgeries.push("surgery to remove her prostate implant");
slave.prostate = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.prostate === 1 && thisSurgery.surgery_prostate === 1) {
surgeries.push("a precum production enhancing drug implant");
slave.prostate = 2;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.balls > 0 && slave.vasectomy === 0 && thisSurgery.surgery_vasectomy === true) {
surgeries.push("vasectomy");
V.surgeryType = "vasectomy";
@@ -369,14 +427,26 @@ window.rulesAutosurgery = (function() {
slave.faceImplant += 25 - 5 * Math.trunc(V.PC.medicine / 50) - 5 * V.surgeryUpgrade;
slave.face = Math.clamp(slave.face + 20, -100, 100);
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.faceImplant <= 15 && slave.ageImplant !== 1 && slave.visualAge >= 25 && thisSurgery.surgery_cosmetic > 0) {
surgeries.push("an age lift");
slave.ageImplant = 1;
slave.faceImplant += 25 - 5 * Math.trunc(V.PC.medicine / 50) - 5 * V.surgeryUpgrade;
- if (slave.visualAge > 80) { slave.visualAge -= 40; } else if (slave.visualAge >= 70) { slave.visualAge -= 30; } else if (slave.visualAge > 50) { slave.visualAge -= 20; } else if (slave.visualAge > 36) { slave.visualAge -= 10; } else { slave.visualAge -= 5; }
+ if (slave.visualAge > 80) {
+ slave.visualAge -= 40;
+ } else if (slave.visualAge >= 70) {
+ slave.visualAge -= 30;
+ } else if (slave.visualAge > 50) {
+ slave.visualAge -= 20;
+ } else if (slave.visualAge > 36) {
+ slave.visualAge -= 10;
+ } else { slave.visualAge -= 5; }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (((slave.underArmHStyle !== "bald" && slave.underArmHStyle !== "hairless") || (slave.pubicHStyle !== "bald" && slave.pubicHStyle !== "hairless")) && thisSurgery.surgery_bodyhair === 2) {
surgeries.push("body hair removal");
if (slave.underArmHStyle !== "hairless") { slave.underArmHStyle = "bald"; }
@@ -392,19 +462,25 @@ window.rulesAutosurgery = (function() {
surgeries.push("liposuction");
slave.weight -= 50;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
- } else if ((slave.bellySagPreg > 0 || slave.bellySag > 0) && (thisSurgery.surgery_cosmetic > 0 || thisSurgery.surgery_tummy > 0 )) {
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
+ } else if ((slave.bellySagPreg > 0 || slave.bellySag > 0) && (thisSurgery.surgery_cosmetic > 0 || thisSurgery.surgery_tummy > 0)) {
surgeries.push("a tummy tuck");
slave.bellySag = 0;
slave.bellySagPreg = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 10; } else { slave.health -= 20; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 10;
+ } else { slave.health -= 20; }
} else if (slave.voice === 1 && slave.voiceImplant === 0 && thisSurgery.surgery_cosmetic > 0) {
surgeries.push("a feminine voice");
slave.voice += 1;
slave.voiceImplant += 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (thisSurgery.surgery_lips === 0 && slave.lipsImplant > 0) {
surgeries.push("surgery to remove her lip implants");
slave.lips -= slave.lipsImplant;
@@ -413,7 +489,9 @@ window.rulesAutosurgery = (function() {
slave.skill.oral -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.lips <= 95 && (slave.lips < thisSurgery.surgery_lips)) {
surgeries.push("bigger lips");
slave.lipsImplant += 10;
@@ -422,19 +500,25 @@ window.rulesAutosurgery = (function() {
slave.skill.oral -= 10;
}
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.cSec === 1 && thisSurgery.surgery_cosmetic > 0) {
surgeries.push("surgery to remove a c-section scar");
slave.cSec = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.faceImplant <= 45 && slave.face <= 95 && thisSurgery.surgery_cosmetic === 2) {
surgeries.push("a nicer face");
if (slave.faceShape === "masculine") { slave.faceShape = "androgynous"; }
slave.faceImplant += 25 - 5 * Math.trunc(V.PC.medicine / 50) - 5 * V.surgeryUpgrade;
slave.face = Math.clamp(slave.face + 20, -100, 100);
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.faceImplant <= 45 && slave.ageImplant !== 1 && slave.visualAge >= 25 && thisSurgery.surgery_cosmetic === 2) {
surgeries.push("an age lift");
slave.ageImplant = 1;
@@ -451,13 +535,17 @@ window.rulesAutosurgery = (function() {
}
slave.faceImplant += 25 - 5 * Math.trunc(V.PC.medicine / 50) - 5 * V.surgeryUpgrade;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.voice < 3 && slave.voiceImplant === 0 && thisSurgery.surgery_cosmetic === 2) {
surgeries.push("a bimbo's voice");
slave.voice += 1;
slave.voiceImplant += 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
}
}
if (slave.health > 20 && surgeries.length < 3) {
@@ -465,30 +553,40 @@ window.rulesAutosurgery = (function() {
surgeries.push("a narrower waist");
slave.waist -= 20;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.hips < 1 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.surgery_hips)) {
surgeries.push("wider hips");
slave.hips++;
slave.hipsImplant++;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.waist >= -95 && V.seeExtreme === 1 && thisSurgery.surgery_cosmetic === 2) {
surgeries.push("a narrower waist");
slave.waist = Math.clamp(slave.waist - 20, -100, 100);
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.hips < 2 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.surgery_hips)) {
surgeries.push("wider hips");
slave.hips++;
slave.hipsImplant++;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else if (slave.hips < 3 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.surgery_hips)) {
surgeries.push("wider hips");
slave.hips++;
slave.hipsImplant++;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
}
}
if (slave.health > 20 && surgeries.length < 3) {
@@ -499,11 +597,15 @@ window.rulesAutosurgery = (function() {
if (slave.ovaries === 1 || slave.mpreg === 1) {
surgeries.push("belly implant");
V.surgeryType = "bellyIn";
- if (V.PC.medicine >= 100) { slave.health -= 5; } else { slave.health -= 10; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 5;
+ } else { slave.health -= 10; }
} else {
surgeries.push("male belly implant");
V.surgeryType = "bellyInMale";
- if (V.PC.medicine >= 100) { slave.health -= 25; } else { slave.health -= 50; }
+ if (V.PC.medicine >= 100) {
+ slave.health -= 25;
+ } else { slave.health -= 50; }
}
bellyIn(slave);
} else if (slave.bellyImplant >= 0 && thisSurgery.surgery_bellyImplant === "remove") {
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 366a185619f4cafe5229ba870e31d46584002a52..35b98f60ce6ea95850caf2d057d893a798d0ea5a 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1632,7 +1632,15 @@ window.FResult = (function() {
if (slave.attrKnown === 1) {
result += Math.trunc(slave.attrXX / 20);
result += Math.trunc(slave.attrXY / 20);
- if (slave.energy > 95) { result += 3; } else if (slave.energy > 80) { result += 2; } else if (slave.energy > 60) { result += 1; } else if (slave.energy <= 20) { result -= 2; } else if (slave.energy <= 40) { result -= 1; }
+ if (slave.energy > 95) {
+ result += 3;
+ } else if (slave.energy > 80) {
+ result += 2;
+ } else if (slave.energy > 60) {
+ result += 1;
+ } else if (slave.energy <= 20) {
+ result -= 2;
+ } else if (slave.energy <= 40) { result -= 1; }
}
if (slave.sexualFlaw !== "none") { result -= 2; }
if (slave.sexualQuirk !== "none") { result += 2; }
@@ -1655,7 +1663,9 @@ window.FResult = (function() {
* @param {App.Entity.SlaveState} slave
*/
function calcSight(slave) {
- if (!canSee(slave)) { result -= 3; } else if (slave.eyes <= -1) {
+ if (!canSee(slave)) {
+ result -= 3;
+ } else if (slave.eyes <= -1) {
if (slave.eyewear !== "corrective glasses" && slave.eyewear !== "corrective contacts") {
result -= 1;
}
@@ -1670,7 +1680,9 @@ window.FResult = (function() {
* @param {App.Entity.SlaveState} slave
*/
function calcHearing(slave) {
- if (!canHear(slave)) { result -= 2; } else if (slave.hears <= -1) {
+ if (!canHear(slave)) {
+ result -= 2;
+ } else if (slave.hears <= -1) {
if (slave.earwear !== "hearing aids") {
result -= 1;
}
@@ -1746,10 +1758,14 @@ window.FResult = (function() {
function calcAge(slave) {
if ((V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset") && slave.physicalAge === V.minimumSlaveAge && slave.physicalAge === V.fertilityAge && canGetPregnant(slave)) {
result += 1;
- if (slave.birthWeek === 0) { result += result; } else if (slave.birthWeek < 4) { result += 0.2 * result; }
+ if (slave.birthWeek === 0) {
+ result += result;
+ } else if (slave.birthWeek < 4) { result += 0.2 * result; }
} else if (slave.physicalAge === V.minimumSlaveAge) {
result += 1;
- if (slave.birthWeek === 0) { result += 0.5 * result; } else if (slave.birthWeek < 4) { result += 0.1 * result; }
+ if (slave.birthWeek === 0) {
+ result += 0.5 * result;
+ } else if (slave.birthWeek < 4) { result += 0.1 * result; }
} else if (slave.physicalAge === V.fertilityAge && canGetPregnant(slave) && (V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset")) {
result += 1;
if (slave.birthWeek === 0) {
@@ -2208,7 +2224,7 @@ window.slaveCost = (function() {
}
}
- function calcCost(/* slave */) {
+ function calcCost( /* slave */ ) {
cost *= multiplier * 50;
cost = Number(cost) || 0;
if (cost < V.minimumSlaveCost) {
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index a701ad92c803b5b0ed2cd77094c6636f6df628b2..42cbfced2579194e869b4d2c5347a49c874ef441 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -238,7 +238,11 @@ window.WombBirthReady = function(actor, readyAge) {
};
window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with minor adaptation.
- if (actor.pregData.sizeType === 0) { return getVolByLen(actor); } else if (actor.pregData.sizeType === 1) { return getVolByWeight(actor); } else if (actor.pregData.sizeType === 2) { return getVolByRaw(actor); } else { return 0; }
+ if (actor.pregData.sizeType === 0) {
+ return getVolByLen(actor);
+ } else if (actor.pregData.sizeType === 1) {
+ return getVolByWeight(actor);
+ } else if (actor.pregData.sizeType === 2) { return getVolByRaw(actor); } else { return 0; }
function getCurData(actor, age) {
let i = 0;
@@ -320,7 +324,7 @@ window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with
alert("WombGetVolume warning - " + actor.slaveName + " " + err);
}
if (wombSize < 0) // catch for strange cases, to avoid messing with outside code.
- { wombSize = 0; }
+ { wombSize = 0; }
return wombSize;
}
@@ -337,7 +341,7 @@ window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with
});
if (wombSize < 0) // catch for strange cases, to avoid messing with outside code.
- { wombSize = 0; }
+ { wombSize = 0; }
return wombSize;
}
@@ -354,7 +358,7 @@ window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with
});
if (wombSize < 0) // catch for strange cases, to avoid messing with outside code.
- { wombSize = 0; }
+ { wombSize = 0; }
return wombSize;
}
@@ -737,10 +741,10 @@ window.BCReserveInit = function() {
slave.womb.forEach(function(ft) {
if (typeof ft.reserve !== 'string') { ft.reserve = ""; }
if (typeof ft.motherID !== 'number') // setting missing biological mother ID for fetus.
- { ft.motherID = slave.ID; }
+ { ft.motherID = slave.ID; }
if (ft.ID === undefined) { ft.ID = generateNewID(); }
if (typeof ft.realAge !== 'number') // setting missing chronological age
- { ft.realAge = ft.age; }
+ { ft.realAge = ft.age; }
});
});
@@ -748,7 +752,7 @@ window.BCReserveInit = function() {
if (typeof ft.reserve !== 'string') { ft.reserve = ""; }
if (typeof ft.motherID !== 'number') { ft.motherID = SV.PC.ID; }
if (typeof ft.realAge !== 'number') // setting missing chronological age
- { ft.realAge = ft.age; }
+ { ft.realAge = ft.age; }
});
};