data bump

This commit is contained in:
Bill Meltsner
2013-10-24 11:31:49 -07:00
parent 7f61154a0f
commit 80947cf89b
2 changed files with 35 additions and 16 deletions

View File

@@ -1843,6 +1843,23 @@ exports.BattleItems = {
gen: 4,
desc: "Halves damage taken from a super effective Poison-type attack. Single use."
},
"keeberry": {
id: "keeberry",
name: "Kee Berry",
spritenum: 0,
isBerry: true,
onAfterDamage: function(damage, target, source, move) {
if (move.category === 'Physical') {
target.eatItem();
}
},
onEat: function(pokemon) {
this.boost({def: 1});
},
num: -6,
gen: 6,
desc: "Raises Defense by 1 if hit by a Physical attack. Single use."
},
"kelpsyberry": {
id: "kelpsyberry",
name: "Kelpsy Berry",
@@ -2280,6 +2297,23 @@ exports.BattleItems = {
gen: 6,
desc: "Mega-evolves Manectric."
},
"marangaberry": {
id: "marangaberry",
name: "Maranga Berry",
spritenum: 0,
isBerry: true,
onAfterDamage: function(damage, target, source, move) {
if (move.category === 'Special') {
target.eatItem()
}
},
onEat: function(pokemon) {
this.boost({spd: 1});
},
num: -6,
gen: 6,
desc: "Raises Special Defense by 1 if hit by a Special attack. Single use."
},
"masterball": {
id: "masterball",
name: "Master Ball",

View File

@@ -5986,22 +5986,6 @@ exports.BattleMovedex = {
target: "normal",
type: "Electric"
},
"hiddenpowerfairy": {
accuracy: 100,
basePower: 60,
category: "Special",
desc: "",
shortDesc: "",
id: "hiddenpower",
isViable: true,
name: "Hidden Power Fairy",
pp: 15,
priority: 0,
secondary: false,
target: "normal",
type: "Fairy",
gen: 6
},
"hiddenpowerfighting": {
accuracy: 100,
basePower: 60,
@@ -13659,6 +13643,7 @@ exports.BattleMovedex = {
name: "Topsy-turvy",
pp: 10,
priority: 0,
isBounceable: true,
onHit: function(target) {
var targetBoosts = {};