From b80d2d2963299e3f8f1c85c1c7bd367559baab00 Mon Sep 17 00:00:00 2001 From: a_magical_me Date: Tue, 20 Apr 2010 23:26:12 -0700 Subject: [PATCH] Fix location_area_encounter_rates - encounter_type_id -> encounter_terrain_id - Added a version_id column. Previous rates were from Diamond and HeartGold; these have been copied to Pearl & Platinum and SoulSilver, respectively, which i assume is accurate. RBY rates need to be added. --- .../csv/location_area_encounter_rates.csv | 2596 ++++++++++++----- pokedex/db/tables.py | 3 +- 2 files changed, 1847 insertions(+), 752 deletions(-) diff --git a/pokedex/data/csv/location_area_encounter_rates.csv b/pokedex/data/csv/location_area_encounter_rates.csv index 4b3ed49..e75b9b7 100644 --- a/pokedex/data/csv/location_area_encounter_rates.csv +++ b/pokedex/data/csv/location_area_encounter_rates.csv @@ -1,751 +1,1845 @@ -location_area_id,encounter_type_id,rate -1,2,25 -1,3,50 -1,4,75 -1,5,10 -2,2,25 -2,3,50 -2,4,75 -2,5,10 -3,2,25 -3,3,50 -3,4,75 -3,5,10 -4,2,25 -4,3,50 -4,4,75 -4,5,10 -5,2,25 -5,3,50 -5,4,75 -5,5,10 -6,1,10 -7,1,10 -8,1,30 -8,2,25 -8,3,50 -8,4,75 -8,5,10 -9,1,30 -10,1,30 -10,2,25 -10,3,50 -10,4,75 -10,5,10 -11,1,10 -11,2,25 -11,3,50 -11,4,75 -11,5,10 -12,1,10 -13,1,10 -14,1,30 -15,1,30 -16,1,10 -16,2,25 -16,3,50 -16,4,75 -16,5,10 -17,1,15 -18,1,15 -19,1,15 -20,1,10 -21,1,10 -22,1,10 -23,1,10 -23,2,25 -23,3,50 -23,4,75 -23,5,10 -24,1,35 -24,2,25 -24,3,50 -24,4,75 -24,5,15 -25,1,35 -25,2,25 -25,3,50 -25,4,75 -25,5,15 -26,1,35 -26,2,25 -26,3,50 -26,4,75 -26,5,15 -27,1,35 -27,2,25 -27,3,50 -27,4,75 -27,5,15 -28,1,35 -29,1,35 -29,2,25 -29,3,50 -29,4,75 -29,5,15 -30,1,10 -31,1,10 -32,1,10 -33,1,10 -34,1,10 -35,1,10 -36,1,15 -37,1,15 -38,1,20 -39,1,20 -40,1,20 -41,1,10 -42,1,10 -43,1,10 -44,1,10 -45,1,25 -46,1,25 -47,1,30 -48,1,15 -49,1,15 -50,1,15 -50,2,25 -50,3,50 -50,4,75 -50,5,15 -51,1,15 -51,2,25 -51,3,50 -51,4,75 -51,5,15 -52,1,15 -53,1,15 -54,1,10 -54,2,25 -54,3,50 -54,4,75 -54,5,10 -55,1,10 -56,1,10 -56,2,25 -56,3,50 -56,4,75 -56,5,10 -57,1,30 -58,1,10 -59,1,10 -60,1,30 -60,2,25 -60,3,50 -60,4,75 -60,5,10 -61,1,10 -62,1,10 -63,1,10 -64,1,15 -70,1,15 -76,1,15 -82,1,15 -107,1,15 -108,1,10 -109,1,10 -110,1,10 -111,1,10 -112,1,10 -113,1,10 -114,1,10 -115,1,10 -116,1,10 -117,1,10 -118,1,30 -119,2,25 -119,3,50 -119,4,75 -119,5,10 -120,1,10 -121,1,10 -122,1,10 -123,1,10 -124,1,10 -125,1,10 -126,1,10 -127,1,10 -128,1,10 -129,1,10 -130,1,10 -131,1,10 -132,1,10 -133,1,15 -134,1,10 -135,1,30 -135,2,25 -135,3,50 -135,4,75 -135,5,10 -136,1,30 -136,2,25 -136,3,50 -136,4,75 -136,5,10 -137,1,30 -137,2,25 -137,3,50 -137,4,75 -137,5,10 -138,1,30 -138,2,25 -138,3,50 -138,4,75 -138,5,10 -139,1,30 -140,1,30 -141,1,30 -142,1,30 -143,1,30 -143,2,25 -143,3,50 -143,4,75 -143,5,10 -144,1,30 -144,2,25 -144,3,50 -144,4,75 -144,5,10 -145,1,30 -145,2,25 -145,3,50 -145,4,75 -145,5,10 -146,1,30 -146,2,25 -146,3,50 -146,4,75 -146,5,10 -147,1,30 -147,2,25 -147,3,50 -147,4,75 -147,5,10 -148,1,30 -149,1,30 -150,1,30 -150,2,25 -150,3,50 -150,4,75 -150,5,10 -151,1,30 -151,2,25 -151,3,50 -151,4,75 -151,5,10 -152,1,10 -153,1,10 -154,1,10 -155,1,10 -156,1,10 -157,1,30 -158,1,30 -158,2,25 -158,3,50 -158,4,75 -158,5,10 -159,1,30 -160,1,30 -161,1,30 -161,2,25 -161,3,50 -161,4,75 -161,5,10 -162,1,30 -162,2,25 -162,3,50 -162,4,75 -162,5,10 -163,1,30 -163,2,25 -163,3,50 -163,4,75 -163,5,10 -164,1,30 -164,2,25 -164,3,50 -164,4,75 -164,5,10 -165,1,30 -166,1,30 -167,1,30 -168,1,30 -168,2,25 -168,3,50 -168,4,75 -168,5,10 -169,2,25 -169,3,50 -169,4,75 -169,5,20 -170,1,30 -170,2,25 -170,3,50 -170,4,75 -170,5,10 -171,1,30 -171,2,45 -171,3,70 -171,4,95 -171,5,10 -172,1,30 -172,2,25 -172,3,50 -172,4,75 -172,5,10 -173,1,30 -173,2,25 -173,3,50 -173,4,75 -173,5,10 -174,1,30 -174,2,25 -174,3,50 -174,4,75 -174,5,10 -175,1,30 -175,2,25 -175,3,50 -175,4,75 -175,5,10 -176,1,30 -176,2,25 -176,3,50 -176,4,75 -176,5,10 -177,2,25 -177,3,50 -177,4,75 -177,5,10 -178,2,25 -178,3,50 -178,4,75 -178,5,10 -179,2,25 -179,3,50 -179,4,75 -179,5,10 -180,2,25 -180,3,50 -180,4,75 -180,5,20 -181,2,25 -181,3,50 -181,4,75 -181,5,20 -182,1,30 -182,2,25 -182,3,50 -182,4,75 -182,5,20 -183,1,30 -183,2,25 -183,3,50 -183,4,75 -183,5,20 -184,2,25 -184,3,50 -184,4,75 -184,5,15 -185,1,25 -186,2,25 -186,3,50 -186,4,75 -186,5,15 -187,1,25 -187,2,25 -187,3,50 -187,4,75 -187,5,15 -188,1,25 -188,2,25 -188,3,50 -188,4,75 -188,5,15 -189,2,25 -189,3,50 -189,4,75 -189,5,15 -190,1,5 -191,1,5 -192,1,25 -192,2,25 -192,3,50 -192,4,75 -192,5,15 -193,1,10 -193,2,25 -193,3,50 -193,4,75 -193,5,10 -193,6,20 -194,1,15 -195,1,15 -196,1,15 -197,1,15 -198,1,10 -198,2,25 -198,3,50 -198,4,75 -198,5,15 -199,1,15 -199,2,25 -199,3,50 -199,4,75 -199,5,15 -200,1,15 -200,2,25 -200,3,50 -200,4,75 -200,5,15 -201,1,25 -202,1,5 -202,2,25 -202,3,50 -202,4,75 -202,5,10 -203,1,15 -203,2,25 -203,3,50 -203,4,75 -203,5,10 -204,1,5 -204,2,25 -204,3,50 -204,4,75 -204,5,15 -205,1,25 -205,2,25 -205,3,50 -205,4,75 -205,5,15 -206,1,25 -206,2,25 -206,3,50 -206,4,75 -206,5,15 -207,1,25 -208,1,25 -209,1,25 -210,1,25 -211,2,25 -211,3,50 -211,4,75 -211,5,15 -212,1,10 -213,1,10 -214,1,5 -215,1,5 -216,1,5 -217,1,5 -218,1,5 -219,1,5 -220,1,5 -221,1,5 -222,1,25 -223,1,25 -224,2,25 -224,3,50 -224,4,75 -224,5,15 -225,2,25 -225,3,50 -225,4,75 -225,5,10 -226,2,25 -226,3,50 -226,4,75 -226,5,10 -227,1,5 -227,2,25 -227,3,50 -227,4,75 -227,5,10 -228,1,5 -230,1,5 -230,2,25 -230,3,50 -230,4,75 -230,5,10 -232,1,5 -235,2,25 -235,3,50 -235,4,75 -235,5,15 -235,6,30 -236,1,25 -236,2,25 -236,3,50 -236,4,75 -236,5,10 -237,1,10 -237,2,25 -237,3,50 -237,4,75 -237,5,10 -238,1,10 -239,1,10 -239,2,25 -239,3,50 -239,4,75 -239,5,10 -240,1,10 -240,2,25 -240,3,50 -240,4,75 -240,5,10 -241,1,20 -241,2,25 -241,3,50 -241,4,75 -241,5,10 -242,2,25 -242,3,50 -242,4,75 -242,5,10 -243,1,25 -243,2,25 -243,3,50 -243,4,75 -243,5,10 -244,1,5 -245,1,5 -246,1,5 -247,1,5 -249,2,25 -249,3,50 -249,4,75 -249,5,10 -250,2,25 -250,3,50 -250,4,75 -250,5,10 -251,1,25 -251,2,25 -251,3,50 -251,4,75 -251,5,10 -252,1,25 -253,1,10 -253,2,25 -253,3,50 -253,4,75 -253,5,10 -253,6,50 -254,1,10 -254,2,25 -254,3,50 -254,4,75 -254,5,10 -255,1,25 -255,2,25 -255,3,50 -255,4,75 -255,5,15 -256,2,25 -256,3,50 -256,4,75 -256,5,15 -257,2,25 -257,3,50 -257,4,75 -257,5,15 -258,1,5 -259,1,5 -260,1,5 -261,1,10 -262,1,10 -262,2,25 -262,3,50 -262,4,75 -262,5,5 -263,1,5 -263,2,25 -263,3,50 -263,4,75 -263,5,10 -264,1,10 -264,2,25 -264,3,50 -264,4,75 -264,5,10 -265,1,10 -265,2,25 -265,3,50 -265,4,75 -265,5,10 -266,2,25 -266,3,50 -266,4,75 -266,5,15 -267,1,10 -267,6,30 -268,1,5 -269,1,25 -269,2,25 -269,3,50 -269,4,75 -269,5,10 -270,1,10 -270,2,25 -270,3,50 -270,4,75 -270,5,10 -271,1,20 -272,1,10 -273,1,20 -273,2,25 -273,3,50 -273,4,75 -273,5,10 -275,1,20 -275,2,100 -275,3,100 -275,4,100 -275,5,15 -276,2,25 -276,3,50 -276,4,75 -276,5,15 -277,2,25 -277,3,50 -277,4,75 -277,5,10 -277,6,30 -278,2,25 -278,3,50 -278,4,75 -278,5,10 -279,2,25 -279,3,50 -279,4,75 -279,5,15 -280,2,25 -280,3,50 -280,4,75 -280,5,15 -281,2,25 -281,3,50 -281,4,75 -281,5,10 -282,2,25 -282,3,50 -282,4,75 -282,5,15 -282,6,40 -283,5,15 -284,2,25 -284,3,50 -284,4,75 -284,5,15 -285,2,25 -285,3,50 -285,4,75 -285,5,15 -286,1,25 -287,1,25 -287,2,25 -287,3,50 -287,4,75 -287,5,10 -288,1,25 -288,2,25 -288,3,50 -288,4,75 -288,5,10 -289,1,25 -289,2,25 -289,3,50 -289,4,75 -289,5,10 -290,1,15 -291,1,15 -292,1,15 -293,1,15 -293,6,20 -294,1,10 -295,1,20 -296,1,20 -297,1,20 -298,1,20 -298,2,25 -298,3,50 -298,4,75 -298,5,15 -299,1,20 -300,1,20 -300,2,25 -300,3,50 -300,4,75 -300,5,15 -301,1,20 -302,1,20 -303,1,20 -303,2,25 -303,3,50 -303,4,75 -303,5,15 -304,1,20 -304,2,25 -304,3,50 -304,4,75 -304,5,15 -305,1,20 -306,1,20 -306,2,25 -306,3,50 -306,4,75 -306,5,15 -307,1,20 -308,1,20 -309,1,20 -310,1,20 -311,1,20 -312,1,20 -312,2,25 -312,3,50 -312,4,75 -312,5,10 -313,1,20 -313,2,25 -313,3,50 -313,4,75 -313,5,10 -314,1,20 -314,2,25 -314,3,50 -314,4,75 -314,5,10 -315,1,20 -315,2,25 -315,3,50 -315,4,75 -315,5,10 -316,1,15 -316,2,25 -316,3,50 -316,4,75 -316,5,10 -317,1,10 -318,1,10 -319,1,10 -319,6,40 -320,1,20 -321,1,15 -323,1,10 -323,2,25 -323,3,50 -323,4,75 -323,5,10 -323,6,5 -324,1,10 -324,2,25 -324,3,50 -324,4,75 -324,5,10 -325,1,10 -325,2,25 -325,3,50 -325,4,75 -325,5,10 -325,6,5 +location_area_id,encounter_terrain_id,version_id,rate +1,2,12,25 +1,2,13,25 +1,2,14,25 +1,3,12,50 +1,3,13,50 +1,3,14,50 +1,4,12,75 +1,4,13,75 +1,4,14,75 +1,5,12,10 +1,5,13,10 +1,5,14,10 +2,2,12,25 +2,2,13,25 +2,2,14,25 +2,3,12,50 +2,3,13,50 +2,3,14,50 +2,4,12,75 +2,4,13,75 +2,4,14,75 +2,5,12,10 +2,5,13,10 +2,5,14,10 +3,2,12,25 +3,2,13,25 +3,2,14,25 +3,3,12,50 +3,3,13,50 +3,3,14,50 +3,4,12,75 +3,4,13,75 +3,4,14,75 +3,5,12,10 +3,5,13,10 +3,5,14,10 +4,2,12,25 +4,2,13,25 +4,2,14,25 +4,3,12,50 +4,3,13,50 +4,3,14,50 +4,4,12,75 +4,4,13,75 +4,4,14,75 +4,5,12,10 +4,5,13,10 +4,5,14,10 +5,2,12,25 +5,2,13,25 +5,2,14,25 +5,3,12,50 +5,3,13,50 +5,3,14,50 +5,4,12,75 +5,4,13,75 +5,4,14,75 +5,5,12,10 +5,5,13,10 +5,5,14,10 +6,1,12,10 +6,1,13,10 +6,1,14,10 +7,1,12,10 +7,1,13,10 +7,1,14,10 +8,1,12,30 +8,1,13,30 +8,1,14,30 +8,2,12,25 +8,2,13,25 +8,2,14,25 +8,3,12,50 +8,3,13,50 +8,3,14,50 +8,4,12,75 +8,4,13,75 +8,4,14,75 +8,5,12,10 +8,5,13,10 +8,5,14,10 +9,1,12,30 +9,1,13,30 +9,1,14,30 +10,1,12,30 +10,1,13,30 +10,1,14,30 +10,2,12,25 +10,2,13,25 +10,2,14,25 +10,3,12,50 +10,3,13,50 +10,3,14,50 +10,4,12,75 +10,4,13,75 +10,4,14,75 +10,5,12,10 +10,5,13,10 +10,5,14,10 +11,1,12,10 +11,1,13,10 +11,1,14,10 +11,2,12,25 +11,2,13,25 +11,2,14,25 +11,3,12,50 +11,3,13,50 +11,3,14,50 +11,4,12,75 +11,4,13,75 +11,4,14,75 +11,5,12,10 +11,5,13,10 +11,5,14,10 +12,1,12,10 +12,1,13,10 +12,1,14,10 +13,1,12,10 +13,1,13,10 +13,1,14,10 +14,1,12,30 +14,1,13,30 +14,1,14,30 +15,1,12,30 +15,1,13,30 +15,1,14,30 +16,1,12,10 +16,1,13,10 +16,1,14,10 +16,2,12,25 +16,2,13,25 +16,2,14,25 +16,3,12,50 +16,3,13,50 +16,3,14,50 +16,4,12,75 +16,4,13,75 +16,4,14,75 +16,5,12,10 +16,5,13,10 +16,5,14,10 +17,1,12,15 +17,1,13,15 +17,1,14,15 +18,1,12,15 +18,1,13,15 +18,1,14,15 +19,1,12,15 +19,1,13,15 +19,1,14,15 +20,1,12,10 +20,1,13,10 +20,1,14,10 +21,1,12,10 +21,1,13,10 +21,1,14,10 +22,1,12,10 +22,1,13,10 +22,1,14,10 +23,1,12,10 +23,1,13,10 +23,1,14,10 +23,2,12,25 +23,2,13,25 +23,2,14,25 +23,3,12,50 +23,3,13,50 +23,3,14,50 +23,4,12,75 +23,4,13,75 +23,4,14,75 +23,5,12,10 +23,5,13,10 +23,5,14,10 +24,1,12,35 +24,1,13,35 +24,1,14,35 +24,2,12,25 +24,2,13,25 +24,2,14,25 +24,3,12,50 +24,3,13,50 +24,3,14,50 +24,4,12,75 +24,4,13,75 +24,4,14,75 +24,5,12,15 +24,5,13,15 +24,5,14,15 +25,1,12,35 +25,1,13,35 +25,1,14,35 +25,2,12,25 +25,2,13,25 +25,2,14,25 +25,3,12,50 +25,3,13,50 +25,3,14,50 +25,4,12,75 +25,4,13,75 +25,4,14,75 +25,5,12,15 +25,5,13,15 +25,5,14,15 +26,1,12,35 +26,1,13,35 +26,1,14,35 +26,2,12,25 +26,2,13,25 +26,2,14,25 +26,3,12,50 +26,3,13,50 +26,3,14,50 +26,4,12,75 +26,4,13,75 +26,4,14,75 +26,5,12,15 +26,5,13,15 +26,5,14,15 +27,1,12,35 +27,1,13,35 +27,1,14,35 +27,2,12,25 +27,2,13,25 +27,2,14,25 +27,3,12,50 +27,3,13,50 +27,3,14,50 +27,4,12,75 +27,4,13,75 +27,4,14,75 +27,5,12,15 +27,5,13,15 +27,5,14,15 +28,1,12,35 +28,1,13,35 +28,1,14,35 +29,1,12,35 +29,1,13,35 +29,1,14,35 +29,2,12,25 +29,2,13,25 +29,2,14,25 +29,3,12,50 +29,3,13,50 +29,3,14,50 +29,4,12,75 +29,4,13,75 +29,4,14,75 +29,5,12,15 +29,5,13,15 +29,5,14,15 +30,1,12,10 +30,1,13,10 +30,1,14,10 +31,1,12,10 +31,1,13,10 +31,1,14,10 +32,1,12,10 +32,1,13,10 +32,1,14,10 +33,1,12,10 +33,1,13,10 +33,1,14,10 +34,1,12,10 +34,1,13,10 +34,1,14,10 +35,1,12,10 +35,1,13,10 +35,1,14,10 +36,1,12,15 +36,1,13,15 +36,1,14,15 +37,1,12,15 +37,1,13,15 +37,1,14,15 +38,1,12,20 +38,1,13,20 +38,1,14,20 +39,1,12,20 +39,1,13,20 +39,1,14,20 +40,1,12,20 +40,1,13,20 +40,1,14,20 +41,1,12,10 +41,1,13,10 +41,1,14,10 +42,1,12,10 +42,1,13,10 +42,1,14,10 +43,1,12,10 +43,1,13,10 +43,1,14,10 +44,1,12,10 +44,1,13,10 +44,1,14,10 +45,1,12,25 +45,1,13,25 +45,1,14,25 +46,1,12,25 +46,1,13,25 +46,1,14,25 +47,1,12,30 +47,1,13,30 +47,1,14,30 +48,1,12,15 +48,1,13,15 +48,1,14,15 +49,1,12,15 +49,1,13,15 +49,1,14,15 +50,1,12,15 +50,1,13,15 +50,1,14,15 +50,2,12,25 +50,2,13,25 +50,2,14,25 +50,3,12,50 +50,3,13,50 +50,3,14,50 +50,4,12,75 +50,4,13,75 +50,4,14,75 +50,5,12,15 +50,5,13,15 +50,5,14,15 +51,1,12,15 +51,1,13,15 +51,1,14,15 +51,2,12,25 +51,2,13,25 +51,2,14,25 +51,3,12,50 +51,3,13,50 +51,3,14,50 +51,4,12,75 +51,4,13,75 +51,4,14,75 +51,5,12,15 +51,5,13,15 +51,5,14,15 +52,1,12,15 +52,1,13,15 +52,1,14,15 +53,1,12,15 +53,1,13,15 +53,1,14,15 +54,1,12,10 +54,1,13,10 +54,1,14,10 +54,2,12,25 +54,2,13,25 +54,2,14,25 +54,3,12,50 +54,3,13,50 +54,3,14,50 +54,4,12,75 +54,4,13,75 +54,4,14,75 +54,5,12,10 +54,5,13,10 +54,5,14,10 +55,1,12,10 +55,1,13,10 +55,1,14,10 +56,1,12,10 +56,1,13,10 +56,1,14,10 +56,2,12,25 +56,2,13,25 +56,2,14,25 +56,3,12,50 +56,3,13,50 +56,3,14,50 +56,4,12,75 +56,4,13,75 +56,4,14,75 +56,5,12,10 +56,5,13,10 +56,5,14,10 +57,1,12,30 +57,1,13,30 +57,1,14,30 +58,1,12,10 +58,1,13,10 +58,1,14,10 +59,1,12,10 +59,1,13,10 +59,1,14,10 +60,1,12,30 +60,1,13,30 +60,1,14,30 +60,2,12,25 +60,2,13,25 +60,2,14,25 +60,3,12,50 +60,3,13,50 +60,3,14,50 +60,4,12,75 +60,4,13,75 +60,4,14,75 +60,5,12,10 +60,5,13,10 +60,5,14,10 +61,1,12,10 +61,1,13,10 +61,1,14,10 +62,1,12,10 +62,1,13,10 +62,1,14,10 +63,1,12,10 +63,1,13,10 +63,1,14,10 +64,1,12,15 +64,1,13,15 +64,1,14,15 +70,1,12,15 +70,1,13,15 +70,1,14,15 +76,1,12,15 +76,1,13,15 +76,1,14,15 +82,1,12,15 +82,1,13,15 +82,1,14,15 +107,1,12,15 +107,1,13,15 +107,1,14,15 +108,1,12,10 +108,1,13,10 +108,1,14,10 +109,1,12,10 +109,1,13,10 +109,1,14,10 +110,1,12,10 +110,1,13,10 +110,1,14,10 +111,1,12,10 +111,1,13,10 +111,1,14,10 +112,1,12,10 +112,1,13,10 +112,1,14,10 +113,1,12,10 +113,1,13,10 +113,1,14,10 +114,1,12,10 +114,1,13,10 +114,1,14,10 +115,1,12,10 +115,1,13,10 +115,1,14,10 +116,1,12,10 +116,1,13,10 +116,1,14,10 +117,1,12,10 +117,1,13,10 +117,1,14,10 +118,1,12,30 +118,1,13,30 +118,1,14,30 +119,2,12,25 +119,2,13,25 +119,2,14,25 +119,3,12,50 +119,3,13,50 +119,3,14,50 +119,4,12,75 +119,4,13,75 +119,4,14,75 +119,5,12,10 +119,5,13,10 +119,5,14,10 +120,1,12,10 +120,1,13,10 +120,1,14,10 +121,1,12,10 +121,1,13,10 +121,1,14,10 +122,1,12,10 +122,1,13,10 +122,1,14,10 +123,1,12,10 +123,1,13,10 +123,1,14,10 +124,1,12,10 +124,1,13,10 +124,1,14,10 +125,1,12,10 +125,1,13,10 +125,1,14,10 +126,1,12,10 +126,1,13,10 +126,1,14,10 +127,1,12,10 +127,1,13,10 +127,1,14,10 +128,1,12,10 +128,1,13,10 +128,1,14,10 +129,1,12,10 +129,1,13,10 +129,1,14,10 +130,1,12,10 +130,1,13,10 +130,1,14,10 +131,1,12,10 +131,1,13,10 +131,1,14,10 +132,1,12,10 +132,1,13,10 +132,1,14,10 +133,1,12,15 +133,1,13,15 +133,1,14,15 +134,1,12,10 +134,1,13,10 +134,1,14,10 +135,1,12,30 +135,1,13,30 +135,1,14,30 +135,2,12,25 +135,2,13,25 +135,2,14,25 +135,3,12,50 +135,3,13,50 +135,3,14,50 +135,4,12,75 +135,4,13,75 +135,4,14,75 +135,5,12,10 +135,5,13,10 +135,5,14,10 +136,1,12,30 +136,1,13,30 +136,1,14,30 +136,2,12,25 +136,2,13,25 +136,2,14,25 +136,3,12,50 +136,3,13,50 +136,3,14,50 +136,4,12,75 +136,4,13,75 +136,4,14,75 +136,5,12,10 +136,5,13,10 +136,5,14,10 +137,1,12,30 +137,1,13,30 +137,1,14,30 +137,2,12,25 +137,2,13,25 +137,2,14,25 +137,3,12,50 +137,3,13,50 +137,3,14,50 +137,4,12,75 +137,4,13,75 +137,4,14,75 +137,5,12,10 +137,5,13,10 +137,5,14,10 +138,1,12,30 +138,1,13,30 +138,1,14,30 +138,2,12,25 +138,2,13,25 +138,2,14,25 +138,3,12,50 +138,3,13,50 +138,3,14,50 +138,4,12,75 +138,4,13,75 +138,4,14,75 +138,5,12,10 +138,5,13,10 +138,5,14,10 +139,1,12,30 +139,1,13,30 +139,1,14,30 +140,1,12,30 +140,1,13,30 +140,1,14,30 +141,1,12,30 +141,1,13,30 +141,1,14,30 +142,1,12,30 +142,1,13,30 +142,1,14,30 +143,1,12,30 +143,1,13,30 +143,1,14,30 +143,2,12,25 +143,2,13,25 +143,2,14,25 +143,3,12,50 +143,3,13,50 +143,3,14,50 +143,4,12,75 +143,4,13,75 +143,4,14,75 +143,5,12,10 +143,5,13,10 +143,5,14,10 +144,1,12,30 +144,1,13,30 +144,1,14,30 +144,2,12,25 +144,2,13,25 +144,2,14,25 +144,3,12,50 +144,3,13,50 +144,3,14,50 +144,4,12,75 +144,4,13,75 +144,4,14,75 +144,5,12,10 +144,5,13,10 +144,5,14,10 +145,1,12,30 +145,1,13,30 +145,1,14,30 +145,2,12,25 +145,2,13,25 +145,2,14,25 +145,3,12,50 +145,3,13,50 +145,3,14,50 +145,4,12,75 +145,4,13,75 +145,4,14,75 +145,5,12,10 +145,5,13,10 +145,5,14,10 +146,1,12,30 +146,1,13,30 +146,1,14,30 +146,2,12,25 +146,2,13,25 +146,2,14,25 +146,3,12,50 +146,3,13,50 +146,3,14,50 +146,4,12,75 +146,4,13,75 +146,4,14,75 +146,5,12,10 +146,5,13,10 +146,5,14,10 +147,1,12,30 +147,1,13,30 +147,1,14,30 +147,2,12,25 +147,2,13,25 +147,2,14,25 +147,3,12,50 +147,3,13,50 +147,3,14,50 +147,4,12,75 +147,4,13,75 +147,4,14,75 +147,5,12,10 +147,5,13,10 +147,5,14,10 +148,1,12,30 +148,1,13,30 +148,1,14,30 +149,1,12,30 +149,1,13,30 +149,1,14,30 +150,1,12,30 +150,1,13,30 +150,1,14,30 +150,2,12,25 +150,2,13,25 +150,2,14,25 +150,3,12,50 +150,3,13,50 +150,3,14,50 +150,4,12,75 +150,4,13,75 +150,4,14,75 +150,5,12,10 +150,5,13,10 +150,5,14,10 +151,1,12,30 +151,1,13,30 +151,1,14,30 +151,2,12,25 +151,2,13,25 +151,2,14,25 +151,3,12,50 +151,3,13,50 +151,3,14,50 +151,4,12,75 +151,4,13,75 +151,4,14,75 +151,5,12,10 +151,5,13,10 +151,5,14,10 +152,1,12,10 +152,1,13,10 +152,1,14,10 +153,1,12,10 +153,1,13,10 +153,1,14,10 +154,1,12,10 +154,1,13,10 +154,1,14,10 +155,1,12,10 +155,1,13,10 +155,1,14,10 +156,1,12,10 +156,1,13,10 +156,1,14,10 +157,1,12,30 +157,1,13,30 +157,1,14,30 +158,1,12,30 +158,1,13,30 +158,1,14,30 +158,2,12,25 +158,2,13,25 +158,2,14,25 +158,3,12,50 +158,3,13,50 +158,3,14,50 +158,4,12,75 +158,4,13,75 +158,4,14,75 +158,5,12,10 +158,5,13,10 +158,5,14,10 +159,1,12,30 +159,1,13,30 +159,1,14,30 +160,1,12,30 +160,1,13,30 +160,1,14,30 +161,1,12,30 +161,1,13,30 +161,1,14,30 +161,2,12,25 +161,2,13,25 +161,2,14,25 +161,3,12,50 +161,3,13,50 +161,3,14,50 +161,4,12,75 +161,4,13,75 +161,4,14,75 +161,5,12,10 +161,5,13,10 +161,5,14,10 +162,1,12,30 +162,1,13,30 +162,1,14,30 +162,2,12,25 +162,2,13,25 +162,2,14,25 +162,3,12,50 +162,3,13,50 +162,3,14,50 +162,4,12,75 +162,4,13,75 +162,4,14,75 +162,5,12,10 +162,5,13,10 +162,5,14,10 +163,1,12,30 +163,1,13,30 +163,1,14,30 +163,2,12,25 +163,2,13,25 +163,2,14,25 +163,3,12,50 +163,3,13,50 +163,3,14,50 +163,4,12,75 +163,4,13,75 +163,4,14,75 +163,5,12,10 +163,5,13,10 +163,5,14,10 +164,1,12,30 +164,1,13,30 +164,1,14,30 +164,2,12,25 +164,2,13,25 +164,2,14,25 +164,3,12,50 +164,3,13,50 +164,3,14,50 +164,4,12,75 +164,4,13,75 +164,4,14,75 +164,5,12,10 +164,5,13,10 +164,5,14,10 +165,1,12,30 +165,1,13,30 +165,1,14,30 +166,1,12,30 +166,1,13,30 +166,1,14,30 +167,1,12,30 +167,1,13,30 +167,1,14,30 +168,1,12,30 +168,1,13,30 +168,1,14,30 +168,2,12,25 +168,2,13,25 +168,2,14,25 +168,3,12,50 +168,3,13,50 +168,3,14,50 +168,4,12,75 +168,4,13,75 +168,4,14,75 +168,5,12,10 +168,5,13,10 +168,5,14,10 +169,2,12,25 +169,2,13,25 +169,2,14,25 +169,3,12,50 +169,3,13,50 +169,3,14,50 +169,4,12,75 +169,4,13,75 +169,4,14,75 +169,5,12,20 +169,5,13,20 +169,5,14,20 +170,1,12,30 +170,1,13,30 +170,1,14,30 +170,2,12,25 +170,2,13,25 +170,2,14,25 +170,3,12,50 +170,3,13,50 +170,3,14,50 +170,4,12,75 +170,4,13,75 +170,4,14,75 +170,5,12,10 +170,5,13,10 +170,5,14,10 +171,1,12,30 +171,1,13,30 +171,1,14,30 +171,2,12,45 +171,2,13,45 +171,2,14,45 +171,3,12,70 +171,3,13,70 +171,3,14,70 +171,4,12,95 +171,4,13,95 +171,4,14,95 +171,5,12,10 +171,5,13,10 +171,5,14,10 +172,1,12,30 +172,1,13,30 +172,1,14,30 +172,2,12,25 +172,2,13,25 +172,2,14,25 +172,3,12,50 +172,3,13,50 +172,3,14,50 +172,4,12,75 +172,4,13,75 +172,4,14,75 +172,5,12,10 +172,5,13,10 +172,5,14,10 +173,1,12,30 +173,1,13,30 +173,1,14,30 +173,2,12,25 +173,2,13,25 +173,2,14,25 +173,3,12,50 +173,3,13,50 +173,3,14,50 +173,4,12,75 +173,4,13,75 +173,4,14,75 +173,5,12,10 +173,5,13,10 +173,5,14,10 +174,1,12,30 +174,1,13,30 +174,1,14,30 +174,2,12,25 +174,2,13,25 +174,2,14,25 +174,3,12,50 +174,3,13,50 +174,3,14,50 +174,4,12,75 +174,4,13,75 +174,4,14,75 +174,5,12,10 +174,5,13,10 +174,5,14,10 +175,1,12,30 +175,1,13,30 +175,1,14,30 +175,2,12,25 +175,2,13,25 +175,2,14,25 +175,3,12,50 +175,3,13,50 +175,3,14,50 +175,4,12,75 +175,4,13,75 +175,4,14,75 +175,5,12,10 +175,5,13,10 +175,5,14,10 +176,1,12,30 +176,1,13,30 +176,1,14,30 +176,2,12,25 +176,2,13,25 +176,2,14,25 +176,3,12,50 +176,3,13,50 +176,3,14,50 +176,4,12,75 +176,4,13,75 +176,4,14,75 +176,5,12,10 +176,5,13,10 +176,5,14,10 +177,2,12,25 +177,2,13,25 +177,2,14,25 +177,3,12,50 +177,3,13,50 +177,3,14,50 +177,4,12,75 +177,4,13,75 +177,4,14,75 +177,5,12,10 +177,5,13,10 +177,5,14,10 +178,2,12,25 +178,2,13,25 +178,2,14,25 +178,3,12,50 +178,3,13,50 +178,3,14,50 +178,4,12,75 +178,4,13,75 +178,4,14,75 +178,5,12,10 +178,5,13,10 +178,5,14,10 +179,2,12,25 +179,2,13,25 +179,2,14,25 +179,3,12,50 +179,3,13,50 +179,3,14,50 +179,4,12,75 +179,4,13,75 +179,4,14,75 +179,5,12,10 +179,5,13,10 +179,5,14,10 +180,2,12,25 +180,2,13,25 +180,2,14,25 +180,3,12,50 +180,3,13,50 +180,3,14,50 +180,4,12,75 +180,4,13,75 +180,4,14,75 +180,5,12,20 +180,5,13,20 +180,5,14,20 +181,2,12,25 +181,2,13,25 +181,2,14,25 +181,3,12,50 +181,3,13,50 +181,3,14,50 +181,4,12,75 +181,4,13,75 +181,4,14,75 +181,5,12,20 +181,5,13,20 +181,5,14,20 +182,1,12,30 +182,1,13,30 +182,1,14,30 +182,2,12,25 +182,2,13,25 +182,2,14,25 +182,3,12,50 +182,3,13,50 +182,3,14,50 +182,4,12,75 +182,4,13,75 +182,4,14,75 +182,5,12,20 +182,5,13,20 +182,5,14,20 +183,1,12,30 +183,1,13,30 +183,1,14,30 +183,2,12,25 +183,2,13,25 +183,2,14,25 +183,3,12,50 +183,3,13,50 +183,3,14,50 +183,4,12,75 +183,4,13,75 +183,4,14,75 +183,5,12,20 +183,5,13,20 +183,5,14,20 +184,2,15,25 +184,2,16,25 +184,3,15,50 +184,3,16,50 +184,4,15,75 +184,4,16,75 +184,5,15,15 +184,5,16,15 +185,1,15,25 +185,1,16,25 +186,2,15,25 +186,2,16,25 +186,3,15,50 +186,3,16,50 +186,4,15,75 +186,4,16,75 +186,5,15,15 +186,5,16,15 +187,1,15,25 +187,1,16,25 +187,2,15,25 +187,2,16,25 +187,3,15,50 +187,3,16,50 +187,4,15,75 +187,4,16,75 +187,5,15,15 +187,5,16,15 +188,1,15,25 +188,1,16,25 +188,2,15,25 +188,2,16,25 +188,3,15,50 +188,3,16,50 +188,4,15,75 +188,4,16,75 +188,5,15,15 +188,5,16,15 +189,2,15,25 +189,2,16,25 +189,3,15,50 +189,3,16,50 +189,4,15,75 +189,4,16,75 +189,5,15,15 +189,5,16,15 +190,1,15,5 +190,1,16,5 +191,1,15,5 +191,1,16,5 +192,1,15,25 +192,1,16,25 +192,2,15,25 +192,2,16,25 +192,3,15,50 +192,3,16,50 +192,4,15,75 +192,4,16,75 +192,5,15,15 +192,5,16,15 +193,1,15,10 +193,1,16,10 +193,2,15,25 +193,2,16,25 +193,3,15,50 +193,3,16,50 +193,4,15,75 +193,4,16,75 +193,5,15,10 +193,5,16,10 +193,6,15,20 +193,6,16,20 +194,1,15,15 +194,1,16,15 +195,1,15,15 +195,1,16,15 +196,1,15,15 +196,1,16,15 +197,1,15,15 +197,1,16,15 +198,1,15,10 +198,1,16,10 +198,2,15,25 +198,2,16,25 +198,3,15,50 +198,3,16,50 +198,4,15,75 +198,4,16,75 +198,5,15,15 +198,5,16,15 +199,1,15,15 +199,1,16,15 +199,2,15,25 +199,2,16,25 +199,3,15,50 +199,3,16,50 +199,4,15,75 +199,4,16,75 +199,5,15,15 +199,5,16,15 +200,1,15,15 +200,1,16,15 +200,2,15,25 +200,2,16,25 +200,3,15,50 +200,3,16,50 +200,4,15,75 +200,4,16,75 +200,5,15,15 +200,5,16,15 +201,1,15,25 +201,1,16,25 +202,1,15,5 +202,1,16,5 +202,2,15,25 +202,2,16,25 +202,3,15,50 +202,3,16,50 +202,4,15,75 +202,4,16,75 +202,5,15,10 +202,5,16,10 +203,1,15,15 +203,1,16,15 +203,2,15,25 +203,2,16,25 +203,3,15,50 +203,3,16,50 +203,4,15,75 +203,4,16,75 +203,5,15,10 +203,5,16,10 +204,1,15,5 +204,1,16,5 +204,2,15,25 +204,2,16,25 +204,3,15,50 +204,3,16,50 +204,4,15,75 +204,4,16,75 +204,5,15,15 +204,5,16,15 +205,1,15,25 +205,1,16,25 +205,2,15,25 +205,2,16,25 +205,3,15,50 +205,3,16,50 +205,4,15,75 +205,4,16,75 +205,5,15,15 +205,5,16,15 +206,1,15,25 +206,1,16,25 +206,2,15,25 +206,2,16,25 +206,3,15,50 +206,3,16,50 +206,4,15,75 +206,4,16,75 +206,5,15,15 +206,5,16,15 +207,1,15,25 +207,1,16,25 +208,1,15,25 +208,1,16,25 +209,1,15,25 +209,1,16,25 +210,1,15,25 +210,1,16,25 +211,2,15,25 +211,2,16,25 +211,3,15,50 +211,3,16,50 +211,4,15,75 +211,4,16,75 +211,5,15,15 +211,5,16,15 +212,1,15,10 +212,1,16,10 +213,1,15,10 +213,1,16,10 +214,1,15,5 +214,1,16,5 +215,1,15,5 +215,1,16,5 +216,1,15,5 +216,1,16,5 +217,1,15,5 +217,1,16,5 +218,1,15,5 +218,1,16,5 +219,1,15,5 +219,1,16,5 +220,1,15,5 +220,1,16,5 +221,1,15,5 +221,1,16,5 +222,1,15,25 +222,1,16,25 +223,1,15,25 +223,1,16,25 +224,2,15,25 +224,2,16,25 +224,3,15,50 +224,3,16,50 +224,4,15,75 +224,4,16,75 +224,5,15,15 +224,5,16,15 +225,2,15,25 +225,2,16,25 +225,3,15,50 +225,3,16,50 +225,4,15,75 +225,4,16,75 +225,5,15,10 +225,5,16,10 +226,2,15,25 +226,2,16,25 +226,3,15,50 +226,3,16,50 +226,4,15,75 +226,4,16,75 +226,5,15,10 +226,5,16,10 +227,1,15,5 +227,1,16,5 +227,2,15,25 +227,2,16,25 +227,3,15,50 +227,3,16,50 +227,4,15,75 +227,4,16,75 +227,5,15,10 +227,5,16,10 +228,1,15,5 +228,1,16,5 +230,1,15,5 +230,1,16,5 +230,2,15,25 +230,2,16,25 +230,3,15,50 +230,3,16,50 +230,4,15,75 +230,4,16,75 +230,5,15,10 +230,5,16,10 +232,1,15,5 +232,1,16,5 +235,2,15,25 +235,2,16,25 +235,3,15,50 +235,3,16,50 +235,4,15,75 +235,4,16,75 +235,5,15,15 +235,5,16,15 +235,6,15,30 +235,6,16,30 +236,1,15,25 +236,1,16,25 +236,2,15,25 +236,2,16,25 +236,3,15,50 +236,3,16,50 +236,4,15,75 +236,4,16,75 +236,5,15,10 +236,5,16,10 +237,1,15,10 +237,1,16,10 +237,2,15,25 +237,2,16,25 +237,3,15,50 +237,3,16,50 +237,4,15,75 +237,4,16,75 +237,5,15,10 +237,5,16,10 +238,1,15,10 +238,1,16,10 +239,1,15,10 +239,1,16,10 +239,2,15,25 +239,2,16,25 +239,3,15,50 +239,3,16,50 +239,4,15,75 +239,4,16,75 +239,5,15,10 +239,5,16,10 +240,1,15,10 +240,1,16,10 +240,2,15,25 +240,2,16,25 +240,3,15,50 +240,3,16,50 +240,4,15,75 +240,4,16,75 +240,5,15,10 +240,5,16,10 +241,1,15,20 +241,1,16,20 +241,2,15,25 +241,2,16,25 +241,3,15,50 +241,3,16,50 +241,4,15,75 +241,4,16,75 +241,5,15,10 +241,5,16,10 +242,2,15,25 +242,2,16,25 +242,3,15,50 +242,3,16,50 +242,4,15,75 +242,4,16,75 +242,5,15,10 +242,5,16,10 +243,1,15,25 +243,1,16,25 +243,2,15,25 +243,2,16,25 +243,3,15,50 +243,3,16,50 +243,4,15,75 +243,4,16,75 +243,5,15,10 +243,5,16,10 +244,1,15,5 +244,1,16,5 +245,1,15,5 +245,1,16,5 +246,1,15,5 +246,1,16,5 +247,1,15,5 +247,1,16,5 +249,2,15,25 +249,2,16,25 +249,3,15,50 +249,3,16,50 +249,4,15,75 +249,4,16,75 +249,5,15,10 +249,5,16,10 +250,2,15,25 +250,2,16,25 +250,3,15,50 +250,3,16,50 +250,4,15,75 +250,4,16,75 +250,5,15,10 +250,5,16,10 +251,1,15,25 +251,1,16,25 +251,2,15,25 +251,2,16,25 +251,3,15,50 +251,3,16,50 +251,4,15,75 +251,4,16,75 +251,5,15,10 +251,5,16,10 +252,1,15,25 +252,1,16,25 +253,1,15,10 +253,1,16,10 +253,2,15,25 +253,2,16,25 +253,3,15,50 +253,3,16,50 +253,4,15,75 +253,4,16,75 +253,5,15,10 +253,5,16,10 +253,6,15,50 +253,6,16,50 +254,1,15,10 +254,1,16,10 +254,2,15,25 +254,2,16,25 +254,3,15,50 +254,3,16,50 +254,4,15,75 +254,4,16,75 +254,5,15,10 +254,5,16,10 +255,1,15,25 +255,1,16,25 +255,2,15,25 +255,2,16,25 +255,3,15,50 +255,3,16,50 +255,4,15,75 +255,4,16,75 +255,5,15,15 +255,5,16,15 +256,2,15,25 +256,2,16,25 +256,3,15,50 +256,3,16,50 +256,4,15,75 +256,4,16,75 +256,5,15,15 +256,5,16,15 +257,2,15,25 +257,2,16,25 +257,3,15,50 +257,3,16,50 +257,4,15,75 +257,4,16,75 +257,5,15,15 +257,5,16,15 +258,1,15,5 +258,1,16,5 +259,1,15,5 +259,1,16,5 +260,1,15,5 +260,1,16,5 +261,1,15,10 +261,1,16,10 +262,1,15,10 +262,1,16,10 +262,2,15,25 +262,2,16,25 +262,3,15,50 +262,3,16,50 +262,4,15,75 +262,4,16,75 +262,5,15,5 +262,5,16,5 +263,1,15,5 +263,1,16,5 +263,2,15,25 +263,2,16,25 +263,3,15,50 +263,3,16,50 +263,4,15,75 +263,4,16,75 +263,5,15,10 +263,5,16,10 +264,1,15,10 +264,1,16,10 +264,2,15,25 +264,2,16,25 +264,3,15,50 +264,3,16,50 +264,4,15,75 +264,4,16,75 +264,5,15,10 +264,5,16,10 +265,1,15,10 +265,1,16,10 +265,2,15,25 +265,2,16,25 +265,3,15,50 +265,3,16,50 +265,4,15,75 +265,4,16,75 +265,5,15,10 +265,5,16,10 +266,2,15,25 +266,2,16,25 +266,3,15,50 +266,3,16,50 +266,4,15,75 +266,4,16,75 +266,5,15,15 +266,5,16,15 +267,1,15,10 +267,1,16,10 +267,6,15,30 +267,6,16,30 +268,1,15,5 +268,1,16,5 +269,1,15,25 +269,1,16,25 +269,2,15,25 +269,2,16,25 +269,3,15,50 +269,3,16,50 +269,4,15,75 +269,4,16,75 +269,5,15,10 +269,5,16,10 +270,1,15,10 +270,1,16,10 +270,2,15,25 +270,2,16,25 +270,3,15,50 +270,3,16,50 +270,4,15,75 +270,4,16,75 +270,5,15,10 +270,5,16,10 +271,1,15,20 +271,1,16,20 +272,1,15,10 +272,1,16,10 +273,1,15,20 +273,1,16,20 +273,2,15,25 +273,2,16,25 +273,3,15,50 +273,3,16,50 +273,4,15,75 +273,4,16,75 +273,5,15,10 +273,5,16,10 +275,1,15,20 +275,1,16,20 +275,2,15,100 +275,2,16,100 +275,3,15,100 +275,3,16,100 +275,4,15,100 +275,4,16,100 +275,5,15,15 +275,5,16,15 +276,2,15,25 +276,2,16,25 +276,3,15,50 +276,3,16,50 +276,4,15,75 +276,4,16,75 +276,5,15,15 +276,5,16,15 +277,2,15,25 +277,2,16,25 +277,3,15,50 +277,3,16,50 +277,4,15,75 +277,4,16,75 +277,5,15,10 +277,5,16,10 +277,6,15,30 +277,6,16,30 +278,2,15,25 +278,2,16,25 +278,3,15,50 +278,3,16,50 +278,4,15,75 +278,4,16,75 +278,5,15,10 +278,5,16,10 +279,2,15,25 +279,2,16,25 +279,3,15,50 +279,3,16,50 +279,4,15,75 +279,4,16,75 +279,5,15,15 +279,5,16,15 +280,2,15,25 +280,2,16,25 +280,3,15,50 +280,3,16,50 +280,4,15,75 +280,4,16,75 +280,5,15,15 +280,5,16,15 +281,2,15,25 +281,2,16,25 +281,3,15,50 +281,3,16,50 +281,4,15,75 +281,4,16,75 +281,5,15,10 +281,5,16,10 +282,2,15,25 +282,2,16,25 +282,3,15,50 +282,3,16,50 +282,4,15,75 +282,4,16,75 +282,5,15,15 +282,5,16,15 +282,6,15,40 +282,6,16,40 +283,5,15,15 +283,5,16,15 +284,2,15,25 +284,2,16,25 +284,3,15,50 +284,3,16,50 +284,4,15,75 +284,4,16,75 +284,5,15,15 +284,5,16,15 +285,2,15,25 +285,2,16,25 +285,3,15,50 +285,3,16,50 +285,4,15,75 +285,4,16,75 +285,5,15,15 +285,5,16,15 +286,1,15,25 +286,1,16,25 +287,1,15,25 +287,1,16,25 +287,2,15,25 +287,2,16,25 +287,3,15,50 +287,3,16,50 +287,4,15,75 +287,4,16,75 +287,5,15,10 +287,5,16,10 +288,1,15,25 +288,1,16,25 +288,2,15,25 +288,2,16,25 +288,3,15,50 +288,3,16,50 +288,4,15,75 +288,4,16,75 +288,5,15,10 +288,5,16,10 +289,1,15,25 +289,1,16,25 +289,2,15,25 +289,2,16,25 +289,3,15,50 +289,3,16,50 +289,4,15,75 +289,4,16,75 +289,5,15,10 +289,5,16,10 +290,1,15,15 +290,1,16,15 +291,1,15,15 +291,1,16,15 +292,1,15,15 +292,1,16,15 +293,1,15,15 +293,1,16,15 +293,6,15,20 +293,6,16,20 +294,1,15,10 +294,1,16,10 +295,1,15,20 +295,1,16,20 +296,1,15,20 +296,1,16,20 +297,1,15,20 +297,1,16,20 +298,1,15,20 +298,1,16,20 +298,2,15,25 +298,2,16,25 +298,3,15,50 +298,3,16,50 +298,4,15,75 +298,4,16,75 +298,5,15,15 +298,5,16,15 +299,1,15,20 +299,1,16,20 +300,1,15,20 +300,1,16,20 +300,2,15,25 +300,2,16,25 +300,3,15,50 +300,3,16,50 +300,4,15,75 +300,4,16,75 +300,5,15,15 +300,5,16,15 +301,1,15,20 +301,1,16,20 +302,1,15,20 +302,1,16,20 +303,1,15,20 +303,1,16,20 +303,2,15,25 +303,2,16,25 +303,3,15,50 +303,3,16,50 +303,4,15,75 +303,4,16,75 +303,5,15,15 +303,5,16,15 +304,1,15,20 +304,1,16,20 +304,2,15,25 +304,2,16,25 +304,3,15,50 +304,3,16,50 +304,4,15,75 +304,4,16,75 +304,5,15,15 +304,5,16,15 +305,1,15,20 +305,1,16,20 +306,1,15,20 +306,1,16,20 +306,2,15,25 +306,2,16,25 +306,3,15,50 +306,3,16,50 +306,4,15,75 +306,4,16,75 +306,5,15,15 +306,5,16,15 +307,1,15,20 +307,1,16,20 +308,1,15,20 +308,1,16,20 +309,1,15,20 +309,1,16,20 +310,1,15,20 +310,1,16,20 +311,1,15,20 +311,1,16,20 +312,1,15,20 +312,1,16,20 +312,2,15,25 +312,2,16,25 +312,3,15,50 +312,3,16,50 +312,4,15,75 +312,4,16,75 +312,5,15,10 +312,5,16,10 +313,1,15,20 +313,1,16,20 +313,2,15,25 +313,2,16,25 +313,3,15,50 +313,3,16,50 +313,4,15,75 +313,4,16,75 +313,5,15,10 +313,5,16,10 +314,1,15,20 +314,1,16,20 +314,2,15,25 +314,2,16,25 +314,3,15,50 +314,3,16,50 +314,4,15,75 +314,4,16,75 +314,5,15,10 +314,5,16,10 +315,1,15,20 +315,1,16,20 +315,2,15,25 +315,2,16,25 +315,3,15,50 +315,3,16,50 +315,4,15,75 +315,4,16,75 +315,5,15,10 +315,5,16,10 +316,1,15,15 +316,1,16,15 +316,2,15,25 +316,2,16,25 +316,3,15,50 +316,3,16,50 +316,4,15,75 +316,4,16,75 +316,5,15,10 +316,5,16,10 +317,1,15,10 +317,1,16,10 +318,1,15,10 +318,1,16,10 +319,1,15,10 +319,1,16,10 +319,6,15,40 +319,6,16,40 +320,1,15,20 +320,1,16,20 +321,1,15,15 +321,1,16,15 +323,1,15,10 +323,1,16,10 +323,2,15,25 +323,2,16,25 +323,3,15,50 +323,3,16,50 +323,4,15,75 +323,4,16,75 +323,5,15,10 +323,5,16,10 +323,6,15,5 +323,6,16,5 +324,1,15,10 +324,1,16,10 +324,2,15,25 +324,2,16,25 +324,3,15,50 +324,3,16,50 +324,4,15,75 +324,4,16,75 +324,5,15,10 +324,5,16,10 +325,1,15,10 +325,1,16,10 +325,2,15,25 +325,2,16,25 +325,3,15,50 +325,3,16,50 +325,4,15,75 +325,4,16,75 +325,5,15,10 +325,5,16,10 +325,6,15,5 +325,6,16,5 diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 491bfd2..c2cf297 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -185,7 +185,8 @@ class LocationArea(TableBase): class LocationAreaEncounterRate(TableBase): __tablename__ = 'location_area_encounter_rates' location_area_id = Column(Integer, ForeignKey('location_areas.id'), primary_key=True, nullable=False, autoincrement=False) - encounter_type_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=True, nullable=False, autoincrement=False) + encounter_terrain_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=True, nullable=False, autoincrement=False) + version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, autoincrement=False) rate = Column(Integer, nullable=True) class Machine(TableBase):