From 34bd7cb8791311c8b80753678345eaa22d55cacf Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 9 Jan 2015 09:47:06 -0600 Subject: [PATCH 1/4] Added mana to stats page --- views/shared/profiles/stats.jade | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index 3a3e512c66..e466f37ac8 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -4,6 +4,10 @@ table.table.table-striped td strong=env.t('health') | : {{profile.stats.hp | number:0}} / 50 + tr + td + strong=env.t('mana') + | : {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}} tr td strong=env.t('gold') From 2d0d2cedd9ff1ec2d2602d7e1a25318520c886dc Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 9 Jan 2015 09:50:13 -0600 Subject: [PATCH 2/4] Converted floor mechanism to filter to match health calculation --- views/shared/profiles/stats.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index e466f37ac8..09bb6e9485 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -7,7 +7,7 @@ table.table.table-striped tr td strong=env.t('mana') - | : {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}} + | : {{user.stats.mp | number:0}} / {{user._statsComputed.maxMP}} tr td strong=env.t('gold') From 9b0d854855192dcd68e7d534936de79508a6c993 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 9 Jan 2015 09:56:53 -0600 Subject: [PATCH 3/4] Changed calculation to use profile instead of logged in user (duh) --- views/shared/profiles/stats.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index 09bb6e9485..f6fd7f081e 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -7,7 +7,7 @@ table.table.table-striped tr td strong=env.t('mana') - | : {{user.stats.mp | number:0}} / {{user._statsComputed.maxMP}} + | : {{profile.stats.mp | number:0}} / {{profile._statsComputed.maxMP}} tr td strong=env.t('gold') From a61c4c1b18b092abfabaaa68e646b605b0723fb6 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 9 Jan 2015 10:09:07 -0600 Subject: [PATCH 4/4] Wrote in ng-if to hide the mp if user has not chosen a class --- views/shared/profiles/stats.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index f6fd7f081e..3b1da52c93 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -4,7 +4,7 @@ table.table.table-striped td strong=env.t('health') | : {{profile.stats.hp | number:0}} / 50 - tr + tr(ng-if='profile.stats.lvl >= 10 && !profile.preferences.disableClasses') td strong=env.t('mana') | : {{profile.stats.mp | number:0}} / {{profile._statsComputed.maxMP}}