pokedex-terminal 0.1.2 → 0.1.4

data/lib/classes/Print.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 require_relative './Main_menu'
 require 'colorize'
 
 class Print
-
   def self.print_pokemon_expanded(hash)
-    system 'clear'
-    puts "-" * 40
-    puts "#{hash[:name]}"
-    puts "-" * 40
-    print "#{hash[:name]} belongs to the #{hash[:type_1]} type"
-    if hash[:type_2] != nil
-      print ", with a secondary type of #{hash[:type_2]} \n"
+    puts '-' * 40
+    puts (hash[:name]).to_s
+    puts '-' * 40
+    print "#{hash[:name]} belongs to the #{colorize_attribute(hash, :type_1, :type_1)} type"
+    if !hash[:type_2].nil?
+      print ", with a secondary type of #{colorize_attribute(hash, :type_2, :type_2)} \n"
     else
       print ".\n"
     end
@@ -23,42 +23,56 @@ class Print
     if hash[:legendary] == 'True'
       puts "Most importantly, #{hash[:name]} is a legendary Pokemon!"
     end
-    puts "-" * 40
+    puts '-' * 40
     Main_menu.return?
   end
 
   def self.print_pokemon_condensed(hash)
-    system 'clear'
-    name = "#{hash[:name]}"
-    case hash[:type_1]
-      when "Normal"
-        puts name
-      when "Fire"
-        puts name.colorize(:red)
-      when "Water" 	
-        puts name.colorize(:blue)
-      when "Grass"
-        puts name.colorize(:green)
-      when "Electric"
-        puts name.colorize(:light_blue)
-      when "Ice"
-        puts name.colorize(:grey)
-      when "Fighting" 
-        puts name.colorize(:yellow)	
-      when "Poison"
-        puts name.colorize(:purple)
-      when "Ground"
-        puts name.colorize(:brown)
-      when "Flying"
-      when "Psychic"
-      when "Bug"
-      when "Rock"
-      when "Ghost"
-      when "Dark" 	
-      when "Dragon"
-      when "Steel" 	
-      when "Fairy"
-    end
+    puts colorize_attribute(hash, :name, :type_1)
   end
 
-end
+  def self.colorize_attribute(hash, key, type)
+    attribute = ''
+    hash.each do |k, v|
+      attribute = v if k == key
+    end
+    case hash[type]
+    when 'Normal'
+      attribute
+    when 'Fire'
+      attribute.colorize(:red)
+    when 'Water'
+      attribute.colorize(:blue)
+    when 'Grass'
+      attribute.colorize(:green)
+    when 'Electric'
+      attribute.colorize(:light_blue)
+    when 'Ice'
+      attribute.colorize(:default)
+    when 'Fighting'
+      attribute.colorize(:light_red)
+    when 'Poison'
+      attribute.colorize(:cyan)
+    when 'Ground'
+      attribute.colorize(:default)
+    when 'Flying'
+      attribute.colorize(:light_white)
+    when 'Psychic'
+      attribute.colorize(:light_magenta)
+    when 'Bug'
+      attribute.colorize(:light_green)
+    when 'Rock'
+      attribute.colorize(:white)
+    when 'Ghost'
+      attribute.colorize(:light_black)
+    when 'Dark'
+      attribute.colorize(:black)
+    when 'Dragon'
+      attribute.colorize(:light_yellow)
+    when 'Steel'
+      attribute.colorize(:light_cyan)
+    when 'Fairy'
+      attribute.colorize(:magenta)
+    end
+  end
+end

data/lib/classes/Search.rb

@@ -1,27 +1,23 @@
+# frozen_string_literal: true
+
 require_relative './Print'
 require_relative './Main_menu'
 
 class Search
-
   def self.by_name(data)
     search_prompt = TTY::Prompt.new(active_color: :red)
     poke_array = []
     data.each do |hash|
-      hash.each do |k,v|
-        if k == :name
-          poke_array << v
-        end
+      hash.each do |k, v|
+        poke_array << v if k == :name
       end
     end
-    return search_prompt.select('Please enter the name of the Pokemon you\'re looking for.', poke_array, filter: true)
+    search_prompt.select('Please enter the name of the Pokemon you\'re looking for.', poke_array, filter: true)
   end
 
   def self.return_hash(data, name)
     data.each do |hash|
-      if hash[:name] == name
-        return hash
-      end
+      return hash if hash[:name] == name
     end
   end
-
-end
+end

data/lib/classes/Update.rb

@@ -1,69 +1,71 @@
+# frozen_string_literal: true
+
 require_relative './New'
 require_relative './Search'
 
 class Update
-
   def self.update_pokemon_menu(data)
     update_prompt = TTY::Prompt.new(active_color: :red)
     name = Search.by_name(data)
     data.each do |hash|
-      if hash[:name] == name
-        user_input = update_prompt.select("Which attribute would you like to update?") do |menu|
-          menu.choice "Name", 1
-          menu.choice "Type", 2
-          menu.choice "Secondary Type", 3
-          menu.choice "HP", 4
-          menu.choice "Attack", 5
-          menu.choice "Defense", 6
-          menu.choice "Special Attack", 7
-          menu.choice "Special Defense", 8
-          menu.choice "Speed", 9
-          menu.choice "Generation", 10
-          menu.choice "Legendary", 11
-          menu.choice "Exit this menu", 12
-        end
-        case user_input
-          when 1
-            puts "What would you like #{hash[:name]}'s new name to be?"
-            name = New.add_name
-            hash[:name] = name
-          when 2
-            puts "What would you like #{hash[:name]}'s new type to be?"
-            type_1 = New.add_type
-            hash[:type_1] = type_1
-          when 3
-            puts "What would you like #{hash[:name]}'s new secondary type to be?"
-            type_2 = New.add_type
-            hash[:type_2] = type_2
-          when 4
-            hp = New.add_points('HP')
-            hash[:hp] = hp
-          when 5
-            attack = New.add_points('Attack')
-            hash[:attack] = attack
-          when 6
-            defense = New.add_points('Defense')
-            hash[:defense] = defense
-          when 7
-            sp_atk = New.add_points('Special Attack')
-            hash[:"sp._atk"] = sp_atk
-          when 8
-            sp_def = New.add_points('Special Defense')
-            hash[:"sp._def"] = sp_def
-          when 9
-            speed = New.add_points('Speed')
-            hash[:speed] = speed
-          when 10
-            generation = New.add_generation
-            hash[:generation] = generation
-          when 11
-            legendary = New.add_legendary
-            hash[:legendary] = legendary
-          when 12
-            Main_menu.run
-        end
+      next unless hash[:name] == name
+
+      user_input = update_prompt.select('Which attribute would you like to update?') do |menu|
+        menu.choice 'Name', 1
+        menu.choice 'Type', 2
+        menu.choice 'Secondary Type', 3
+        menu.choice 'HP', 4
+        menu.choice 'Attack', 5
+        menu.choice 'Defense', 6
+        menu.choice 'Special Attack', 7
+        menu.choice 'Special Defense', 8
+        menu.choice 'Speed', 9
+        menu.choice 'Generation', 10
+        menu.choice 'Legendary', 11
+        menu.choice 'Exit this menu', 12
       end
+      case user_input
+      when 1
+        puts "What would you like #{hash[:name]}'s new name to be?"
+        name = New.add_name
+        hash[:name] = name
+      when 2
+        puts "What would you like #{hash[:name]}'s new type to be?"
+        type_1 = New.add_type
+        hash[:type_1] = type_1
+      when 3
+        puts "What would you like #{hash[:name]}'s new secondary type to be?"
+        type_2 = New.add_type
+        hash[:type_2] = type_2
+      when 4
+        hp = New.add_points('HP')
+        hash[:hp] = hp
+      when 5
+        attack = New.add_points('Attack')
+        hash[:attack] = attack
+      when 6
+        defense = New.add_points('Defense')
+        hash[:defense] = defense
+      when 7
+        sp_atk = New.add_points('Special Attack')
+        hash[:"sp._atk"] = sp_atk
+      when 8
+        sp_def = New.add_points('Special Defense')
+        hash[:"sp._def"] = sp_def
+      when 9
+        speed = New.add_points('Speed')
+        hash[:speed] = speed
+      when 10
+        generation = New.add_generation
+        hash[:generation] = generation
+      when 11
+        legendary = New.add_legendary
+        hash[:legendary] = legendary
+      when 12
+        Main_menu.run
+      end
+      hash[:total] = hash[:hp] + hash[:attack] + hash[:defense] + hash[:"sp._atk"] + hash[:"sp._def"] + hash[:speed]
+      Print.print_pokemon_expanded(hash)
     end
   end
-
 end