This commit is contained in:
Deukhoofd committed 2016-02-26 22:32:33 +01:00
1 parent ed22806774
commit e08531263e
7 files changed
+11 -5

No files matched your search

+4 -4
View File
@@ -7,7 +7,7 @@
"armor"
],
"spriteId": 404,
"type": "megastone"
"type": "formeitem"
},
"Flygon Armor": {
"description": "Increases the Defense and Special Defense stats of Flygon by 25% when held.",
@@ -17,7 +17,7 @@
"armor"
],
"spriteId": 404,
"type": "megastone"
"type": "formeitem"
},
"Leavanny Armor": {
"description": "Increases the Defense and Special Defense stats of Leavanny by 25% when held.",
@@ -27,7 +27,7 @@
"armor"
],
"spriteId": 404,
"type": "megastone"
"type": "formeitem"
},
"Zekrom Armor": {
"description": "Increases the Defense and Special Defense stats of Zekrom by 25% when held.",
@@ -37,7 +37,7 @@
"armor"
],
"spriteId": 404,
"type": "megastone"
"type": "formeitem"
},
"Ability Capsule": {
"description": "Allows a Pokemon with one of its two standard Abilities to change to the other when used.",
+3
View File
@@ -26,6 +26,9 @@ oldHasTakeableItem = @Pokemon::hasTakeableItem
if @item.type == 'megastone'
[ species, forme ] = @item.mega
return false if @species == species
else if @item.type is "formeitem"
[ species, forme ] = @item.itemForme
return false if @species == species
return true
# Powder moves no longer affect Grass-type Pokemon.