From 04159520a94ee2492e62618b928a7d4f225f04ef Mon Sep 17 00:00:00 2001
From: Gabor Biro <gabor.biro@cern.ch>
Date: Sat, 2 Aug 2014 21:38:57 +0200
Subject: [PATCH] More upgrades and a little balancing

---
 js/game.js         |  8 ++---
 json/upgrades.json | 81 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/js/game.js b/js/game.js
index c0856ae..d0c768f 100644
--- a/js/game.js
+++ b/js/game.js
@@ -22,7 +22,7 @@
     money: 0,
     researchHistogram: new Histogram('#ResearchHist'),
     getGrant: function () {
-      this.money += this.reputation * 10;  // TODO: adjust factor
+      this.money += this.reputation * 5;  // TODO: adjust factor
     },
     acquire: function (amount) {
       this.data += amount;
@@ -56,7 +56,7 @@
   research.map(function (item) {  // define additional stuff on the objects
     item.level = 0;
     item.is_visible = function () {
-      return this.level > 0 || lab.data >= this.cost * .9;
+      return this.level > 0 || lab.data >= this.cost * .7;
     };
     item.is_available = function () {
       return lab.data >= this.cost;
@@ -73,7 +73,7 @@
   workers.map(function (worker) {
     worker.hired = 0;
     worker.is_visible = function () {
-      return this.hired > 0 || lab.money >= this.cost * .9;
+      return this.hired > 0 || lab.money >= this.cost * .7;
     };
     worker.is_available = function () {
       return lab.money >= this.cost;
@@ -117,7 +117,7 @@
       return false;
     };
     upgrade.is_visible = function () {
-      return !this.used && this.hasReceiver() && lab.money >= this.cost * .9;
+      return !this.used && this.hasReceiver() && lab.money >= this.cost * .7;
     };
     upgrade.is_available = function () {
       return !this.used && this.hasReceiver() && lab.money >= this.cost;
diff --git a/json/upgrades.json b/json/upgrades.json
index d410fc3..a51588c 100644
--- a/json/upgrades.json
+++ b/json/upgrades.json
@@ -14,7 +14,7 @@
   {
     "name": "Free coffee",
     "description": "Sleeping is the coffee of the weaks.",
-    "cost": 1000,
+    "cost": 1500,
     "used": false,
     "type": "hr",
     "receiver": "PhD Students",
@@ -23,10 +23,37 @@
     "constant": 1,
     "image": "assets/coffee.png"
   },
+
+  {
+    "name": "Free beer",
+    "description": "The work is easier when the worker is happy.",
+    "cost": 5000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Postdocs",
+    "property": "rate",
+    "factor": 1.2,
+    "constant": 5,
+    "image": "assets/beer.png"
+  },
+  {
+    "name": "Free coffee",
+    "description": "Sleeping is the coffee of the weaks.",
+    "cost": 20000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Postdocs",
+    "property": "rate",
+    "factor": 1.2,
+    "constant": 5,
+    "image": "assets/coffee.png"
+  },
+
+
   {
     "name": "Detector upgrade",
     "description": "More efficient detector.",
-    "cost": 100,
+    "cost": 1000,
     "used": false,
     "type": "detector",
     "receiver": "",
@@ -38,7 +65,7 @@
   {
     "name": "Propaganda",
     "description": "Makes your weird science popular (?).",
-    "cost": 100,
+    "cost": 1000,
     "used": false,
     "type": "research",
     "receiver": "W-Boson",
@@ -46,5 +73,53 @@
     "factor": 1.2,
     "constant": 1,
     "image": "assets/propaganda.png"
+  },
+  {
+    "name": "Propaganda",
+    "description": "Makes your weird science popular (?).",
+    "cost": 5000,
+    "used": false,
+    "type": "research",
+    "receiver": "Z-Boson",
+    "property": "reputation",
+    "factor": 1.2,
+    "constant": 5,
+    "image": "assets/propaganda.png"
+  },
+  {
+    "name": "Propaganda",
+    "description": "Makes your weird science popular (?).",
+    "cost": 100000,
+    "used": false,
+    "type": "research",
+    "receiver": "top-Quark",
+    "property": "reputation",
+    "factor": 1.2,
+    "constant": 100,
+    "image": "assets/propaganda.png"
+  },
+  {
+    "name": "Propaganda",
+    "description": "Makes your weird science popular (?).",
+    "cost": 500000,
+    "used": false,
+    "type": "research",
+    "receiver": "Higgs-Boson",
+    "property": "reputation",
+    "factor": 1.2,
+    "constant": 1000,
+    "image": "assets/propaganda.png"
+  },
+  {
+    "name": "Propaganda",
+    "description": "Makes your weird science popular (?).",
+    "cost": 5000000,
+    "used": false,
+    "type": "research",
+    "receiver": "MSSM",
+    "property": "reputation",
+    "factor": 1.2,
+    "constant": 1,
+    "image": "assets/propaganda.png"
   }
 ]