Skip to content
Permalink
Browse files

Make sure Z moves don't get item boosts

  • Loading branch information...
AustinXII committed Mar 24, 2017
1 parent 50e03d1 commit 3cdb78644fbafb005ca2472f93d93bac67af8e04
Showing with 4 additions and 4 deletions.
  1. +4 −4 js/damage.js
@@ -478,12 +478,12 @@ function getDamageResult(attacker, defender, move, field) {

if ((attacker.item === "Thick Club" && (attacker.name === "Cubone" || attacker.name === "Marowak" || attacker.name === "Marowak-Alola") && move.category === "Physical") ||
(attacker.item === "Deep Sea Tooth" && attacker.name === "Clamperl" && move.category === "Special") ||
(attacker.item === "Light Ball" && attacker.name === "Pikachu")) {
(attacker.item === "Light Ball" && attacker.name === "Pikachu") && !move.isZ) {
atMods.push(0x2000);
description.attackerItem = attacker.item;
} else if ((gen < 7 && attacker.item === "Soul Dew" && (attacker.name === "Latios" || attacker.name === "Latias") && move.category === "Special") ||
(attacker.item === "Choice Band" && move.category === "Physical") ||
(attacker.item === "Choice Specs" && move.category === "Special")) {
(attacker.item === "Choice Specs" && move.category === "Special") && !move.isZ) {
atMods.push(0x1800);
description.attackerItem = attacker.item;
}
@@ -644,10 +644,10 @@ function getDamageResult(attacker, defender, move, field) {
finalMods.push(0xC00);
description.defenderAbility = defAbility;
}
if (attacker.item === "Expert Belt" && typeEffectiveness > 1) {
if (attacker.item === "Expert Belt" && typeEffectiveness > 1 && !move.isZ) {
finalMods.push(0x1333);
description.attackerItem = attacker.item;
} else if (attacker.item === "Life Orb") {
} else if (attacker.item === "Life Orb" && !move.isZ) {
finalMods.push(0x14CC);
description.attackerItem = attacker.item;
}

0 comments on commit 3cdb786

Please sign in to comment.
You can’t perform that action at this time.