krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into classes

Browse Source 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
This commit is contained in:
Tyler Renelle
2013-12-01 19:51:36 -07:00
parent 91c141140d 1000796ddd
commit 19b6eb73e0
81 changed files with 1369 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/controllers/tasksCtrl.js
View File

@@ -6,7 +6,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
$scope.score = function(task, direction) {
if (task.type === "reward" && User.user.stats.gp < task.value){
return Notification.text('Not enough GP.');
return Notification.text('Not enough Gold!');
}
Algos.score(User.user, task, direction);
User.log({op: "score",data: task, dir: direction});
@@ -120,7 +120,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
Notification.text("Item purchased.");
updateStore();
} else {
Notification.text("Not enough GP.");
Notification.text("Not enough Gold!");
}
};