diff --git a/src/js/game.js b/src/js/game.js index 5f0325ff..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; @@ -79,27 +79,35 @@ 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; + //let months = this.month - this.lastMonth; + // for (let i in selectedIDs) { + // this.money += (MoneyData["BudgetItems"][selectedIDs[i]]["MOCOST"]*months)+; + // } + // 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({ + "EntryName": budget_ledger["BudgetItems"][i]["NAME"], + "Value": (budget_ledger["BudgetItems"][i]["MOCOST"] + budget_ledger["BudgetItems"][i]["MINC"]), + "MONTH":this.month, + "MOD": budget_ledger["BudgetItems"][i]["MOD"] + }); + PollMod += budget_ledger["BudgetItems"][i]["MOD"]; + this.polling += (this.polling*PollMod); + } } - this.lastMonth = this.month; + var CashFlow = budget_ledger.LedgerItems; + this.money = 0; + + for (i = 0; i < CashFlow.length; i++) { + this.money += CashFlow[i].Value; + } + - // 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"] - // }); - // } - // } - // var CashFlow = budget_ledger.LedgerItems; - // this.money = 0; - // for (i = 0; i < CashFlow.length; i++) { - // this.money += CashFlow[i].Value } } handleClick(x,y){ this.lastClickX = x; 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, diff --git a/src/js/voters.js b/src/js/voters.js new file mode 100644 index 00000000..e69de29b