Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop

This commit is contained in:
Blade Barringer 2015-05-08 08:45:24 -05:00
commit 4ccfaa974f

View file

@ -43,13 +43,13 @@ table.table.table-striped
ul.list-unstyled(ng-init='g=Content.gear.flat;e=profile.items.gear.equipped')
li(ng-show='profile.stats.lvl > 1')
span.hint(popover-title=env.t('levelBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('levelBonusText'))=env.t('level')
|: {{(Math.min(profile.stats.lvl - 1, 100)) / 2}} 
|: {{Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2)}} 
li(ng-show='g[e.weapon].#{k} + g[e.armor].#{k} + g[e.head].#{k} + g[e.shield].#{k} > 0')
span.hint(popover-title=env.t('equipment'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('equipmentBonusText'))=env.t('equipment')
|: {{g[e.weapon].#{k} + g[e.armor].#{k} + g[e.head].#{k} + g[e.shield].#{k} || 0}} 
li(ng-show='profile._statsComputed.#{k} - profile.stats.buffs.#{k} - ((Math.min(profile.stats.lvl - 1, 100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k} > 0')
li(ng-show='profile._statsComputed.#{k} - profile.stats.buffs.#{k} - Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k} > 0')
span.hint(popover-title=env.t('classBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('classBonusText'))=env.t('classEquipBonus')
|: {{profile._statsComputed.#{k} - profile.stats.buffs.#{k} - ((Math.min(profile.stats.lvl - 1,100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k}}} 
|: {{profile._statsComputed.#{k} - profile.stats.buffs.#{k} - Math.ceil((Math.min(profile.stats.lvl - 1,100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k}}} 
li(ng-show='profile.stats.#{k} > 0')
span.hint(popover-title=env.t('allocatedPoints'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('allocatedPointsText'))=env.t('allocated')
|: {{profile.stats.#{k} || 0}}