From 468e01d0f04e6ffd0ac6e43fc45690e0726a8b9b Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 18 Oct 2020 16:09:10 -0400
Subject: [PATCH] Gumjob cleaning
---
js/003-data/policiesData.js | 9 +--------
src/endWeek/saChoosesOwnJob.js | 4 ++--
src/npc/children/longChildDescription.js | 3 ---
src/npc/descriptions/mouth.js | 4 ++--
src/npc/generate/lawCompliance.js | 4 +---
5 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index accfec545c0..9bbd1421023 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -333,9 +333,6 @@ App.Data.Policies.Selection = {
title: "Gumjob Fetishism",
text: "you will use your personal influence to make toothless slaves and gummy blowjobs more desirable than not.",
activatedText: "you are using your personal influence to make toothless slaves and gummy blowjobs more desirable than not.",
- get requirements() { return (V.arcologies[0].FSDegradationist != "unset" ||
- V.arcologies[0].FSTransformationFetishist != "unset" ||
- V.arcologies[0].FSMaturityPreferentialist != "unset") },
note: `Will increase beauty of slaves without teeth, and decrease beauty and usage of slaves with teeth`
}
],
@@ -344,11 +341,7 @@ App.Data.Policies.Selection = {
title: "Gumjob Fetishism SMR",
text: "in order to be sold in your arcology, slaves will need to have their teeth removed.",
activatedText: "in order to be sold in your arcology, slaves must have their teeth removed.",
- get requirements() { return ((V.arcologies[0].FSDegradationist >= 90 ||
- V.arcologies[0].FSTransformationFetishist >= 90 ||
- V.arcologies[0].FSMaturityPreferentialist >= 90) &&
- V.arcologies[0].FSPaternalist === "unset"); },
- note: `Will increase beauty of slaves without teeth, and decrease beauty and usage of slaves with teeth`
+ get requirements() { return (V.arcologies[0].FSPaternalist === "unset"); },
}
],
},
diff --git a/src/endWeek/saChoosesOwnJob.js b/src/endWeek/saChoosesOwnJob.js
index b30719ef237..f77cecf7efd 100644
--- a/src/endWeek/saChoosesOwnJob.js
+++ b/src/endWeek/saChoosesOwnJob.js
@@ -184,7 +184,7 @@ App.SlaveAssignment.choosesOwnJob = (function() {
choice.push(assignJob(slave, "serve the public"));
}
slave.sexAmount = 10;
- } else if (slave.energy > 60 && (V.policies.gumjobFetishism === 0 || (V.policies.gumjobFetishism === 1 && slave.teeth == "removable"))) {
+ } else if (slave.energy > 60) {
choice.push(`and ${he} thinks of little but sex with you,`);
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`so ${he} heads straight to ${V.masterSuiteName}.`);
@@ -344,7 +344,7 @@ App.SlaveAssignment.choosesOwnJob = (function() {
}
slave.sexAmount = 10;
}
- } else if (slave.fetish === "pregnancy" && (V.policies.gumjobFetishism === 0 || (V.policies.gumjobFetishism === 1 && slave.teeth == "removable"))) {
+ } else if (slave.fetish === "pregnancy") {
if (V.PC.dick > 0 && isFertile(slave)) {
if (V.universalRulesAssignsSelfFacility === 1 && V.masterSuite > masterSL) {
choice.push(`decides to serve you in ${V.masterSuiteName}, hoping that you'll get ${him} pregnant.`);
diff --git a/src/npc/children/longChildDescription.js b/src/npc/children/longChildDescription.js
index ceb2fa26654..34ab09241ff 100644
--- a/src/npc/children/longChildDescription.js
+++ b/src/npc/children/longChildDescription.js
@@ -3944,9 +3944,6 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
r += `${He} is in the process of replacing ${his} baby teeth. `;
}
}
- if(V.policies.gumjobFetishism === 1 && child.teeth !== "removable") {
- r += `${His} teeth have not yet been removed and replaced with high-quality dentures.`;
- }
if (child.tastes === -1) {
r += `${He} has no sense of taste, but this isn't immediately obvious just by looking at ${his} tongue. `;
diff --git a/src/npc/descriptions/mouth.js b/src/npc/descriptions/mouth.js
index f10234b8e9f..2e31bcbc1cb 100644
--- a/src/npc/descriptions/mouth.js
+++ b/src/npc/descriptions/mouth.js
@@ -130,8 +130,8 @@ App.Desc.mouth = function(slave) {
r.push(`${He} is in the process of replacing ${his} baby teeth.`);
}
}
- if(V.policies.gumjobFetishism === 1 && slave.teeth !== "removable") {
- r.push(`${His} teeth have not yet been removed and replaced with high-quality dentures.`);
+ if (V.policies.gumjobFetishism === 1 && slave.teeth !== "removable") {
+ r.push(`${His} teeth have not yet been removed, <span class="red">disappointing</span> those that find them unwilling to pop out.`);
}
}
if (slave.tastes === -1) {
diff --git a/src/npc/generate/lawCompliance.js b/src/npc/generate/lawCompliance.js
index c99f2830c36..b5f2cb59426 100644
--- a/src/npc/generate/lawCompliance.js
+++ b/src/npc/generate/lawCompliance.js
@@ -309,9 +309,7 @@ App.Desc.lawCompliance = function(slave, market = 0) {
if(slave.devotion <= 50) {
slave.trust -= 10;
}
- if(slave.health.longDamage <= 30) {
- Math.clamp(slave.health.longDamage += 20, 0, 50);
- }
+ healthDamage(slave, 10);
return `In order to qualify for sale, ${he} has had his teeth removed and replaced with high-quality, removable dentures.`;
}
--
GitLab