diff --git a/index.html b/index.html index e6badaa..da239d1 100644 --- a/index.html +++ b/index.html @@ -138,6 +138,23 @@ + + diff --git a/js/achievements.js b/js/achievements.js index ee0c115..251168d 100644 --- a/js/achievements.js +++ b/js/achievements.js @@ -50,6 +50,15 @@ var achievements = achievements.list[i].completed = true; } } + + $('#Achievements').scope().displayAchievements(); + }, + + // i'm a bit sleepy now, so not thinking about relation between add** functions and update + // so this function might not be necessary + pureUpdate: function() + { + $('#Achievements').scope().displayAchievements(); } }; diff --git a/js/game.js b/js/game.js index d77970c..8075a6a 100644 --- a/js/game.js +++ b/js/game.js @@ -227,7 +227,18 @@ this.upgrades = upgrades; }); - app.controller('AchievementsController', function () { - this.achievements = achievements.list; + app.controller('AchievementsController', function ($scope) { + $scope.achievements = achievements.list; + + $scope.displayAchievements = function(){ + // newachievements = [ac for (ac in this.achievements) if (ac.completed == true && ac.displayed == false)]; + for (var i=0;i<$scope.achievements.length;i++){ + if ($scope.achievements[i].completed == true && $scope.achievements[i].displayed == false){ + alert("Yo!"); + alert($scope.achievements[i].description); + $scope.achievements[i].displayed = true; + } + } + } }); })(); diff --git a/json/achievements.json b/json/achievements.json index 2a46857..19083e7 100644 --- a/json/achievements.json +++ b/json/achievements.json @@ -6,6 +6,7 @@ "type": "research", "target": "Z-Boson", "threshold": 1, + "displayed": false, "image": "assets/Z.png" }, { @@ -15,15 +16,27 @@ "type": "research", "target": "top-Quark", "threshold": 1, + "displayed": false, "image": "assets/t.png" }, { - "name": "Hired First Nobel Prize Winner", - "description": "Achievement: Yo! You have hired your first nobel prize winner!", + "name": "Hired First PhD", + "description": "Achievement: Yo! You have hired your first PhD!", "difficulty": "5", "type": "workers", "target": "PhD Students", "threshold": 1, + "displayed": false, + "image": "assets/W.png" + }, + { + "name": "Hired First Posdoc", + "description": "Achievement: Yo! You have hired your first POST DOC!", + "difficulty": "5", + "type": "workers", + "target": "Postdocs", + "threshold": 1, + "displayed": false, "image": "assets/W.png" } ]