sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 07:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

winter: add salt spell to remove snowball buff

Browse source
This commit is contained in:
Tyler Renelle 2013-12-20 18:35:50 -07:00
parent 6cb90093d0
commit 9518cd1b51
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/user.js
View file

@ -299,7 +299,7 @@ api.buyGemsPaypalIPN = function(req, res) {
api.cast = function(req, res) {
var user = res.locals.user;
var type = req.body.type, target = req.body.target;
var klass = req.params.spell == 'snowball' ? 'special' : user.stats.class
var klass = shared.content.spells.special[req.params.spell] ? 'special' : user.stats.class
var spell = shared.content.spells[klass][req.params.spell];
var done = function(){

23
views/shared/tasks/lists.jade
View file

@ -60,20 +60,31 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
span(bo-class='{"shop_{{item.key}} shop-sprite item-img": true}')
p.task-text {{item.text}}
// Snowball (event spells?)
ul.items.rewards(ng-if='main && list.type=="reward" && user.items.special.snowball>0')
li.task.reward-item
// Winter Event
ul.items.rewards(ng-if='main && list.type=="reward" && (user.items.special.snowball>0 || user.stats.buffs.snowball)')
li.task.reward-item(ng-if='user.items.special.snowball>0')
.task-meta-controls
span.task-notes(popover-trigger='mouseenter', popover-placement='left', popover='{{Content.spells.special.snowball.notes}}', popover-title='{{Content.spells.special.snowball.text}}')
i.icon-comment
//left-hand size commands
.task-controls
a.money.btn-buy.item-btn(ng-click='castStart(Content.spells.special.snowball)')
span.reward-cost
strong {{user.items.special.snowball}}
span.reward-cost {{user.items.special.snowball}}
span.shop_snowball(style='display:inline-block;vertical-align:top;')
// main content
span.shop_snowball.shop-sprite.item-img
p.task-text {{Content.spells.special.snowball.text}}
li.task.reward-item(ng-if='user.stats.buffs.snowball')
.task-meta-controls
span.task-notes(popover-trigger='mouseenter', popover-placement='left', popover='{{Content.spells.special.salt.notes}}', popover-title='{{Content.spells.special.salt.text}}')
i.icon-comment
//left-hand size commands
.task-controls
a.money.btn-buy.item-btn(ng-click='castStart(Content.spells.special.salt)')
span.reward-cost {{Content.spells.special.salt.value}}
span.shop_gold
// main content
span.shop_salt.shop-sprite.item-img
p.task-text {{Content.spells.special.salt.text}}
// Spells
ul.items(ng-if='main && list.type=="reward" && user.stats.class && !user.preferences.disableClasses')