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

Merge branch 'develop' into sabrecat/modal-warnings

Browse Source
This commit is contained in:
Sabe Jones
2015-09-02 15:17:33 -04:00
parent 12b0361d45 ceebb33daf
commit e82f73c712
503 changed files with 13077 additions and 12411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,10 @@ habitrpg.controller('NotificationCtrl',
if (after == before) return;
if (User.user.stats.lvl == 0) return;
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);
//Append Bonus
@@ -64,7 +67,10 @@ habitrpg.controller('NotificationCtrl',
var text, notes, type;
$rootScope.playSound('Item_Drop');
if (after.type !== 'gear' && after.type !== 'Quest' && after.type !== 'Mystery') {
// Note: For Mystery Item gear, after.type will be 'head', 'armor', etc
// so we use after.notificationType below.
if (after.type !== 'gear' && after.type !== 'Quest' && after.notificationType !== 'Mystery') {
if (after.type === 'Food') {
type = 'food';
} else if (after.type === 'HatchingPotion') {
@@ -93,7 +99,7 @@ habitrpg.controller('NotificationCtrl',
} else if (after.type === 'Quest') {
$rootScope.selectedQuest = Content.quests[after.key];
$rootScope.openModal('questDrop', {controller:'PartyCtrl'});
} else if (after.type === 'Mystery') {
} else if (after.notificationType === 'Mystery') {
text = Content.gear.flat[after.key].text();
Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after);
} else {