diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js index 2e5aa8683e86f0338c641fc2357e8387346fa1ca..7e79b731835b436696ca7099fb305b91e6125831 100644 --- a/src/endWeek/saWhore.js +++ b/src/endWeek/saWhore.js @@ -480,10 +480,10 @@ window.saWhore = (function saWhore() { let canA = canDoAnal(slave); let canV = canDoVaginal(slave); let skilltarget = (100 + ((slave.skill.anal - 100)*canA*(1.5 - .5*canV) + (slave.skill.vaginal - 100)*canV*(1.5 - .5*canA) + (slave.skill.oral - 100)*(3 - 1.5*canA - 1.5*canV + canA*canV))*3/10); - //Complicated, I know - but it should automatically account for what acts are possible to scale the injury risk smoothly between 90% when totally unskilled - //and 0% when perfectly skilled in the relevant method or methods. - if (jsRandom(1,100) > skilltarget) { - slave.health -= 10 - 7*canA*canV; //Any limitations means an injury inflicts the harsher 10 instead of 3 + // Complicated, I know - but it should automatically account for what acts are possible to scale the injury risk smoothly between 90% when totally unskilled + // and 0% when perfectly skilled in the relevant method or methods. + if (jsRandom(1, 100) > skilltarget) { + slave.health -= 10 - 7*canA*canV; // Any limitations means an injury inflicts the harsher 10 instead of 3 injury = 1; } diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 542d3dcb0c70d4eb31eacc15541297ff71ffdaae..308564be44cb86d00df48ab2c7ec0974e4031b43 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -285,7 +285,7 @@ window.DefaultRules = (function() { break; case "work a glory hole": - if (slave.indentureRestrictions <= 0 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl == 1 || V.arcologies[0].FSRestart === "unset")) { + if (slave.indentureRestrictions <= 0 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset")) { break; } else { delete rule.setAssignment; @@ -295,7 +295,7 @@ window.DefaultRules = (function() { case "whore": case "serve the public": case "stay confined": - if ((slave.fuckdoll === 0) && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl == 1 || V.arcologies[0].FSRestart === "unset")) { + if ((slave.fuckdoll === 0) && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset")) { break; } else { delete rule.setAssignment; diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js index 38fb72d13b75081443bf6eecc48884e92a56e6e0..7fe6f523304097baff49009c195d6184e1cb900e 100644 --- a/src/js/rulesAutosurgery.js +++ b/src/js/rulesAutosurgery.js @@ -438,41 +438,31 @@ window.rulesAutosurgery = (function() { if(slave.health > 20 && surgeries.length < 3) { if (slave.horn !== "none" && thisSurgery.horn === 1) { commitProcedure(`surgery to remove ${his} implanted horns`, s => { s.horn = "none"; }); - } - else if (slave.horn !== "curved succubus horns" && thisSurgery.horn === 2) { + } else if (slave.horn !== "curved succubus horns" && thisSurgery.horn === 2) { commitProcedure(`surgery to implant ${his} with curved succubus horns`, s => { s.horn = "curved succubus horns"; s.hornColor = "white"; }); - } - else if (slave.horn !== "backswept horns" && thisSurgery.horn === 3) { + } else if (slave.horn !== "backswept horns" && thisSurgery.horn === 3) { commitProcedure(`surgery to implant ${his} with backswept horns`, s => { s.horn = "backswept horns"; s.hornColor = "white"; }); - } - else if (slave.horn !== "cow horns" && thisSurgery.horn === 4) { + } else if (slave.horn !== "cow horns" && thisSurgery.horn === 4) { commitProcedure(`surgery to implant ${his} with cow horns`, s => { s.horn = "cow horns"; s.hornColor = "white"; }); - } - else if (slave.horn !== "one long oni horn" && thisSurgery.horn === 5) { + } else if (slave.horn !== "one long oni horn" && thisSurgery.horn === 5) { commitProcedure(`surgery to implant ${his} with one long oni horn`, s => { s.horn = "one long oni horn"; s.hornColor = "white"; }); - } - else if (slave.horn !== "two long oni horns" && thisSurgery.horn === 6) { + } else if (slave.horn !== "two long oni horns" && thisSurgery.horn === 6) { commitProcedure(`surgery to implant ${his} with two long oni horns`, s => { s.horn = "two long oni horns"; s.hornColor = "white"; }); - } - else if (slave.horn !== "small horns" && thisSurgery.horn === 7) { + } else if (slave.horn !== "small horns" && thisSurgery.horn === 7) { commitProcedure(`surgery to implant ${his} with small horns`, s => { s.horn = "small horns"; s.hornColor = "white"; }); } } if(slave.health > 20 && surgeries.length < 3) { if (slave.earShape !== "normal" && thisSurgery.earShape === 1) { commitProcedure(`surgery to restore ${his} modified ears`, s => { s.earShape = "normal"; }); - } - else if (slave.earShape !== "pointy" && thisSurgery.earShape === 2) { + } else if (slave.earShape !== "pointy" && thisSurgery.earShape === 2) { commitProcedure(`surgery to modify ${his} ears into a pair of small pointy ears`, s => { s.earShape = "pointy"; }); - } - else if (slave.earShape !== "elven" && thisSurgery.earShape === 3) { + } else if (slave.earShape !== "elven" && thisSurgery.earShape === 3) { commitProcedure(`surgery to modify ${his} ears into a pair of elven ears`, s => { s.earShape = "elven"; }); - } - else if (slave.earShape !== "ushi" && thisSurgery.earShape === 4) { + } else if (slave.earShape !== "ushi" && thisSurgery.earShape === 4) { commitProcedure(`surgery to modify ${his} ears into a pair of bovine-like ears`, s => { s.earShape = "ushi"; }); } } - } /**