From 0122ccadcf514ac4d28a9ba92805d06ff92808a6 Mon Sep 17 00:00:00 2001 From: jonisavo Date: Fri, 16 Oct 2020 14:07:09 +0300 Subject: [PATCH] Deprecate Pokemon#otgender and Pokemon#otgender= --- Data/Scripts/016_Pokemon/001_Pokemon.rb | 10 ---------- Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Data/Scripts/016_Pokemon/001_Pokemon.rb b/Data/Scripts/016_Pokemon/001_Pokemon.rb index 3b39a6e7e..91e08fcc5 100644 --- a/Data/Scripts/016_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/016_Pokemon/001_Pokemon.rb @@ -94,11 +94,6 @@ class Pokemon attr_accessor :hatchedMap # @param value [Integer] new language attr_writer :language - # Changes the gender of the original trainer. This is for information only, - # and is not used to verify ownership of the Pokémon. - # @param value [Integer] new value for the original trainer's gender: - # 0 - male, 1 - female, 2 - mixed, 3 - unknown - attr_writer :otgender # @param value [Integer] new contest stat attr_writer :cool,:beauty,:cute,:smart,:tough,:sheen @@ -204,11 +199,6 @@ class Pokemon end alias isForeign? foreign? - # @return [0, 1, 2] the gender of this Pokémon original trainer (0 = male, 1 = female, 2 = unknown) - def otgender - return @otgender || 2 - end - # @return [Integer] this Pokémon's level when it was obtained def obtainLevel return @obtainLevel || 0 diff --git a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb index e82dbd756..ef558347e 100644 --- a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb +++ b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb @@ -42,6 +42,18 @@ class Pokemon Deprecation.warn_method('Pokemon#ot=', 'vXX', 'Pokemon::Owner#name=') @owner.name = value end + + # @deprecated Use {Owner#gender} instead. This alias is slated to be removed in vXX. + def otgender + Deprecation.warn_method('Pokemon#otgender', 'vXX', 'Pokemon::Owner#gender') + return @owner.gender + end + + # @deprecated Use {Owner#gender=} instead. This alias is slated to be removed in vXX. + def otgender=(value) + Deprecation.warn_method('Pokemon#otgender=', 'vXX', 'Pokemon::Owner#gender=') + @owner.gender = value + end end # (see Pokemon#initialize)