2 files changed, 16 insertions, 22 deletions

@@ -142,28 +142,6 @@ module Pokeviewer
       ot_number.to_s.rjust(5, '0')
     end
 
-    def display_met
-      if met_type == :normal
-        if outsider?
-          "Apparently met in #{location.name} at Lv. #{met_level}."
-        else
-          "Met in #{location.name} at Lv. #{met_level}."
-        end
-      elsif met_type == :hatched
-        if outsider?
-          "Apparently hatched in #{location.name} at Lv. 5."
-        else
-          "Hatched in #{location.name} at Lv. 5."
-        end
-      elsif met_type == :npc_trade
-        "Met in a trade."
-      elsif met_type == :fateful_encounter
-        "Obtained in a fateful encounter at Lv. #{met_level}."
-      elsif met_type == :orre
-        "Met in a trade."
-      end
-    end
-
     def nature_benefits?(stat)
       if stat == :attack
         [:lonely, :brave, :adamant, :naughty].include? nature.intern
@@ -140,6 +140,22 @@ module Pokeviewer
         less_than_or_equal_to: 4,
         only_integer: true}
 
+    def move_1_pp
+      move_1.pp * (5 + move_1_pp_bonuses) / 5
+    end
+
+    def move_2_pp
+      move_2.pp * (5 + move_2_pp_bonuses) / 5
+    end
+
+    def move_3_pp
+      move_3.pp * (5 + move_3_pp_bonuses) / 5
+    end
+
+    def move_4_pp
+      move_4.pp * (5 + move_4_pp_bonuses) / 5
+    end
+
     def ribbons
       result = []