1
0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2025-10-27 18:00:03 +00:00

Fixed issue where popover wasn't appearing when first pokemon didn't have a mega stone

This commit is contained in:
Deukhoofd
2016-05-22 17:34:31 +02:00
parent 2e1bb22aab
commit b7230033bb
4 changed files with 10 additions and 0 deletions

View File

@@ -248,6 +248,7 @@ class @Pokemon extends Backbone.Model
if @get('species') == "Rayquaza" and "Dragon Ascent" in @get('moves')
return true
item = @getItem()
return false if typeof item == "undefined"
return false if item.type != 'megastone'
[ species, forme ] = item.mega
return false if @get('species') != species || @get('forme') != 'default'

View File

@@ -166,6 +166,7 @@ class @BattleView extends Backbone.View
this
movePopover: ($this, moveName, move) =>
console.log(moveName)
{type, damage} = move
damageFriendly = move.damage[0].toUpperCase() + move.damage.substr(1)
targetFriendly = move.target[0].toUpperCase() + move.target.substr(1)