Added Psyblade and Hydro Steam #2834
Conversation
Done discussing and done changing. Ready for re-review 👀 |
|
As it currently is, Hydro Steam is weakened under sunlight after its base power is boosted. |
Oh, I didn't realize Hydro Steam's effect boosted the move's power beyond nulling the sunlight's nerf. I'll address that. Thanks! |
LOuroboros
force-pushed
the
hydroPsySteamBlade
branch
from
cff1061
to
f4e8389
Compare
|
Done. I also rebased because this doesn't feel like a contribution that should be split into so many commits. Ready for re-re-review 👀 |
| @@ -9586,7 +9590,7 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move | |||
| } | |||
| else if (IsBattlerWeatherAffected(battlerAtk, B_WEATHER_SUN)) | |||
| { | |||
| if (moveType == TYPE_FIRE) | |||
| if (moveType == TYPE_FIRE || gBattleMoves[move].effect == EFFECT_HYDRO_STEAM) | |||
There was a problem hiding this comment.
The check for Utility Umbrella is still missing. If the mon using Hydro Steam is holding one, then Hydro Steam's damage is halved, not doubled (see this post).
Most likely this was overlooked because two lines above the code is incorrect. It should be (IsBattlerWeatherAffected(battlerDef, B_WEATHER_SUN)), not (IsBattlerWeatherAffected(battlerAtk, B_WEATHER_SUN)).
There was a problem hiding this comment.
The check for the Utility Umbrella is in IsBattlerWeatherAffected. However, when the Utility Umbrella was implemented in the expansion, we all assumed that the defender's Umbrella didn't affect the attacker's damage multiplier, which Anubis states it does. As discussed in the Discord server, we'll add a new function specific for weather damage multipliers.
There was a problem hiding this comment.
Addressed in #2835
Description
Closes #2832 and #2833.
Discord contact info
Lunos#4026