From 6f400afae7e67f9140ed0cc1dfba8848a10968d4 Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Sat, 9 Feb 2019 21:48:41 -0500 Subject: [PATCH] Move the reset for cash and rep tracking from endweek to nextweek --- src/uncategorized/endWeek.tw | 2 -- src/uncategorized/nextWeek.tw | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw index 1cab3891329..08fefd3be08 100644 --- a/src/uncategorized/endWeek.tw +++ b/src/uncategorized/endWeek.tw @@ -132,8 +132,6 @@ <</if>> <</if>> -<<setupLastWeeksCash>> -<<setupLastWeeksRep>> <<run $slaves.forEach(function(s) { s.lastWeeksCashIncome = 0, s.lastWeeksRepIncome = 0, s.lastWeeksRepExpenses = 0; })>> <<set $lastWeeksCashErrors = "Errors: ">> <<set $lastWeeksRepErrors = "Errors: ">> diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index 320c201a101..801a890152c 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -1,5 +1,8 @@ :: Next Week [nobr] +<<setupLastWeeksCash>> +<<setupLastWeeksRep>> + <<if $rivalOwner != 0>> <<set _rival = $arcologies.find(function(s) { return s.rival == 1; })>> <<if def _rival>> -- GitLab