From c2884106c4795e96b81ebcfb952db92a9174c2f6 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 21 Apr 2019 04:16:22 -0400
Subject: [PATCH] Added recruiter stuff + moved HG to her suite
---
.../headGirlSuite/headGirlSuiteFramework.js | 16 +++++++++++++++-
src/facilities/penthouse/penthouseFramework.js | 10 +++++-----
src/init/setupVars.tw | 4 ++--
src/js/slaveSummaryWidgets.js | 10 +++++-----
4 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/facilities/headGirlSuite/headGirlSuiteFramework.js b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
index bcf4c1b873b..a40d3cf0a84 100644
--- a/src/facilities/headGirlSuite/headGirlSuiteFramework.js
+++ b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
@@ -10,7 +10,21 @@ App.Data.Facilities.headGirlSuite = {
}
},
defaultJob: "HGToy",
- manager: null
+ manager: {
+ position: "Head Girl",
+ assignment: "be your Head Girl",
+ careers: ["a captain", "a corporate executive", "a director", "a dominatrix", "a gang leader", "a judge", "a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a noblewoman", "a politician", "a Queen", "a slaver", "a student council president"],
+ skill: "headGirl",
+ publicSexUse: false,
+ fuckdollAccepted: false,
+ broodmotherAccepted: false,
+ shouldWalk: true,
+ shouldSee: true,
+ shouldHear: true,
+ shouldTalk: true,
+ shouldThink: true,
+ requiredDevotion: 51
+ }
}
App.Entity.facilities.headGirlSuite = new App.Entity.Facilities.Facility(
diff --git a/src/facilities/penthouse/penthouseFramework.js b/src/facilities/penthouse/penthouseFramework.js
index 9aa441d94bf..d3253aafc05 100644
--- a/src/facilities/penthouse/penthouseFramework.js
+++ b/src/facilities/penthouse/penthouseFramework.js
@@ -66,11 +66,11 @@ App.Data.Facilities.penthouse = {
},
defaultJob: "rest",
manager: {
- position: "Head Girl",
- assignment: "be your Head Girl",
- careers: ["a captain", "a corporate executive", "a director", "a dominatrix", "a gang leader", "a judge", "a lawyer", "a leading arcology citizen", "a military officer", "a model-UN star", "a noblewoman", "a politician", "a Queen", "a slaver", "a student council president"],
- skill: "headGirl",
- publicSexUse: false,
+ position: "Recruiter",
+ assignment: "recruit girls",
+ careers: ["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"],
+ skill: "recruiter",
+ publicSexUse: true,
fuckdollAccepted: false,
broodmotherAccepted: false,
shouldWalk: true,
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 7d204c0a1b5..97f0e27335b 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -317,7 +317,7 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
<<set setup.whoreCareers = ["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"]>>
-<<set setup.HGCareers = App.Data.Facilities.penthouse.manager.careers>>
+<<set setup.HGCareers = App.Data.Facilities.headGirlSuite.manager.careers>>
<<set setup.madamCareers = App.Data.Facilities.brothel.manager.careers>>
@@ -341,7 +341,7 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
<<set setup.schoolteacherCareers = App.Data.Facilities.schoolroom.manager.careers>>
-<<set setup.recruiterCareers = ["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"]>> /* pregmod */
+<<set setup.recruiterCareers = App.Data.Facilities.penthouse.manager.careers>> /* pregmod */
<<set setup.servantCareers = ["a butler", "a cook", "a handmaiden", "a housewife", "a maid", "a shrine maiden"]>>
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 80286c88cef..57cc3835879 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -5085,7 +5085,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
const selectionPassageToFacilityMap = {
- "HG Select": makeSelectionPassageInfo(App.Entity.facilities.penthouse, "HG Workaround"),
+ "HG Select": makeSelectionPassageInfo(App.Entity.facilities.headGirlSuite, "HG Workaround"),
"BG Select": makeSelectionPassageInfo(App.Entity.facilities.armory, "Bodyguard Workaround"),
"Attendant Select": makeSelectionPassageInfo(App.Entity.facilities.spa, "Attendant Workaround"),
"Concubine Select": makeSelectionPassageInfo(App.Entity.facilities.masterSuite, "Concubine Workaround"),
@@ -5099,7 +5099,7 @@ App.UI.slaveSummaryList = function (passageName) {
"Schoolteacher Select": makeSelectionPassageInfo(App.Entity.facilities.schoolroom, "Schoolteacher Workaround"),
"Wardeness Select": makeSelectionPassageInfo(App.Entity.facilities.cellblock, "Wardeness Workaround"),
"Agent Select": makeSelectionPassageInfo(null, "Agent Workaround"),
- "Recruiter Select": makeSelectionPassageInfo(null, "Recruiter Workaround")
+ "Recruiter Select": makeSelectionPassageInfo(App.Entity.facilities.penthouse, "Recruiter Workaround")
};
/** @type {App.Entity.Facilities.Facility} */
@@ -5112,8 +5112,8 @@ App.UI.slaveSummaryList = function (passageName) {
if (passageName === "Main" && V.useSlaveSummaryTabs === 1) {
if (tabName === "overview") {
- if (V.showOneSlave === "Head Girl" && _Slave.assignment !== App.Data.Facilities.penthouse.manager.assignment) continue;
- if (V.showOneSlave === "recruit girls" && _Slave.assignment !== "recruit girls") continue;
+ if (V.showOneSlave === "Head Girl" && _Slave.assignment !== App.Data.Facilities.headGirlSuite.manager.assignment) continue;
+ if (V.showOneSlave === "recruit girls" && _Slave.assignment !== App.Entity.facilities.penthouse.manager.assignment) continue;
if (V.showOneSlave === "guard you" && _Slave.assignment !== App.Data.Facilities.armory.manager.assignment) continue;
} else {
if (tabName === "resting") {
@@ -5166,7 +5166,7 @@ App.UI.slaveSummaryList = function (passageName) {
_Slave = slaves[_ssi]; /* restore devotion value so repeatedly changing clothes isn't an exploit */
}
res.push(dividerAndImage(_Slave));
- if (App.Data.Facilities.penthouse.manager.assignment === _Slave.assignment) res.push('<strong>@@.lightcoral;HG@@</strong> ');
+ if (App.Data.Facilities.headGirlSuite.manager.assignment === _Slave.assignment) res.push('<strong>@@.lightcoral;HG@@</strong> ');
else if ("recruit girls" === _Slave.assignment) res.push('<strong>@@.lightcoral;RC@@</strong> ');
else if (App.Data.Facilities.armory.manager.assignment === _Slave.assignment) res.push('<strong>@@.lightcoral;BG@@</strong> ');
--
GitLab