about summary refs log tree commit diff stats
path: root/app/models/pokeviewer/pokemon.rb
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2017-10-10 22:46:46 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2017-10-10 22:46:46 -0400
commit0f32f526b73ecfd10012c0db9d7c4a4f15251a73 (patch)
treed456a80075b3a0680fa34214c51f47355ca24d43 /app/models/pokeviewer/pokemon.rb
parent09ed6a6c7567bbd01dc236570982bf7ea31e11e6 (diff)
downloadpokeviewer-0f32f526b73ecfd10012c0db9d7c4a4f15251a73.tar.gz
pokeviewer-0f32f526b73ecfd10012c0db9d7c4a4f15251a73.tar.bz2
pokeviewer-0f32f526b73ecfd10012c0db9d7c4a4f15251a73.zip
Added type and ability data to species model
Diffstat (limited to 'app/models/pokeviewer/pokemon.rb')
-rw-r--r--app/models/pokeviewer/pokemon.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/pokeviewer/pokemon.rb b/app/models/pokeviewer/pokemon.rb index 268a417..1b690f5 100644 --- a/app/models/pokeviewer/pokemon.rb +++ b/app/models/pokeviewer/pokemon.rb
@@ -200,6 +200,14 @@ module Pokeviewer
200 "pokeviewer/items/#{Pokemon.pokeball.values.find_index(pokeball) + 1}.png" 200 "pokeviewer/items/#{Pokemon.pokeball.values.find_index(pokeball) + 1}.png"
201 end 201 end
202 202
203 def ability
204 if second_ability
205 species.ability_2
206 else
207 species.ability_1
208 end
209 end
210
203 private 211 private
204 212
205 def set_uuid 213 def set_uuid