sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 11:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2123 from HabitRPG/sabe/tweak3

Browse source 
Fix #2072 (add Mana delta alerts)
This commit is contained in:
Tyler Renelle 2013-12-27 07:53:12 -08:00
commit 13e1792685
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/css/alerts.styl
View file

@ -28,6 +28,8 @@ xpColor = #DCC0FB
xpText = #635673
deathColor = #4E4E4E
deathText = #ABABAB
mpColor = #c7d3e9
mpText = #003aa1
borderDarken = 20%
// alert styles
@ -57,6 +59,11 @@ borderDarken = 20%
border-color: deathColor
color: deathText
.alert-mp
background-color: mpColor
border-color: darken(mpColor,borderDarken)
color: mpText
// alert icons
.icon-gold

7
public/js/controllers/notificationCtrl.js
View file

@ -31,6 +31,13 @@ habitrpg.controller('NotificationCtrl',
}
});
$rootScope.$watch('user.stats.mp', function(after,before) {
if (after == before) return;
if (User.user.stats.lvl == 0) return;
var mana = after - before;
Notification.mp(mana);
});
$rootScope.$watch('user._tmp.drop', function(after, before){
// won't work when getting the same item twice?
if (after == before || !after) return;

3
public/js/services/notificationServices.js
View file

@ -65,6 +65,9 @@ angular.module("notificationServices", [])
},
error: function(error){
growl("<i class='icon-exclamation-sign'></i> " + error, "error");
},
mp: function(val) {
growl("<i class='icon-fire'></i> " + sign(val) + " " + round(val) + " MP", 'mp');
}
};
}