Added habitat sprites. Renamed flavor to flavor_text.

pokemon_flavor_text.flavor -> pokemon_flavor_text.flavor_text

diff --git a/pokedex/data/csv/pokemon_flavor_text.csv b/pokedex/data/csv/pokemon_flavor_text.csv
index 50f6b43..15b65bb 100644 (file)
--- a/pokedex/data/csv/pokemon_flavor_text.csv
+++ b/pokedex/data/csv/pokemon_flavor_text.csv
@@ -1,4 +1,4 @@
-pokemon_id,version_id,flavor
+pokemon_id,version_id,flavor_text

 1,1,A strange seed was planted in its back at birth.  The plant sprouts and grows with this Pokemon.
 1,3,"It can go for days without eating a single morsel.  In the bulb on its back, it stores energy."
 1,4,The seed on its back is filled with nutrients. The seed grows steadily larger as its body grows.
 1,1,A strange seed was planted in its back at birth.  The plant sprouts and grows with this Pokemon.
 1,3,"It can go for days without eating a single morsel.  In the bulb on its back, it stores energy."
 1,4,The seed on its back is filled with nutrients. The seed grows steadily larger as its body grows.

diff --git a/pokedex/data/media/chrome/habitats/cave.png b/pokedex/data/media/chrome/habitats/cave.png
new file mode 100644 (file)
index 0000000..7cc9fa9
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/cave.png differ

diff --git a/pokedex/data/media/chrome/habitats/forest.png b/pokedex/data/media/chrome/habitats/forest.png
new file mode 100644 (file)
index 0000000..8d726e7
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/forest.png differ

diff --git a/pokedex/data/media/chrome/habitats/grassland.png b/pokedex/data/media/chrome/habitats/grassland.png
new file mode 100644 (file)
index 0000000..1b6b14b
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/grassland.png differ

diff --git a/pokedex/data/media/chrome/habitats/mountain.png b/pokedex/data/media/chrome/habitats/mountain.png
new file mode 100644 (file)
index 0000000..ad3bf29
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/mountain.png differ

diff --git a/pokedex/data/media/chrome/habitats/rare.png b/pokedex/data/media/chrome/habitats/rare.png
new file mode 100644 (file)
index 0000000..a050560
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/rare.png differ

diff --git a/pokedex/data/media/chrome/habitats/rough-terrain.png b/pokedex/data/media/chrome/habitats/rough-terrain.png
new file mode 100644 (file)
index 0000000..b6ae4f6
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/rough-terrain.png differ

diff --git a/pokedex/data/media/chrome/habitats/sea.png b/pokedex/data/media/chrome/habitats/sea.png
new file mode 100644 (file)
index 0000000..0c8ca66
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/sea.png differ

diff --git a/pokedex/data/media/chrome/habitats/urban.png b/pokedex/data/media/chrome/habitats/urban.png
new file mode 100644 (file)
index 0000000..9af6ab7
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/urban.png differ

diff --git a/pokedex/data/media/chrome/habitats/waters-edge.png b/pokedex/data/media/chrome/habitats/waters-edge.png
new file mode 100644 (file)
index 0000000..718efa1
Binary files /dev/null and b/pokedex/data/media/chrome/habitats/waters-edge.png differ

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index f804eb2..4c38755 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -133,7 +133,7 @@ class PokemonFlavorText(TableBase):
     __tablename__ = 'pokemon_flavor_text'
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
     version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False)
     __tablename__ = 'pokemon_flavor_text'
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
     version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False)

-    flavor = Column(Unicode(255), nullable=False)
+    flavor_text = Column(Unicode(255), nullable=False)

 
 class PokemonName(TableBase):
     __tablename__ = 'pokemon_names'
 
 class PokemonName(TableBase):
     __tablename__ = 'pokemon_names'


@@ -199,6 +199,7 @@ Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__,
                                         order_by=PokemonEggGroup.egg_group_id,
                                         backref='pokemon')
 Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon')
                                         order_by=PokemonEggGroup.egg_group_id,
                                         backref='pokemon')
 Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon')

+Pokemon.flavor_text = relation(PokemonFlavorText, backref='pokemon')

 Pokemon.foreign_names = relation(PokemonName, backref='pokemon')
 Pokemon.generation = relation(Generation, backref='pokemon')
 Pokemon.shape = relation(PokemonShape, backref='pokemon')
 Pokemon.foreign_names = relation(PokemonName, backref='pokemon')
 Pokemon.generation = relation(Generation, backref='pokemon')
 Pokemon.shape = relation(PokemonShape, backref='pokemon')


@@ -207,6 +208,8 @@ Pokemon.types = relation(Type, secondary=PokemonType.__table__)
 
 PokemonDexNumber.generation = relation(Generation)
 
 
 PokemonDexNumber.generation = relation(Generation)
 

+PokemonFlavorText.version = relation(Version)
+

 PokemonName.language = relation(Language)
 
 PokemonStat.stat = relation(Stat)
 PokemonName.language = relation(Language)
 
 PokemonStat.stat = relation(Stat)