From cc30489cd388056fca82a32e0e18c90c2c60e344 Mon Sep 17 00:00:00 2001
From: Stuffed <stuffedgame@gmail.com>
Date: Tue, 10 Apr 2018 12:03:35 +0900
Subject: [PATCH] Change rest to remove assignment instead of setting it to
rest
I'm not sure what the difference is exactly, but this just
keeps the previous behavior
Also remove the now-unused workaround files
---
src/npc/fucktoyWorkaround.tw | 6 ------
src/npc/restWorkaround.tw | 6 ------
src/npc/servantWorkaround.tw | 6 ------
src/uncategorized/classesWorkaround.tw | 6 ------
src/uncategorized/confinementWorkaround.tw | 6 ------
src/uncategorized/holeWorkaround.tw | 6 ------
src/uncategorized/milkingWorkaround.tw | 6 ------
src/uncategorized/publicServantWorkaround.tw | 6 ------
src/uncategorized/slaveSummary.tw | 16 ++++++++--------
src/uncategorized/whoreWorkaround.tw | 6 ------
10 files changed, 8 insertions(+), 62 deletions(-)
delete mode 100644 src/npc/fucktoyWorkaround.tw
delete mode 100644 src/npc/restWorkaround.tw
delete mode 100644 src/npc/servantWorkaround.tw
delete mode 100644 src/uncategorized/classesWorkaround.tw
delete mode 100644 src/uncategorized/confinementWorkaround.tw
delete mode 100644 src/uncategorized/holeWorkaround.tw
delete mode 100644 src/uncategorized/milkingWorkaround.tw
delete mode 100644 src/uncategorized/publicServantWorkaround.tw
delete mode 100644 src/uncategorized/whoreWorkaround.tw
diff --git a/src/npc/fucktoyWorkaround.tw b/src/npc/fucktoyWorkaround.tw
deleted file mode 100644
index 86343cdfbaa..00000000000
--- a/src/npc/fucktoyWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Fucktoy Workaround [silently]
-
-<<assignJob $slaves[$i] "please you">>
-
-<<goto "Main">>
-
diff --git a/src/npc/restWorkaround.tw b/src/npc/restWorkaround.tw
deleted file mode 100644
index 439a7300a12..00000000000
--- a/src/npc/restWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Rest Workaround [silently]
-
-<<removeJob $slaves[$i] $slaves[$i].assignment>>
-
-<<goto "Main">>
-
diff --git a/src/npc/servantWorkaround.tw b/src/npc/servantWorkaround.tw
deleted file mode 100644
index 427529ebf4e..00000000000
--- a/src/npc/servantWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Servant Workaround [silently]
-
-<<assignJob $slaves[$i] "be a servant">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/classesWorkaround.tw b/src/uncategorized/classesWorkaround.tw
deleted file mode 100644
index 1e61bdde315..00000000000
--- a/src/uncategorized/classesWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Classes Workaround [silently]
-
-<<assignJob $slaves[$i] "take classes">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/confinementWorkaround.tw b/src/uncategorized/confinementWorkaround.tw
deleted file mode 100644
index c157a6185f5..00000000000
--- a/src/uncategorized/confinementWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Confinement Workaround [silently]
-
-<<assignJob $slaves[$i] "stay confined">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/holeWorkaround.tw b/src/uncategorized/holeWorkaround.tw
deleted file mode 100644
index f5a07f47aea..00000000000
--- a/src/uncategorized/holeWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Hole Workaround [silently]
-
-<<assignJob $slaves[$i] "work a glory hole">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/milkingWorkaround.tw b/src/uncategorized/milkingWorkaround.tw
deleted file mode 100644
index f64bf7c0317..00000000000
--- a/src/uncategorized/milkingWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Milking Workaround [silently]
-
-<<assignJob $slaves[$i] "get milked">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/publicServantWorkaround.tw b/src/uncategorized/publicServantWorkaround.tw
deleted file mode 100644
index 7742aa735e9..00000000000
--- a/src/uncategorized/publicServantWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Public Servant Workaround [silently]
-
-<<assignJob $slaves[$i] "serve the public">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 0ebcb60f14c..34c7638ce6e 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -90,7 +90,7 @@
<<switch _Pass>>
<<case "Main">>
-
+
<<if $useSlaveSummaryTabs == 1>>
<<if $slaveAssignmentTab == "overview">>
<<if $showOneSlave == "Head Girl">>
@@ -100,7 +100,7 @@
<<elseif $showOneSlave == "guard you">>
<<if (_Slave.assignment != "guard you")>><<continue>><</if>>
<</if>>
-
+
<<elseif $slaveAssignmentTab == "resting">>
<<if _Slave.assignment != "rest">><<continue>><</if>>
<<elseif $slaveAssignmentTab == "stay confined">>
@@ -129,7 +129,7 @@
<</if>>
<</if>>
<</if>>
-
+
<<if (_Slave.choosesOwnClothes == 1) && (_Slave.clothes == "choosing her own clothes")>>
<<set $i = _ssi, _oldDevotion = _Slave.devotion>>
<<silently>><<include "SA chooses own clothes">><</silently>>
@@ -142,7 +142,7 @@
<</if>>
<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Slave.ID; }) != -1>>''@@.lightcoral;PA@@''<</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
-
+
<<case "Personal Attention Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
<<link _slaveName>>
@@ -508,7 +508,7 @@ will
<<if ($displayAssignments == 1) && (_Pass == "Main") && (_Slave.ID != $HeadGirl.ID) && (_Slave.ID != $Recruiter.ID) && (_Slave.ID != $Bodyguard.ID)>>
<<if _Slave.assignment != "rest">>
- <<link "Rest" "Main">><<assignJob $slaves[_ssi] "rest">><</link>>
+ <<link "Rest" "Main">><<removeJob $slaves[_ssi] $slaves[_ssi].assignment>><</link>>
<<else>>
Rest
<</if>>
@@ -565,7 +565,7 @@ will
<</if>>
<<set _numFacilities = $brothel+$club+$dairy+$servantsQuarters+$masterSuite+$spa+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
-
+
<<if _numFacilities > 0>>
<<if _Pass == "Main" || _Pass == "Head Girl Suite" || _Pass == "Spa" || _Pass == "Brothel" || _Pass == "Club" || _Pass == "Arcade" || _Pass == "Clinic" || _Pass == "Schoolroom" || _Pass == "Dairy" || _Pass == "Servants' Quarters" || _Pass == "Master Suite" || _Pass == "Cellblock" >>
@@ -574,11 +574,11 @@ will
<br>Transfer to:
<<if _Slave.assignment != "rest" && _Slave.assignment != "please you" && _Slave.assignment != "take classes" && _Slave.assignment != "be a servant" && _Slave.assignment != "whore" && _Slave.assignment != "serve the public" && _Slave.assignment != "get milked" && _Slave.assignment != "stay confined">>
- <<link "Penthouse" "Main">><<assignJob $slaves[_ssi] "rest">><</link>>
+ <<link "Penthouse" "Main">><<removeJob $slaves[_ssi] $slaves[_ssi].assignment>><</link>>
<<else>>
Penthouse |
<</if>>
-
+
<<if $arcade != 0>>
<<if $arcade > $arcadeSlaves && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
[[Arcade|Assign][$assignTo = "Arcade", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
diff --git a/src/uncategorized/whoreWorkaround.tw b/src/uncategorized/whoreWorkaround.tw
deleted file mode 100644
index d5ada4531e7..00000000000
--- a/src/uncategorized/whoreWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Whore Workaround [silently]
-
-<<assignJob $slaves[$i] "whore">>
-
-<<goto "Main">>
-
--
GitLab