Skip to content

Commit

Permalink
Some work on balancing. Not quite there yet.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kdungs
kdungs committed Dec 12, 2014
1 parent babf580 commit 88109a7
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 39 deletions.
36 changes: 18 additions & 18 deletions json/research.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"image": "assets/icons/png/Jpsi.png",
"info": "html/Jpsi.html",
"state": {
"reputation": 5,
"reputation": 10,
"cost": 100,
"info_levels": [1, 5, 10, 25]
}
Expand All @@ -33,8 +33,8 @@
"image": "assets/icons/png/tau.png",
"info": "html/tau.html",
"state": {
"reputation": 50,
"cost": 2000,
"reputation": 100,
"cost": 1000,
"info_levels": [1, 5, 10, 25]
}
},
Expand All @@ -46,8 +46,8 @@
"image": "assets/icons/png/b.png",
"info": "html/b.html",
"state": {
"reputation": 100,
"cost": 25000,
"reputation": 1000,
"cost": 10000,
"info_levels": [1, 5, 10, 25]
}
},
Expand All @@ -59,33 +59,33 @@
"image": "assets/icons/png/weak.png",
"info": "html/weak.html",
"state": {
"reputation": 200,
"cost": 50000,
"reputation": 10000,
"cost": 100000,
"info_levels": [1, 5, 10, 25]
}
},
{
"key": "research-top",
"name": "Top quark",
"description": "The heaviest of the quarks.",
"cost_increase": 2,
"cost_increase": 1.65,
"image": "assets/icons/png/t.png",
"info": "html/top.html",
"state": {
"reputation": 1000,
"cost": 2000000,
"reputation": 100000,
"cost": 1000000,
"info_levels": [1, 5, 10, 25]
}
},
{
"key": "research-antihydrogen",
"name": "Antihydrogen",
"description": "The lightest anti-atom, it consists of an antiproton and a positron.",
"cost_increase": 2.5,
"cost_increase": 1.7,
"image": "assets/icons/png/antihydrogen.png",
"info": "html/antihydrogen.html",
"state": {
"reputation": 5000,
"reputation": 1000000,
"cost": 10000000,
"info_levels": [1, 5, 10, 25]
}
Expand All @@ -94,25 +94,25 @@
"key": "research-boscillations",
"name": "B oscillations",
"description": "B mesons turn into their antiparticles and vice versa!",
"cost_increase": 2.5,
"cost_increase": 1.75,
"image": "assets/icons/png/BBbar.png",
"info": "html/BBbar.html",
"state": {
"reputation": 5000,
"cost": 50000000,
"reputation": 10000000,
"cost": 100000000,
"info_levels": [1, 5, 10, 25]
}
},
{
"key": "research-higgs",
"name": "Higgs boson",
"description": "Spontaneous symmetry breaking and Goldstone bosons sound familiar to you, right?",
"cost_increase": 3,
"cost_increase": 1.8,
"image": "assets/icons/png/H.png",
"info": "html/H.html",
"state": {
"reputation": 10000,
"cost": 72500000,
"reputation": 100000000,
"cost": 1000000000,
"info_levels": [1, 5, 10, 25]
}
}
Expand Down
92 changes: 90 additions & 2 deletions json/upgrades.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,56 @@
],
"factor": 2
},
{
"key": "upgrade-postdocs1",
"name": "Postdocs 1",
"description": "",
"effect": "Postdocs produce an additional 30 data per second.",
"icon": "fa-group",
"cost": 10000,
"targets": [{"key": "workers-postdocs", "property": "rate"}],
"requirements": [{"key": "workers-postdocs", "property": "hired", "threshold": 5}],
"constant": 30
},
{
"key": "upgrade-postdocs2",
"name": "Postdocs 2",
"description": "",
"effect": "Postdocs produce twice as much data per second.",
"icon": "fa-group",
"cost": 10000,
"targets": [{"key": "workers-postdocs", "property": "rate"}],
"requirements": [
{"key": "upgrade-postdocs1", "property": "used", "threshold": 1}
],
"factor": 2
},
{
"key": "upgrade-postdocs3",
"name": "Postdocs 3",
"description": "",
"effect": "Postdocs produce twice as much data per second.",
"icon": "fa-group",
"cost": 100000,
"targets": [{"key": "workers-postdocs", "property": "rate"}],
"requirements": [
{"key": "upgrade-postdocs2", "property": "used", "threshold": 1}
],
"factor": 2
},
{
"key": "upgrade-postdocs4",
"name": "Postdocs 4",
"description": "",
"effect": "Postdocs produce twice as much data per second.",
"icon": "fa-group",
"cost": 1000000,
"targets": [{"key": "workers-postdocs", "property": "rate"}],
"requirements": [
{"key": "upgrade-postdocs3", "property": "used", "threshold": 1}
],
"factor": 2
},
{
"key": "upgrade-summerlectures",
"name": "Summer Lectures",
Expand Down Expand Up @@ -101,18 +151,18 @@
],
"factor": 2
},

{
"key": "upgrade-coffee",
"name": "Free coffee",
"description": "Addictively delicious. Also free.",
"effect": "All workers produce twice as much data per second.",
"icon": "fa-group",
"icon": "fa-coffee",
"cost": 1e6,
"targets": [
{"key": "workers-phdstudents", "property": "rate"},
{"key": "workers-postdocs", "property": "rate"},
{"key": "workers-fellows", "property": "rate"},
{"key": "workers-permanent", "property": "rate"},
{"key": "workers-profs", "property": "rate"},
{"key": "workers-nobel", "property": "rate"},
{"key": "workers-summies", "property": "rate"}
Expand All @@ -121,10 +171,48 @@
{"key": "workers-phdstudents", "property": "hired", "threshold": 1},
{"key": "workers-postdocs", "property": "hired", "threshold": 1},
{"key": "workers-fellows", "property": "hired", "threshold": 1},
{"key": "workers-permanent", "property": "hired", "threshold": 1},
{"key": "workers-profs", "property": "hired", "threshold": 1},
{"key": "workers-nobel", "property": "hired", "threshold": 1},
{"key": "workers-summies", "property": "hired", "threshold": 1}
],
"factor": 2
},
{
"key": "upgrade-energy1",
"name": "√s = 1 GeV",
"description": "Increased centre-of-mass energy.",
"effect": "Double the amount of data per click.",
"icon": "fa-bolt",
"cost": 10,
"targets": [{"key": "lab", "property": "detector"}],
"requirements": [],
"factor": 2
},
{
"key": "upgrade-energy2",
"name": "√s = 10 GeV",
"description": "Increased centre-of-mass energy.",
"effect": "Double the amount of data per click.",
"icon": "fa-bolt",
"cost": 100,
"targets": [{"key": "lab", "property": "detector"}],
"requirements": [
{"key": "upgrade-energy1", "property": "used", "threshold": 1}
],
"factor": 2
},
{
"key": "upgrade-energy3",
"name": "√s = 100 GeV",
"description": "Increased centre-of-mass energy.",
"effect": "Double the amount of data per click.",
"icon": "fa-bolt",
"cost": 1000,
"targets": [{"key": "lab", "property": "detector"}],
"requirements": [
{"key": "upgrade-energy2", "property": "used", "threshold": 1}
],
"factor": 2
}
]
48 changes: 29 additions & 19 deletions json/workers.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,70 @@
"key": "workers-phdstudents",
"name": "PhD Students",
"description": "Cheap and enthusiastic manpower, they can save you a lot of work.",
"cost_increase": 1.4,
"cost_increase": 1.2,
"state": {
"cost": 100,
"rate": 1
"cost": 1e2,
"rate": 1e0
}
},
{
"key": "workers-postdocs",
"name": "Postdocs",
"description": "These brilliant minds are here only to serve your needs.",
"cost_increase": 1.4,
"cost_increase": 1.25,
"state": {
"cost": 2000,
"rate": 5
"cost": 1e3,
"rate": 1e1
}
},
{
"key": "workers-fellows",
"name": "Research Fellows",
"description": "You pay them a lot. They work a lot.",
"cost_increase": 1.5,
"cost_increase": 1.3,
"state": {
"cost": 50000,
"rate": 50
"cost": 1e4,
"rate": 1e2
}
},
{
"key": "workers-permanent",
"name": "Permanent Staff",
"description": "Somebody who gets a permanent position in physics has to be good.",
"cost_increase": 1.35,
"state": {
"cost": 1e5,
"rate": 1e3
}
},
{
"key": "workers-profs",
"name": "Tenured Professors",
"description": "They bring their own group along and are able to get a lot of work done.",
"cost_increase": 1.6,
"cost_increase": 1.4,
"state": {
"cost": 1000000,
"rate": 100
"cost": 1e6,
"rate": 1e4
}
},
{
"key": "workers-nobel",
"name": "Nobel Prize Winners",
"description": "They received their prize for a reason... Why don't you give them more money?",
"cost_increase": 2,
"description": "They received their prize for a reason.",
"cost_increase": 1.45,
"state": {
"cost": 50000000,
"rate": 500
"cost": 1e7,
"rate": 1e5
}
},
{
"key": "workers-summies",
"name": "Summer Students",
"description": "They are AWESOME. Their best ideas come between two parties.",
"cost_increase": 3,
"cost_increase": 1.5,
"state": {
"cost": 99999999,
"rate": 1000
"cost": 1e8,
"rate": 1e6
}
}
]

0 comments on commit 88109a7

Please sign in to comment.