From 36aee5d4641769b475ed42a22f2f8758bd8343cc Mon Sep 17 00:00:00 2001
From: Anu <barrychahal@gmail.com>
Date: Thu, 17 Jun 2021 07:38:55 +0000
Subject: [PATCH 1/2] Update src/js/DefaultRules.js
---
src/js/DefaultRules.js | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index d9d220b08fc..30f676b9ccd 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1618,14 +1618,17 @@ globalThis.DefaultRules = (function() {
if ((slave.diet !== "restricted")) {
slave.diet = "restricted";
r += `<br>${slave.slaveName} is too fat so ${his} diet has been set to restricted.`;
+ dietPills(slave);
}
} else if (((slave.weight < -95) || ((slave.weight < -30) && (slave.hips > -2)))) {
if ((slave.diet !== "fattening")) {
slave.diet = "fattening";
r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`;
+ dietPills(slave);
}
} else if (["restricted", "fattening"].includes(slave.diet)) {
r += `<br>${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`;
+ dietPills(slave);
muscleRule(slave, rule);
} else {
muscleRule(slave, rule);
@@ -1635,14 +1638,17 @@ globalThis.DefaultRules = (function() {
if (slave.diet !== "restricted") {
slave.diet = "restricted";
r += `<br>${slave.slaveName} is too fat so ${his} diet has been set to restricted.`;
+ dietPills(slave);
}
} else if (slave.weight < rule.weight.min) {
if (slave.diet !== "fattening") {
slave.diet = "fattening";
r += `<br>${slave.slaveName} is too skinny so ${his} diet has been set to fattening.`;
+ dietPills(slave);
}
} else if (["restricted", "fattening"].includes(slave.diet)) {
r += `<br>${slave.slaveName} is at the target weight, so ${his} diet has been normalized.`;
+ dietPills(slave);
muscleRule(slave, rule);
} else {
muscleRule(slave, rule);
@@ -1680,6 +1686,7 @@ globalThis.DefaultRules = (function() {
if (slave.diet !== "fattening") {
slave.diet = "fattening";
r += `<br>${slave.slaveName} is on drugs designed to expand major body parts, so ${he}'s been put on a fattening diet to provide ${his} body as much fuel for growth as possible.`;
+ dietPills(slave);
}
} else if ((rule.diet === "XX")) {
if ((slave.diet !== "XX")) {
@@ -1755,13 +1762,14 @@ globalThis.DefaultRules = (function() {
dietRule(slave, rule);
}
- // TODO: Place these somewhere in a function too.
- if (slave.drugs === "appetite suppressors" && slave.diet !== "restricted") {
- slave.drugs = "no drugs";
- r += `<br>${slave.slaveName} no longer needs to lose weight, so ${he}'s no longer being given appetite suppressors.`;
- } else if (slave.diet === "restricted" && V.arcologies[0].FSSlimnessEnthusiastResearch === 1 && slave.drugs === "no drugs") {
- slave.drugs = "appetite suppressors";
- r += `<br>${slave.slaveName} needs to lose weight so ${he} will be given weight loss pills.`;
+ function dietPills(slave) {
+ if (slave.drugs === "appetite suppressors" && slave.diet !== "restricted") {
+ slave.drugs = "no drugs";
+ r += `<br>${slave.slaveName} no longer needs to lose weight, so ${he}'s no longer being given appetite suppressors.`;
+ } else if (slave.diet === "restricted" && V.arcologies[0].FSSlimnessEnthusiastResearch === 1 && slave.drugs === "no drugs") {
+ slave.drugs = "appetite suppressors";
+ r += `<br>${slave.slaveName} needs to lose weight so ${he} will be given weight loss pills.`;
+ }
}
}
--
GitLab
From 35c409c15f94107dccf312470e72cde0496bc2cb Mon Sep 17 00:00:00 2001
From: Anu <barrychahal@gmail.com>
Date: Thu, 17 Jun 2021 10:03:13 +0000
Subject: [PATCH 2/2] fix spacing
---
src/npc/interaction/fFeelings.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/npc/interaction/fFeelings.js b/src/npc/interaction/fFeelings.js
index 58635247662..492b3afb658 100644
--- a/src/npc/interaction/fFeelings.js
+++ b/src/npc/interaction/fFeelings.js
@@ -1728,7 +1728,7 @@ App.Interact.feelings = function(slave) {
} else if (slave.relationship <= 4) {
r.push(Spoken(slave, `I really love ${_partnerName}." ${He} blushes. "Thank you for letting us be together, ${Master}.`));
} else {
- r.push(Spoken(slave, `I'm so happy with${_partnerName}." ${He} blushes. "Thank you for ${him2}, ${Master}.`));
+ r.push(Spoken(slave, `I'm so happy with ${_partnerName}." ${He} blushes. "Thank you for ${him2}, ${Master}.`));
}
if (slave.relationship >= 3) {
if (slave.mother === _partner.ID) {
--
GitLab