From e416d0d947a72ffc89003fbc99bb52e3ed1b0ca5 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sun, 31 Mar 2019 04:51:15 +0200
Subject: [PATCH] curlybraces
---
src/js/rulesAutosurgery.js | 77 +++++++++++++++++++++-----------------
1 file changed, 43 insertions(+), 34 deletions(-)
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 8e0d4738e65..8a6158e1ffa 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -13,10 +13,12 @@ window.rulesAutosurgery = (function() {
r = "";
const surgeries = [];
const thisSurgery = ProcessHGTastes(slave);
- if (slave.health > 20)
+ if (slave.health > 20) {
CommitSurgery(slave, thisSurgery, surgeries);
- if (surgeries.length > 0)
+ }
+ if (surgeries.length > 0) {
PrintResult(slave, thisSurgery, surgeries);
+ }
return r;
}
@@ -116,19 +118,23 @@ window.rulesAutosurgery = (function() {
.map(x => x.set));
if ((thisSurgery.surgery_hips !== "no default setting") && (thisSurgery.surgery_butt !== "no default setting")) {
if (slave.hips < -1) {
- if (thisSurgery.surgery_butt > 2)
+ if (thisSurgery.surgery_butt > 2) {
thisSurgery.surgery_butt = 2;
+ }
} else if (slave.hips < 0) {
- if (thisSurgery.surgery_butt > 4)
+ if (thisSurgery.surgery_butt > 4) {
thisSurgery.surgery_butt = 4;
+ }
} else if (slave.hips > 0) {
- if (thisSurgery.surgery_butt > 8)
+ if (thisSurgery.surgery_butt > 8) {
thisSurgery.surgery_butt = 8;
+ }
} else if (slave.hips > 1) {
// true
} else {
- if (thisSurgery.surgery_butt > 6)
+ if (thisSurgery.surgery_butt > 6) {
thisSurgery.surgery_butt = 6;
+ }
}
}
break;
@@ -213,10 +219,11 @@ window.rulesAutosurgery = (function() {
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)
+ if (slave.boobs > 800) {
slave.boobShape = "torpedo-shaped";
- else
+ } else {
slave.boobShape = "perky";
+ }
surgeries.push("more interestingly shaped breasts");
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
@@ -295,21 +302,21 @@ window.rulesAutosurgery = (function() {
if (slave.anus > 3 && thisSurgery.surgery_cosmetic > 0) {
surgeries.push("a restored anus");
slave.anus = 3;
- if (slave.skill.anal > 10)
+ if (slave.skill.anal > 10) {
slave.skill.anal -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
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;
- if (slave.skill.vaginal > 10)
+ if (slave.skill.vaginal > 10) {
slave.skill.vaginal -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
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;
@@ -319,16 +326,15 @@ window.rulesAutosurgery = (function() {
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
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;
- if (slave.skill.vaginal > 10)
+ if (slave.skill.vaginal > 10) {
slave.skill.vaginal -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
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;
@@ -338,7 +344,6 @@ window.rulesAutosurgery = (function() {
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
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;
@@ -366,19 +371,21 @@ window.rulesAutosurgery = (function() {
} else if (slave.balls > 0 && slave.vasectomy === 0 && thisSurgery.surgery_vasectomy === true) {
surgeries.push("vasectomy");
V.surgeryType = "vasectomy";
- if (V.PC.medicine >= 100)
+ if (V.PC.medicine >= 100) {
slave.health -= 5;
- else
+ } else {
slave.health -= 10;
+ }
slave.vasectomy = 1;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
} else if (slave.balls > 0 && slave.vasectomy === 1 && thisSurgery.surgery_vasectomy === false) {
surgeries.push("undo vasectomy");
V.surgeryType = "vasectomy undo";
- if (V.PC.medicine >= 100)
+ if (V.PC.medicine >= 100) {
slave.health -=5;
- else
+ } else {
slave.health -= 10;
+ }
slave.vasectomy = 0;
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
}
@@ -388,7 +395,7 @@ window.rulesAutosurgery = (function() {
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);
+ 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;
@@ -439,8 +446,9 @@ window.rulesAutosurgery = (function() {
surgeries.push("surgery to remove her lip implants");
slave.lips -= slave.lipsImplant;
slave.lipsImplant = 0;
- if (slave.skill.oral > 10)
+ if (slave.skill.oral > 10) {
slave.skill.oral -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
@@ -448,8 +456,9 @@ window.rulesAutosurgery = (function() {
surgeries.push("bigger lips");
slave.lipsImplant += 10;
slave.lips += 10;
- if (slave.skill.oral > 10)
+ if (slave.skill.oral > 10) {
slave.skill.oral -= 10;
+ }
cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
if (V.PC.medicine >= 100) slave.health -= 5;
else slave.health -= 10;
@@ -463,7 +472,7 @@ window.rulesAutosurgery = (function() {
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);
+ 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;
@@ -510,7 +519,7 @@ window.rulesAutosurgery = (function() {
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);
+ 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;
@@ -547,14 +556,14 @@ window.rulesAutosurgery = (function() {
else slave.health -= 50;
}
bellyIn(slave);
-
} else if (slave.bellyImplant >= 0 && thisSurgery.surgery_bellyImplant === "remove") {
surgeries.push("belly implant removal");
V.surgeryType = "bellyOut";
- if (V.PC.medicine >= 100)
+ if (V.PC.medicine >= 100) {
slave.health -= 5;
- else
+ } else {
slave.health -= 10;
+ }
slave.preg = 0;
slave.bellyImplant = -1;
slave.cervixImplant = 0;
@@ -570,11 +579,11 @@ window.rulesAutosurgery = (function() {
*/
function PrintResult(slave, thisSurgery, surgeries) {
let surgeriesDisplay = "";
- if (surgeries.length === 1)
+ if (surgeries.length === 1) {
surgeriesDisplay = surgeries[0];
- else {
+ } else {
surgeriesDisplay = surgeries.slice(0, surgeries.length - 1).join(", ");
- surgeriesDisplay += ", and" + surgeries[surgeries.length - 1];
+ surgeriesDisplay += `, and${surgeries[surgeries.length - 1]}`;
}
r += `${V.assistantName === "your personal assistant" ? "Your personal assistant" : V.assistantName}, ordered to apply surgery, gives ${slave.slaveName} <span class="lime">${surgeriesDisplay}.</span>`;
}
@@ -582,11 +591,11 @@ window.rulesAutosurgery = (function() {
/** @param {App.Entity.SlaveState} slave */
function bellyIn(slave) {
// less hacky version of calling surgery degradation silently
- if (slave.devotion > 50)
+ if (slave.devotion > 50) {
slave.devotion += 4;
- else if (slave.devotion >= -20)
+ } else if (slave.devotion >= -20) {
slave.trust -= 5;
- else {
+ } else {
slave.trust -= 5;
slave.devotion -= 5;
}
--
GitLab