Merge branch 'dev' into ai

This commit is contained in:
Maruno17
2023-02-10 21:20:28 +00:00
33 changed files with 341 additions and 1055 deletions

View File

@@ -314,15 +314,15 @@ class Pokemon
return species_data.types.clone
end
# @deprecated This method is slated to be removed in v21.
# @deprecated This method is slated to be removed in v22.
def type1
Deprecation.warn_method("type1", "v21", "pkmn.types")
Deprecation.warn_method("type1", "v22", "pkmn.types")
return types[0]
end
# @deprecated This method is slated to be removed in v21.
# @deprecated This method is slated to be removed in v22.
def type2
Deprecation.warn_method("type2", "v21", "pkmn.types")
Deprecation.warn_method("type2", "v22", "pkmn.types")
return types[1] || types[0]
end