Merge branch 'dev' into ai

This commit is contained in:
Maruno17
2023-03-23 23:20:58 +00:00
7 changed files with 494 additions and 453 deletions

View File

@@ -836,7 +836,7 @@ class Battle::Move::SetTargetTypesToPsychic < Battle::Move
def pbFailsAgainstTarget?(user, target, show_message)
if !target.canChangeType? || !GameData::Type.exists?(:PSYCHIC) ||
!target.pbHasOtherType?(:PSYCHIC) || !target.affectedByPowder?
!target.pbHasOtherType?(:PSYCHIC)
@battle.pbDisplay(_INTL("But it failed!")) if show_message
return true
end