Add slot index to encounter_slots

diff --git a/pokedex/data/csv/encounter_slots.csv b/pokedex/data/csv/encounter_slots.csv
index 9b7a58b..72ab34f 100644 (file)
--- a/pokedex/data/csv/encounter_slots.csv
+++ b/pokedex/data/csv/encounter_slots.csv
@@ -1,123 +1,123 @@
-id,version_group_id,encounter_terrain_id,rarity
-1,8,1,20
-2,8,1,20
-3,8,1,10
-4,8,1,10
-5,8,1,10
-6,8,1,10
-7,8,1,5
-8,8,1,5
-9,8,1,4
-10,8,1,4
-11,8,1,1
-12,8,1,1
-13,8,2,60
-14,8,2,30
-15,8,2,5
-16,8,2,4
-17,8,2,1
-18,8,3,40
-19,8,3,40
-20,8,3,15
-21,8,3,4
-22,8,3,1
-23,8,4,40
-24,8,4,40
-25,8,4,15
-26,8,4,4
-27,8,4,1
-28,8,5,60
-29,8,5,30
-30,8,5,5
-31,8,5,4
-32,8,5,1
-33,9,1,20
-34,9,1,20
-35,9,1,10
-36,9,1,10
-37,9,1,10
-38,9,1,10
-39,9,1,5
-40,9,1,5
-41,9,1,4
-42,9,1,4
-43,9,1,1
-44,9,1,1
-45,9,2,60
-46,9,2,30
-47,9,2,5
-48,9,2,4
-49,9,2,1
-50,9,3,60
-51,9,3,30
-52,9,3,5
-53,9,3,4
-54,9,3,1
-55,9,4,60
-56,9,4,30
-57,9,4,5
-58,9,4,4
-59,9,4,1
-60,9,5,60
-61,9,5,30
-62,9,5,5
-63,9,5,4
-64,9,5,1
-65,9,6,90
-66,9,6,10
-67,1,1,25
-68,1,1,15
-69,1,1,15
-70,1,1,10
-71,1,1,10
-72,1,1,10
-73,1,1,5
-74,1,1,5
-75,1,1,4
-76,1,1,1
-77,1,5,25
-78,1,5,15
-79,1,5,15
-80,1,5,10
-81,1,5,10
-82,1,5,10
-83,1,5,5
-84,1,5,5
-85,1,5,4
-86,1,5,1
-87,2,1,25
-88,2,1,15
-89,2,1,15
-90,2,1,10
-91,2,1,10
-92,2,1,10
-93,2,1,5
-94,2,1,5
-95,2,1,4
-96,2,1,1
-97,2,5,25
-98,2,5,15
-99,2,5,15
-100,2,5,10
-101,2,5,10
-102,2,5,10
-103,2,5,5
-104,2,5,5
-105,2,5,4
-106,2,5,1
-107,1,2,100
-108,1,3,50
-109,1,3,50
-110,1,4,25
-111,1,4,8
-112,1,4,17
-113,1,4,17
-114,1,4,8
-115,1,4,25
-116,2,2,100
-117,2,3,50
-118,2,3,50
-119,2,4,40
-120,2,4,30
-121,2,4,20
-122,2,4,10
+id,version_group_id,encounter_terrain_id,slot,rarity
+1,8,1,1,20
+2,8,1,2,20
+3,8,1,3,10
+4,8,1,4,10
+5,8,1,5,10
+6,8,1,6,10
+7,8,1,7,5
+8,8,1,8,5
+9,8,1,9,4
+10,8,1,10,4
+11,8,1,11,1
+12,8,1,12,1
+13,8,2,1,60
+14,8,2,2,30
+15,8,2,3,5
+16,8,2,4,4
+17,8,2,5,1
+18,8,3,1,40
+19,8,3,2,40
+20,8,3,3,15
+21,8,3,4,4
+22,8,3,5,1
+23,8,4,1,40
+24,8,4,2,40
+25,8,4,3,15
+26,8,4,4,4
+27,8,4,5,1
+28,8,5,1,60
+29,8,5,2,30
+30,8,5,3,5
+31,8,5,4,4
+32,8,5,5,1
+33,9,1,1,20
+34,9,1,2,20
+35,9,1,3,10
+36,9,1,4,10
+37,9,1,5,10
+38,9,1,6,10
+39,9,1,7,5
+40,9,1,8,5
+41,9,1,9,4
+42,9,1,10,4
+43,9,1,11,1
+44,9,1,12,1
+45,9,2,1,60
+46,9,2,2,30
+47,9,2,3,5
+48,9,2,4,4
+49,9,2,5,1
+50,9,3,1,60
+51,9,3,2,30
+52,9,3,3,5
+53,9,3,4,4
+54,9,3,5,1
+55,9,4,1,60
+56,9,4,2,30
+57,9,4,3,5
+58,9,4,4,4
+59,9,4,5,1
+60,9,5,1,60
+61,9,5,2,30
+62,9,5,3,5
+63,9,5,4,4
+64,9,5,5,1
+65,9,6,1,90
+66,9,6,2,10
+67,1,1,1,25
+68,1,1,2,15
+69,1,1,3,15
+70,1,1,4,10
+71,1,1,5,10
+72,1,1,6,10
+73,1,1,7,5
+74,1,1,8,5
+75,1,1,9,4
+76,1,1,10,1
+77,1,5,1,25
+78,1,5,2,15
+79,1,5,3,15
+80,1,5,4,10
+81,1,5,5,10
+82,1,5,6,10
+83,1,5,7,5
+84,1,5,8,5
+85,1,5,9,4
+86,1,5,10,1
+87,2,1,1,25
+88,2,1,2,15
+89,2,1,3,15
+90,2,1,4,10
+91,2,1,5,10
+92,2,1,6,10
+93,2,1,7,5
+94,2,1,8,5
+95,2,1,9,4
+96,2,1,10,1
+97,2,5,1,25
+98,2,5,2,15
+99,2,5,3,15
+100,2,5,4,10
+101,2,5,5,10
+102,2,5,6,10
+103,2,5,7,5
+104,2,5,8,5
+105,2,5,9,4
+106,2,5,10,1
+107,1,2,1,100
+108,1,3,1,50
+109,1,3,2,50
+110,1,4,,25
+111,1,4,,8
+112,1,4,,17
+113,1,4,,17
+114,1,4,,8
+115,1,4,,25
+116,2,2,1,100
+117,2,3,1,50
+118,2,3,2,50
+119,2,4,1,40
+120,2,4,2,30
+121,2,4,3,20
+122,2,4,4,10

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index a5d8a84..b2e04c9 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -118,7 +118,8 @@ class EncounterSlot(TableBase):
     id = Column(Integer, primary_key=True, nullable=False)
     version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False, autoincrement=False)
     encounter_terrain_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=False, nullable=False, autoincrement=False)
     id = Column(Integer, primary_key=True, nullable=False)
     version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False, autoincrement=False)
     encounter_terrain_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=False, nullable=False, autoincrement=False)

-    rarity = Column(Integer, nullable=False, autoincrement=False)
+    slot = Column(Integer, nullable=True)
+    rarity = Column(Integer, nullable=False)

 
 class EncounterSlotCondition(TableBase):
     """Lists all conditions that affect each slot."""
 
 class EncounterSlotCondition(TableBase):
     """Lists all conditions that affect each slot."""