From 84979b137d24d04b2c2fc8b902939509d19db572 Mon Sep 17 00:00:00 2001 From: agentx999 Date: Fri, 8 May 2015 18:32:18 -0700 Subject: [PATCH 1/7] Update spells.json modified Backstab, Brutal Smash, Burst of Flames, and Pickpocket descriptions --- common/locales/en/spells.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/locales/en/spells.json b/common/locales/en/spells.json index f35aed93ad..be77b0927f 100644 --- a/common/locales/en/spells.json +++ b/common/locales/en/spells.json @@ -1,6 +1,6 @@ { "spellWizardFireballText": "Burst of Flames", - "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! (Based on: INT)", + "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)", "spellWizardMPHealText": "Ethereal Surge", "spellWizardMPHealNotes": "You sacrifice mana to help your friends. The rest of your party gains MP! (Based on: INT)", @@ -12,7 +12,7 @@ "spellWizardFrostNotes": "Ice covers your tasks. None of your streaks will reset to zero tomorrow! (One cast affects all streaks.)", "spellWarriorSmashText": "Brutal Smash", - "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! (Based on: STR)", + "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! Click on a task to cast. (Based on: STR)", "spellWarriorDefensiveStanceText": "Defensive Stance", "spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a buff to Constitution! (Based on: Unbuffed CON)", @@ -24,10 +24,10 @@ "spellWarriorIntimidateNotes": "Your gaze strikes fear into your enemies. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)", "spellRoguePickPocketText": "Pickpocket", - "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! (Based on: PER)", + "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! Click on a task to cast. (Based on: PER)", "spellRogueBackStabText": "Backstab", - "spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! (Based on: STR)", + "spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! Click on a task to cast. (Based on: STR)", "spellRogueToolsOfTradeText": "Tools of the Trade", "spellRogueToolsOfTradeNotes": "You share your talents with friends. Your whole party gains a buff to Perception! (Based on: Unbuffed PER)", From 8e5cdbd742f288155a813b61ce3104f3c61d7ba5 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Wed, 13 May 2015 12:12:03 -0400 Subject: [PATCH 2/7] Fixed challenges achievement always displaying (again) Unearned achievements are hidden when viewing others' profiles, but are visible when a user views their own profile. Currently, the challenges achievement is displayed when viewing other users' profiles, even when they have not won any. This PR makes the challenges achievement display to other users' only when one or more challenges have been won. --- website/views/shared/profiles/achievements.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index bfa614f5dc..b2bec658d8 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -144,7 +144,7 @@ div(ng-if='::profile.achievements.originalUser') small!=env.t('originalUserText') hr -div(ng-if='::profile.achievements.challenges || user._id == profile._id') +div(ng-if='::profile.achievements.challenges.length || user._id == profile._id') // This is a very strange icon to use. revisit .achievement.achievement-karaoke(ng-if='::profile.achievements.challenges.length') div(ng-class='::{muted: !profile.achievements.challenges.length}') From d6385a94e983a616750a0d9dc3b8f14da98adbac Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 15 May 2015 22:31:47 -0500 Subject: [PATCH 3/7] Front page now shows avatar with link --- website/public/manifest.json | 4 +++- website/views/static/front.jade | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/website/public/manifest.json b/website/public/manifest.json index 6d8af2438d..8bb5d7d275 100644 --- a/website/public/manifest.json +++ b/website/public/manifest.json @@ -125,7 +125,9 @@ ], "css": [ "bower_components/css-social-buttons/css/zocial.css", - "front/staticstyle.css" + "front/staticstyle.css", + "common/dist/sprites/habitrpg-shared.css", + "app.css" ] } } diff --git a/website/views/static/front.jade b/website/views/static/front.jade index d9af6f2470..c3aa29a078 100644 --- a/website/views/static/front.jade +++ b/website/views/static/front.jade @@ -35,6 +35,9 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') body(ng-controller='AuthCtrl') include ./login-modal + include ../shared/header/avatar + include ../shared/mixins + include ../shared/modals/members .mobile-container header#header nav.navbar.navbar-default.navbar-static-top @@ -131,14 +134,14 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') .row .col-sm-8.col-sm-offset-2 p - = env.t('andeeliaoQuote') + = env.t('andeeliaoQuote') small AndeeLiao .item blockquote .row .col-sm-8.col-sm-offset-2 p - = env.t('alexandraQuote') + = env.t('alexandraQuote') small _AlexandraSo_ // Carousel Buttons Next/Prev a.left.carousel-control(data-slide='prev', href='#quote-carousel') @@ -330,7 +333,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') .usetweet.tweet.popover.right .arrow .popover-content - = env.t('dreimQuote') + = env.t('dreimQuote') // End Item .item.improvement-use h3= env.t('goals') @@ -368,7 +371,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') .usetweet.tweet.popover.right .arrow .popover-content - = env.t('kazuiQuote') + = env.t('kazuiQuote') // End Item .item.housework-use h3= env.t('chores') @@ -642,3 +645,4 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') }]).directive('carousel', [function () { return {} }]); + From 3c35b52d277fc2cac8ae9097ddeec877abd9e3c1 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 15 May 2015 23:08:26 -0500 Subject: [PATCH 4/7] Hide contributor level if contribText func is not available; put math on scope --- website/public/js/static.js | 2 ++ website/views/shared/modals/members.jade | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/website/public/js/static.js b/website/public/js/static.js index 3fdd1e6f2d..ae355a4b17 100644 --- a/website/public/js/static.js +++ b/website/public/js/static.js @@ -18,6 +18,8 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui. }); }) } + + $scope.Math = window.Math; }]) .controller("PlansCtrl", ['$rootScope', diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index 0add44a526..28b8f7952b 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -2,7 +2,7 @@ script(type='text/ng-template', id='modals/member.html') .modal-header h4 span {{::profile.profile.name}} - span(ng-if='profile.contributor.level') - {{::contribText(profile.contributor, profile.backer)}} + span(ng-if='::contribText && profile.contributor.level') - {{::contribText(profile.contributor, profile.backer)}} .modal-body .container-fluid .row @@ -22,6 +22,7 @@ script(type='text/ng-template', id='modals/member.html') |  | {{::profile.auth.timestamps.loggedin | date:user.preferences.dateFormat}} - h3=env.t('stats') + // @TODO: Figure out why this isn't showing up in front page .label.label-info {{:: {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer")}[profile.stats.class] }} include ../profiles/stats .col-md-6 From 52d869b1954941df7fd844508a62bfb7b9e17480 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Sat, 16 May 2015 16:52:58 -0400 Subject: [PATCH 5/7] 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 6/7] 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 7/7] 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.",