From 8e309b2d5754de65d5444cf76d5bdd780b548e4f Mon Sep 17 00:00:00 2001
From: Trashman1138 <11461-Trashman1138@users.noreply.gitgud.io>
Date: Thu, 11 Jul 2019 17:08:16 -0700
Subject: [PATCH] Replace saServeThePublic.js
---
src/endWeek/saServeThePublic.js | 48 ++++++++-------------------------
1 file changed, 11 insertions(+), 37 deletions(-)
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index c4ad50c058e..68aeada5f74 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -317,70 +317,44 @@ window.saServeThePublic = (function saServeThePublic() {
r += ` protect ${him} from the wear of being a slut.`;
} else if (slave.health < -50) {
r += ` The stress of being a slut while ill is <span class="red">very hard on ${him}.</span>`;
- slave.health -= 10;
- injury = 1;
} else if (slave.health < -20 && jsRandom(1, 100) > 50) {
r += ` The stress of being a slut while ill is <span class="red">hard on ${him}.</span>`;
- slave.health -= 7;
- injury = 1;
} else if (slave.vagina < 0) {
- if ((slave.skill.anal + slave.skill.oral) >= 200) {
+ if (slave.minorInjury === 0) {
r += ` ${He}'s such an expert public servant that ${he} copes with the stress of being a ${SlaveTitle(slave)} slut.`;
- } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) {
+ } else {
r += ` The stress of being a ${SlaveTitle(slave)} slut is <span class="red">hard on ${him}.</span>`;
- slave.health -= 7;
- injury = 1;
}
} else if (slave.vagina > 0 && !canDoVaginal(slave)) {
if (canDoAnal(slave)) {
- if ((slave.skill.anal + slave.skill.oral) >= 200) {
+ if (slave.minorInjury === 0) {
r += ` ${He}'s such an expert slut that ${he} copes with the stress of being limited to buttsex and oral.`;
- } else if (jsRandom(1, 100) > (40 + (10 * (slave.skill.anal + slave.skill.oral)))) {
+ } else {
r += ` The stress of being limited to buttsex and oral is <span class="red">hard on ${him}.</span>`;
- slave.health -= 7;
- injury = 1;
}
} else {
- if (slave.skill.oral >= 100) {
+ if (slave.minorInjury === 0) {
r += ` ${He}'s such an expert slut that ${he} copes with the stress of being limited to oral.`;
- } else if (jsRandom(1, 100) > (40 + (10 * slave.skill.oral))) {
+ } else {
r += ` The stress of being limited to oral sex is <span class="red">hard on ${him}.</span>`;
- slave.health -= 7;
- injury = 1;
}
}
- } else if ((slave.skill.anal + slave.skill.oral + slave.skill.vaginal) < 300) {
- if (jsRandom(1, 100) > (10 + ((slave.skill.anal + slave.skill.oral + slave.skill.vaginal) / 10))) {
- injury = 1;
- }
}
}
- if (injury === 1) {
- slave.health -= 3;
- let injuryChance;
- if (canDoAnal(slave)) {
- injuryChance = jsRandom(1, 100);
- } else {
- injuryChance = jsRandom(1, 80);
- }
- if (injuryChance > 80) {
- slave.minorInjury = "sore ass";
+ if (slave.minorInjury !== 0) {
+ if (slave.minorInjury === "sore ass") {
r += ` Rough anal with a careless citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`;
r += minorInjuryResponse(slave);
- } else if (injuryChance > 60) {
- slave.minorInjury = "black eye";
+ } else if (slave.minorInjury === "black eye") {
r += ` A violent citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`;
r += minorInjuryResponse(slave);
- } else if (injuryChance > 40) {
- slave.minorInjury = "split lip";
+ } else if (slave.minorInjury === "split lip") {
r += ` An abusive citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`;
r += minorInjuryResponse(slave);
- } else if (injuryChance > 20) {
- slave.minorInjury = "bad bruise";
+ } else if (slave.minorInjury === "bad bruise") {
r += ` A rough citizen left ${him} with a <span class="red">${slave.minorInjury}.</span>`;
r += minorInjuryResponse(slave);
} else {
- slave.minorInjury = "sore muscle";
r += ` The hard labor of constant sex left ${him} with a <span class="red">${slave.minorInjury}.</span>`;
}
}
--
GitLab