From e6b66564d75b52b27936a42bb7ef96742d669de0 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 7 Aug 2021 17:39:25 -0700
Subject: [PATCH] servant careers are General, not Leaders.
---
js/003-data/careers.js | 4 ++--
src/endWeek/saNanny.js | 2 +-
src/endWeek/saServant.js | 6 +++---
src/interaction/sellSlave.js | 4 ++--
src/js/economyJS.js | 2 +-
src/js/slaveCostJS.js | 4 ++--
src/npc/descriptions/career.js | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/js/003-data/careers.js b/js/003-data/careers.js
index 8764824377c..d1757edade6 100644
--- a/js/003-data/careers.js
+++ b/js/003-data/careers.js
@@ -16,6 +16,8 @@ App.Data.Careers = {
whore: ["a bimbo", "a child prostitute", "a criminal", "a cum dump", "a Futanari Sister", "a juvenile delinquent", "a mail-order bride", "a meat toilet", "a mistress", "a model", "a pageant star", "a pirate", "a porn star", "a prostitute", "a reality show star", "a saleswoman", "a serial divorcee", "a stripper", "a trophy wife", "an escort", "an exotic dancer"],
+ servant: ["a butler", "a cook", "a handmaiden", "a housewife", "a maid", "a shrine maiden"],
+
/* otherCareers: ["a producer", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>> */
},
Leader: {
@@ -44,7 +46,5 @@ App.Data.Careers = {
schoolteacher: ["a child prodigy", "a coach", "a dean", "a historian", "a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher's pet", "a teacher", "a teaching assistant", "an archaeologist", "an astronaut", "an economist"],
recruiter: ["a club recruiter", "a college scout", "a con artist", "a cult leader", "a girl scout", "a hunter", "a lobbyist", "a military recruiter", "a missionary", "a political activist", "a princess", "a spy", "a talent scout", "retired"],
-
- servant: ["a butler", "a cook", "a handmaiden", "a housewife", "a maid", "a shrine maiden"],
},
};
diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 9908fd16433..6c1a49e9b6d 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -61,7 +61,7 @@ App.SlaveAssignment.nanny = function(slave) {
let t = '';
// TODO:
- if (App.Data.Careers.Leader.servant.includes(slave.career)) {
+ if (App.Data.Careers.General.servant.includes(slave.career)) {
t += ` ${He} has experience with nannying from ${his} life before ${he} was a slave, making ${him} more effective.`;
} else if (slave.skill.servant >= V.masteredXP) {
t += ` ${He} has experience with nannying from working for you, making ${him} more effective.`;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index c5e1fdd264c..ef1f299fcec 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -18,7 +18,7 @@ App.SlaveAssignment.servant = (function() {
return saServant;
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.ReportSlave} slave
* @param {number} [bonus=0] - bonus from facility leader effects
* @returns {string}
*/
@@ -149,7 +149,7 @@ App.SlaveAssignment.servant = (function() {
r.push(`${He} does ${his} very best to be the perfect house${wife}, making ${him} an outstanding servant.`);
}
- if (App.Data.Careers.Leader.servant.includes(slave.career)) {
+ if (App.Data.Careers.General.servant.includes(slave.career)) {
r.push(`${He} has experience with house keeping from ${his} life before ${he} was a slave, making ${him} more effective.`);
} else if (slave.skill.servant >= V.masteredXP) {
r.push(`${He} has experience with house keeping from working for you, making ${him} more effective.`);
@@ -192,7 +192,7 @@ App.SlaveAssignment.servant = (function() {
}
/**
- * @param {App.Entity.SlaveState} slave
+ * @param {FC.ReportSlave} slave
*
*/
function physicalEffects(slave) {
diff --git a/src/interaction/sellSlave.js b/src/interaction/sellSlave.js
index dcd96b949d6..5bca28ec90f 100644
--- a/src/interaction/sellSlave.js
+++ b/src/interaction/sellSlave.js
@@ -341,7 +341,7 @@ App.Interact.sellSlave = function(slave) {
t.push(`${His} background should make ${him} a bit more trusting.`);
} else if (App.Data.Careers.General.menial.includes(slave.career)) {
t.push(`${His} background should make ${him} a bit more tractable.`);
- } else if (App.Data.Careers.Leader.servant.includes(slave.career)) {
+ } else if (App.Data.Careers.General.servant.includes(slave.career)) {
t.push(`${His} background should make ${him} a good servant.`);
}
}
@@ -397,7 +397,7 @@ App.Interact.sellSlave = function(slave) {
if (slave.skill.wardeness >= V.masteredXP && !App.Data.Careers.Leader.wardeness.includes(slave.career)) {
careers.push("Wardeness");
}
- if (slave.skill.servant >= V.masteredXP && !App.Data.Careers.Leader.servant.includes(slave.career)) {
+ if (slave.skill.servant >= V.masteredXP && !App.Data.Careers.General.servant.includes(slave.career)) {
careers.push("Servant");
}
if (slave.skill.entertainer >= V.masteredXP && !App.Data.Careers.General.entertainment.includes(slave.career)) {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index cacc5a3709c..21c3b37531e 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -871,7 +871,7 @@ globalThis.calculateCosts = (function() {
if (slave.assignment === Job.QUARTER) {
effectiveness *= 1.1;
}
- if (App.Data.Careers.Leader.servant.includes(slave.career) || slave.skill.servant >= V.masteredXP) {
+ if (App.Data.Careers.General.servant.includes(slave.career) || slave.skill.servant >= V.masteredXP) {
effectiveness *= 1.1;
}
effectiveness = Math.trunc(effectiveness * restEffects(slave) / 10);
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 2436c2d11cf..68d08bae409 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -2633,7 +2633,7 @@ globalThis.slaveCostBeauty = (function() {
multiplier += 0.05;
} else if (App.Data.Careers.General.menial.includes(slave.career)) {
multiplier += 0.05;
- } else if (App.Data.Careers.Leader.servant.includes(slave.career)) {
+ } else if (App.Data.Careers.General.servant.includes(slave.career)) {
multiplier += 0.05;
}
}
@@ -2686,7 +2686,7 @@ globalThis.slaveCostBeauty = (function() {
if (!App.Data.Careers.Leader.recruiter.includes(slave.career) && slave.skill.recruiter >= V.masteredXP) {
multiplier += 0.1;
}
- if (!App.Data.Careers.Leader.servant.includes(slave.career) && slave.skill.servant >= V.masteredXP) {
+ if (!App.Data.Careers.General.servant.includes(slave.career) && slave.skill.servant >= V.masteredXP) {
multiplier += 0.05;
}
if (!App.Data.Careers.General.entertainment.includes(slave.career) && slave.skill.entertainer >= V.masteredXP) {
diff --git a/src/npc/descriptions/career.js b/src/npc/descriptions/career.js
index 427f4379696..c0878c988bd 100644
--- a/src/npc/descriptions/career.js
+++ b/src/npc/descriptions/career.js
@@ -116,7 +116,7 @@ App.Desc.career = function(slave) {
}
} else if (App.Data.Careers.General.menial.includes(slave.career)) {
r.push(`${career}, giving ${him} experience following orders.`);
- } else if (App.Data.Careers.Leader.servant.includes(slave.career)) {
+ } else if (App.Data.Careers.General.servant.includes(slave.career)) {
r.push(`${career}, giving ${him} a slight edge in housekeeping.`);
} else {
r.push(`${career}.`);
--
GitLab