From b9801ef171c98d26c182929f8f443814286c097c Mon Sep 17 00:00:00 2001 From: jonisavo Date: Fri, 16 Oct 2020 14:11:09 +0300 Subject: [PATCH] Deprecate Pokemon#language and Pokemon#language= --- Data/Scripts/016_Pokemon/001_Pokemon.rb | 7 ------- Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Data/Scripts/016_Pokemon/001_Pokemon.rb b/Data/Scripts/016_Pokemon/001_Pokemon.rb index 91e08fcc5..931e58956 100644 --- a/Data/Scripts/016_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/016_Pokemon/001_Pokemon.rb @@ -92,8 +92,6 @@ class Pokemon # Otherwise returns 0. # @return [Integer] the map ID where egg was hatched (0 by default) attr_accessor :hatchedMap - # @param value [Integer] new language - attr_writer :language # @param value [Integer] new contest stat attr_writer :cool,:beauty,:cute,:smart,:tough,:sheen @@ -934,11 +932,6 @@ class Pokemon return @name != self.speciesName end - # @return [Integer] this Pokémon's language - def language - return @language || 0 - end - # @return [Integer] the markings this Pokémon has def markings return @markings || 0 diff --git a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb index ef558347e..77e551ecd 100644 --- a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb +++ b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb @@ -54,6 +54,18 @@ class Pokemon Deprecation.warn_method('Pokemon#otgender=', 'vXX', 'Pokemon::Owner#gender=') @owner.gender = value end + + # @deprecated Use {Owner#language} instead. This alias is slated to be removed in vXX. + def language + Deprecation.warn_method('Pokemon#language', 'vXX', 'Pokemon::Owner#language') + return @owner.language + end + + # @deprecated Use {Owner#language=} instead. This alias is slated to be removed in vXX. + def language=(value) + Deprecation.warn_method('Pokemon#language=', 'vXX', 'Pokemon::Owner#language=') + @owner.language = value + end end # (see Pokemon#initialize)