Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-08-29 18:24:34 +01:00

View File

@@ -333,7 +333,7 @@ GameData::Evolution.register({
:minimum_level => 1, # Needs any level up
:level_up_proc => proc { |pkmn, parameter|
if pkmn.happiness >= 220
next pkmn.moves.any? { |m| m && m.id > 0 && m.type == parameter }
next pkmn.moves.any? { |m| m && m.type == parameter }
end
}
})