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

WIP(tutorial): Award GP and XP

Browse Source
This commit is contained in:
Sabe Jones
2015-08-24 16:02:25 -04:00
parent 8b75de56b6
commit 23259cd456
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/public/js/controllers/notificationCtrl.js
View File

@@ -29,7 +29,10 @@ habitrpg.controller('NotificationCtrl',
if (after == before) return; if (after == before) return;
if (User.user.stats.lvl == 0) return; if (User.user.stats.lvl == 0) return;
var money = after - before; var money = after - before;
var bonus = User.user._tmp.streakBonus; var bonus;
if (User.user._tmp) {
bonus = User.user._tmp.streakBonus || 0;
}
Notification.gp(money, bonus || 0); Notification.gp(money, bonus || 0);
//Append Bonus //Append Bonus

30
website/public/js/services/guideServices.js
View File

@@ -18,28 +18,36 @@ function($rootScope, User, $timeout, $state, Analytics) {
placement: "top", placement: "top",
proceed: window.env.t('tourAvatarProceed'), proceed: window.env.t('tourAvatarProceed'),
backdrop: false, backdrop: false,
orphan: true orphan: true,
gold: 4,
experience: 29
}, },
{ {
state: 'tasks', state: 'tasks',
element: ".task-column.todos", element: ".task-column.todos",
content: window.env.t('tourToDosBrief'), content: window.env.t('tourToDosBrief'),
placement: "top", placement: "top",
proceed: window.env.t('tourOkay') proceed: window.env.t('tourOkay'),
gold: 4,
experience: 29
}, },
{ {
state: 'tasks', state: 'tasks',
element: ".task-column.dailys", element: ".task-column.dailys",
content: window.env.t('tourDailiesBrief'), content: window.env.t('tourDailiesBrief'),
placement: "top", placement: "top",
proceed: window.env.t('tourDailiesProceed') proceed: window.env.t('tourDailiesProceed'),
gold: 4,
experience: 29
}, },
{ {
state: 'tasks', state: 'tasks',
element: ".task-column.habits", element: ".task-column.habits",
content: window.env.t('tourHabitsBrief'), content: window.env.t('tourHabitsBrief'),
placement: "right", placement: "right",
proceed: window.env.t('tourHabitsProceed') proceed: window.env.t('tourHabitsProceed'),
gold: 4,
experience: 29
}, },
{ {
state: 'tasks', state: 'tasks',
@@ -47,6 +55,8 @@ function($rootScope, User, $timeout, $state, Analytics) {
content: window.env.t('tourRewardsBrief'), content: window.env.t('tourRewardsBrief'),
placement: "top", placement: "top",
proceed: window.env.t('tourRewardsProceed'), proceed: window.env.t('tourRewardsProceed'),
gold: 4,
experience: 29,
final: true final: true
} }
] ]
@@ -187,11 +197,19 @@ function($rootScope, User, $timeout, $state, Analytics) {
} }
}; };
step.onHide = function(){ step.onHide = function(){
var ups={};
if (!$rootScope.stepAwarded) $rootScope.stepAwarded = {};
if (!$rootScope.stepAwarded[i]) {
$rootScope.stepAwarded[i] = true;
ups['stats.gp'] = User.user.stats.gp + (step.gold || 0);
ups['stats.exp'] = User.user.stats.exp + (step.experience || 0);
}
if (step.final) { // -2 indicates complete if (step.final) { // -2 indicates complete
var ups={};ups['flags.tour.'+k] = -2; ups['flags.tour.'+k] = -2;
User.set(ups); $rootScope.stepAwarded = null;
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':true}) Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':true})
} }
User.set(ups);
} }
}) })
}); });