krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework gem adjustment so it actually makes sense

Browse Source
This commit is contained in:
Blade Barringer
2015-07-24 17:15:37 -05:00
parent 68f9a78aac
commit 6aae668b8c
3 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/public/js/controllers/challengesCtrl.js
View File

@@ -1,5 +1,3 @@
"use strict";
habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', 'Challenges', 'Notification', '$compile', 'Groups', '$state', '$stateParams', 'Tasks',
function($rootScope, $scope, Shared, User, Challenges, Notification, $compile, Groups, $state, $stateParams, Tasks) {
@@ -68,7 +66,6 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
});
_calculateMaxPrize(defaultGroup);
_checkIfUserHasEnoughGemsForTavernChallenge();
};
/**
@@ -282,7 +279,6 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
$scope.$watch('newChallenge.group', function(gid){
if (!gid) return;
_checkIfUserHasEnoughGemsForTavernChallenge();
_calculateMaxPrize(gid);
if (gid == 'habitrpg') {
@@ -306,14 +302,14 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
return true;
};
function _checkIfUserHasEnoughGemsForTavernChallenge() {
$scope.insufficientGemsForTavernChallenge = function() {
var balance = User.user.balance || 0;
var isForTavern = $scope.newChallenge.group == 'habitrpg';
if (isForTavern && balance <= 0) {
$scope.isTavernChallengeAndUserCannotProvidePrize = false;
if (isForTavern) {
return balance <= 0;
} else {
$scope.isTavernChallengeAndUserCannotProvidePrize = true;
return false;
}
}