krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up quest progress logic

Browse Source
This commit is contained in:
Blade Barringer
2016-09-07 12:47:10 -05:00
parent db19dbf49c
commit 67716ef309
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
website/client/js/controllers/menuCtrl.js
View File

@@ -1,8 +1,8 @@
'use strict'; 'use strict';
angular.module('habitrpg') angular.module('habitrpg')
.controller('MenuCtrl', ['$scope', '$rootScope', '$http', 'Chat', .controller('MenuCtrl', ['$scope', '$rootScope', '$http', 'Chat', 'Content',
function($scope, $rootScope, $http, Chat) { function($scope, $rootScope, $http, Chat, Content) {
$scope.logout = function() { $scope.logout = function() {
localStorage.clear(); localStorage.clear();
@@ -29,24 +29,32 @@ angular.module('habitrpg')
$scope.hasQuestProgress = function() { $scope.hasQuestProgress = function() {
var user = $scope.user; var user = $scope.user;
if (user.party.quest) { if (user.party.quest) {
var userQuest = $scope.Content.quests[user.party.quest.key]; var userQuest = Content.quests[user.party.quest.key];
if (userQuest && userQuest.boss && user.party.quest.progress.up > 0) return true;
if (userQuest && userQuest.collect && user.party.quest.progress.collectedItems > 0) return true; if (!userQuest) {
return false;
}
if (userQuest.boss && user.party.quest.progress.up > 0) {
return true;
}
if (userQuest.collect && user.party.quest.progress.collectedItems > 0) {
return true;
}
} }
return false; return false;
}; };
$scope.getQuestInfo = function() { $scope.getQuestInfo = function() {
var user = $scope.user; var user = $scope.user;
var questInfo = {}; var questInfo = {};
if (user.party.quest) { if (user.party.quest) {
var userQuest = $scope.Content.quests[user.party.quest.key]; var userQuest = Content.quests[user.party.quest.key];
questInfo.title = userQuest.text();
if (userQuest.boss) { if (userQuest.boss) {
questInfo.title = userQuest.boss.name();
questInfo.body = window.env.t('questTaskDamage', { damage: user.party.quest.progress.up.toPrecision(2) }); questInfo.body = window.env.t('questTaskDamage', { damage: user.party.quest.progress.up.toPrecision(2) });
} } else if (userQuest.collect) {
else if (userQuest.collect) {
questInfo.title = userQuest.collect.text();
questInfo.body = window.env.t('questTaskCollection', { items: user.party.quest.progress.collectedItems }); questInfo.body = window.env.t('questTaskCollection', { items: user.party.quest.progress.collectedItems });
} }
} }