diff --git a/src/endWeek/player/prLongTermPhysicalEffects.js b/src/endWeek/player/prLongTermPhysicalEffects.js
index 4f87f3743758ea8cb422181202944272773e3fe0..65c5fe162c5384809c36127700b6db9234f08499 100644
--- a/src/endWeek/player/prLongTermPhysicalEffects.js
+++ b/src/endWeek/player/prLongTermPhysicalEffects.js
@@ -953,31 +953,29 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
}
}
- if (PC.weight >= 100) {
- if (PC.weight > 190) {
- r.push(`Your extreme obesity <span class="health dec">directly impacts</span> your health, but since you let yourself get this large, it's not really that bothersome.`);
- healthDamage(PC, 2);
- if (random(1, 100 + PC.health.condition) < 5) {
- r.push(`Unfortunately, this week ushered in <span class="health dec">severe health complications</span> related to it. After extensive, <span class="cash">and very costly,</span> heart surgery, your life was saved, though you'd better set aside some ¤ for when it happens again.`);
- cashX(forceNeg(15000), "PCmedical");
- healthDamage(PC, 80);
- }
- } else if (PC.weight > 160) {
- if (random(1, 150 + PC.health.condition) < 5) {
- r.push(`Your obesity has brought <span class="health dec">severe health complications</span> upon you this week. They required extensive, <span class="cash">and costly,</span> surgery to correct, so it may be time to pay more mind to your wellbeing.`);
- cashX(forceNeg(5000), "PCmedical");
- healthDamage(PC, 40);
- }
- } else if (PC.weight > 130) {
- if (random(1, 175 + PC.health.condition) < 5) {
- r.push(`Your weight caused you some <span class="health dec">severe health complications</span> this week. They passed after some time, but are rather concerning.`);
- healthDamage(PC, 20);
- }
- } else if (PC.weight > 95) {
- if (random(1, 200 + PC.health.condition) < 5) {
- r.push(`Your weight caused you some <span class="health dec">minor health complications</span> this week. It passed quickly enough, and shouldn't be a real problem.`);
- healthDamage(PC, 5);
- }
+ if (PC.weight > 190) {
+ r.push(`Your extreme obesity <span class="health dec">directly impacts</span> your health, but since you let yourself get this large, it's not really that bothersome.`);
+ healthDamage(PC, 2);
+ if (random(1, 100 + PC.health.condition) < 5) {
+ r.push(`Unfortunately, this week ushered in <span class="health dec">severe health complications</span> related to it. After extensive, <span class="cash">and very costly,</span> heart surgery, your life was saved, though you'd better set aside some ¤ for when it happens again.`);
+ cashX(forceNeg(15000), "PCmedical");
+ healthDamage(PC, 80);
+ }
+ } else if (PC.weight > 160) {
+ if (random(1, 150 + PC.health.condition) < 5) {
+ r.push(`Your obesity has brought <span class="health dec">severe health complications</span> upon you this week. They required extensive, <span class="cash">and costly,</span> surgery to correct, so it may be time to pay more mind to your wellbeing.`);
+ cashX(forceNeg(5000), "PCmedical");
+ healthDamage(PC, 40);
+ }
+ } else if (PC.weight > 130) {
+ if (random(1, 175 + PC.health.condition) < 5) {
+ r.push(`Your weight caused you some <span class="health dec">severe health complications</span> this week. They passed after some time, but are rather concerning.`);
+ healthDamage(PC, 20);
+ }
+ } else if (PC.weight > 95) {
+ if (random(1, 200 + PC.health.condition) < 5) {
+ r.push(`Your weight caused you some <span class="health dec">minor health complications</span> this week. It passed quickly enough, and shouldn't be a real problem.`);
+ healthDamage(PC, 5);
}
}
}
diff --git a/src/endWeek/saGuardYou.js b/src/endWeek/saGuardYou.js
index 48c40fa5bf082a280e922dfd594f9dd419abb6a8..4ab6b852e2663e160d4a19b5f0a4c224250b435a 100644
--- a/src/endWeek/saGuardYou.js
+++ b/src/endWeek/saGuardYou.js
@@ -239,7 +239,6 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
slave.devotion += 1;
} else {
r.push(`Between protecting you, training, and keeping vigil while you sleep, ${he} lives a <span class="health dec">very tiring</span> life.`);
- /** ##Note I assume these two are health effects **/
}
tired(slave);
}
@@ -281,9 +280,9 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
}
}
if (!candidate) {
- if (V.ConcubineID !== 0 && S.Concubine.skill.combat === 0 && S.Concubine.devotion > 50 && S.Concubine.muscles >= -30 && S.Concubine.weight < 150 && S.Concubine.butt < 10 && S.Concubine.boobs < 25000 && S.Concubine.belly < 5000 && S.Concubine.balls < 20 && S.Concubine.dick < 15 && S.Concubine.fuckdoll === 0 && S.Concubine.fetish !== "mindbroken" && canWalk(S.Concubine)) {
+ if (V.ConcubineID !== 0 && S.Concubine.skill.combat === 0 && S.Concubine.devotion > 50 && S.Concubine.muscles >= -30 && S.Concubine.weight < 160 && S.Concubine.butt < 10 && S.Concubine.boobs < 25000 && S.Concubine.belly < 5000 && S.Concubine.balls < 20 && S.Concubine.dick < 15 && S.Concubine.fuckdoll === 0 && S.Concubine.fetish !== "mindbroken" && canWalk(S.Concubine)) {
r.push(`${He} does ${his} best to train ${S.Concubine.slaveName} whenever ${he} can, hoping that your Concubine can be made capable of stepping into ${his} place.`);
- if (S.Concubine.boobs >= 8000 || S.Concubine.butt >= 10 || S.Concubine.belly >= 5000 || S.Concubine.balls >= 10 || S.Concubine.dick >= 10 || S.Concubine.muscles < 0 || S.Concubine.weight >= 100) {
+ if (S.Concubine.boobs >= 8000 || S.Concubine.butt >= 10 || S.Concubine.belly >= 5000 || S.Concubine.balls >= 10 || S.Concubine.dick >= 10 || S.Concubine.muscles < 0 || S.Concubine.weight >= 130) {
r.push(`${His} body is poorly suited for combat, but ${he} can learn to work around it with enough effort.`);
flawedTrainee = jsRandom(0, 50);
}
@@ -291,7 +290,7 @@ App.SlaveAssignment.guardYou = function saGuardYou(slave) {
}
}
if (!candidate) {
- if (V.WardenessID !== 0 && S.Wardeness.skill.combat === 0 && S.Wardeness.fetish !== "mindbroken" && bodyguardSuccessorEligible(S.Wardeness)) {
+ if (V.WardenessID !== 0 && S.Wardeness.skill.combat === 0 && bodyguardSuccessorEligible(S.Wardeness)) {
r.push(`${He} does ${his} best to train ${S.Wardeness.slaveName} whenever ${he} can, hoping that your Wardeness can be made capable of stepping into ${his} place.`);
candidate = S.Wardeness;
}
diff --git a/src/endWeek/saLiveWithHG.js b/src/endWeek/saLiveWithHG.js
index 345ff4354e7797bbbf3bde040cae776eb167e2f8..d38389b0731f550968863dd421a00977b74d5875 100644
--- a/src/endWeek/saLiveWithHG.js
+++ b/src/endWeek/saLiveWithHG.js
@@ -93,7 +93,7 @@ App.SlaveAssignment.liveWithHG = function saliveWithHG(slave) {
} else {
t.push(`and keeps ${him} on ${his} fertility diet.`);
}
- } else if ((slave.weight < 100 && arcology.FSHedonisticDecadence >= 20) || (slave.weight < -10)) {
+ } else if ((slave.weight < 130 && arcology.FSHedonisticDecadence >= 20) || (slave.weight < -10)) {
t.push(`${HG.slaveName} thinks ${slave.slaveName} could use a little extra weight`);
if (arcology.FSHedonisticDecadence >= 20) {
t.push(`since plump ${girl}s are all the rage in your arcology`);
diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js
index 909726a5b943c9a387df4cf9cc93675ecb4a91c4..2b9573d40a76b83374787b391f0e90ed05633aa4 100644
--- a/src/endWeek/saLongTermPhysicalEffects.js
+++ b/src/endWeek/saLongTermPhysicalEffects.js
@@ -2950,35 +2950,33 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
}
}
- if (slave.weight >= 100) {
- if (slave.weight > 190) {
- if (slave.curatives !== 1) {
- r.push(`${His} extreme obesity <span class="health dec">directly affects</span> ${his} health.`);
- healthDamage(slave, 2);
- }
- if (random(1, 200) < 5) {
- r.push(`${He} experienced <span class="health dec">severe health complications</span> due to ${his} weight this week. After extensive surgery, ${his} health was stabilized, though ${his} survival is not assured.`);
- healthDamage(slave, 80);
- }
- } else if (slave.weight > 160) {
- if (slave.curatives !== 1) {
- r.push(`${His} obesity <span class="health dec">directly affects</span> ${his} health.`);
- healthDamage(slave, 1);
- }
- if (random(1, 200) < 5) {
- r.push(`${He} experienced <span class="health dec">severe health complications</span> due to ${his} weight this week. After extensive surgery, ${his} health was stabilized.`);
- healthDamage(slave, 40);
- }
- } else if (slave.weight > 130) {
- if (random(1, 200) < 5) {
- r.push(`${He} experienced <span class="health dec">severe health complications</span> due to ${his} weight this week. After some rest, ${he} recovered.`);
- healthDamage(slave, 20);
- }
- } else if (slave.weight > 95) {
- if (random(1, 200) < 5) {
- r.push(`${He} experienced <span class="health dec">minor health complications</span> due to ${his} weight this week. After some rest, ${he} recovered.`);
- healthDamage(slave, 5);
- }
+ if (slave.weight > 190) {
+ if (slave.curatives !== 1) {
+ r.push(`${His} extreme obesity <span class="health dec">directly affects</span> ${his} health.`);
+ healthDamage(slave, 2);
+ }
+ if (random(1, 200) < 5) {
+ r.push(`${He} experienced <span class="health dec">severe health complications</span> due to ${his} weight this week. After extensive surgery, ${his} health was stabilized, though ${his} survival is not assured.`);
+ healthDamage(slave, 80);
+ }
+ } else if (slave.weight > 160) {
+ if (slave.curatives !== 1) {
+ r.push(`${His} obesity <span class="health dec">directly affects</span> ${his} health.`);
+ healthDamage(slave, 1);
+ }
+ if (random(1, 200) < 5) {
+ r.push(`${He} experienced <span class="health dec">severe health complications</span> due to ${his} weight this week. After extensive surgery, ${his} health was stabilized.`);
+ healthDamage(slave, 40);
+ }
+ } else if (slave.weight > 130) {
+ if (random(1, 200) < 5) {
+ r.push(`${He} experienced <span class="health dec">severe health complications</span> due to ${his} weight this week. After some rest, ${he} recovered.`);
+ healthDamage(slave, 20);
+ }
+ } else if (slave.weight > 95) {
+ if (random(1, 200) < 5) {
+ r.push(`${He} experienced <span class="health dec">minor health complications</span> due to ${his} weight this week. After some rest, ${he} recovered.`);
+ healthDamage(slave, 5);
}
}
}
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index d086bd7528ae0e40ce840c343627a6b83936d005..c5b3f795609688b0ad67a63ffb579b095fedb685 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -374,7 +374,7 @@ globalThis.bodyguardSuccessorEligible = function(slave) {
if (!slave) {
return false;
}
- return (slave.devotion > 50 && slave.muscles >= 0 && slave.weight < 100 && slave.boobs < 8000 && slave.butt < 10 && slave.belly < 5000 && slave.balls < 10 && slave.dick < 10 && slave.preg < 20 && slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && canWalk(slave) && canHold(slave) && canSee(slave) && canHear(slave));
+ return (slave.devotion > 50 && slave.muscles >= 0 && slave.weight < 130 && slave.boobs < 8000 && slave.butt < 10 && slave.belly < 5000 && slave.balls < 10 && slave.dick < 10 && slave.preg < 20 && slave.fuckdoll === 0 && slave.fetish !== "mindbroken" && canWalk(slave) && canHold(slave) && canSee(slave) && canHear(slave));
};
/**
diff --git a/src/npc/generate/lawCompliance.js b/src/npc/generate/lawCompliance.js
index ee337eda42df03c75828b834d6d68a09b46cb055..9f197d832c40b55ab1039c99e36a7f0ba49661e3 100644
--- a/src/npc/generate/lawCompliance.js
+++ b/src/npc/generate/lawCompliance.js
@@ -626,7 +626,7 @@ App.Desc.lawCompliance = function(slave, market = 0) {
}
function weightSMR() {
- if (slave.weight > 100) {
+ if (slave.weight > 95) {
slave.weight = jsRandom(-50, 50);
}
slave.trust -= 5;