From 1e88b2ee8bfea08568b73ab8ad092258e1af1446 Mon Sep 17 00:00:00 2001 From: Kevin Dungs Date: Tue, 9 Dec 2014 03:11:55 +0100 Subject: [PATCH] Some work on the balancing, getting there slowly. --- json/research.json | 34 ++--- json/upgrades.json | 329 ++++++++++++++++++++++++++++++++++++--------- json/workers.json | 44 +++--- 3 files changed, 310 insertions(+), 97 deletions(-) diff --git a/json/research.json b/json/research.json index fdf9cc8..ba47b1b 100644 --- a/json/research.json +++ b/json/research.json @@ -3,12 +3,12 @@ "key": "research-cpv", "name": "CP violation", "description": "CP symmetry is broken!", - "cost_increase": 1.4, + "cost_increase": 1.8, "image": "assets/icons/png/CPV.png", "info": "html/CPV.html", "state": { - "reputation": 1, - "cost": 10, + "reputation": 1e0, + "cost": 1e1, "info_levels": [ 1, 5, 10, 25 ] } }, @@ -16,12 +16,12 @@ "key": "research-jpsi", "name": "J/ψ", "description": "The J/ψ meson consists of a c and an anti-c quark.", - "cost_increase": 1.45, + "cost_increase": 1.7, "image": "assets/icons/png/Jpsi.png", "info": "html/Jpsi.html", "state": { - "reputation": 10, - "cost": 100, + "reputation": 1e1, + "cost": 4e2, "info_levels": [ 1, 5, 10, 25 ] } }, @@ -29,7 +29,7 @@ "key": "research-tau", "name": "τ lepton", "description": "The third generation charged lepton.", - "cost_increase": 1.5, + "cost_increase": 1.15, "image": "assets/icons/png/tau.png", "info": "html/tau.html", "state": { @@ -42,7 +42,7 @@ "key": "research-beauty", "name": "Beauty quark", "description": "The third generation down-type quark.", - "cost_increase": 1.55, + "cost_increase": 1.15, "image": "assets/icons/png/b.png", "info": "html/b.html", "state": { @@ -55,7 +55,7 @@ "key": "research-gluons", "name": "Gluons", "description": "8 almost identical elementary particles that convey the strong force.", - "cost_increase": 1.6, + "cost_increase": 1.15, "image": "assets/icons/png/gluons.png", "info": "html/gluons.html", "state": { @@ -68,7 +68,7 @@ "key": "research-weak", "name": "W and Z boson", "description": "The carriers of the weak force.", - "cost_increase": 1.6, + "cost_increase": 1.15, "image": "assets/icons/png/weak.png", "info": "html/weak.html", "state": { @@ -81,7 +81,7 @@ "key": "research-top", "name": "Top quark", "description": "The heaviest of the quarks.", - "cost_increase": 1.65, + "cost_increase": 1.15, "image": "assets/icons/png/t.png", "info": "html/top.html", "state": { @@ -94,7 +94,7 @@ "key": "research-boscillations", "name": "B oscillations", "description": "B mesons turn into their antiparticles and vice versa!", - "cost_increase": 1.75, + "cost_increase": 1.15, "image": "assets/icons/png/BBbar.png", "info": "html/BBbar.html", "state": { @@ -107,7 +107,7 @@ "key": "research-higgs", "name": "Higgs boson", "description": "Spontaneous symmetry breaking and Goldstone bosons sound familiar to you, right?", - "cost_increase": 1.8, + "cost_increase": 1.15, "image": "assets/icons/png/H.png", "info": "html/H.html", "state": { @@ -120,12 +120,12 @@ "key": "research-dstars", "name": "D*s⁻", "description": "The first ever observed heavy flavored spin-3 particle.", - "cost_increase": 1.85, + "cost_increase": 1.15, "image": "assets/icons/png/Dstar_s.png", "info": "html/Dstar_s.html", "state": { "reputation": 1000000000, - "cost": 1, + "cost": 10000000000000, "info_levels": [ 1, 5, 10, 25 ] } }, @@ -133,12 +133,12 @@ "key": "research-xib", "name": "Ξb'- and Ξb*-", "description": "Recently discovered strange beauty baryons. Both differ only in their spin configurations.", - "cost_increase": 1.9, + "cost_increase": 1.15, "image": "assets/icons/png/Xi_b.png", "info": "html/Xi_b.html", "state": { "reputation": 10000000000, - "cost": 1, + "cost": 100000000000000, "info_levels": [ 1, 5, 10, 25 ] } } diff --git a/json/upgrades.json b/json/upgrades.json index c553abe..120c578 100644 --- a/json/upgrades.json +++ b/json/upgrades.json @@ -1,4 +1,29 @@ [ + { + "key": "upgrade-kinderzimmer", + "name": "Kinderzimmer", + "description": "A shared room for all your Master students. Used to be a server room.", + "effect": "Master Students produce an additional 2 data per second.", + "icon": "fa-group", + "cost": 4e2, + "targets": [ { "key": "workers-masterstudents", "property": "rate" } ], + "requirements": [ { "key": "workers-masterstudents", "property": "hired", "threshold": 5 } ], + "constant": 2 + }, + { + "key": "upgrade-owndesk", + "name": "Own desk", + "description": "Not having to share one is a blessing.", + "effect": "Master Students produce twice as much data per second.", + "icon": "fa-group", + "cost": 4e3, + "targets": [ { "key": "workers-masterstudents", "property": "rate" } ], + "requirements": [ + { "key": "upgrade-kinderzimmer", "property": "used", "threshold": 1 }, + { "key": "workers-phdstudents", "property": "hired", "threshold": 1 } + ], + "factor": 2 + }, { "key": "upgrade-thesissupervision", "name": "Thesis supervision", @@ -6,21 +31,21 @@ "effect": "PhD Students produce an additional 3 data per second.", "icon": "fa-group", "cost": 1000, - "targets": [{"key": "workers-phdstudents", "property": "rate"}], - "requirements": [{"key": "workers-phdstudents", "property": "hired", "threshold": 5}], + "targets": [ { "key": "workers-phdstudents", "property": "rate" } ], + "requirements": [ { "key": "workers-phdstudents", "property": "hired", "threshold": 5 } ], "constant": 3 }, { - "key": "upgrade-owndesk", - "name": "Own desk", - "description": "Not having to share one is a blessing.", + "key": "upgrade-ownoffice", + "name": "Own office", + "description": "Each PhD student gets a quiet place for themselves.", "effect": "PhD Students produce twice as much data per second.", "icon": "fa-group", "cost": 10000, - "targets": [{"key": "workers-phdstudents", "property": "rate"}], + "targets": [ { "key": "workers-phdstudents", "property": "rate" } ], "requirements": [ - {"key": "upgrade-thesissupervision", "property": "used", "threshold": 1}, - {"key": "workers-postdocs", "property": "hired", "threshold": 1} + { "key": "upgrade-thesissupervision", "property": "used", "threshold": 1 }, + { "key": "workers-postdocs", "property": "hired", "threshold": 1 } ], "factor": 2 }, @@ -31,10 +56,10 @@ "effect": "PhD Students produce twice as much data per second.", "icon": "fa-group", "cost": 100000, - "targets": [{"key": "workers-phdstudents", "property": "rate"}], + "targets": [ { "key": "workers-phdstudents", "property": "rate" } ], "requirements": [ - {"key": "upgrade-owndesk", "property": "used", "threshold": 1}, - {"key": "workers-fellows", "property": "hired", "threshold": 1} + { "key": "upgrade-ownoffice", "property": "used", "threshold": 1 }, + { "key": "workers-fellows", "property": "hired", "threshold": 1 } ], "factor": 2 }, @@ -45,9 +70,9 @@ "effect": "PhD Students produce twice as much data per second.", "icon": "fa-group", "cost": 1000000, - "targets": [{"key": "workers-phdstudents", "property": "rate"}], + "targets": [ { "key": "workers-phdstudents", "property": "rate" } ], "requirements": [ - {"key": "upgrade-mentoring", "property": "used", "threshold": 1} + { "key": "upgrade-mentoring", "property": "used", "threshold": 1 } ], "factor": 2 }, @@ -58,8 +83,8 @@ "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}], + "targets": [ { "key": "workers-postdocs", "property": "rate" } ], + "requirements": [ { "key": "workers-postdocs", "property": "hired", "threshold": 5 } ], "constant": 30 }, { @@ -69,9 +94,9 @@ "effect": "Postdocs produce twice as much data per second.", "icon": "fa-group", "cost": 10000, - "targets": [{"key": "workers-postdocs", "property": "rate"}], + "targets": [ { "key": "workers-postdocs", "property": "rate" } ], "requirements": [ - {"key": "upgrade-postdocs1", "property": "used", "threshold": 1} + { "key": "upgrade-postdocs1", "property": "used", "threshold": 1 } ], "factor": 2 }, @@ -82,9 +107,9 @@ "effect": "Postdocs produce twice as much data per second.", "icon": "fa-group", "cost": 100000, - "targets": [{"key": "workers-postdocs", "property": "rate"}], + "targets": [ { "key": "workers-postdocs", "property": "rate" } ], "requirements": [ - {"key": "upgrade-postdocs2", "property": "used", "threshold": 1} + { "key": "upgrade-postdocs2", "property": "used", "threshold": 1 } ], "factor": 2 }, @@ -95,9 +120,9 @@ "effect": "Postdocs produce twice as much data per second.", "icon": "fa-group", "cost": 1000000, - "targets": [{"key": "workers-postdocs", "property": "rate"}], + "targets": [ { "key": "workers-postdocs", "property": "rate" } ], "requirements": [ - {"key": "upgrade-postdocs3", "property": "used", "threshold": 1} + { "key": "upgrade-postdocs3", "property": "used", "threshold": 1 } ], "factor": 2 }, @@ -108,8 +133,8 @@ "effect": "Summmer Students produce an additional 3 data per second.", "icon": "fa-group", "cost": 1000, - "targets": [{"key": "workers-summies", "property": "rate"}], - "requirements": [{"key": "workers-summies", "property": "hired", "threshold": 5}], + "targets": [ { "key": "workers-summies", "property": "rate" } ], + "requirements": [ { "key": "workers-summies", "property": "hired", "threshold": 5 } ], "constant": 3 }, { @@ -119,9 +144,9 @@ "effect": "Summer Students produce twice as much data per second.", "icon": "fa-group", "cost": 10000, - "targets": [{"key": "workers-summies", "property": "rate"}], + "targets": [ { "key": "workers-summies", "property": "rate" } ], "requirements": [ - {"key": "upgrade-summerlectures", "property": "used", "threshold": 1} + { "key": "upgrade-summerlectures", "property": "used", "threshold": 1 } ], "factor": 2 }, @@ -132,9 +157,9 @@ "effect": "Summer Students produce twice as much data per second.", "icon": "fa-group", "cost": 100000, - "targets": [{"key": "workers-summies", "property": "rate"}], + "targets": [ { "key": "workers-summies", "property": "rate" } ], "requirements": [ - {"key": "upgrade-postersessions", "property": "used", "threshold": 1} + { "key": "upgrade-postersessions", "property": "used", "threshold": 1 } ], "factor": 2 }, @@ -145,9 +170,9 @@ "effect": "Summer Students produce twice as much data per second.", "icon": "fa-group", "cost": 1000000, - "targets": [{"key": "workers-summies", "property": "rate"}], + "targets": [ { "key": "workers-summies", "property": "rate" } ], "requirements": [ - {"key": "upgrade-bbqs", "property": "used", "threshold": 1} + { "key": "upgrade-bbqs", "property": "used", "threshold": 1 } ], "factor": 2 }, @@ -159,85 +184,263 @@ "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"} + { "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" } ], "requirements": [ - {"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} + { "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", + "name": "√s = 1.4 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": [], + "cost": 1e1, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ ], "factor": 2 }, { "key": "upgrade-energy2", - "name": "√s = 10 GeV", + "name": "√s = 28 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"}], + "cost": 1e2, + "targets": [ { "key": "lab", "property": "detector" } ], "requirements": [ - {"key": "upgrade-energy1", "property": "used", "threshold": 1} + { "key": "upgrade-energy1", "property": "used", "threshold": 1 } ], "factor": 2 }, { "key": "upgrade-energy3", - "name": "√s = 100 GeV", + "name": "√s = 45 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"}], + "cost": 1e3, + "targets": [ { "key": "lab", "property": "detector" } ], "requirements": [ - {"key": "upgrade-energy2", "property": "used", "threshold": 1} + { "key": "upgrade-energy2", "property": "used", "threshold": 1 } ], "factor": 2 }, { "key": "upgrade-energy4", - "name": "√s = 1 TeV", + "name": "√s = 209 GeV", "description": "Increased centre-of-mass energy.", "effect": "Double the amount of data per click.", "icon": "fa-bolt", - "cost": 10000, - "targets": [{"key": "lab", "property": "detector"}], + "cost": 1e4, + "targets": [ { "key": "lab", "property": "detector" } ], "requirements": [ - {"key": "upgrade-energy3", "property": "used", "threshold": 1} + { "key": "upgrade-energy3", "property": "used", "threshold": 1 } ], "factor": 2 }, { "key": "upgrade-energy5", - "name": "√s = 2 TeV", + "name": "√s = 450 GeV", "description": "Increased centre-of-mass energy.", "effect": "Double the amount of data per click.", "icon": "fa-bolt", - "cost": 100000, - "targets": [{"key": "lab", "property": "detector"}], + "cost": 1e5, + "targets": [ { "key": "lab", "property": "detector" } ], "requirements": [ - {"key": "upgrade-energy4", "property": "used", "threshold": 1} + { "key": "upgrade-energy4", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-energy6", + "name": "√s = 800 GeV", + "description": "Increased centre-of-mass energy.", + "effect": "Double the amount of data per click.", + "icon": "fa-bolt", + "cost": 1e6, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy5", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-energy7", + "name": "√s = 1 TeV", + "description": "Increased centre-of-mass energy.", + "effect": "Double the amount of data per click.", + "icon": "fa-bolt", + "cost": 1e7, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy6", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-energy8", + "name": "√s = 3.5 TeV", + "description": "Increased centre-of-mass energy.", + "effect": "Double the amount of data per click.", + "icon": "fa-bolt", + "cost": 1e8, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy7", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-energy9", + "name": "√s = 6 TeV", + "description": "Increased centre-of-mass energy.", + "effect": "Double the amount of data per click.", + "icon": "fa-bolt", + "cost": 1e9, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy8", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-energy10", + "name": "√s = 8 TeV", + "description": "Increased centre-of-mass energy.", + "effect": "Double the amount of data per click.", + "icon": "fa-bolt", + "cost": 1e10, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy9", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-energy11", + "name": "√s = 13 TeV", + "description": "Increased centre-of-mass energy.", + "effect": "Double the amount of data per click.", + "icon": "fa-bolt", + "cost": 1e11, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy10", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-energy12", + "name": "√s = 14 TeV", + "description": "Increased centre-of-mass energy.", + "effect": "Double the amount of data per click.", + "icon": "fa-bolt", + "cost": 1e12, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy11", "property": "used", "threshold": 1 } + ], + "factor": 2 + }, + { + "key": "upgrade-sps", + "name": "Super Proton Synchrotron", + "description": "A larger particle smasher.", + "effect": "Ten times the amount of data per click.", + "icon": "fa-circle-o-notch", + "cost": 5e4, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy4", "property": "used", "threshold": 1 } + ], + "factor": 10 + }, + { + "key": "upgrade-tevatron", + "name": "Tevatron", + "description": "A larger particle smasher.", + "effect": "Ten times the amount of data per click.", + "icon": "fa-circle-o-notch", + "cost": 5e6, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy4", "property": "used", "threshold": 1 } + ], + "factor": 10 + }, + { + "key": "upgrade-lhc", + "name": "Large Hadron Collider", + "description": "A larger particle smasher.", + "effect": "Ten times the amount of data per click.", + "icon": "fa-circle-o-notch", + "cost": 5e9, + "targets": [ { "key": "lab", "property": "detector" } ], + "requirements": [ + { "key": "upgrade-energy4", "property": "used", "threshold": 1 } + ], + "factor": 10 + }, + { + "key": "upgrade-cpv-1", + "name": "CP violation 1", + "description": "", + "effect": "Future research gives +4 reputation.", + "icon": "fa-newspaper-o", + "cost": 750, + "targets": [ { "key": "research-cpv", "property": "reputation" } ], + "requirements": [ + { "key": "research-cpv", "property": "level", "threshold": 5 } + ], + "constant": 4 + }, + { + "key": "upgrade-inspire", + "name": "Inspire HEP", + "description": "Publish your research online.", + "effect": "Double the reputation for all future research.", + "icon": "", + "cost": 1e12, + "targets": [ + { "key": "research-cpv", "property": "reputation" }, + { "key": "research-jpsi", "property": "reputation" }, + { "key": "research-tau", "property": "reputation" }, + { "key": "research-beauty", "property": "reputation" }, + { "key": "research-gluons", "property": "reputation" }, + { "key": "research-weak", "property": "reputation" }, + { "key": "research-top", "property": "reputation" }, + { "key": "research-boscillations", "property": "reputation" }, + { "key": "research-higgs", "property": "reputation" }, + { "key": "research-dstars", "property": "reputation" }, + { "key": "research-xib", "property": "reputation" } + ], + "requirements": [ + { "key": "research-cpv", "property": "level", "threshold": 1 }, + { "key": "research-jpsi", "property": "level", "threshold": 1 }, + { "key": "research-tau", "property": "level", "threshold": 1 }, + { "key": "research-beauty", "property": "level", "threshold": 1 }, + { "key": "research-gluons", "property": "level", "threshold": 1 }, + { "key": "research-weak", "property": "level", "threshold": 1 }, + { "key": "research-top", "property": "level", "threshold": 1 }, + { "key": "research-boscillations", "property": "level", "threshold": 1 }, + { "key": "research-higgs", "property": "level", "threshold": 1 }, + { "key": "research-dstars", "property": "level", "threshold": 1 }, + { "key": "research-xib", "property": "level", "threshold": 1 } ], "factor": 2 } diff --git a/json/workers.json b/json/workers.json index 0251930..a5e19b6 100644 --- a/json/workers.json +++ b/json/workers.json @@ -1,72 +1,82 @@ [ + { + "key": "workers-masterstudents", + "name": "Master Students", + "description": "Cheap and enthusiastic workforce, they can save you a lot of work.", + "cost_increase": 1.5, + "state": { + "cost": 4e1, + "rate": 1e0 + } + }, { "key": "workers-phdstudents", "name": "PhD Students", - "description": "Cheap and enthusiastic manpower, they can save you a lot of work.", - "cost_increase": 1.2, + "description": "They decided to do a PhD. Now they are working hard.", + "cost_increase": 1.45, "state": { - "cost": 1e2, - "rate": 1e0 + "cost": 4e2, + "rate": 0.8e1 } }, { "key": "workers-postdocs", "name": "Postdocs", "description": "These brilliant minds are here only to serve your needs.", - "cost_increase": 1.25, + "cost_increase": 1.4, "state": { - "cost": 1e3, - "rate": 1e1 + "cost": 4e3, + "rate": 1e2 } }, { "key": "workers-fellows", "name": "Research Fellows", "description": "You pay them a lot. They work a lot.", - "cost_increase": 1.3, + "cost_increase": 1.35, "state": { "cost": 1e4, - "rate": 1e2 + "rate": 1e3 } }, { "key": "workers-permanent", "name": "Permanent Staff", "description": "Somebody who gets a permanent position in physics has to be good.", - "cost_increase": 1.35, + "cost_increase": 1.3, "state": { "cost": 1e5, - "rate": 1e3 + "rate": 1e4 } }, { "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.4, + "cost_increase": 1.25, "state": { "cost": 1e6, - "rate": 1e4 + "rate": 1e5 } }, { "key": "workers-nobel", "name": "Nobel Prize Winners", "description": "They received their prize for a reason.", - "cost_increase": 1.45, + "cost_increase": 1.2, "state": { "cost": 1e7, - "rate": 1e5 + "rate": 1e6 } }, { "key": "workers-summies", "name": "Summer Students", "description": "They are AWESOME. Their best ideas come between two parties.", - "cost_increase": 1.5, + "cost_increase": 1.15, "state": { "cost": 1e8, - "rate": 1e6 + "rate": 1e7 } } ]