diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw index 6819e7be717e5f65faeeb813b93dab6d16e2053c..661fb76ccc73929ddeaffd64fe906a12d4a0396b 100644 --- a/src/gui/mainMenu/AlphaDisclaimer.tw +++ b/src/gui/mainMenu/AlphaDisclaimer.tw @@ -30,7 +30,7 @@ Pregmod is a modification of the original <i>Free Cities</i> created by FCdev, which can be seen at https://freecitiesblog.blogspot.com/. </div> <div class="note"> - version: $ver, mod version: $pmodVer, build: $releaseID, commit: a62b10d6f + version: $ver, mod version: $pmodVer, build: $releaseID </div> <div id="version"> <<link "More version info">> diff --git a/src/js/economyJS.js b/src/js/economyJS.js index 1a617b208a6ac5c2bebbcfc75c0ffa36a4e0854a..7c9a30b07a80ae66414731b5dc41bd643874d148 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -182,7 +182,38 @@ window.CategoryAssociatedGroup = Object.freeze({ 'babyTransfer' ], FINANCIALS: [ - 'weather' + 'weather', + 'rents', + 'fines', + 'event', + 'capEx', + 'futureSocieties', + 'schoolBacking', + 'war', + 'cheating' + ], + POLICIES: [ + 'policies' + ], + EDICTS: [ + 'edicts' + ], + PERSONALFINANCE: [ + 'personalBusiness', + 'personalLivingExpenses', + 'PCSkills', + 'PCtraining', + 'PCmedical', + 'citizenOrphanage', + 'privateOrphanage', + 'stocks', + 'stocksTraded' + ], + SECURITY: [ + 'mercenaries', + 'securityExpansion', + 'specialForces', + 'peacekeepers' ] }); @@ -2559,6 +2590,7 @@ window.setupLastWeeksCash = function() { V.lastWeeksCashExpenses = new App.Data.Records.LastWeeksCash(); V.lastWeeksCashProfits = new App.Data.Records.LastWeeksCash(); + // Here we reset our tracked totals on week end, and add the default categories to all objects V.lastWeeksGatheredTotals = {}; for (var key of Object.keys(CategoryAssociatedGroup)){ V.lastWeeksGatheredTotals[key] = {income: 0, expenses: 0, profits: 0}; diff --git a/src/uncategorized/costsBudget.js b/src/uncategorized/costsBudget.js index 15e23758534f53c63e0e922d5b8aabbe5aa14881..933341ccb4510075d4b3300c6f13a1c1fd1777fb 100644 --- a/src/uncategorized/costsBudget.js +++ b/src/uncategorized/costsBudget.js @@ -724,6 +724,41 @@ App.UI.Budget.Cost = function() { // FINANCIALS generateRowShowTotal("Financials", "FINANCIALS"); generateRowTracking("Weather", "weather"); + generateRowTracking("Rents", "rents"); + generateRowTracking("Fines", "fines"); + generateRowTracking("Events", "event"); + generateRowTracking("Capital Expenses", "capEx"); + generateRowTracking("Future Society Shaping", "futureSocieties"); + generateRowTracking("School Subsidy", "schoolBacking") + generateRowTracking("Arcology conflict", "war"); + generateRowTracking("Cheating", "cheating"); + + // POLICIES + generateRowShowTotal("Policies", "POLICIES"); + generateRowTracking("Policies", "policies"); + + // EDICTS + generateRowShowTotal("Edicts", "EDICTS"); + generateRowTracking("Edicts", "edicts"); + + // PERSONAL FINANCE + generateRowShowTotal("Personal Finance", "PERSONALFINANCE"); + generateRowTracking("Personal Business", "personalBusiness"); + generateRowTracking("Personal Living Expenses", "personalLivingExpenses"); + generateRowTracking("Your skills", "PCSkills"); + generateRowTracking("Your training expenses", "PCtraining"); + generateRowTracking("Your medical expenses", "PCmedical"); + generateRowTracking("Citizen Orphanage", "citizenOrphanage"); + generateRowTracking("Private Orphanage", "privateOrphanage"); + generateRowTracking("Stock dividents", "stocks"); + generateRowTracking("Stock trading", "stocksTraded"); + + // SECURITY + generateRowShowTotal("Security", "SECURITY"); + generateRowTracking("Mercenaries", "mercenaries"); + generateRowTracking("Security Expansion", "securityExpansion"); + generateRowTracking("Special Forces", "specialForces"); + generateRowTracking("Peacekeepers", "peacekeepers"); // BUDGET REPORT createSectionHeader("Budget Report");