From 52d869b1954941df7fd844508a62bfb7b9e17480 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Sat, 16 May 2015 16:52:58 -0400 Subject: [PATCH 1/3] Fixed issue #5203 --- common/locales/en/character.json | 1 + website/views/options/profile.jade | 1 + 2 files changed, 2 insertions(+) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 0586cebff2..35c54e97d6 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -70,6 +70,7 @@ "allocatePerPop": "Add a point to Perception", "allocateInt": "Points allocated to Intelligence:", "allocateIntPop": "Add a point to Intelligence", + "noMoreAllocate": "Congrats! Now that you've hit level 100, you won't gain Attribute Points any more. You can keep leveling up, or you can use the Orb of Rebirth in the Market to reset to level 1!", "stats": "Stats", "strength": "Strength", "strengthText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.", diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index d37cf01aa0..4fa2cbf9bd 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -161,6 +161,7 @@ mixin profileStats table.table.table-striped tr td + p(ng-if='user.stats.lvl >= 100')!=env.t('noMoreAllocate') strong.inline |{{user.stats.points}}  strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelPopover'))=env.t('unallocated') From 9017ba7d7e583458db008a47de1718562af4f405 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 16 May 2015 17:08:06 -0500 Subject: [PATCH 2/3] Hide attribute points counter if you're over 100 and have 0 left --- website/views/options/profile.jade | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index 4fa2cbf9bd..a489c01f77 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -161,10 +161,11 @@ mixin profileStats table.table.table-striped tr td - p(ng-if='user.stats.lvl >= 100')!=env.t('noMoreAllocate') - strong.inline - |{{user.stats.points}}  - strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelPopover'))=env.t('unallocated') + p(ng-if='::user.stats.lvl >= 100')!=env.t('noMoreAllocate') + p(ng-if='user.stats.points || user.stats.lvl < 100') + strong.inline + |{{user.stats.points}}  + strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelPopover'))=env.t('unallocated') td tr td(colspan=2) From bc967dd8503af228bded0f91a25f1276d7cad5b5 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 16 May 2015 22:50:24 -0500 Subject: [PATCH 3/3] Adjust wording of attribute points warning --- common/locales/en/character.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 35c54e97d6..124ee4ec26 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -70,7 +70,7 @@ "allocatePerPop": "Add a point to Perception", "allocateInt": "Points allocated to Intelligence:", "allocateIntPop": "Add a point to Intelligence", - "noMoreAllocate": "Congrats! Now that you've hit level 100, you won't gain Attribute Points any more. You can keep leveling up, or you can use the Orb of Rebirth in the Market to reset to level 1!", + "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, available for free in the Market.", "stats": "Stats", "strength": "Strength", "strengthText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",