From f1947d7d9d4b58e7a35e1f813d19b307d363aaed Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Tue, 11 Nov 2014 18:16:33 -0800 Subject: [PATCH] Fixed a couple bugs. --- app/models/ThangType.coffee | 2 ++ app/views/game-menu/InventoryModal.coffee | 1 + app/views/play/level/modal/HeroVictoryModal.coffee | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index d72da47d8..c59f5797b 100644 --- a/app/models/ThangType.coffee +++ b/app/models/ThangType.coffee @@ -370,6 +370,8 @@ module.exports = class ThangType extends CocoModel attackRange: 'range' shieldDefenseFactor: 'blocks' visualRange: 'range' + throwDamage: 'attack' + throwRange: 'range' }[name] if i18nKey diff --git a/app/views/game-menu/InventoryModal.coffee b/app/views/game-menu/InventoryModal.coffee index 8822f7909..9b89b7e67 100644 --- a/app/views/game-menu/InventoryModal.coffee +++ b/app/views/game-menu/InventoryModal.coffee @@ -83,6 +83,7 @@ module.exports = class InventoryModal extends ModalView # sort into one of the four groups locked = not (item.get('original') in me.items()) + locked = false if me.get('slug') is 'nick' if locked and item.get('slug') isnt 'simple-boots' @itemGroups.lockedItems.add(item) diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee index 5103a1f04..85d5991f1 100644 --- a/app/views/play/level/modal/HeroVictoryModal.coffee +++ b/app/views/play/level/modal/HeroVictoryModal.coffee @@ -249,7 +249,7 @@ module.exports = class HeroVictoryModal extends ModalView onGameSubmitted: (e) -> ladderURL = "/play/ladder/#{@level.get('slug')}#my-matches" # Preserve the supermodel as we navigate back to the ladder. - Backbone.Mediator.publish 'router:navigate', route: ladderURL, viewClass: require('views/play/ladder/LadderView'), viewArgs: [{supermodel: @supermodel}] + Backbone.Mediator.publish 'router:navigate', route: ladderURL, viewClass: require('views/play/ladder/LadderView'), viewArgs: [{supermodel: @supermodel}, @level.get('slug')] playSelectionSound: (hero, preload=false) -> return unless sounds = hero.get('soundTriggers')?.selected