From 83f35180dadfd505028e12d645755cf6c22b92d6 Mon Sep 17 00:00:00 2001
From: Philippe Matray <phmatray@outlook.com>
Date: Fri, 2 Sep 2016 13:55:55 +0200
Subject: [PATCH 1/2] Add official color codes of each type and damage class
---
pokedex/data/csv/move_damage_classes.csv | 8 ++---
pokedex/data/csv/types.csv | 42 ++++++++++++------------
pokedex/db/tables.py | 4 +++
3 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/pokedex/data/csv/move_damage_classes.csv b/pokedex/data/csv/move_damage_classes.csv
index 8c4c15c..2a1d46b 100644
--- a/pokedex/data/csv/move_damage_classes.csv
+++ b/pokedex/data/csv/move_damage_classes.csv
@@ -1,4 +1,4 @@
-id,identifier
-1,status
-2,physical
-3,special
+id,identifier,color_code
+1,status,"#FF969296"
+2,physical,"#FFCE2918"
+3,special,"#FF5A637B"
diff --git a/pokedex/data/csv/types.csv b/pokedex/data/csv/types.csv
index 0603c39..c2633ee 100644
--- a/pokedex/data/csv/types.csv
+++ b/pokedex/data/csv/types.csv
@@ -1,21 +1,21 @@
-id,identifier,generation_id,damage_class_id
-1,normal,1,2
-2,fighting,1,2
-3,flying,1,2
-4,poison,1,2
-5,ground,1,2
-6,rock,1,2
-7,bug,1,2
-8,ghost,1,2
-9,steel,2,2
-10,fire,1,3
-11,water,1,3
-12,grass,1,3
-13,electric,1,3
-14,psychic,1,3
-15,ice,1,3
-16,dragon,1,3
-17,dark,2,3
-18,fairy,6,
-10001,unknown,2,
-10002,shadow,3,
+id,identifier,generation_id,damage_class_id,color_code
+1,normal,1,2,"#FFA8A878"
+2,fighting,1,2,"#FF903028"
+3,flying,1,2,"#FFA890F0"
+4,poison,1,2,"#FFA040A0"
+5,ground,1,2,"#FFE0C068"
+6,rock,1,2,"#FFB8A038"
+7,bug,1,2,"#FFA8B820"
+8,ghost,1,2,"#FF705898"
+9,steel,2,2,"#FFB8B8D0"
+10,fire,1,3,"#FFF05030"
+11,water,1,3,"#FF68A090"
+12,grass,1,3,"#FF78C850"
+13,electric,1,3,"#FFF8D030"
+14,psychic,1,3,"#FFF85888"
+15,ice,1,3,"#FF98D8D8"
+16,dragon,1,3,"#FF7038F8"
+17,dark,2,3,"#FF705848"
+18,fairy,6,,"#FFF8A0E0"
+10001,unknown,2,,"#FF68A090"
+10002,shadow,3,,"#FF403246"
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 4652838..5c4fbc9 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -1276,6 +1276,8 @@ class MoveDamageClass(TableBase):
identifier = Column(Unicode(79), nullable=False,
doc=u"An identifier",
info=dict(format='identifier'))
+ color_code = Column(Unicode(79), nullable=True,
+ doc=u"The ARGB color code of the DamageClass")
create_translation_table('move_damage_class_prose', MoveDamageClass, 'prose',
relation_lazy='joined',
@@ -2158,6 +2160,8 @@ class Type(TableBase):
doc=u"The ID of the generation this type first appeared in.")
damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=True,
doc=u"The ID of the damage class this type's moves had before Generation IV, null if not applicable (e.g. ???).")
+ color_code = Column(Unicode(79), nullable=True,
+ doc=u"The ARGB color code of the type")
create_translation_table('type_names', Type, 'names',
relation_lazy='joined',
From 0b4cdde893f87ad5d7e1179d3a18409dc485962f Mon Sep 17 00:00:00 2001
From: Philippe Matray <phmatray@outlook.com>
Date: Fri, 2 Sep 2016 14:08:36 +0200
Subject: [PATCH 2/2] Change Unicode(79) to UnicodeText
---
pokedex/db/tables.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 5c4fbc9..ec57982 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -1276,7 +1276,7 @@ class MoveDamageClass(TableBase):
identifier = Column(Unicode(79), nullable=False,
doc=u"An identifier",
info=dict(format='identifier'))
- color_code = Column(Unicode(79), nullable=True,
+ color_code = Column(UnicodeText, nullable=True,
doc=u"The ARGB color code of the DamageClass")
create_translation_table('move_damage_class_prose', MoveDamageClass, 'prose',
@@ -2160,7 +2160,7 @@ class Type(TableBase):
doc=u"The ID of the generation this type first appeared in.")
damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=True,
doc=u"The ID of the damage class this type's moves had before Generation IV, null if not applicable (e.g. ???).")
- color_code = Column(Unicode(79), nullable=True,
+ color_code = Column(UnicodeText, nullable=True,
doc=u"The ARGB color code of the type")
create_translation_table('type_names', Type, 'names',