Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-14 04:05:39 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Shed Bell may be nullified by Sheer Force

Browse Source 
Also remove 'AfterMove' global event from all gens, and 'AfterMoveSelf' from Gen 3 onwards.
This commit is contained in:
Slayer95
2014-07-14 19:03:38 -05:00
parent 3b22b1f570
commit 377345454f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/items.js
View File

@@ -3686,7 +3686,8 @@ exports.BattleItems = {
fling: {
basePower: 30
},
onAfterMoveSelf: function (source, target) {
onAfterMoveSecondarySelfPriority: -1,
onAfterMoveSecondarySelf: function (source, target) {
if (source.lastDamage > 0) {
this.heal(source.lastDamage / 8, source);
}

3
data/scripts.js
View File

@@ -44,8 +44,7 @@ exports.BattleScripts = {
pokemon.moveUsed(move);
this.useMove(move, pokemon, target, sourceEffect);
this.singleEvent('AfterMove', move, null, pokemon, target, move);
this.runEvent('AfterMove', target, pokemon, move);
this.runEvent('AfterMoveSelf', pokemon, target, move);
if (this.gen <= 2) this.runEvent('AfterMoveSelf', pokemon, target, move);
},
useMove: function (move, pokemon, target, sourceEffect) {
if (!sourceEffect && this.effect.id) sourceEffect = this.effect;

2
mods/gennext/items.js
View File

@@ -78,7 +78,7 @@ exports.BattleItems = {
},
"bigroot": {
inherit: true,
onAfterMoveSelf: function (source, target) {
onAfterMoveSecondarySelf: function (source, target) {
if (source.hasType('Grass')) {
if (source.lastDamage > 0) {
this.heal(source.lastDamage / 8, source);