From 1ebce3deb6c126f8af62f580b6b4360ff29aea98 Mon Sep 17 00:00:00 2001 From: baculus87 Date: Sun, 28 Apr 2019 10:16:34 -0700 Subject: [PATCH 1/4] Update money.js --- src/js/money.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/js/money.js b/src/js/money.js index 52a37f93..a5f8c9e6 100644 --- a/src/js/money.js +++ b/src/js/money.js @@ -2,7 +2,7 @@ let MoneyData = { "BudgetItems": [ { "NAME": "Campaign Manager", - "MOD": 0.2, + "MOD": 0.02, "INITCOST": 0, "MOCOST": -2000, "MINC": 2300, @@ -11,9 +11,9 @@ let MoneyData = { }, { "NAME": "Graphic Designer", - "MOD": 0.1, - "INITCOST": -2000, - "MOCOST": 0, + "MOD": 0.01, + "INITCOST": 0, + "MOCOST": -200, "MINC": 400, "MEFF": 0, "ID": 1 @@ -29,7 +29,7 @@ let MoneyData = { }, { "NAME": "Volunteer Coordinator", - "MOD": 0.3, + "MOD": 0.03, "INITCOST": 0, "MOCOST": -800, "MINC": 800, @@ -38,7 +38,7 @@ let MoneyData = { }, { "NAME": "Literature/Digital", - "MOD": 0.3, + "MOD": 0.03, "INITCOST": 0, "MOCOST": -3000, "MINC": 1000, @@ -47,7 +47,7 @@ let MoneyData = { }, { "NAME": "Other Media", - "MOD": 0.2, + "MOD": 0.02, "INITCOST": 0, "MOCOST": -3000, "MINC": 0, From 5da2d6be85eb939c2b69ffe4f0e929fc993ed4ac Mon Sep 17 00:00:00 2001 From: baculus87 Date: Sun, 28 Apr 2019 10:36:05 -0700 Subject: [PATCH 2/4] Some rollbacks to the old code. Gotta test to make sure it works. --- src/js/game.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/js/game.js b/src/js/game.js index 5f0325ff..d2fad45b 100644 --- a/src/js/game.js +++ b/src/js/game.js @@ -79,27 +79,27 @@ class Game{ } calculateBudget(selectedIDs) { if (this.month <= this.lastMonth) return; - let months = this.month - this.lastMonth; - for (let i in selectedIDs) { - this.money += MoneyData["BudgetItems"][selectedIDs[i]]["MOCOST"]*months; - } - this.lastMonth = this.month; - - // for (var i = 0; i < selectedIDs.length; i++){ - // if (budget_ledger["BudgetItems"][i].ID = selectedIDs[i]) { - // budget_ledger.LedgerItems.push({ - // "EntryName": budget_ledger["BudgetItems"][i]["NAME"], - // "Value": (budget_ledger["BudgetItems"][i]["MOCOST"] == 0) ? budget_ledger["BudgetItems"][i]["INITCOST"]:budget_ledger["BudgetItems"][i]["MOCOST"], - // "MONTH":month, - // "MOD": budget_ledger["BudgetItems"][i]["MOD"] - // }); - // } + //let months = this.month - this.lastMonth; + // for (let i in selectedIDs) { + // this.money += (MoneyData["BudgetItems"][selectedIDs[i]]["MOCOST"]*months)+; // } - // var CashFlow = budget_ledger.LedgerItems; - // this.money = 0; + // this.lastMonth = this.month; + + for (var i = 0; i < selectedIDs.length; i++){ + if (budget_ledger["BudgetItems"][i].ID = selectedIDs[i]) { + budget_ledger.LedgerItems.push({ + "EntryName": budget_ledger["BudgetItems"][i]["NAME"], + "Value": (budget_ledger["BudgetItems"][i]["MOCOST"] == 0) ? budget_ledger["BudgetItems"][i]["INITCOST"]:budget_ledger["BudgetItems"][i]["MOCOST"], + "MONTH":this.month, + "MOD": budget_ledger["BudgetItems"][i]["MOD"] + }); + } + } + var CashFlow = budget_ledger.LedgerItems; + this.money = 0; - // for (i = 0; i < CashFlow.length; i++) { - // this.money += CashFlow[i].Value } + for (i = 0; i < CashFlow.length; i++) { + this.money += CashFlow[i].Value } } handleClick(x,y){ this.lastClickX = x; From 10443c7547707e9580e54b59d8d88c22842c3e15 Mon Sep 17 00:00:00 2001 From: baculus87 Date: Sun, 28 Apr 2019 10:52:45 -0700 Subject: [PATCH 3/4] Update game.js --- src/js/game.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/game.js b/src/js/game.js index d2fad45b..56d09ba5 100644 --- a/src/js/game.js +++ b/src/js/game.js @@ -89,7 +89,7 @@ class Game{ if (budget_ledger["BudgetItems"][i].ID = selectedIDs[i]) { budget_ledger.LedgerItems.push({ "EntryName": budget_ledger["BudgetItems"][i]["NAME"], - "Value": (budget_ledger["BudgetItems"][i]["MOCOST"] == 0) ? budget_ledger["BudgetItems"][i]["INITCOST"]:budget_ledger["BudgetItems"][i]["MOCOST"], + "Value": (budget_ledger["BudgetItems"][i]["MOCOST"] + budget_ledger["BudgetItems"][i]["MINC"]), "MONTH":this.month, "MOD": budget_ledger["BudgetItems"][i]["MOD"] }); From e047812e14ed3f28b9030d0a7f5b331ac625da70 Mon Sep 17 00:00:00 2001 From: baculus87 Date: Sun, 28 Apr 2019 11:36:58 -0700 Subject: [PATCH 4/4] Polling Data Part of Budget Function --- src/js/game.js | 14 +++++++++++--- src/js/voters.js | 0 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 src/js/voters.js diff --git a/src/js/game.js b/src/js/game.js index 56d09ba5..b5a132d1 100644 --- a/src/js/game.js +++ b/src/js/game.js @@ -43,9 +43,9 @@ class Game{ this.money = 10000; // starting budget // Scoring - this.polling = 0.3251243124; // TODO calculate this somewhere + this.polling = 0.1; this.month = 0; - this.lastMonth = 0; // updated when calculateBudget() is called + this.lastMonth = 0; // Background this.backgroundImage = null; @@ -85,6 +85,8 @@ class Game{ // } // this.lastMonth = this.month; + var PollMod = 0; + for (var i = 0; i < selectedIDs.length; i++){ if (budget_ledger["BudgetItems"][i].ID = selectedIDs[i]) { budget_ledger.LedgerItems.push({ @@ -93,13 +95,19 @@ class Game{ "MONTH":this.month, "MOD": budget_ledger["BudgetItems"][i]["MOD"] }); + PollMod += budget_ledger["BudgetItems"][i]["MOD"]; + this.polling += (this.polling*PollMod); } } var CashFlow = budget_ledger.LedgerItems; this.money = 0; for (i = 0; i < CashFlow.length; i++) { - this.money += CashFlow[i].Value } + this.money += CashFlow[i].Value; + } + + + } handleClick(x,y){ this.lastClickX = x; diff --git a/src/js/voters.js b/src/js/voters.js new file mode 100644 index 00000000..e69de29b