From 53c78636525ba560ce7429c3a4b6ad8177ca90b8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 26 Dec 2019 00:52:43 -0500
Subject: [PATCH] canHold facility head kickers cleanup
---
.../penthouse/penthouseFramework.js | 2 +-
src/js/economyJS.js | 3 +++
src/uncategorized/slaveAssignmentsReport.tw | 23 +++++++++----------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/facilities/penthouse/penthouseFramework.js b/src/facilities/penthouse/penthouseFramework.js
index 7b06d4880fd..d9a8bfb4da6 100644
--- a/src/facilities/penthouse/penthouseFramework.js
+++ b/src/facilities/penthouse/penthouseFramework.js
@@ -80,7 +80,7 @@ App.Data.Facilities.penthouse = {
fuckdollAccepted: false,
broodmotherAccepted: false,
shouldWalk: true,
- shouldHold: true,
+ shouldHold: false,
shouldSee: true,
shouldHear: true,
shouldTalk: true,
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 792083c0306..b2b9bd0a6d5 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1127,6 +1127,9 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
} else if (!canHear(V.Madam)) {
V.Madam = 0;
V.unMadam = 6;
+ } else if (!canHold(V.Madam)) {
+ V.Madam = 0;
+ V.unMadam = 7;
}
}
if (V.Madam !== 0) {
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 9dd1b9dcd96..13885f18b98 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -467,7 +467,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$HeadGirl.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Head Girl any more.@@<br>
<<set $HeadGirl = 0>>
<<elseif !canHold($HeadGirl)>>
- ''__@@.pink;$HeadGirl.slaveName@@__'' is no longer disciplinate your slaves @@.yellow;and cannot serve as your Head Girl any more.@@<br>
+ ''__@@.pink;$HeadGirl.slaveName@@__'' is no longer able to handle your slaves @@.yellow;and cannot serve as your Head Girl any more.@@<br>
<<set $HeadGirl = 0>>
<<elseif !canSee($HeadGirl)>>
''__@@.pink;$HeadGirl.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Head Girl any more.@@<br>
@@ -519,9 +519,6 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
<<elseif !canWalk($Recruiter)>>
''__@@.pink;$Recruiter.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your recruiter any more.@@<br>
<<set $Recruiter = 0>>
- <<elseif !canHold($Recruiter)>>
- ''__@@.pink;$Recruiter.slaveName@@__'' can no longer hold @@.yellow;and cannot serve as your recruiter any more.@@<br>
- <<set $Recruiter = 0>>
<<elseif !canSee($Recruiter)>>
''__@@.pink;$Recruiter.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your recruiter any more.@@<br>
<<set $Recruiter = 0>>
@@ -545,6 +542,8 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Madam.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Madam any more.@@<br>
<<elseif $unMadam == 6>>
''__@@.pink;$Madam.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Madam any more.@@<br>
+ <<elseif $unMadam == 7>>
+ ''__@@.pink;$Madam.slaveName@@__'' can no longer handle $his underlings @@.yellow;and cannot serve as your Madam any more.@@<br>
<</if>>
<<if $Madam == 0>>
<<= removeJob($slaves[$i], "be the Madam")>>
@@ -576,7 +575,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Milkmaid.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
<<set $Milkmaid = 0>>
<<elseif !canHold($Milkmaid)>>
- ''__@@.pink;$Milkmaid.slaveName@@__'' can no longer milk your slaves @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
+ ''__@@.pink;$Milkmaid.slaveName@@__'' can no longer handle nor milk your slaves @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
<<set $Milkmaid = 0>>
<<elseif !canSee($Milkmaid)>>
''__@@.pink;$Milkmaid.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Milkmaid any more.@@<br>
@@ -600,7 +599,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Farmer.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Farmer any more.@@<br>
<<set $Farmer = 0>>
<<elseif !canHold($Farmer)>>
- ''__@@.pink;$Farmer.slaveName@@__'' can no longer hold @@.yellow;and cannot serve as your Farmer any more.@@<br>
+ ''__@@.pink;$Farmer.slaveName@@__'' can no longer grip things @@.yellow;and cannot serve as your Farmer any more.@@<br>
<<set $Farmer = 0>>
<<elseif !canSee($Farmer)>>
''__@@.pink;$Farmer.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Farmer any more.@@<br>
@@ -627,7 +626,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Stewardess.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Stewardess any more.@@<br>
<<set $Stewardess = 0>>
<<elseif !canHold($Stewardess)>>
- ''__@@.pink;$Stewardess.slaveName@@__'' can no longer hold @@.yellow;and cannot serve as your Stewardess any more.@@<br>
+ ''__@@.pink;$Stewardess.slaveName@@__'' can no longer handle $his underlings nor effectively clean @@.yellow;and cannot serve as your Stewardess any more.@@<br>
<<set $Stewardess = 0>>
<<elseif !canSee($Stewardess)>>
''__@@.pink;$Stewardess.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Stewardess any more.@@<br>
@@ -666,7 +665,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Wardeness.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Wardeness any more.@@<br>
<<set $Wardeness = 0>>
<<elseif !canHold($Wardeness)>>
- ''__@@.pink;$Wardeness.slaveName@@__'' can no longer hold @@.yellow;and cannot serve as your Wardeness any more.@@<br>
+ ''__@@.pink;$Wardeness.slaveName@@__'' can no longer handle $his charges @@.yellow;and cannot serve as your Wardeness any more.@@<br>
<<set $Wardeness = 0>>
<<elseif $Wardeness.preg > 37 && $Wardeness.broodmother == 2>>
''__@@.pink;$Wardeness.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Wardeness any longer.@@
@@ -693,7 +692,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Attendant.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Attendant any more.@@<br>
<<set $Attendant = 0>>
<<elseif !canHold($Attendant)>>
- ''__@@.pink;$Attendant.slaveName@@__'' can no longer hold @@.yellow;and cannot serve as your Attendant any more.@@<br>
+ ''__@@.pink;$Attendant.slaveName@@__'' can no longer support $his charges @@.yellow;and cannot serve as your Attendant any more.@@<br>
<<set $Attendant = 0>>
<<elseif !canHear($Attendant)>>
''__@@.pink;$Attendant.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Attendant any more.@@<br>
@@ -714,7 +713,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Matron.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Matron any more.@@<br>
<<set $Matron = 0>>
<<elseif !canHold($Matron)>>
- ''__@@.pink;$Matron.slaveName@@__'' can no longer hold @@.yellow;and cannot serve as your Matron any more.@@<br>
+ ''__@@.pink;$Matron.slaveName@@__'' can no longer hold infants @@.yellow;and cannot serve as your Matron any more.@@<br>
<<set $Matron = 0>>
<<elseif !canHear($Matron)>>
''__@@.pink;$Matron.slaveName@@__'' can no longer hear @@.yellow;and cannot serve as your Matron any more.@@<br>
@@ -738,7 +737,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Nurse.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your Nurse any more.@@<br>
<<set $Nurse = 0>>
<<elseif !canHold($Nurse)>>
- ''__@@.pink;$Nurse.slaveName@@__'' can no longer hold @@.yellow;and cannot serve as your Nurse any more.@@<br>
+ ''__@@.pink;$Nurse.slaveName@@__'' can no longer hold onto patients @@.yellow;and cannot serve as your Nurse any more.@@<br>
<<set $Nurse = 0>>
<<elseif !canSee($Nurse)>>
''__@@.pink;$Nurse.slaveName@@__'' can no longer see @@.yellow;and cannot serve as your Nurse any more.@@<br>
@@ -759,7 +758,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
''__@@.pink;$Bodyguard.slaveName@@__'' is no longer independently mobile @@.yellow;and cannot serve as your bodyguard any more.@@<br>
<<set $Bodyguard = 0>>
<<elseif !canHold($Bodyguard)>>
- ''__@@.pink;$Bodyguard.slaveName@@__'' is no longer able to use weapons @@.yellow;and cannot serve as your bodyguard any more.@@<br>
+ ''__@@.pink;$Bodyguard.slaveName@@__'' is no longer able to hold a weapon @@.yellow;and cannot serve as your bodyguard any more.@@<br>
<<set $Bodyguard = 0>>
<<elseif $Bodyguard.preg > 37 && $Bodyguard.broodmother == 2>>
''__@@.pink;$Bodyguard.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your bodyguard any longer.@@
--
GitLab