From 644d9fc720dbcfbc845c46528ac29dfc80e2c39f Mon Sep 17 00:00:00 2001 From: V4Victini Date: Mon, 21 Oct 2013 12:34:04 -0400 Subject: [PATCH] Partial Trapping moves now deal 1/8 damage In Gen 5, partial trapping residual damage was 1/16 Max HP and 1/8 with Binding Band In Gen 6, it is now 1/8 Max HP and 1/6 with Binding Band --- data/statuses.js | 4 ++-- mods/gen5/statuses.js | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/data/statuses.js b/data/statuses.js index c978b2ea61..a76c0caaa2 100644 --- a/data/statuses.js +++ b/data/statuses.js @@ -172,9 +172,9 @@ exports.BattleStatuses = { return; } if (this.effectData.source.item === 'bindingband') { - this.damage(pokemon.maxhp/8); + this.damage(pokemon.maxhp/6); } else { - this.damage(pokemon.maxhp/16); + this.damage(pokemon.maxhp/8); } }, onEnd: function(pokemon) { diff --git a/mods/gen5/statuses.js b/mods/gen5/statuses.js index a4d3bb972a..3d6b7d6e63 100644 --- a/mods/gen5/statuses.js +++ b/mods/gen5/statuses.js @@ -5,4 +5,18 @@ exports.BattleStatuses = { this.effectData.time = this.effectData.startTime; } } + partiallytrapped: { + inherit: true, + onResidual: function(pokemon) { + if (this.effectData.source && (!this.effectData.source.isActive || this.effectData.source.hp <= 0)) { + pokemon.removeVolatile('partiallytrapped'); + return; + } + if (this.effectData.source.item === 'bindingband') { + this.damage(pokemon.maxhp/8); + } else { + this.damage(pokemon.maxhp/16); + } + }, + } };