Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-02 22:08:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Implement Bulletproof

Browse Source
This commit is contained in:
The Immortal 2013-11-04 16:35:47 +04:00
parent bd418c69f9
commit c2885a687a
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/abilities.js
View File

@ -245,6 +245,21 @@ exports.BattleAbilities = {
rating: 2,
num: 66
},
"bulletproof": {
desc: "This Pokemon is protected from some Ball and Bomb moves.",
shortDesc: "This Pokemon is protected from ball and bomb moves.",
onTryHit: function(pokemon, target, move) {
if (move.isBallMove || move.isBombMove) {
this.add('-immune', pokemon, '[msg]', '[from] Bulletproof');
return null;
}
},
id: "bulletproof",
name: "Bulletproof",
rating: 3,
num: -6,
gen: 6
},
"cheekpouch": {
desc: "Increases HP when this Pokemon consumes a berry.",
shortDesc: "Increases HP when this Pokemon consumes a berry.",
@ -255,7 +270,7 @@ exports.BattleAbilities = {
},
id: "cheekpouch",
name: "Cheek Pouch",
rating: 3,
rating: 2.5,
num: -6,
gen: 6
},
@ -1729,7 +1744,7 @@ exports.BattleAbilities = {
num: 12
},
"overcoat": {
desc: "In battle, the Pokemon does not take damage from weather conditions like Sandstorm or Hail. It is also immune to powder moves.",
desc: "In battle, the Pokemon does not take damage from weather conditions like Sandstorm or Hail. It is also immune to Powder moves.",
shortDesc: "This Pokemon is immune to residual weather damage, and powder moves.",
onImmunity: function(type, pokemon) {
if (type === 'sandstorm' || type === 'hail') return false;

12
data/moves.js
View File

@ -3170,6 +3170,7 @@ exports.BattleMovedex = {
name: "Egg Bomb",
pp: 10,
priority: 0,
isBombMove: true,
secondary: false,
target: "normal",
type: "Normal"
@ -3284,6 +3285,7 @@ exports.BattleMovedex = {
name: "Electro Ball",
pp: 10,
priority: 0,
isBallMove: true,
secondary: false,
target: "normal",
type: "Electric"
@ -3486,6 +3488,7 @@ exports.BattleMovedex = {
name: "Energy Ball",
pp: 10,
priority: 0,
isBallMove: true,
secondary: {
chance: 10,
boosts: {
@ -5433,6 +5436,7 @@ exports.BattleMovedex = {
pp: 5,
priority: 0,
isContact: true,
isBallMove: true,
secondary: false,
target: "normal",
type: "Steel"
@ -6431,6 +6435,7 @@ exports.BattleMovedex = {
pp: 20,
priority: 0,
isContact: true,
isBallMove: true,
effect: {
duration: 2,
onLockMove: 'iceball',
@ -7607,6 +7612,7 @@ exports.BattleMovedex = {
name: "Magnet Bomb",
pp: 20,
priority: 0,
isBombMove: true,
secondary: false,
target: "normal",
type: "Steel"
@ -8314,6 +8320,7 @@ exports.BattleMovedex = {
name: "Mist Ball",
pp: 5,
priority: 0,
isBallMove: true,
secondary: {
chance: 50,
boosts: {
@ -8475,6 +8482,7 @@ exports.BattleMovedex = {
name: "Mud Bomb",
pp: 10,
priority: 0,
isBombMove: true,
secondary: {
chance: 30,
boosts: {
@ -11175,6 +11183,7 @@ exports.BattleMovedex = {
name: "Seed Bomb",
pp: 15,
priority: 0,
isBombMove: true,
secondary: false,
target: "normal",
type: "Grass"
@ -11246,6 +11255,7 @@ exports.BattleMovedex = {
name: "Shadow Ball",
pp: 15,
priority: 0,
isBallMove: true,
secondary: {
chance: 20,
boosts: {
@ -11920,6 +11930,7 @@ exports.BattleMovedex = {
name: "Sludge Bomb",
pp: 10,
priority: 0,
isBombMove: true,
secondary: {
chance: 30,
status: 'psn'
@ -14460,6 +14471,7 @@ exports.BattleMovedex = {
name: "Weather Ball",
pp: 10,
priority: 0,
isBallMove: true,
onModifyMove: function(move) {
switch (this.effectiveWeather()) {
case 'sunnyday':