diff --git a/assets/budget.png b/assets/budget.png new file mode 100644 index 0000000..59effdc Binary files /dev/null and b/assets/budget.png differ diff --git a/assets/budget@2x.png b/assets/budget@2x.png new file mode 100644 index 0000000..e4b0aff Binary files /dev/null and b/assets/budget@2x.png differ diff --git a/assets/conv b/assets/conv new file mode 100755 index 0000000..384b4ad --- /dev/null +++ b/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 diff --git a/assets/energy.png b/assets/energy.png new file mode 100644 index 0000000..41ff377 Binary files /dev/null and b/assets/energy.png differ diff --git a/assets/energy@2x.png b/assets/energy@2x.png new file mode 100644 index 0000000..ddcb610 Binary files /dev/null and b/assets/energy@2x.png differ diff --git a/assets/gadget.png b/assets/gadget.png new file mode 100644 index 0000000..1b45836 Binary files /dev/null and b/assets/gadget.png differ diff --git a/assets/gadget@2x.png b/assets/gadget@2x.png new file mode 100644 index 0000000..2e3ff68 Binary files /dev/null and b/assets/gadget@2x.png differ diff --git a/assets/motivation.png b/assets/motivation.png new file mode 100644 index 0000000..e5f860f Binary files /dev/null and b/assets/motivation.png differ diff --git a/assets/motivation@2x.png b/assets/motivation@2x.png new file mode 100644 index 0000000..05d9bd5 Binary files /dev/null and b/assets/motivation@2x.png differ diff --git a/assets/nobel.png b/assets/nobel.png new file mode 100644 index 0000000..174e27b Binary files /dev/null and b/assets/nobel.png differ diff --git a/assets/nobel@2x.png b/assets/nobel@2x.png new file mode 100644 index 0000000..d630afc Binary files /dev/null and b/assets/nobel@2x.png differ diff --git a/assets/nu.png b/assets/nu.png new file mode 100644 index 0000000..ab70c12 Binary files /dev/null and b/assets/nu.png differ diff --git a/assets/nu.svg b/assets/nu.svg new file mode 100644 index 0000000..cd5583c --- /dev/null +++ b/assets/nu.svg @@ -0,0 +1,104 @@ + + + + + + + + image/svg+xml + + + + + + + + + + W + diff --git a/assets/nu@2x.png b/assets/nu@2x.png new file mode 100644 index 0000000..3051ac6 Binary files /dev/null and b/assets/nu@2x.png differ diff --git a/assets/teamwork.png b/assets/teamwork.png new file mode 100644 index 0000000..3adcd5a Binary files /dev/null and b/assets/teamwork.png differ diff --git a/assets/teamwork@2x.png b/assets/teamwork@2x.png new file mode 100644 index 0000000..7d8a8d8 Binary files /dev/null and b/assets/teamwork@2x.png differ diff --git a/js/game.js b/js/game.js index d0c768f..5e66972 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 * 5; // TODO: adjust factor + this.money += this.reputation * 5; // TODO: adjust factor, 5 }, acquire: function (amount) { this.data += amount; diff --git a/json/research.json b/json/research.json index 1d9f682..ff5e281 100644 --- a/json/research.json +++ b/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" }, { diff --git a/json/upgrades.json b/json/upgrades.json index 7e2551f..16fbf97 100644 --- a/json/upgrades.json +++ b/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 (?).", diff --git a/json/workers.json b/json/workers.json index ee57a08..88d91a1 100644 --- a/json/workers.json +++ b/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" } ]