diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 2c76f5a36878a0e44b9f27606360a9e6b39858d8..b2f0873764b066c030465968ce141166760b4841 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -564,8 +564,8 @@ window.DefaultRules = (function() { ProcessAVirginDildos(slave, rule); } else if (slave.vagina > 0) { ProcessNonVirginDildos(slave, rule); - ProcessVaginalAttachments(slave, rule); } + ProcessVaginalAttachments(slave, rule); } /** @param {App.Entity.SlaveState} slave */ @@ -751,7 +751,6 @@ window.DefaultRules = (function() { slave.vaginalAttachment = rule.vaginalAttachment; if (slave.vaginalAccessory !== "none") { switch (slave.vaginalAttachment) { - case "none": r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} dildo.`; break; @@ -766,7 +765,6 @@ window.DefaultRules = (function() { } } else { switch (slave.vaginalAttachment) { - case "none": r += `<br>${slave.slaveName} has been instructed not to use any vaginal accessories.`; break; @@ -1047,7 +1045,7 @@ window.DefaultRules = (function() { if ((rule.bellyImplantVol !== undefined) && slave.bellyImplant >= 0 && rule.bellyImplantVol >= 0) { r += "<br>"; if (slave.health > -10 ) { - let diff = rule.bellyImplantVol - slave.bellyImplant; + const diff = rule.bellyImplantVol - slave.bellyImplant; if (diff >= 5000 && slave.bellyPain === 0 && slave.health > 50) { r += `${slave.slaveName}'s belly is way too small, so ${he} has been directed to have intensive belly implant filling procedures throughout this week.`; slave.bellyImplant += 1000; @@ -1148,7 +1146,7 @@ window.DefaultRules = (function() { slave.trust -= 10, slave.devotion -= 10; } else if (slave.fetish === "pregnancy") { r += `${he} did not handle it well.`; - let fetishModifier = (slave.fetishStrength / 2); + const fetishModifier = (slave.fetishStrength / 2); slave.devotion -= (1 * fetishModifier), (slave.trust -= 1 * fetishModifier); } else if (slave.devotion <= 20) { r += `${he} did not handle it well.`; @@ -1823,7 +1821,7 @@ window.DefaultRules = (function() { slave.curatives = rule.curatives; } } else { - r += `<br>${slave.slaveName} has been ${rule.curatives > 0 ? "put on preventatives" : "taken off health drugs"}`; + r += `<br>${slave.slaveName} has been ${rule.curatives > 0 ? "put on preventatives" : "taken off health drugs"}.`; slave.curatives = rule.curatives; } } diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js index 78275bcd539bdd8b12cefd3711a596afecd5f214..dfdeb26ed532159478166a978178ad34289b0d4c 100644 --- a/src/js/datatypeCleanupJS.js +++ b/src/js/datatypeCleanupJS.js @@ -1526,7 +1526,7 @@ window.FacilityDatatypeCleanup = (function() { V.dairyPrepUpgrade = Math.clamp(+V.dairyPrepUpgrade, 0, 1) || 0; V.dairyHyperPregRemodel = Math.clamp(+V.dairyHyperPregRemodel, 0, 1) || 0; V.dairyImplantsSetting = Math.clamp(+V.dairyImplantsSetting, 0, 3) || 0; - V.dairyWeightSetting = Math.clamp(+V.dairyWeightSetting, 0, 4) || 0; + V.dairyWeightSetting = Math.clamp(+V.dairyWeightSetting, -1, 4) || 0; /* bioreactors */ V.bioreactorsAnnounced = Math.clamp(+V.bioreactorsAnnounced, 0, 1) || 0; V.createBioreactors = Math.clamp(+V.createBioreactors, 0, 1) || 0; diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 2b61cf819ea041c8828c3563df4443d660adb56c..3de9d95cefa0d2ee1d82591dd64ba5b58333286a 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -1288,7 +1288,7 @@ window.rulesAssistantOptions = (function() { class LeggingsList extends List { constructor() { const items = [ - ["No default setting"], + ["No default setting", "no default setting"], ["None", "none"], ["Short stockings", "short stockings"], ["Long stockings", "long stockings"], diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 7e603835792b90889c23bb7fce270f71c558f738..1bce093e79a7a3ec59872e081b766590fdb006a6 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -694,13 +694,13 @@ $He has <<if ($activeSlave.areolae > 0) && ($activeSlave.areolaeShape == "circle")>> They are big enough that they could be reshaped into a pattern. Graft skin to make $his areolae: [[Heart-shaped|Surgery Degradation][$activeSlave.areolaeShape = "heart",$activeSlave.areolae -= 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "areolae"]] - | [[Star-shaped|Surgery Degradation][$activeSlave.areolaeShape = "star",$activeSlave.areolae -= 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "areolae"]] | + | [[Star-shaped|Surgery Degradation][$activeSlave.areolaeShape = "star",$activeSlave.areolae -= 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "areolae"]] <</if>> <<if $activeSlave.areolae > 0>> | [[Reduce areolae|Surgery Degradation][$activeSlave.areolae -= 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "areolae"]] <</if>> <<if $activeSlave.areolae < 4>> - [[Enlarge areolae|Surgery Degradation][$activeSlave.areolae += 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "areolae"]] + | [[Enlarge areolae|Surgery Degradation][$activeSlave.areolae += 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "areolae"]] <</if>> <</if>>