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

Resolve #27

Browse Source
This commit is contained in:
Deukhoofd
2016-02-26 22:32:33 +01:00
parent ed22806774
commit e08531263e
7 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/in/data/data_items.json
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
server/in/pokemon.coffee
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.