From 6a6a4a0e57b7f814221bee7f050daeb6ece18e43 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 10 Feb 2015 20:30:20 -0600 Subject: [PATCH] feat(event): Valentine's cards --- src/controllers/user.js | 2 +- views/options/inventory/inventory.jade | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/controllers/user.js b/src/controllers/user.js index ae2987fb8c..2a599384ba 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -389,7 +389,7 @@ api.cast = function(req, res, next) { series.push(function(cb2){found.save(cb2)}); } - if (group) { + if (group && !spell.silent) { series.push(function(cb2){ var message = '`'+user.profile.name+' casts '+spell.text() + (targetType=='user' ? ' on '+found.profile.name : ' for the party')+'.`'; group.sendChat(message); diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index c8d066ba93..a90ebe977e 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -244,3 +244,8 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') p | 20  span.shop_gold + div + button.customize-option(popover='{{::Content.spells.special.valentine.notes()}}', popover-title='{{::Content.spells.special.valentine.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.valentine)', class='inventory_special_valentine') + p + | {{Content.spells.special.valentine.value}} + span(class='shop_gold') \ No newline at end of file