mirror of
https://github.com/smogon/pokemon-showdown.git
synced 2026-05-23 16:26:15 -05:00
Ring Target only affects type-to-type immunities
This commit is contained in:
parent
e226249395
commit
9fbeebcb8a
|
|
@ -1105,12 +1105,15 @@ var BattlePokemon = (function() {
|
|||
return true;
|
||||
}
|
||||
if (this.negateImmunity[type]) return true;
|
||||
if (!this.negateImmunity['Type'] && !this.battle.getImmunity(type, this)) {
|
||||
this.battle.debug('natural immunity');
|
||||
if (message) {
|
||||
this.battle.add('-immune', this, '[msg]');
|
||||
if (!(this.negateImmunity['Type'] && type in this.data.TypeChart)) {
|
||||
// Ring Target not active
|
||||
if (!this.battle.getImmunity(type, this)) {
|
||||
this.battle.debug('natural immunity');
|
||||
if (message) {
|
||||
this.battle.add('-immune', this, '[msg]');
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
var immunity = this.battle.runEvent('Immunity', this, null, null, type);
|
||||
if (!immunity) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user