More workers, researches and upgrades. Balancing (== lot of testing/playing) needed!

assets/conv

@@ -0,0 +1,4 @@
+#!/bin/bash
+convert $1 -resize 128x128 $2@2x.png
+convert $2@2x.png -resize 64x64 $2.png
+rm $1

assets/nu.svg

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="64"
+   height="64"
+   sodipodi:docname="nu.png">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="718"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="52.200269"
+     inkscape:cy="36.489185"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <image
+     width="64"
+     height="64"
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAABS1JREFU
+eJztm1FoG3Ucx7+/S5MshRLRdWudq+jL7IsM91DKqnMKw+G0MHxpXxSE1lZTN3JJwTEJG1WapKw0
+2tg9OZD2bTDsqAgyp5UyYQ8+zaKCFmXFFmnsSJq0dz8f0lwvbS49L3eXZOnnqf3f//7/3/fb3v3v
+fv/fAXvUNmT1BKGeUH2jt77DQXSMgSMAHQGhCeAGAhoAgIFVgFbBWAR4noB5ifnuUiI5G7oaSloZ
+nyUGxMXIARbQTcBZIrQB5DI2EmeYcYeB6yRjsi8a+NvcSE024BN/9AWHAwEQv0KgOjPHZvAGmL6S
+JETeGxG/M2tcUwz4NDh80kGOSwA6zBhPB7Ms8cW+aODbUgcqyYAr54aa97ncI0ToKjUQIzBjai2T
+9p8fvXDf6BiGDRgfjJ4WwFMAeY2OYQ6ckEFd/cPijJGzBSMnxYNRP4Gnyy8eAMhL4Ol4MOo3dPb/
+6Tzm87mdnpYJInrTyGRWw8zX1lMLvQOxWFrvOboNGPN91OjyOG+AqN1YeDbBPJdJrXcOxD5Y0tNd
+1yUw5vO5q0I8ABC1uzzOG2M+n1tPd10GOD0tE1UhPgdRu9PTMqGnq2O3DvFg1E9EwdKjshciOvrq
+8VMPbv7w9VzRfsUOjg9GTxN4mkCGVotyw2CZQWeKLZGaBlw5N9TscbvuVcZSVwqcSKUzrVoPS5p/
+2X0u90j1iwcA8ma1aBwt1BgXIy+Sg25ZF5T9sMQnC707FPwPIAddtjwim9HStMOA8UD4BOx7q7OT
+jk1teewwgEgQ7YnHfgppy7sHxMXIATjwlxnJjEeb9qP5qSfy2v649xserKxqniMIAlrbns1rSyyv
+4M9ffi81HACbSRUJh9SZpTyhLKBbMCmT8/jTh3H89Zfy2hLLK8UNqHOgo/PlvLZff/rZNAMIVCcL
+3A1gVJkzvwPOmjJTBbNdo2JAqCdUn01gPtwQoS3UE6rP/a4Y0Oit7zCeva0myJXVmkUxwEF0rDwB
+2Y9aq2JAdtOiNlBrVd0EqWYMUGvdWvIITVZP693/CNaSBzWP1zlN3UvRRqVVNSM3WL1VuH2NLx/c
+kPtJuQRyG5W1gFprVWZ6zES5BBhYJeAxKyf7Z3EZ6dSa5nESCE1PHrIyBAC57fgsqnsArcJiA+Zu
+3i76XF/ncuLtSwNWhrAJKQZsXQKMRRtmrgxUWlX3AJ4vRyzlYUurehWoGQPUWhUDJOa75QnHftRa
+FQOWEslZgDPlCclOOJPVmmUrH3A1lGTGnfIEZR/MuKOuPMt7EGLguv0h2ct2jfkpMRmTDN6wNyT7
+YPAGyZhUt+14+4kHo18S4Yx9YdkHM6b7wuJr6rYd7wKShIh9IdlLIW0F338/G4x+j4dvd2j2nWHx
++e2NBd8GJZY+tD4ee2GJLxZqL2jAu+HBW8yYsjYk+2DGlFZVqWY+YC2T9gOcsCwq2+BEVkthNA04
+P3rhvgzqYrBsTWDWw2BZBnUVK6UtmhHqHxZnwNVXIKXAFNythFZXFjQejHxeqdWhWjDztb5w4K3d
++unKCa6nFnrBXLTcrKJgnltPLfTq6arLgIFYLJ1JrXdWhQlKqay+euFdCyVzzPz4TfLUc898IdR5
+DxPRUeMRWsdmsfQbA7GP/9V7jqGdkHgw6gdxuFIKKBksgynYFxY1y+G02Ptgwui0/cPiTCqdaS3n
+EyMzplLpTKtR8YBJm4GbhZWXUWsfTW1nPBA+QSSIVn42xyxH+yPB22aNa8l28Oj7QwddbldXzX04
+WYhK/3R2j1rnP8Op6HQtsFZIAAAAAElFTkSuQmCC
+"
+     id="image10"
+     x="0"
+     y="0" />
+  <rect
+     style="fill:#98778c;fill-opacity:1"
+     id="rect2987"
+     width="30.779661"
+     height="29.423729"
+     x="15.593224"
+     y="15.728813" />
+  <text
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmex10;-inkscape-font-specification:cmex10"
+     x="21.423729"
+     y="20.474577"
+     id="text2989"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2991"
+       x="21.423729"
+       y="20.474577"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:cmex10;-inkscape-font-specification:cmex10">W</tspan></text>
+</svg>

js/game.js

@@ -22,7 +22,7 @@
     money: 0,
     researchHistogram: new Histogram('#ResearchHist'),
     getGrant: function () {
-      this.money += this.reputation * 5;  // TODO: adjust factor
+      this.money += this.reputation * 5;  // TODO: adjust factor, 5
     },
     acquire: function (amount) {
       this.data += amount;

json/research.json

@@ -12,7 +12,7 @@
     "description": "The Z-Boson.",
     "reputation": 5,
     "cost": 100,
-    "cost_increase": 1.3,
+    "cost_increase": 1.35,
     "image": "assets/Z.png"
   },
   {
@@ -20,15 +20,23 @@
     "description": "The top-Quark.",
     "reputation": 50,
     "cost": 2000,
-    "cost_increase": 1.3,
+    "cost_increase": 1.4,
     "image": "assets/t.png"
   },
+  {
+    "name": "Oscillating neutrinos",
+    "description": "They are slightly slower than speed (yes, really...), and on top of that they're oscillating.",
+    "reputation": 100,
+    "cost": 25000,
+    "cost_increase": 1.45,
+    "image": "assets/nu.png"
+  },
   {
     "name": "Higgs-Boson",
     "description": "The Higgs-Boson...",
     "reputation": 200,
     "cost": 50000,
-    "cost_increase": 1.3,
+    "cost_increase": 1.5,
     "image": "assets/H.png"
   },
   {

json/upgrades.json

@@ -1,67 +1,227 @@
 [
   {
     "name": "Free beer",
-    "description": "The work is easier when the worker is happy. Upgrades your slav... I mean your PhD Students.",
-    "cost": 100,
+    "description": "The work is easier when the worker is happy. Your slav... I mean your PhD Students will produce +2 data.",
+    "cost": 1000,
     "used": false,
     "type": "hr",
     "receiver": "PhD Students",
     "property": "rate",
-    "factor": 1.2,
-    "constant": 1,
+    "factor": 1,
+    "constant": 2,
     "image": "assets/beer.png"
   },
   {
-    "name": "Free coffee",
-    "description": "Sleeping is the coffee of the weaks. Upgrades your slav... I mean you PhD Students.",
-    "cost": 1500,
+    "name": "Extra coffee",
+    "description": "Sleeping is the coffee of the weaks. Your slav... I mean your PhD Students will produce 1.3 times more data.",
+    "cost": 3000,
     "used": false,
     "type": "hr",
     "receiver": "PhD Students",
     "property": "rate",
-    "factor": 1.2,
-    "constant": 1,
+    "factor": 1.5,
+    "constant": 0,
     "image": "assets/coffee.png"
   },
+  {
+    "name": "Motivation",
+    "description": "There are other, you know... more diligent Students... Your slav... I mean your PhD Students will produce 2 times more data.",
+    "cost": 10000,
+    "used": false,
+    "type": "hr",
+    "receiver": "PhD Students",
+    "property": "rate",
+    "factor": 2,
+    "constant": 0,
+    "image": "assets/motivation.png"
+  },
+  {
+    "name": "Division of labor",
+    "description": "Teamwork between PhD Students is a great invention. Your slav... I mean your PhD Students will produce much more data.",
+    "cost": 200000,
+    "used": false,
+    "type": "hr",
+    "receiver": "PhD Students",
+    "property": "rate",
+    "factor": 3,
+    "constant": 3,
+    "image": "assets/teamwork.png"
+  },
 
   {
     "name": "Free beer",
-    "description": "The work is easier when the worker is happy. Upgrades your Postdocs.",
+    "description": "The work is easier when the worker is happy. Your Postdocs will produce +4 data.",
     "cost": 5000,
     "used": false,
     "type": "hr",
     "receiver": "Postdocs",
     "property": "rate",
-    "factor": 1.2,
-    "constant": 5,
+    "factor": 1,
+    "constant": 4,
     "image": "assets/beer.png"
   },
   {
-    "name": "Free coffee",
-    "description": "Sleeping is the coffee of the weaks. Upgrades your Postdocs.",
+    "name": "Extra coffee",
+    "description": "Sleeping is the coffee of the weaks. Your Postdocs will produce 1.5 times more data.",
     "cost": 20000,
     "used": false,
     "type": "hr",
     "receiver": "Postdocs",
     "property": "rate",
-    "factor": 1.2,
-    "constant": 5,
+    "factor": 1.5,
+    "constant": 0,
     "image": "assets/coffee.png"
   },
-
+  {
+    "name": "Motivation",
+    "description": "There are other, you know... more diligent Postdocs... Your Postdocs will produce 2 times more data.",
+    "cost": 500000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Postdocs",
+    "property": "rate",
+    "factor": 2,
+    "constant": 0,
+    "image": "assets/motivation.png"
+  },
+  {
+    "name": "Division of labor",
+    "description": "Teamwork between Postdocs is a great invention. Your Postdocs will produce much more data.",
+    "cost": 2000000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Postdocs",
+    "property": "rate",
+    "factor": 1.5,
+    "constant": 18,
+    "image": "assets/teamwork.png"
+  },
 
   {
-    "name": "Detector upgrade",
-    "description": "Increases the luminosity (you get more data with clicks).",
+    "name": "Increased budget",
+    "description": "Your Fellows get a little more money. They will produce +25 more data.",
+    "cost": 200000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Fellows",
+    "property": "rate",
+    "factor": 1,
+    "constant": 25,
+    "image": "assets/budget.png"
+  },
+  {
+    "name": "New gadgets",
+    "description": "Your Fellows get new techs. They will produce 1.4 times more data.",
+    "cost": 800000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Fellows",
+    "property": "rate",
+    "factor": 1.4,
+    "constant": 0,
+    "image": "assets/gadget.png"
+  },
+
+  {
+    "name": "More PhD Students",
+    "description": "Your Mighty Professors get some Students to work. They will produce +75 more data.",
+    "cost": 20000000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Tenured Professors",
+    "property": "rate",
+    "factor": 1,
+    "constant": 75,
+    "image": "assets/budget.png"
+  },
+
+  {
+    "name": "2. Nobel Prize",
+    "description": "So your Brightest Minds now are demigods... They will produce 1.7 times more data.",
+    "cost": 100000000,
+    "used": false,
+    "type": "hr",
+    "receiver": "Nobel Prize Winners",
+    "property": "rate",
+    "factor": 1.7,
+    "constant": 0,
+    "image": "assets/nobel.png"
+  },
+
+  {
+    "name": "Accelerator upgrade",
+    "description": "Increases the luminosity (you get 2 times more data with clicks).",
     "cost": 1000,
     "used": false,
     "type": "detector",
     "receiver": "",
     "property": "rate",
+    "factor": 2,
+    "constant": 0,
+    "image": "assets/energy.png"
+  },
+  {
+    "name": "Accelerator upgrade 2",
+    "description": "Increases the luminosity (you get 2 times more data with clicks).",
+    "cost": 10000,
+    "used": false,
+    "type": "detector",
+    "receiver": "",
+    "property": "rate",
+    "factor": 2,
+    "constant": 0,
+    "image": "assets/energy.png"
+  },
+  {
+    "name": "Accelerator upgrade 3",
+    "description": "Increases the luminosity (you get 2 times more data with clicks).",
+    "cost": 100000,
+    "used": false,
+    "type": "detector",
+    "receiver": "",
+    "property": "rate",
+    "factor": 2,
+    "constant": 0,
+    "image": "assets/energy.png"
+  },
+
+  {
+    "name": "Detector upgrade",
+    "description": "Your amazing detector works with better efficiency (you get +2 data with clicks).",
+    "cost": 500,
+    "used": false,
+    "type": "detector",
+    "receiver": "",
+    "property": "rate",
     "factor": 1,
-    "constant": 1,
+    "constant": 2,
     "image": "assets/efficiency.png"
   },
+  {
+    "name": "Detector upgrade 2",
+    "description": "Your amazing detector works with better efficiency (you get +6 data with clicks).",
+    "cost": 5000,
+    "used": false,
+    "type": "detector",
+    "receiver": "",
+    "property": "rate",
+    "factor": 1,
+    "constant": 6,
+    "image": "assets/efficiency.png"
+  },
+  {
+    "name": "Detector upgrade 3",
+    "description": "Your amazing detector works with better efficiency (you get +24 data with clicks).",
+    "cost": 50000,
+    "used": false,
+    "type": "detector",
+    "receiver": "",
+    "property": "rate",
+    "factor": 0,
+    "constant": 24,
+    "image": "assets/efficiency.png"
+  },
+
   {
     "name": "Propaganda",
     "description": "Makes your weird science (W-Boson) more popular (?).",

json/workers.json

@@ -10,33 +10,41 @@
   {
     "name": "Postdocs",
     "description": "Can get shit done for you.",
-    "cost": 1000,
+    "cost": 2000,
     "cost_increase": 1.4,
-    "rate": 10,
+    "rate": 5,
     "image": "http://placekitten.com/64/64"
   },
   {
     "name": "Fellows",
     "description": "You pay them a lot. They work a lot.",
-    "cost": 10000,
+    "cost": 50000,
     "cost_increase": 1.5,
-    "rate": 100,
+    "rate": 50,
     "image": "http://placekitten.com/64/64"
   },
   {
     "name": "Tenured Professors",
     "description": "They bring their own group along and are able to get a lot of work done.",
-    "cost": 100000,
+    "cost": 1000000,
     "cost_increase": 1.6,
-    "rate": 1000,
+    "rate": 100,
     "image": "http://placekitten.com/64/64"
   },
   {
     "name": "Nobel Prize Winners",
     "description": "Hell Yeah.",
-    "cost": 1000000,
+    "cost": 50000000,
     "cost_increase": 1.8,
-    "rate": 10000,
+    "rate": 500,
+    "image": "http://placekitten.com/64/64"
+  },
+  {
+    "name": "Summer Students",
+    "description": "They are AWESOME. They best ideas come between two parties.",
+    "cost": 99999999,
+    "cost_increase": 3,
+    "rate": 1000,
     "image": "http://placekitten.com/64/64"
   }
 ]