sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 11:38:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #2048 (streak bonuses not appearing to add up)

Browse source
This commit is contained in:
Sabe Jones 2014-01-07 11:14:34 -06:00
parent ec236f36d8
commit be2def91f1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,10 +19,10 @@ habitrpg.controller('NotificationCtrl',
if (after == before) return;
if (User.user.stats.lvl == 0) return;
var money = after - before;
Notification.gp(money);
var bonus = User.user._tmp.streakBonus;
Notification.gp(money, bonus || 0);
//Append Bonus
var bonus = User.user._tmp.streakBonus;
if ((money > 0) && !!bonus) {
if (bonus < 0.01) bonus = 0.01;

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

@ -51,8 +51,8 @@ angular.module("notificationServices", [])
if (val < -50) return; // don't show when they level up (resetting their exp)
growl("<i class='icon-star'></i> " + sign(val) + " " + round(val) + " XP", 'xp');
},
gp: function(val) {
growl(sign(val) + " " + coins(val), 'gp');
gp: function(val, bonus) {
growl(sign(val) + " " + coins(val - bonus), 'gp');
},
text: function(val){
growl(val);