From b79971a6bbafcd2b8255016297a27e40ce590956 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 4 Aug 2020 22:04:31 -0400
Subject: [PATCH] move 3 JFC globals into one object
---
js/003-data/gameVariableData.js | 6 ++--
.../backwardsCompatibility.js | 7 ++++
.../JobFulfillmentCenterDelivery.tw | 14 ++++----
.../JobFulfillmentCenterOrder.tw | 32 +++++++++----------
src/uncategorized/scheduledEvent.tw | 2 +-
src/utility/slaveCreationWidgets.tw | 4 +--
6 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 3c4ea750fa0..2e51ec3baf3 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1358,8 +1358,10 @@ App.Data.resetOnNGPlus = {
maxGrowthAge: 24,
/* Job Fulfillment Center */
- JFCOrder: 0,
- Role: "",
+ JFC: {
+ order: 0,
+ role: ""
+ },
cheatMode: 0,
cheatModeM: 1,
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 7249a9fba27..a63d8207d10 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1205,6 +1205,13 @@ App.Update.globalVariables = function(node) {
V.lowerRequirements = V.lowerRequirements || V.lowerRquirements || 0;
}
+ // Job Fulfillment Center (JFC)
+ V.JFC.order = V.JFC.order || V.JFCOrder || 0;
+ V.JFC.role = V.JFC.role || V.Role || "";
+ if (V.JFCReorder) { // Property removed if not in use
+ V.JFC.reorder = V.JFCReorder;
+ }
+
node.append(`Done!`);
};
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index 41b4e563ec2..d48989f6a51 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
@@ -1,15 +1,15 @@
:: JobFulfillmentCenterDelivery [nobr]
-<<set $JFCOrder = 0, $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "Enslaving People">>
+<<set $JFC.order = 0, $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "Enslaving People">>
<<JFCSlave>>
<<set _slaveCost = slaveCost($activeSlave)>>
<<set _slaveCost = _slaveCost*6>>
<<setLocalPronouns $activeSlave>>
-A slave dealer has submitted a slave to satisfy your ''$Role'' order.
+A slave dealer has submitted a slave to satisfy your ''JFC.role'' order.
-<br><br>//As usual, the asking price is quite high, to cover the costs of training a proper <<print $Role>>. In compensation, you can freely decline the slave should $he not meet your standards or the job has already been filled.//
+<br><br>//As usual, the asking price is quite high, to cover the costs of training a proper <<print $JFC.role>>. In compensation, you can freely decline the slave should $he not meet your standards or the job has already been filled.//
<br><br><<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
@@ -22,8 +22,8 @@ A slave dealer has submitted a slave to satisfy your ''$Role'' order.
<<replace "#result">>
$He has been very well trained by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now eagerly awaiting your instructions.
<<include "New Slave Intro">>
- <<set $Role = "">>
- <<if def $JFCReorder>><<run delete $JFCReorder>><</if>>
+ <<set $JFC.role = "">>
+ <<run delete $JFC.reorder>>
<</replace>>
<</link>>
<<else>>
@@ -31,8 +31,8 @@ A slave dealer has submitted a slave to satisfy your ''$Role'' order.
<</if>>
<br>
<<link "Reject this offer and place the same order again">>
- <<set $JFCOrder = 1>>
- <<set $JFCReorder = 1>>
+ <<set $JFC.order = 1>>
+ <<set $JFC.reorder = 1>>
<<goto $nextLink>>
<</link>>
</span>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
index 38241c44967..18ebfeb8796 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
@@ -4,16 +4,16 @@
<<setAssistantPronouns>>
-<<if $JFCOrder == 0>>You work up a new slave order for posting where slave merchants can work to fulfill it.<</if>> <<if $JFCOrder == 1>>You review your posted slave order for a ''$Role''.<</if>> <<if $assistant.personality == 1>>As you work, $assistant.name makes lewd comments about what _heA looks forward to doing to this new slave.<</if>>
+<<if $JFC.order == 0>>You work up a new slave order for posting where slave merchants can work to fulfill it.<</if>> <<if $JFC.order == 1>>You review your posted slave order for a ''JFC.role''.<</if>> <<if $assistant.personality == 1>>As you work, $assistant.name makes lewd comments about what _heA looks forward to doing to this new slave.<</if>>
-<<if $JFCOrder == 0>>
+<<if $JFC.order == 0>>
<span id="JobType">
<br><br>
<<link "Security">>
<<replace "#JobType">>
<br>
- <br>[[Bodyguard|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Bodyguard"]]
- <br>[[Wardeness|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Wardeness"]]
+ <br>[[Bodyguard|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Bodyguard"]]
+ <br>[[Wardeness|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Wardeness"]]
<br>[[Return|JobFulfillmentCenterOrder]]
<</replace>>
<</link>>
@@ -21,14 +21,14 @@
<br><<link "Management">>
<<replace "#JobType">>
<br>
- <br>[[Headgirl|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Headgirl"]]
- <br>[[Teacher|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Teacher"]]
- <br>[[Nurse|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Nurse"]]
- <br>[[Attendant (normal)|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Attendant"]] | [[Attendant (motherly)|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Motherly Attendant"]]
- <br>[[Matron|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Matron"]]
- <br>[[Stewardess|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Stewardess"]]
- <br>[[Milkmaid|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Milkmaid"]]
- <br>[[Farmer|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Farmer"]]
+ <br>[[Headgirl|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Headgirl"]]
+ <br>[[Teacher|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Teacher"]]
+ <br>[[Nurse|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Nurse"]]
+ <br>[[Attendant (normal)|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Attendant"]] | [[Attendant (motherly)|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Motherly Attendant"]]
+ <br>[[Matron|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Matron"]]
+ <br>[[Stewardess|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Stewardess"]]
+ <br>[[Milkmaid|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Milkmaid"]]
+ <br>[[Farmer|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Farmer"]]
<br>[[Return|JobFulfillmentCenterOrder]]
<</replace>>
<</link>>
@@ -36,14 +36,14 @@
<br><<link "Entertainment">>
<<replace "#JobType">>
<br>
- <br>[[DJ|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "DJ"]]
- <br>[[Madam|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Madam"]]
- <br>[[Concubine|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Concubine"]]
+ <br>[[DJ|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "DJ"]]
+ <br>[[Madam|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Madam"]]
+ <br>[[Concubine|JobFulfillmentCenterOrder][$JFC.order = 1, $JFC.role = "Concubine"]]
<br>[[Return|JobFulfillmentCenterOrder]]
<</replace>>
<</link>>
</span>
<<else>>
<br>
- <br>[[Withdraw slave order|JobFulfillmentCenterOrder][$JFCOrder = 0, $Role = ""]]
+ <br>[[Withdraw slave order|JobFulfillmentCenterOrder][$JFC.order = 0, $JFC.role = ""]]
<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 26f93cd7cf5..651d0627a4d 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -135,7 +135,7 @@
<<goto "SE recruiter success">>
<<elseif ($customSlaveOrdered == 1 && $customSlaveOrderedReorder != 1)>>
<<goto "SE custom slave delivery">>
-<<elseif ($JFCOrder == 1 && $JFCReorder != 1)>>
+<<elseif ($JFC.order == 1 && $JFC.reorder != 1)>>
<<goto "JobFulfillmentCenterDelivery">>
<<elseif ($huskSlaveOrdered == 1)>>
<<goto "SE husk slave delivery">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 3d3556ed73b..916ad89f03a 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -666,9 +666,9 @@
<<set $activeSlave.trust = 80, $activeSlave.devotion = 80>>
<<run setHealth($activeSlave, jsRandom(80,95), 0, 0, 0, 0)>>
<<set $activeSlave.origin = "The Job Fulfillment Center offered $his contract to fill your request for a ">>
- <<set $activeSlave.origin += $Role>>
+ <<set $activeSlave.origin += $JFC.role>>
<<set $activeSlave.origin += ".">>
- <<switch $Role>>
+ <<switch $JFC.role>>
/* Opens security */
<<case "Lieutenant Colonel">>
<<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.intelligence = 70, $activeSlave.skill.combat = 1>>
--
GitLab