From 59a2d2b2f001a5f4a9432ec479b75dc84003bfb4 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 23 Aug 2015 08:22:34 -0500 Subject: [PATCH] Improve quest modal appearance --- common/locales/en/quests.json | 2 ++ website/views/shared/modals/quests.jade | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common/locales/en/quests.json b/common/locales/en/quests.json index 1267dfca2e..f3cccafa18 100644 --- a/common/locales/en/quests.json +++ b/common/locales/en/quests.json @@ -29,6 +29,8 @@ "bossStrength": "Boss Strength", "collect": "Collect", "collected": "Collected", + "collectionItems": "<%= number %> <%= items %>", + "itemsToCollect": "Items to Collect", "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).", "bossDmg2": "Only participants will fight the boss and share in the quest loot.", "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).", diff --git a/website/views/shared/modals/quests.jade b/website/views/shared/modals/quests.jade index 13b086e7d0..3f8bf674f1 100644 --- a/website/views/shared/modals/quests.jade +++ b/website/views/shared/modals/quests.jade @@ -6,16 +6,18 @@ mixin questInfo .col-centered(class='quest_{{::selectedQuest.key}}') div(ng-if='::selectedQuest.boss') h4 {{::selectedQuest.boss.name()}} - p - strong=env.t('bossHP') + ': ' - | {{::selectedQuest.boss.hp}} - p - strong=env.t('bossStrength') + ': ' - | {{::selectedQuest.boss.str}} + .well.well-sm + p + strong=env.t('bossHP') + ': ' + | {{::selectedQuest.boss.hp}} + p + strong=env.t('bossStrength') + ': ' + | {{::selectedQuest.boss.str}} div(ng-if='::selectedQuest.collect') - p(ng-repeat='(k,v) in ::selectedQuest.collect') - strong=env.t('collect') + ': ' - | {{::selectedQuest.collect[k].count}} {{::selectedQuest.collect[k].text()}} + h4=env.t('itemsToCollect') + .well.well-sm + p(ng-repeat='(k,v) in ::selectedQuest.collect') + | {{:: env.t('collectionItems', { number: selectedQuest.collect[k].count, items: selectedQuest.collect[k].text() })}} div(ng-bind-html='::selectedQuest.notes()') quest-rewards(key='{{::selectedQuest.key}}', header=env.t('rewards'))