From da1951022be1a2a9385d90d0e2f1a7a39e289c90 Mon Sep 17 00:00:00 2001
From: i107760 <13422-i107760@users.noreply.gitgud.io>
Date: Tue, 24 Mar 2020 22:25:50 +0100
Subject: [PATCH] Make "F" into a global variable ("V.lastWeeksGatheredTotals")
in preperation for facility sheets, and fix some wrong categories for
servants
---
js/003-data/gameVariableData.js | 1 +
src/interaction/budgets/recordTemplates.js | 4 ++--
src/js/economyJS.js | 6 +++---
src/uncategorized/costsBudget.js | 8 ++++----
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index ab244e25693..438199ce076 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -525,6 +525,7 @@ App.Data.resetOnNGPlus = {
lastWeeksRepIncome: {},
lastWeeksRepExpenses: {},
lastWeeksRepProfits: {},
+ lastWeeksGatheredTotals: {},
currentRule: {},
costs: 0,
seeBuilding: 0,
diff --git a/src/interaction/budgets/recordTemplates.js b/src/interaction/budgets/recordTemplates.js
index 735f374df81..c5297ed038c 100644
--- a/src/interaction/budgets/recordTemplates.js
+++ b/src/interaction/budgets/recordTemplates.js
@@ -54,8 +54,8 @@ App.Data.Records.LastWeeksCash = function() {
this.slaveAssignmentTeacher = 0,
this.slaveAssignmentSchool = 0,
this.slaveAssignmentSteward = 0,
- this.slaveAssignmentServant = 0,
- this.slaveAssignmentServantVign = 0,
+ this.slaveAssignmentQuarter = 0,
+ this.slaveAssignmentQuarterVign = 0,
this.slaveAssignmentAttendant = 0,
this.slaveAssignmentSpa = 0,
this.slaveAssignmentBaby_factory = 0,
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 8340df169c1..eceb9aad0f9 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -37,7 +37,7 @@ window.Job = Object.freeze({
TEACHER: 'be the Schoolteacher',
SCHOOL: 'learn in the schoolroom',
STEWARD: 'be the Stewardess',
- SERVANT: 'work as a servant',
+ QUARTER: 'work as a servant',
ATTENDANT: 'be the Attendant',
SPA: 'rest in the spa',
// Does this one exist?
@@ -307,8 +307,8 @@ window.calculateCosts = (function() {
case Job.STEWARD:
cashX(forceNeg(slaveCost), "slaveAssignmentSteward", slave);
break;
- case Job.SERVANT:
- cashX(forceNeg(slaveCost), "slaveAssignmentServant", slave);
+ case Job.QUARTER:
+ cashX(forceNeg(slaveCost), "slaveAssignmentQuarter", slave);
break;
case Job.ATTENDANT:
cashX(forceNeg(slaveCost), "slaveAssignmentAttendant", slave);
diff --git a/src/uncategorized/costsBudget.js b/src/uncategorized/costsBudget.js
index 8d57739e1ac..28493f4fec2 100644
--- a/src/uncategorized/costsBudget.js
+++ b/src/uncategorized/costsBudget.js
@@ -527,10 +527,10 @@ App.UI.Budget.Cost = function() {
]);
*/
// Set up object to track calculated displays
- var F = {};
- let income = "lastWeeksCashIncome";
- let expenses = "lastWeeksCashExpenses";
- let profits = "lastWeeksCashProfits";
+ let income = "lastWeeksCashIncome";
+ let expenses = "lastWeeksCashExpenses";
+ let profits = "lastWeeksCashProfits";
+ let F = V.lastWeeksGatheredTotals;
// HEADER
let header = table.createTHead();
--
GitLab