From 7107926865054dc8f4c7a5497a6c2b979a2f5d06 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 27 Feb 2016 18:56:21 +0100 Subject: [PATCH] Made Ethereal Shroud handle immunities better, removed log spam of eeveelutions --- public/js/app.js | 1 - public/js/replays.js | 1 - server/bw/pokemon.coffee | 4 ++++ shared/learnsets.coffee | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index c2a328a..ff4b53f 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -769,7 +769,6 @@ } } learnable.splice(remindex, 1); - console.log(learnable); } return _.chain(learnable).flatten().sort().unique().value(); }; diff --git a/public/js/replays.js b/public/js/replays.js index 7acb2f9..8f180b4 100644 --- a/public/js/replays.js +++ b/public/js/replays.js @@ -769,7 +769,6 @@ } } learnable.splice(remindex, 1); - console.log(learnable); } return _.chain(learnable).flatten().sort().unique().value(); }; diff --git a/server/bw/pokemon.coffee b/server/bw/pokemon.coffee index b178cd8..e923e47 100644 --- a/server/bw/pokemon.coffee +++ b/server/bw/pokemon.coffee @@ -472,6 +472,10 @@ class @Pokemon return false if options.move?.ignoresImmunities() multiplier = @effectivenessOf(type, options) + if @hasAbility("Ethereal Shroud") + ghosteffect = util.typeEffectiveness(type, ["Ghost"]) + if ghosteffect < 1 + multiplier *= ghosteffect return multiplier == 0 effectivenessOf: (type, options) -> diff --git a/shared/learnsets.coffee b/shared/learnsets.coffee index 6e907eb..c076318 100644 --- a/shared/learnsets.coffee +++ b/shared/learnsets.coffee @@ -139,7 +139,6 @@ self.learnableMoves = (Generations, pokemon, forGeneration) -> if "Hydro Pump" in ele and "Flare Blitz" in ele and "Psychic" in ele and pokemon.species != 'Eevee' remindex = index learnable.splice(remindex, 1) - console.log(learnable) _.chain(learnable).flatten().sort().unique().value()