Added PBS file pokemon_metrics.txt, for all Pokémon sprite positionings

Data/Scripts/010_Data/002_PBS data/008_Species.rb

@@ -40,13 +40,6 @@ module GameData
     attr_reader :mega_move
     attr_reader :unmega_form
     attr_reader :mega_message
-    attr_accessor :back_sprite_x
-    attr_accessor :back_sprite_y
-    attr_accessor :front_sprite_x
-    attr_accessor :front_sprite_y
-    attr_accessor :front_sprite_altitude
-    attr_accessor :shadow_x
-    attr_accessor :shadow_size
 
     DATA = {}
     DATA_FILENAME = "species.dat"
@@ -190,13 +183,6 @@ module GameData
       @mega_move             = hash[:mega_move]
       @unmega_form           = hash[:unmega_form]           || 0
       @mega_message          = hash[:mega_message]          || 0
-      @back_sprite_x         = hash[:back_sprite_x]         || 0
-      @back_sprite_y         = hash[:back_sprite_y]         || 0
-      @front_sprite_x        = hash[:front_sprite_x]        || 0
-      @front_sprite_y        = hash[:front_sprite_y]        || 0
-      @front_sprite_altitude = hash[:front_sprite_altitude] || 0
-      @shadow_x              = hash[:shadow_x]              || 0
-      @shadow_size           = hash[:shadow_size]           || 2
     end
 
     # @return [String] the translated name of this species
@@ -235,25 +221,13 @@ module GameData
     end
 
     def apply_metrics_to_sprite(sprite, index, shadow = false)
-      if shadow
-        if (index & 1) == 1   # Foe Pokémon
-          sprite.x += @shadow_x * 2
-        end
-      else
-        if (index & 1) == 0   # Player's Pokémon
-          sprite.x += @back_sprite_x * 2
-          sprite.y += @back_sprite_y * 2
-        else                  # Foe Pokémon
-          sprite.x += @front_sprite_x * 2
-          sprite.y += @front_sprite_y * 2
-          sprite.y -= @front_sprite_altitude * 2
-        end
-      end
+      metrics_data = GameData::SpeciesMetrics.get_species_form(@species, @form)
+      metrics_data.apply_metrics_to_sprite(sprite, index, shadow)
     end
 
     def shows_shadow?
-      return true
-#      return @front_sprite_altitude > 0
+      metrics_data = GameData::SpeciesMetrics.get_species_form(@species, @form)
+      return metrics_data.shows_shadow?
     end
 
     def get_evolutions(exclude_invalid = false)

Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb

@@ -158,7 +158,8 @@ module GameData
       ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%s", species_data.species))
       return ret if ret
       # Use general shadow graphic
-      return pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%d", species_data.shadow_size))
+      metrics_data = GameData::SpeciesMetrics.get_species_form(species_data.species, form)
+      return pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%d", metrics_data.shadow_size))
     end
 
     def self.shadow_bitmap(species, form = 0)

Data/Scripts/010_Data/002_PBS data/010_SpeciesMetrics.rb

@@ -0,0 +1,89 @@
+module GameData
+  class SpeciesMetrics
+    attr_reader   :id
+    attr_reader   :species
+    attr_reader   :form
+    attr_accessor :back_sprite
+    attr_accessor :front_sprite
+    attr_accessor :front_sprite_altitude
+    attr_accessor :shadow_x
+    attr_accessor :shadow_size
+
+    DATA = {}
+    DATA_FILENAME = "species_metrics.dat"
+
+    SCHEMA = {
+      "BackSprite"          => [0, "ii"],
+      "FrontSprite"         => [0, "ii"],
+      "FrontSpriteAltitude" => [0, "i"],
+      "ShadowX"             => [0, "i"],
+      "ShadowSize"          => [0, "u"]
+    }
+
+    extend ClassMethodsSymbols
+    include InstanceMethods
+
+    # @param species [Symbol, String]
+    # @param form [Integer]
+    # @return [self, nil]
+    def self.get_species_form(species, form)
+      return nil if !species || !form
+      validate species => [Symbol, String]
+      validate form => Integer
+      raise _INTL("Undefined species {1}.", species) if !GameData::Species.exists?(species)
+      species = species.to_sym if species.is_a?(String)
+      if form > 0
+        trial = sprintf("%s_%d", species, form).to_sym
+        if !DATA.has_key?(trial)
+          self.register({:id => species}) if !DATA[species]
+          self.register({
+            :id                    => trial,
+            :species               => species,
+            :form                  => form,
+            :back_sprite           => DATA[species].back_sprite.clone,
+            :front_sprite          => DATA[species].front_sprite.clone,
+            :front_sprite_altitude => DATA[species].front_sprite_altitude,
+            :shadow_x              => DATA[species].shadow_x,
+            :shadow_size           => DATA[species].shadow_size
+          })
+        end
+        return DATA[trial]
+      end
+      self.register({:id => species}) if !DATA[species]
+      return DATA[species]
+    end
+
+    def initialize(hash)
+      @id                    = hash[:id]
+      @species               = hash[:species]               || @id
+      @form                  = hash[:form]                  || 0
+      @back_sprite           = hash[:back_sprite]           || [0, 0]
+      @front_sprite          = hash[:front_sprite]          || [0, 0]
+      @front_sprite_altitude = hash[:front_sprite_altitude] || 0
+      @shadow_x              = hash[:shadow_x]              || 0
+      @shadow_size           = hash[:shadow_size]           || 2
+    end
+
+    def apply_metrics_to_sprite(sprite, index, shadow = false)
+      if shadow
+        if (index & 1) == 1   # Foe Pokémon
+          sprite.x += @shadow_x * 2
+        end
+      else
+        if (index & 1) == 0   # Player's Pokémon
+          sprite.x += @back_sprite[0] * 2
+          sprite.y += @back_sprite[1] * 2
+        else                  # Foe Pokémon
+          sprite.x += @front_sprite[0] * 2
+          sprite.y += @front_sprite[1] * 2
+          sprite.y -= @front_sprite_altitude * 2
+        end
+      end
+    end
+
+    def shows_shadow?
+      return true
+#      return @front_sprite_altitude > 0
+    end
+  end
+end