Progress. Basic game mechanics are working.

This commit is contained in:
Kevin Dungs
2014-08-02 14:46:30 +02:00
parent 6305ec4087
commit 0e66dbaee6
4 changed files with 77 additions and 38 deletions
+1
View File
@@ -0,0 +1 @@
.DS_Store
+9
View File
@@ -0,0 +1,9 @@
body {
padding-top: 100px;
}
#Detector img {
border-radius: 10px;
cursor: pointer;
width: 200px;
}
+55 -32
View File
@@ -5,44 +5,67 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
#Detector img {
border-radius: 10px;
cursor: pointer;
width: 200px;
}
</style>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="css/style.css">
</head>
<body>
<div id="Detector" ng-controller="DetectorController as dc">
<img ng-click="dc.click()" src="assets/detector.png" alt="Your detector. Click on it to generate events.">
</div>
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<span class="navbar-brand">Particle Clicker</span>
</div>
<div id="Lab" ng-controller="LabController as lc">
<h1>{{ lc.lab.name }}</h1>
<p>Data: {{ lc.lab.data }}</p>
<p>Reputation: {{ lc.lab.reputation }}</p>
<p>Money: {{ lc.lab.money }}</p>
</div>
<div id="Research" ng-controller="ResearchController as rc">
<h1>Research</h1>
<div class="research-item" ng-repeat="r in rc.research" ng-show="r.is_available()">
<h2>{{ r.name }}</h2>
<p ng-show="r.level > 0">{{ r.description }} Level: {{ r.level }}</p>
<button ng-click="r.research()">Research ({{ r.cost }})</button>
</div>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="https://github.com/ibab/particle-clicker/">GitHub</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
<div id="HR" ng-controller="HRController as hrc">
<h1>HR Department</h1>
<div class="hr-item" ng-repeat="w in hrc.workers">
<h2>{{ w.name }}</h2>
<p ng-show="w.hired > 0">{{ w.description }} You have {{ w.hired }} of them working for you.</p>
<button ng-click="w.hire()">Hire ({{ w.cost }})</button>
<div class="container-fluid">
<div class="col-xs-4">
<div id="Detector" ng-controller="DetectorController as dc">
<img ng-click="dc.click()" src="assets/detector.png" alt="Your detector. Click on it to generate events.">
</div>
<div id="Lab" ng-controller="LabController as lc">
<h1>{{ lc.lab.name }}</h1>
<p>Data: {{ lc.lab.data }}</p>
<p>Reputation: {{ lc.lab.reputation }}</p>
<p>Money: {{ lc.lab.money }}</p>
</div>
</div>
<div class="col-xs-4" id="Research" ng-controller="ResearchController as rc">
<h1>Research</h1>
<div class="research-item" ng-repeat="r in rc.research" ng-show="r.is_visible()">
<h2>{{ r.name }} <small ng-show="r.level > 0"> Level: {{ r.level }}</small></h2>
<p ng-show="r.level > 0">{{ r.description }}</p>
<button class="btn" ng-disabled="!r.is_available()" ng-click="r.research()">Research ({{ r.cost }})</button>
</div>
</div>
<div class="col-xs-4" id="HR" ng-controller="HRController as hrc">
<h1>HR Department</h1>
<div class="hr-item" ng-repeat="w in hrc.workers" ng-show="w.is_visible()">
<h2>{{ w.name }} <small ng-show="w.hired > 0">({{ w.hired }})</small></h2>
<p ng-show="w.hired > 0">{{ w.description }}</p>
<button class="btn" ng-disabled="!w.is_available()" ng-click="w.hire()">Hire ({{ w.cost }})</button>
</div>
</div>
</div>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.17/angular.min.js"></script>
+12 -6
View File
@@ -1,7 +1,4 @@
'use strict';
var DEBUG = true;
(function () {
var loadJsonFile = function(filename) {
var res;
@@ -53,20 +50,28 @@ var DEBUG = true;
var research = loadJsonFile('json/research.json');
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;
};
item.is_available = function () {
return this.level > 0 || lab.data > item.cost * .9;
return lab.data >= this.cost;
};
item.research = function () {
if (lab.research(this.cost, this.reputation)) {
this.level++;
}
}
};
});
if (DEBUG) console.log(research);
var workers = loadJsonFile('json/workers.json');
workers.map(function (worker) {
worker.hired = 0;
worker.is_visible = function () {
return this.hired > 0 || lab.money >= this.cost * .9;
};
worker.is_available = function () {
return lab.money >= this.cost;
};
worker.hire = function() {
if (lab.buy(this.cost)) {
this.hired++;
@@ -74,6 +79,7 @@ var DEBUG = true;
};
});
var app = angular.module('particleClicker', []);
app.controller('DetectorController', function () {