diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index ab244e25693aa4c662cc3cac54560c444c0241e8..438199ce076264ad09392b21f2ededd8211b0162 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 735f374df816514f839f6289f0851043267ceec3..c5297ed038c7541eb1bc34bd6c828d76c4435dea 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 8340df169c1382e2c4d9375d845d7e9ffcfe961a..eceb9aad0f95799625687926ea199936a0847096 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 8d57739e1ac74b97f49eadc3932f679002161faa..28493f4fec227f1151c761761bda5746b6861ae7 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();