6 files changed, 121 insertions, 28 deletions

@@ -141,6 +141,9 @@
   font-family: 'Power Green';
   display: flex;
   margin: 1em;
+  border: 1px solid #777;
+  border-radius: 5px;
+  background-color: #fafafa;
 
   .male {
     color: blue;
@@ -155,16 +158,49 @@
     white-space: pre;
   }
 
-  .pokemon-ivs {
-    margin: 0 1em;
+  .pd-details {
+    color: white;
+    font-size: bold;
+    padding: .25em .5em;
+  }
+
+  .pd-contents {
+    p {
+      margin: .25em;
+    }
+  }
+
+  .pokemon-basics {
+    margin: .5em;
+  }
+
+  .pokemon-memo {
+    border-left: 1px solid #aaa;
+    background-color: #e7e8ff;
+
+    .pd-details {
+      background-color: #2068e0;
+    }
+  }
 
-    th {
-      text-align: center;
-      padding-right: .5em;
+  .pokemon-stats {
+    border-left: 1px solid #aaa;
+
+    .pd-details {
+      background-color: #d078f8;
     }
 
-    td {
-      text-align: right;
+    table {
+      margin: 0 1em;
+
+      th {
+        text-align: center;
+        padding-right: .5em;
+      }
+
+      td {
+        text-align: right;
+      }
     }
   }
 }
@@ -7,7 +7,7 @@ module Pokeviewer
     end
 
     def show
-      @pokemon = Pokemon.find_by_uuid params[:id]
+      @pokemon = Pokemon.find_by_uuid! params[:id]
     end
   end
 end
@@ -39,9 +39,16 @@ module Pokeviewer
 
           if param["metLevel"] == 0
             r.met_type = :hatched
+            r.met_location = param["metLocation"]
+          elsif param["metLocation"] == 254
+            r.met_type = :npc_trade
+          elsif param["metLocation"] == 255
+            r.met_type = :fateful_encounter
+            r.met_level = param["metLevel"]
           else
             r.met_type = :normal
             r.met_level = param["metLevel"]
+            r.met_location = param["metLocation"]
           end
 
           r.shiny = param["shiny"]
@@ -0,0 +1,5 @@
+module Pokeviewer
+  class Location < ApplicationRecord
+    validates :name, presence: true
+  end
+end
@@ -101,6 +101,42 @@ module Pokeviewer
       end
     end
 
+    def outsider?
+      (ot_name != trainer.name) or (ot_number != trainer.number)
+    end
+
+    def location
+      if (met_type == :normal) or (met_type == :hatched)
+        Location.find_by_id(met_location)
+      else
+        nil
+      end
+    end
+
+    def display_ot_number
+      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}."
+      end
+    end
+
     private
 
       def set_uuid
@@ -7,24 +7,33 @@
     .pokemon-ot
       OT/
       %span{ class: @pokemon.ot_gender }>= @pokemon.ot_name
-    .pokemon-id= "ID/#{@pokemon.ot_number}"
+    .pokemon-id= "ID/#{@pokemon.display_ot_number}"
     .pokemon-level= "Lv. #{@pokemon.revisions.last.level}"
-  %table.pokemon-ivs
-    %tr
-      %th HP
-      %td= @pokemon.revisions.last.hp
-    %tr
-      %th Attack
-      %td= @pokemon.revisions.last.attack
-    %tr
-      %th Defense
-      %td= @pokemon.revisions.last.defense
-    %tr
-      %th Sp. Atk
-      %td= @pokemon.revisions.last.special_attack
-    %tr
-      %th Sp. Def
-      %td= @pokemon.revisions.last.special_defense
-    %tr
-      %th Speed
-      %td= @pokemon.revisions.last.speed
+  .pokemon-memo
+    .pd-details Trainer Memo
+    .pd-contents
+      %p
+        %span.pokemon-nature<= @pokemon.nature.titlecase
+        nature.
+      %p= @pokemon.display_met
+  .pokemon-stats
+    .pd-details Stats
+    %table.pd-contents
+      %tr
+        %th HP
+        %td= @pokemon.revisions.last.hp
+      %tr
+        %th Attack
+        %td= @pokemon.revisions.last.attack
+      %tr
+        %th Defense
+        %td= @pokemon.revisions.last.defense
+      %tr
+        %th Sp. Atk
+        %td= @pokemon.revisions.last.special_attack
+      %tr
+        %th Sp. Def
+        %td= @pokemon.revisions.last.special_defense
+      %tr
+        %th Speed
+        %td= @pokemon.revisions.last.speed