From b4eb38604777f182172c0f120a8d60908e652407 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 11 Apr 2016 07:38:23 -0500 Subject: [PATCH] chore: Change spells file name to skills --- website/views/shared/tasks/index.jade | 2 +- .../views/shared/tasks/task_view/mixins.jade | 2 +- .../task_view/{spells.jade => skills.jade} | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) rename website/views/shared/tasks/task_view/{spells.jade => skills.jade} (67%) diff --git a/website/views/shared/tasks/index.jade b/website/views/shared/tasks/index.jade index b1957f9a00..fc3223b888 100644 --- a/website/views/shared/tasks/index.jade +++ b/website/views/shared/tasks/index.jade @@ -37,6 +37,6 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") include ./task_view/static_rewards - include ./task_view/spells + include ./task_view/skills +taskColumnTabs('bottom') diff --git a/website/views/shared/tasks/task_view/mixins.jade b/website/views/shared/tasks/task_view/mixins.jade index 95552050a5..398813d5ad 100644 --- a/website/views/shared/tasks/task_view/mixins.jade +++ b/website/views/shared/tasks/task_view/mixins.jade @@ -41,7 +41,7 @@ mixin taskColumnTabs(position) li(ng-class='{active: list.view == "ingamerewards"}') a(ng-click='list.view = "ingamerewards"')=env.t('ingamerewards') -mixin specialSpell(k,canceler) +mixin specialSkill(k,canceler) li.task.reward-item(ng-if='#{canceler ? "user.stats.buffs."+canceler : "user.items.special."+k+">0"}',popover-trigger='mouseenter', popover-placement='top', popover='{{Content.spells.special.#{k}.notes()}}') .task-meta-controls span.task-notes diff --git a/website/views/shared/tasks/task_view/spells.jade b/website/views/shared/tasks/task_view/skills.jade similarity index 67% rename from website/views/shared/tasks/task_view/spells.jade rename to website/views/shared/tasks/task_view/skills.jade index 74d017964a..451ebde234 100644 --- a/website/views/shared/tasks/task_view/spells.jade +++ b/website/views/shared/tasks/task_view/skills.jade @@ -1,12 +1,12 @@ // Events -- var seasonalSpells = {'snowball':'salt', 'spookDust':'opaquePotion', 'shinySeed':'petalFreePotion', 'seafoam':'sand'} +- var seasonalSkills = {'snowball':'salt', 'spookDust':'opaquePotion', 'shinySeed':'petalFreePotion', 'seafoam':'sand'} ul.items.rewards - each dispel,spell in seasonalSpells - span(ng-if='main && list.type=="reward" && (user.items.special.#{spell}>0 || user.stats.buffs.#{spell})') - +specialSpell(spell) - +specialSpell(dispel,spell) + each dispel,skill in seasonalSkills + span(ng-if='main && list.type=="reward" && (user.items.special.#{skill}>0 || user.stats.buffs.#{skill})') + +specialSkill(skill) + +specialSkill(dispel,skill) -// Spells +// Class Skills ul.items(ng-if='main && list.type=="reward" && user.stats.class && !user.preferences.disableClasses') li.task.reward-item(ng-repeat='(k,skill) in Content.spells[user.stats.class]', ng-if='user.stats.lvl >= skill.lvl',popover-trigger='mouseenter', popover-placement='top', popover='{{skill.notes()}}') .task-meta-controls @@ -16,8 +16,8 @@ ul.items(ng-if='main && list.type=="reward" && user.stats.class && !user.prefere .task-controls.task-primary a.money.btn-buy.item-btn(ng-click='castStart(skill)', ng-class='{active: skill.key == spell.key}') span.reward-cost - strong {{skill.mana}} + strong {{::skill.mana}} =env.t('mp') // main content - span(ng-class='{"shop_{{skill.key}} shop-sprite item-img": true}') - p.task-text {{skill.text()}} + span(ng-class='{"shop_{{::skill.key}} shop-sprite item-img": true}') + p.task-text {{::skill.text()}}