mirror of
https://github.com/smogon/pokemon-showdown.git
synced 2026-05-09 04:23:45 -05:00
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
This commit is contained in:
parent
514dd8af1d
commit
644d9fc720
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
},
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user