Merge branch 'master' into refactor

This commit is contained in:
Maruno17
2020-10-18 21:40:04 +01:00
49 changed files with 2885 additions and 2861 deletions

View File

@@ -37,15 +37,6 @@ class Pokemon
return pbGetFSpeciesFromForm(@species,formSimple)
end
alias __mf_compatibleWithMove? compatibleWithMove? # Deprecated
def compatibleWithMove?(move)
v = MultipleForms.call("getMoveCompatibility",self)
if v!=nil
return v.any? { |j| j==move }
end
return __mf_compatibleWithMove?(move)
end
alias __mf_initialize initialize
def initialize(*args)
@form = (pbGetSpeciesFromFSpecies(args[0])[1] rescue 0)