Removed all other uses of and support for ID numbers

Data/Scripts/010_Data/001_Hardcoded data/008_Stat.rb

@@ -1,5 +1,3 @@
-# The id_number value determines which order the stats are iterated through by
-# the "each" methods.
 # The pbs_order value determines the order in which the stats are written in
 # several PBS files, where base stats/IVs/EVs/EV yields are defined. Only stats
 # which are yielded by the "each_main" method can have stat numbers defined in
@@ -8,7 +6,6 @@
 module GameData
   class Stat
     attr_reader :id
-    attr_reader :id_number
     attr_reader :real_name
     attr_reader :real_name_brief
     attr_reader :type
@@ -16,7 +13,7 @@ module GameData
 
     DATA = {}
 
-    extend ClassMethods
+    extend ClassMethodsSymbols
     include InstanceMethods
 
     def self.load; end
@@ -39,7 +36,6 @@ module GameData
 
     def initialize(hash)
       @id              = hash[:id]
-      @id_number       = hash[:id_number]  || -1
       @real_name       = hash[:name]       || "Unnamed"
       @real_name_brief = hash[:name_brief] || "None"
       @type            = hash[:type]       || :none
@@ -62,7 +58,6 @@ end
 
 GameData::Stat.register({
   :id         => :HP,
-  :id_number  => 0,
   :name       => _INTL("HP"),
   :name_brief => _INTL("HP"),
   :type       => :main,
@@ -71,7 +66,6 @@ GameData::Stat.register({
 
 GameData::Stat.register({
   :id         => :ATTACK,
-  :id_number  => 1,
   :name       => _INTL("Attack"),
   :name_brief => _INTL("Atk"),
   :type       => :main_battle,
@@ -80,7 +74,6 @@ GameData::Stat.register({
 
 GameData::Stat.register({
   :id         => :DEFENSE,
-  :id_number  => 2,
   :name       => _INTL("Defense"),
   :name_brief => _INTL("Def"),
   :type       => :main_battle,
@@ -89,7 +82,6 @@ GameData::Stat.register({
 
 GameData::Stat.register({
   :id         => :SPECIAL_ATTACK,
-  :id_number  => 3,
   :name       => _INTL("Special Attack"),
   :name_brief => _INTL("SpAtk"),
   :type       => :main_battle,
@@ -98,7 +90,6 @@ GameData::Stat.register({
 
 GameData::Stat.register({
   :id         => :SPECIAL_DEFENSE,
-  :id_number  => 4,
   :name       => _INTL("Special Defense"),
   :name_brief => _INTL("SpDef"),
   :type       => :main_battle,
@@ -107,7 +98,6 @@ GameData::Stat.register({
 
 GameData::Stat.register({
   :id         => :SPEED,
-  :id_number  => 5,
   :name       => _INTL("Speed"),
   :name_brief => _INTL("Spd"),
   :type       => :main_battle,
@@ -116,7 +106,6 @@ GameData::Stat.register({
 
 GameData::Stat.register({
   :id         => :ACCURACY,
-  :id_number  => 6,
   :name       => _INTL("accuracy"),
   :name_brief => _INTL("Acc"),
   :type       => :battle
@@ -124,7 +113,6 @@ GameData::Stat.register({
 
 GameData::Stat.register({
   :id         => :EVASION,
-  :id_number  => 7,
   :name       => _INTL("evasiveness"),
   :name_brief => _INTL("Eva"),
   :type       => :battle

Data/Scripts/010_Data/001_Hardcoded data/009_Nature.rb

@@ -1,13 +1,12 @@
 module GameData
   class Nature
     attr_reader :id
-    attr_reader :id_number
     attr_reader :real_name
     attr_reader :stat_changes
 
     DATA = {}
 
-    extend ClassMethods
+    extend ClassMethodsSymbols
     include InstanceMethods
 
     def self.load; end
@@ -15,7 +14,6 @@ module GameData
 
     def initialize(hash)
       @id           = hash[:id]
-      @id_number    = hash[:id_number]    || -1
       @real_name    = hash[:name]         || "Unnamed"
       @stat_changes = hash[:stat_changes] || []
     end
@@ -31,170 +29,145 @@ end
 
 GameData::Nature.register({
   :id           => :HARDY,
-  :id_number    => 0,
   :name         => _INTL("Hardy")
 })
 
 GameData::Nature.register({
   :id           => :LONELY,
-  :id_number    => 1,
   :name         => _INTL("Lonely"),
   :stat_changes => [[:ATTACK, 10], [:DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :BRAVE,
-  :id_number    => 2,
   :name         => _INTL("Brave"),
   :stat_changes => [[:ATTACK, 10], [:SPEED, -10]]
 })
 
 GameData::Nature.register({
   :id           => :ADAMANT,
-  :id_number    => 3,
   :name         => _INTL("Adamant"),
   :stat_changes => [[:ATTACK, 10], [:SPECIAL_ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :NAUGHTY,
-  :id_number    => 4,
   :name         => _INTL("Naughty"),
   :stat_changes => [[:ATTACK, 10], [:SPECIAL_DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :BOLD,
-  :id_number    => 5,
   :name         => _INTL("Bold"),
   :stat_changes => [[:DEFENSE, 10], [:ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :DOCILE,
-  :id_number    => 6,
   :name         => _INTL("Docile")
 })
 
 GameData::Nature.register({
   :id           => :RELAXED,
-  :id_number    => 7,
   :name         => _INTL("Relaxed"),
   :stat_changes => [[:DEFENSE, 10], [:SPEED, -10]]
 })
 
 GameData::Nature.register({
   :id           => :IMPISH,
-  :id_number    => 8,
   :name         => _INTL("Impish"),
   :stat_changes => [[:DEFENSE, 10], [:SPECIAL_ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :LAX,
-  :id_number    => 9,
   :name         => _INTL("Lax"),
   :stat_changes => [[:DEFENSE, 10], [:SPECIAL_DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :TIMID,
-  :id_number    => 10,
   :name         => _INTL("Timid"),
   :stat_changes => [[:SPEED, 10], [:ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :HASTY,
-  :id_number    => 11,
   :name         => _INTL("Hasty"),
   :stat_changes => [[:SPEED, 10], [:DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :SERIOUS,
-  :id_number    => 12,
   :name         => _INTL("Serious")
 })
 
 GameData::Nature.register({
   :id           => :JOLLY,
-  :id_number    => 13,
   :name         => _INTL("Jolly"),
   :stat_changes => [[:SPEED, 10], [:SPECIAL_ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :NAIVE,
-  :id_number    => 14,
   :name         => _INTL("Naive"),
   :stat_changes => [[:SPEED, 10], [:SPECIAL_DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :MODEST,
-  :id_number    => 15,
   :name         => _INTL("Modest"),
   :stat_changes => [[:SPECIAL_ATTACK, 10], [:ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :MILD,
-  :id_number    => 16,
   :name         => _INTL("Mild"),
   :stat_changes => [[:SPECIAL_ATTACK, 10], [:DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :QUIET,
-  :id_number    => 17,
   :name         => _INTL("Quiet"),
   :stat_changes => [[:SPECIAL_ATTACK, 10], [:SPEED, -10]]
 })
 
 GameData::Nature.register({
   :id           => :BASHFUL,
-  :id_number    => 18,
   :name         => _INTL("Bashful")
 })
 
 GameData::Nature.register({
   :id           => :RASH,
-  :id_number    => 19,
   :name         => _INTL("Rash"),
   :stat_changes => [[:SPECIAL_ATTACK, 10], [:SPECIAL_DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :CALM,
-  :id_number    => 20,
   :name         => _INTL("Calm"),
   :stat_changes => [[:SPECIAL_DEFENSE, 10], [:ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :GENTLE,
-  :id_number    => 21,
   :name         => _INTL("Gentle"),
   :stat_changes => [[:SPECIAL_DEFENSE, 10], [:DEFENSE, -10]]
 })
 
 GameData::Nature.register({
   :id           => :SASSY,
-  :id_number    => 22,
   :name         => _INTL("Sassy"),
   :stat_changes => [[:SPECIAL_DEFENSE, 10], [:SPEED, -10]]
 })
 
 GameData::Nature.register({
   :id           => :CAREFUL,
-  :id_number    => 23,
   :name         => _INTL("Careful"),
   :stat_changes => [[:SPECIAL_DEFENSE, 10], [:SPECIAL_ATTACK, -10]]
 })
 
 GameData::Nature.register({
   :id           => :QUIRKY,
-  :id_number    => 24,
   :name         => _INTL("Quirky")
 })