Deukhoofd/BattleSim
1
0
Fork 0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2025-10-27 18:00:03 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/app.js
View File

@@ -1855,6 +1855,9 @@
return true;
}
item = this.getItem();
if (typeof item === "undefined") {
return false;
}
if (item.type !== 'megastone') {
return false;
}
@@ -3198,6 +3201,7 @@
BattleView.prototype.movePopover = function($this, moveName, move) {
var damage, damageFriendly, displayName, options, targetFriendly, type;
console.log(moveName);
type = move.type, damage = move.damage;
damageFriendly = move.damage[0].toUpperCase() + move.damage.substr(1);
targetFriendly = move.target[0].toUpperCase() + move.target.substr(1);

4
public/js/replays.js
View File

@@ -1855,6 +1855,9 @@
return true;
}
item = this.getItem();
if (typeof item === "undefined") {
return false;
}
if (item.type !== 'megastone') {
return false;
}
@@ -2924,6 +2927,7 @@
BattleView.prototype.movePopover = function($this, moveName, move) {
var damage, damageFriendly, displayName, options, targetFriendly, type;
console.log(moveName);
type = move.type, damage = move.damage;
damageFriendly = move.damage[0].toUpperCase() + move.damage.substr(1);
targetFriendly = move.target[0].toUpperCase() + move.target.substr(1);