From 341b141cf159d9ece770899310426d8c5c61133e Mon Sep 17 00:00:00 2001 From: Zhorken Date: Sun, 20 Dec 2009 01:40:03 -0500 Subject: [PATCH 1/3] Fixed "Official Romaaji" -> "Official Roomaji". --- pokedex/data/csv/languages.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokedex/data/csv/languages.csv b/pokedex/data/csv/languages.csv index 3f17c34..ff9b08f 100644 --- a/pokedex/data/csv/languages.csv +++ b/pokedex/data/csv/languages.csv @@ -1,6 +1,6 @@ id,iso3166,name 1,jp,Japanese -2,jp,Official Romaaji +2,jp,Official Roomaji 3,kr,Korean 4,cn,Chinese 5,fr,French From 37fa52ed470dccc68bf810909d0877f92e9c06ac Mon Sep 17 00:00:00 2001 From: Zhorken Date: Sun, 20 Dec 2009 01:41:10 -0500 Subject: [PATCH 2/3] Added ???'s type efficacies to the database. --- pokedex/data/csv/type_efficacy.csv | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pokedex/data/csv/type_efficacy.csv b/pokedex/data/csv/type_efficacy.csv index 5a70843..3da0b97 100644 --- a/pokedex/data/csv/type_efficacy.csv +++ b/pokedex/data/csv/type_efficacy.csv @@ -16,6 +16,7 @@ damage_type_id,target_type_id,damage_factor 1,15,100 1,16,100 1,17,100 +1,18,100 2,1,200 2,2,100 2,3,50 @@ -33,6 +34,7 @@ damage_type_id,target_type_id,damage_factor 2,15,200 2,16,100 2,17,200 +2,18,100 3,1,100 3,2,200 3,3,100 @@ -50,6 +52,7 @@ damage_type_id,target_type_id,damage_factor 3,15,100 3,16,100 3,17,100 +3,18,100 4,1,100 4,2,100 4,3,100 @@ -67,6 +70,7 @@ damage_type_id,target_type_id,damage_factor 4,15,100 4,16,100 4,17,100 +4,18,100 5,1,100 5,2,100 5,3,0 @@ -84,6 +88,7 @@ damage_type_id,target_type_id,damage_factor 5,15,100 5,16,100 5,17,100 +5,18,100 6,1,100 6,2,50 6,3,200 @@ -101,6 +106,7 @@ damage_type_id,target_type_id,damage_factor 6,15,200 6,16,100 6,17,100 +6,18,100 7,1,100 7,2,50 7,3,50 @@ -118,6 +124,7 @@ damage_type_id,target_type_id,damage_factor 7,15,100 7,16,100 7,17,200 +7,18,100 8,1,0 8,2,100 8,3,100 @@ -135,6 +142,7 @@ damage_type_id,target_type_id,damage_factor 8,15,100 8,16,100 8,17,50 +8,18,100 9,1,100 9,2,100 9,3,100 @@ -152,6 +160,7 @@ damage_type_id,target_type_id,damage_factor 9,15,200 9,16,100 9,17,100 +9,18,100 10,1,100 10,2,100 10,3,100 @@ -169,6 +178,7 @@ damage_type_id,target_type_id,damage_factor 10,15,200 10,16,50 10,17,100 +10,18,100 11,1,100 11,2,100 11,3,100 @@ -186,6 +196,7 @@ damage_type_id,target_type_id,damage_factor 11,15,100 11,16,50 11,17,100 +11,18,100 12,1,100 12,2,100 12,3,50 @@ -203,6 +214,7 @@ damage_type_id,target_type_id,damage_factor 12,15,100 12,16,50 12,17,100 +12,18,100 13,1,100 13,2,100 13,3,200 @@ -220,6 +232,7 @@ damage_type_id,target_type_id,damage_factor 13,15,100 13,16,50 13,17,100 +13,18,100 14,1,100 14,2,200 14,3,100 @@ -237,6 +250,7 @@ damage_type_id,target_type_id,damage_factor 14,15,100 14,16,100 14,17,0 +14,18,100 15,1,100 15,2,100 15,3,200 @@ -254,6 +268,7 @@ damage_type_id,target_type_id,damage_factor 15,15,50 15,16,200 15,17,100 +15,18,100 16,1,100 16,2,100 16,3,100 @@ -271,6 +286,7 @@ damage_type_id,target_type_id,damage_factor 16,15,100 16,16,200 16,17,100 +16,18,100 17,1,100 17,2,50 17,3,100 @@ -288,3 +304,22 @@ damage_type_id,target_type_id,damage_factor 17,15,100 17,16,100 17,17,50 +17,18,100 +18,1,100 +18,2,100 +18,3,100 +18,4,100 +18,5,100 +18,6,100 +18,7,100 +18,8,100 +18,9,100 +18,10,100 +18,11,100 +18,12,100 +18,13,100 +18,14,100 +18,15,100 +18,16,100 +18,17,100 +18,18,100 From 4384d56c2cce9319e02989aac7b744350c0dac13 Mon Sep 17 00:00:00 2001 From: Zhorken Date: Sun, 20 Dec 2009 01:41:40 -0500 Subject: [PATCH 3/3] Added types' generations and pre-gen-IV damage classes. --- pokedex/data/csv/types.csv | 38 +++++++++++++++++++------------------- pokedex/db/tables.py | 5 +++++ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/pokedex/data/csv/types.csv b/pokedex/data/csv/types.csv index 59ecb42..8f74b4a 100644 --- a/pokedex/data/csv/types.csv +++ b/pokedex/data/csv/types.csv @@ -1,19 +1,19 @@ -id,name,abbreviation -1,normal,NRM -2,fighting,FGT -3,flying,FLY -4,poison,PSN -5,ground,GRN -6,rock,RCK -7,bug,BUG -8,ghost,GST -9,steel,STL -10,fire,FIR -11,water,WTR -12,grass,GRS -13,electric,ELE -14,psychic,PSY -15,ice,ICE -16,dragon,DRG -17,dark,DAR -18,???,??? +id,name,abbreviation,generation_id,damage_class_id +1,normal,NRM,1,2 +2,fighting,FGT,1,2 +3,flying,FLY,1,2 +4,poison,PSN,1,2 +5,ground,GRN,1,2 +6,rock,RCK,1,2 +7,bug,BUG,1,2 +8,ghost,GST,1,2 +9,steel,STL,2,2 +10,fire,FIR,1,3 +11,water,WTR,1,3 +12,grass,GRS,1,3 +13,electric,ELE,1,3 +14,psychic,PSY,1,3 +15,ice,ICE,1,3 +16,dragon,DRG,1,3 +17,dark,DAR,2,3 +18,???,???,2,1 diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index afdbe10..2f43601 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -438,6 +438,8 @@ class Type(TableBase): id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(8), nullable=False) abbreviation = Column(Unicode(3), nullable=False) + generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) + damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False) ## ??? is none; everything else is physical or special class VersionGroup(TableBase): __tablename__ = 'version_groups' @@ -578,6 +580,9 @@ Type.target_efficacies = relation(TypeEfficacy, ==TypeEfficacy.target_type_id, backref='target_type') +Type.generation = relation(Generation, backref='types') +Type.damage_class = relation(MoveDamageClass, backref='types') + Version.version_group = relation(VersionGroup, backref='versions') Version.generation = association_proxy('version_group', 'generation')