From e07fcbcd36d2e326987da6e877b79b9e81438c2e Mon Sep 17 00:00:00 2001
From: Guill <g@guillitem.com>
Date: Mon, 28 Aug 2017 15:06:52 -0300
Subject: [PATCH] =?UTF-8?q?-=20Reordered=20efficacy=20rows.=20-=20Added=20?=
 =?UTF-8?q?generation=20versioning=20to=20pokemon=20types.=20-=20Hand=20cr?=
 =?UTF-8?q?afted=20pok=C3=A9mon=20type=20variations=20across=20generations?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pokedex/data/csv/pokemon_types.csv | 2694 +++++++++++++++-------------
 pokedex/data/csv/type_efficacy.csv |  198 +-
 2 files changed, 1567 insertions(+), 1325 deletions(-)

diff --git a/pokedex/data/csv/pokemon_types.csv b/pokedex/data/csv/pokemon_types.csv
index fae5d21..4a4101c 100644
--- a/pokedex/data/csv/pokemon_types.csv
+++ b/pokedex/data/csv/pokemon_types.csv
@@ -1,1226 +1,1468 @@
-pokemon_id,type_id,slot
-1,12,1
-1,4,2
-2,12,1
-2,4,2
-3,12,1
-3,4,2
-4,10,1
-5,10,1
-6,10,1
-6,3,2
-7,11,1
-8,11,1
-9,11,1
-10,7,1
-11,7,1
-12,7,1
-12,3,2
-13,7,1
-13,4,2
-14,7,1
-14,4,2
-15,7,1
-15,4,2
-16,1,1
-16,3,2
-17,1,1
-17,3,2
-18,1,1
-18,3,2
-19,1,1
-20,1,1
-21,1,1
-21,3,2
-22,1,1
-22,3,2
-23,4,1
-24,4,1
-25,13,1
-26,13,1
-27,5,1
-28,5,1
-29,4,1
-30,4,1
-31,4,1
-31,5,2
-32,4,1
-33,4,1
-34,4,1
-34,5,2
-35,18,1
-36,18,1
-37,10,1
-38,10,1
-39,1,1
-39,18,2
-40,1,1
-40,18,2
-41,4,1
-41,3,2
-42,4,1
-42,3,2
-43,12,1
-43,4,2
-44,12,1
-44,4,2
-45,12,1
-45,4,2
-46,7,1
-46,12,2
-47,7,1
-47,12,2
-48,7,1
-48,4,2
-49,7,1
-49,4,2
-50,5,1
-51,5,1
-52,1,1
-53,1,1
-54,11,1
-55,11,1
-56,2,1
-57,2,1
-58,10,1
-59,10,1
-60,11,1
-61,11,1
-62,11,1
-62,2,2
-63,14,1
-64,14,1
-65,14,1
-66,2,1
-67,2,1
-68,2,1
-69,12,1
-69,4,2
-70,12,1
-70,4,2
-71,12,1
-71,4,2
-72,11,1
-72,4,2
-73,11,1
-73,4,2
-74,6,1
-74,5,2
-75,6,1
-75,5,2
-76,6,1
-76,5,2
-77,10,1
-78,10,1
-79,11,1
-79,14,2
-80,11,1
-80,14,2
-81,13,1
-81,9,2
-82,13,1
-82,9,2
-83,1,1
-83,3,2
-84,1,1
-84,3,2
-85,1,1
-85,3,2
-86,11,1
-87,11,1
-87,15,2
-88,4,1
-89,4,1
-90,11,1
-91,11,1
-91,15,2
-92,8,1
-92,4,2
-93,8,1
-93,4,2
-94,8,1
-94,4,2
-95,6,1
-95,5,2
-96,14,1
-97,14,1
-98,11,1
-99,11,1
-100,13,1
-101,13,1
-102,12,1
-102,14,2
-103,12,1
-103,14,2
-104,5,1
-105,5,1
-106,2,1
-107,2,1
-108,1,1
-109,4,1
-110,4,1
-111,5,1
-111,6,2
-112,5,1
-112,6,2
-113,1,1
-114,12,1
-115,1,1
-116,11,1
-117,11,1
-118,11,1
-119,11,1
-120,11,1
-121,11,1
-121,14,2
-122,14,1
-122,18,2
-123,7,1
-123,3,2
-124,15,1
-124,14,2
-125,13,1
-126,10,1
-127,7,1
-128,1,1
-129,11,1
-130,11,1
-130,3,2
-131,11,1
-131,15,2
-132,1,1
-133,1,1
-134,11,1
-135,13,1
-136,10,1
-137,1,1
-138,6,1
-138,11,2
-139,6,1
-139,11,2
-140,6,1
-140,11,2
-141,6,1
-141,11,2
-142,6,1
-142,3,2
-143,1,1
-144,15,1
-144,3,2
-145,13,1
-145,3,2
-146,10,1
-146,3,2
-147,16,1
-148,16,1
-149,16,1
-149,3,2
-150,14,1
-151,14,1
-152,12,1
-153,12,1
-154,12,1
-155,10,1
-156,10,1
-157,10,1
-158,11,1
-159,11,1
-160,11,1
-161,1,1
-162,1,1
-163,1,1
-163,3,2
-164,1,1
-164,3,2
-165,7,1
-165,3,2
-166,7,1
-166,3,2
-167,7,1
-167,4,2
-168,7,1
-168,4,2
-169,4,1
-169,3,2
-170,11,1
-170,13,2
-171,11,1
-171,13,2
-172,13,1
-173,18,1
-174,1,1
-174,18,2
-175,18,1
-176,18,1
-176,3,2
-177,14,1
-177,3,2
-178,14,1
-178,3,2
-179,13,1
-180,13,1
-181,13,1
-182,12,1
-183,11,1
-183,18,2
-184,11,1
-184,18,2
-185,6,1
-186,11,1
-187,12,1
-187,3,2
-188,12,1
-188,3,2
-189,12,1
-189,3,2
-190,1,1
-191,12,1
-192,12,1
-193,7,1
-193,3,2
-194,11,1
-194,5,2
-195,11,1
-195,5,2
-196,14,1
-197,17,1
-198,17,1
-198,3,2
-199,11,1
-199,14,2
-200,8,1
-201,14,1
-202,14,1
-203,1,1
-203,14,2
-204,7,1
-205,7,1
-205,9,2
-206,1,1
-207,5,1
-207,3,2
-208,9,1
-208,5,2
-209,18,1
-210,18,1
-211,11,1
-211,4,2
-212,7,1
-212,9,2
-213,7,1
-213,6,2
-214,7,1
-214,2,2
-215,17,1
-215,15,2
-216,1,1
-217,1,1
-218,10,1
-219,10,1
-219,6,2
-220,15,1
-220,5,2
-221,15,1
-221,5,2
-222,11,1
-222,6,2
-223,11,1
-224,11,1
-225,15,1
-225,3,2
-226,11,1
-226,3,2
-227,9,1
-227,3,2
-228,17,1
-228,10,2
-229,17,1
-229,10,2
-230,11,1
-230,16,2
-231,5,1
-232,5,1
-233,1,1
-234,1,1
-235,1,1
-236,2,1
-237,2,1
-238,15,1
-238,14,2
-239,13,1
-240,10,1
-241,1,1
-242,1,1
-243,13,1
-244,10,1
-245,11,1
-246,6,1
-246,5,2
-247,6,1
-247,5,2
-248,6,1
-248,17,2
-249,14,1
-249,3,2
-250,10,1
-250,3,2
-251,14,1
-251,12,2
-252,12,1
-253,12,1
-254,12,1
-255,10,1
-256,10,1
-256,2,2
-257,10,1
-257,2,2
-258,11,1
-259,11,1
-259,5,2
-260,11,1
-260,5,2
-261,17,1
-262,17,1
-263,1,1
-264,1,1
-265,7,1
-266,7,1
-267,7,1
-267,3,2
-268,7,1
-269,7,1
-269,4,2
-270,11,1
-270,12,2
-271,11,1
-271,12,2
-272,11,1
-272,12,2
-273,12,1
-274,12,1
-274,17,2
-275,12,1
-275,17,2
-276,1,1
-276,3,2
-277,1,1
-277,3,2
-278,11,1
-278,3,2
-279,11,1
-279,3,2
-280,14,1
-280,18,2
-281,14,1
-281,18,2
-282,14,1
-282,18,2
-283,7,1
-283,11,2
-284,7,1
-284,3,2
-285,12,1
-286,12,1
-286,2,2
-287,1,1
-288,1,1
-289,1,1
-290,7,1
-290,5,2
-291,7,1
-291,3,2
-292,7,1
-292,8,2
-293,1,1
-294,1,1
-295,1,1
-296,2,1
-297,2,1
-298,1,1
-298,18,2
-299,6,1
-300,1,1
-301,1,1
-302,17,1
-302,8,2
-303,9,1
-303,18,2
-304,9,1
-304,6,2
-305,9,1
-305,6,2
-306,9,1
-306,6,2
-307,2,1
-307,14,2
-308,2,1
-308,14,2
-309,13,1
-310,13,1
-311,13,1
-312,13,1
-313,7,1
-314,7,1
-315,12,1
-315,4,2
-316,4,1
-317,4,1
-318,11,1
-318,17,2
-319,11,1
-319,17,2
-320,11,1
-321,11,1
-322,10,1
-322,5,2
-323,10,1
-323,5,2
-324,10,1
-325,14,1
-326,14,1
-327,1,1
-328,5,1
-329,5,1
-329,16,2
-330,5,1
-330,16,2
-331,12,1
-332,12,1
-332,17,2
-333,1,1
-333,3,2
-334,16,1
-334,3,2
-335,1,1
-336,4,1
-337,6,1
-337,14,2
-338,6,1
-338,14,2
-339,11,1
-339,5,2
-340,11,1
-340,5,2
-341,11,1
-342,11,1
-342,17,2
-343,5,1
-343,14,2
-344,5,1
-344,14,2
-345,6,1
-345,12,2
-346,6,1
-346,12,2
-347,6,1
-347,7,2
-348,6,1
-348,7,2
-349,11,1
-350,11,1
-351,1,1
-352,1,1
-353,8,1
-354,8,1
-355,8,1
-356,8,1
-357,12,1
-357,3,2
-358,14,1
-359,17,1
-360,14,1
-361,15,1
-362,15,1
-363,15,1
-363,11,2
-364,15,1
-364,11,2
-365,15,1
-365,11,2
-366,11,1
-367,11,1
-368,11,1
-369,11,1
-369,6,2
-370,11,1
-371,16,1
-372,16,1
-373,16,1
-373,3,2
-374,9,1
-374,14,2
-375,9,1
-375,14,2
-376,9,1
-376,14,2
-377,6,1
-378,15,1
-379,9,1
-380,16,1
-380,14,2
-381,16,1
-381,14,2
-382,11,1
-383,5,1
-384,16,1
-384,3,2
-385,9,1
-385,14,2
-386,14,1
-387,12,1
-388,12,1
-389,12,1
-389,5,2
-390,10,1
-391,10,1
-391,2,2
-392,10,1
-392,2,2
-393,11,1
-394,11,1
-395,11,1
-395,9,2
-396,1,1
-396,3,2
-397,1,1
-397,3,2
-398,1,1
-398,3,2
-399,1,1
-400,1,1
-400,11,2
-401,7,1
-402,7,1
-403,13,1
-404,13,1
-405,13,1
-406,12,1
-406,4,2
-407,12,1
-407,4,2
-408,6,1
-409,6,1
-410,6,1
-410,9,2
-411,6,1
-411,9,2
-412,7,1
-413,7,1
-413,12,2
-414,7,1
-414,3,2
-415,7,1
-415,3,2
-416,7,1
-416,3,2
-417,13,1
-418,11,1
-419,11,1
-420,12,1
-421,12,1
-422,11,1
-423,11,1
-423,5,2
-424,1,1
-425,8,1
-425,3,2
-426,8,1
-426,3,2
-427,1,1
-428,1,1
-429,8,1
-430,17,1
-430,3,2
-431,1,1
-432,1,1
-433,14,1
-434,4,1
-434,17,2
-435,4,1
-435,17,2
-436,9,1
-436,14,2
-437,9,1
-437,14,2
-438,6,1
-439,14,1
-439,18,2
-440,1,1
-441,1,1
-441,3,2
-442,8,1
-442,17,2
-443,16,1
-443,5,2
-444,16,1
-444,5,2
-445,16,1
-445,5,2
-446,1,1
-447,2,1
-448,2,1
-448,9,2
-449,5,1
-450,5,1
-451,4,1
-451,7,2
-452,4,1
-452,17,2
-453,4,1
-453,2,2
-454,4,1
-454,2,2
-455,12,1
-456,11,1
-457,11,1
-458,11,1
-458,3,2
-459,12,1
-459,15,2
-460,12,1
-460,15,2
-461,17,1
-461,15,2
-462,13,1
-462,9,2
-463,1,1
-464,5,1
-464,6,2
-465,12,1
-466,13,1
-467,10,1
-468,18,1
-468,3,2
-469,7,1
-469,3,2
-470,12,1
-471,15,1
-472,5,1
-472,3,2
-473,15,1
-473,5,2
-474,1,1
-475,14,1
-475,2,2
-476,6,1
-476,9,2
-477,8,1
-478,15,1
-478,8,2
-479,13,1
-479,8,2
-480,14,1
-481,14,1
-482,14,1
-483,9,1
-483,16,2
-484,11,1
-484,16,2
-485,10,1
-485,9,2
-486,1,1
-487,8,1
-487,16,2
-488,14,1
-489,11,1
-490,11,1
-491,17,1
-492,12,1
-493,1,1
-494,14,1
-494,10,2
-495,12,1
-496,12,1
-497,12,1
-498,10,1
-499,10,1
-499,2,2
-500,10,1
-500,2,2
-501,11,1
-502,11,1
-503,11,1
-504,1,1
-505,1,1
-506,1,1
-507,1,1
-508,1,1
-509,17,1
-510,17,1
-511,12,1
-512,12,1
-513,10,1
-514,10,1
-515,11,1
-516,11,1
-517,14,1
-518,14,1
-519,1,1
-519,3,2
-520,1,1
-520,3,2
-521,1,1
-521,3,2
-522,13,1
-523,13,1
-524,6,1
-525,6,1
-526,6,1
-527,14,1
-527,3,2
-528,14,1
-528,3,2
-529,5,1
-530,5,1
-530,9,2
-531,1,1
-532,2,1
-533,2,1
-534,2,1
-535,11,1
-536,11,1
-536,5,2
-537,11,1
-537,5,2
-538,2,1
-539,2,1
-540,7,1
-540,12,2
-541,7,1
-541,12,2
-542,7,1
-542,12,2
-543,7,1
-543,4,2
-544,7,1
-544,4,2
-545,7,1
-545,4,2
-546,12,1
-546,18,2
-547,12,1
-547,18,2
-548,12,1
-549,12,1
-550,11,1
-551,5,1
-551,17,2
-552,5,1
-552,17,2
-553,5,1
-553,17,2
-554,10,1
-555,10,1
-556,12,1
-557,7,1
-557,6,2
-558,7,1
-558,6,2
-559,17,1
-559,2,2
-560,17,1
-560,2,2
-561,14,1
-561,3,2
-562,8,1
-563,8,1
-564,11,1
-564,6,2
-565,11,1
-565,6,2
-566,6,1
-566,3,2
-567,6,1
-567,3,2
-568,4,1
-569,4,1
-570,17,1
-571,17,1
-572,1,1
-573,1,1
-574,14,1
-575,14,1
-576,14,1
-577,14,1
-578,14,1
-579,14,1
-580,11,1
-580,3,2
-581,11,1
-581,3,2
-582,15,1
-583,15,1
-584,15,1
-585,1,1
-585,12,2
-586,1,1
-586,12,2
-587,13,1
-587,3,2
-588,7,1
-589,7,1
-589,9,2
-590,12,1
-590,4,2
-591,12,1
-591,4,2
-592,11,1
-592,8,2
-593,11,1
-593,8,2
-594,11,1
-595,7,1
-595,13,2
-596,7,1
-596,13,2
-597,12,1
-597,9,2
-598,12,1
-598,9,2
-599,9,1
-600,9,1
-601,9,1
-602,13,1
-603,13,1
-604,13,1
-605,14,1
-606,14,1
-607,8,1
-607,10,2
-608,8,1
-608,10,2
-609,8,1
-609,10,2
-610,16,1
-611,16,1
-612,16,1
-613,15,1
-614,15,1
-615,15,1
-616,7,1
-617,7,1
-618,5,1
-618,13,2
-619,2,1
-620,2,1
-621,16,1
-622,5,1
-622,8,2
-623,5,1
-623,8,2
-624,17,1
-624,9,2
-625,17,1
-625,9,2
-626,1,1
-627,1,1
-627,3,2
-628,1,1
-628,3,2
-629,17,1
-629,3,2
-630,17,1
-630,3,2
-631,10,1
-632,7,1
-632,9,2
-633,17,1
-633,16,2
-634,17,1
-634,16,2
-635,17,1
-635,16,2
-636,7,1
-636,10,2
-637,7,1
-637,10,2
-638,9,1
-638,2,2
-639,6,1
-639,2,2
-640,12,1
-640,2,2
-641,3,1
-642,13,1
-642,3,2
-643,16,1
-643,10,2
-644,16,1
-644,13,2
-645,5,1
-645,3,2
-646,16,1
-646,15,2
-647,11,1
-647,2,2
-648,1,1
-648,14,2
-649,7,1
-649,9,2
-650,12,1
-651,12,1
-652,12,1
-652,2,2
-653,10,1
-654,10,1
-655,10,1
-655,14,2
-656,11,1
-657,11,1
-658,11,1
-658,17,2
-659,1,1
-660,1,1
-660,5,2
-661,1,1
-661,3,2
-662,10,1
-662,3,2
-663,10,1
-663,3,2
-664,7,1
-665,7,1
-666,7,1
-666,3,2
-667,10,1
-667,1,2
-668,10,1
-668,1,2
-669,18,1
-670,18,1
-671,18,1
-672,12,1
-673,12,1
-674,2,1
-675,2,1
-675,17,2
-676,1,1
-677,14,1
-678,14,1
-679,9,1
-679,8,2
-680,9,1
-680,8,2
-681,9,1
-681,8,2
-682,18,1
-683,18,1
-684,18,1
-685,18,1
-686,17,1
-686,14,2
-687,17,1
-687,14,2
-688,6,1
-688,11,2
-689,6,1
-689,11,2
-690,4,1
-690,11,2
-691,4,1
-691,16,2
-692,11,1
-693,11,1
-694,13,1
-694,1,2
-695,13,1
-695,1,2
-696,6,1
-696,16,2
-697,6,1
-697,16,2
-698,6,1
-698,15,2
-699,6,1
-699,15,2
-700,18,1
-701,2,1
-701,3,2
-702,13,1
-702,18,2
-703,6,1
-703,18,2
-704,16,1
-705,16,1
-706,16,1
-707,9,1
-707,18,2
-708,8,1
-708,12,2
-709,8,1
-709,12,2
-710,8,1
-710,12,2
-711,8,1
-711,12,2
-712,15,1
-713,15,1
-714,3,1
-714,16,2
-715,3,1
-715,16,2
-716,18,1
-717,17,1
-717,3,2
-718,16,1
-718,5,2
-719,6,1
-719,18,2
-720,14,1
-720,8,2
-721,10,1
-721,11,2
-10001,14,1
-10002,14,1
-10003,14,1
-10004,7,1
-10004,5,2
-10005,7,1
-10005,9,2
-10006,12,1
-10006,3,2
-10007,8,1
-10007,16,2
-10008,13,1
-10008,10,2
-10009,13,1
-10009,11,2
-10010,13,1
-10010,15,2
-10011,13,1
-10011,3,2
-10012,13,1
-10012,12,2
-10013,10,1
-10014,11,1
-10015,15,1
-10016,11,1
-10017,10,1
-10017,14,2
-10018,1,1
-10018,2,2
-10019,3,1
-10020,13,1
-10020,3,2
-10021,5,1
-10021,3,2
-10022,16,1
-10022,15,2
-10023,16,1
-10023,15,2
-10024,11,1
-10024,2,2
-10025,14,1
-10026,9,1
-10026,8,2
-10027,8,1
-10027,12,2
-10028,8,1
-10028,12,2
-10029,8,1
-10029,12,2
-10030,8,1
-10030,12,2
-10031,8,1
-10031,12,2
-10032,8,1
-10032,12,2
-10033,12,1
-10033,4,2
-10034,10,1
-10034,16,2
-10035,10,1
-10035,3,2
-10036,11,1
-10037,14,1
-10038,8,1
-10038,4,2
-10039,1,1
-10040,7,1
-10040,3,2
-10041,11,1
-10041,17,2
-10042,6,1
-10042,3,2
-10043,14,1
-10043,2,2
-10044,14,1
-10045,13,1
-10045,16,2
-10046,7,1
-10046,9,2
-10047,7,1
-10047,2,2
-10048,17,1
-10048,10,2
-10049,6,1
-10049,17,2
-10050,10,1
-10050,2,2
-10051,14,1
-10051,18,2
-10052,9,1
-10052,18,2
-10053,9,1
-10054,2,1
-10054,14,2
-10055,13,1
-10056,8,1
-10057,17,1
-10058,16,1
-10058,5,2
-10059,2,1
-10059,9,2
-10060,12,1
-10060,15,2
-10061,18,1
-10062,16,1
-10062,14,2
-10063,16,1
-10063,14,2
-10064,11,1
-10064,5,2
-10065,12,1
-10065,16,2
-10066,17,1
-10066,8,2
-10067,16,1
-10067,18,2
-10068,14,1
-10068,2,2
-10069,1,1
-10069,18,2
-10070,11,1
-10070,17,2
-10071,11,1
-10071,14,2
-10072,9,1
-10072,5,2
-10073,1,1
-10073,3,2
-10074,15,1
-10075,6,1
-10075,18,2
-10076,9,1
-10076,14,2
-10077,11,1
-10078,5,1
-10078,10,2
-10079,16,1
-10079,3,2
-10080,13,1
-10081,13,1
-10082,13,1
-10083,13,1
-10084,13,1
-10085,13,1
-10086,14,1
-10086,17,2
-10087,10,1
-10087,5,2
-10088,1,1
-10088,2,2
-10089,16,1
-10089,3,2
-10090,7,1
-10090,4,2
+pokemon_id,type_id,slot,first_generation_id,last_generation_id
+1,12,1,1,
+1,4,2,1,
+2,12,1,1,
+2,4,2,1,
+3,12,1,1,
+3,4,2,1,
+4,10,1,1,
+5,10,1,1,
+6,10,1,1,
+6,3,2,1,
+7,11,1,1,
+8,11,1,1,
+9,11,1,1,
+10,7,1,1,
+11,7,1,1,
+12,7,1,1,
+12,3,2,1,
+13,7,1,1,
+13,4,2,1,
+14,7,1,1,
+14,4,2,1,
+15,7,1,1,
+15,4,2,1,
+16,1,1,1,
+16,3,2,1,
+17,1,1,1,
+17,3,2,1,
+18,1,1,1,
+18,3,2,1,
+19,1,1,1,
+20,1,1,1,
+21,1,1,1,
+21,3,2,1,
+22,1,1,1,
+22,3,2,1,
+23,4,1,1,
+24,4,1,1,
+25,13,1,1,
+26,13,1,1,
+27,5,1,1,
+28,5,1,1,
+29,4,1,1,
+30,4,1,1,
+31,4,1,1,
+31,5,2,1,
+32,4,1,1,
+33,4,1,1,
+34,4,1,1,
+34,5,2,1,
+35,18,1,6,
+35,1,1,1,5
+36,18,1,6,
+36,1,1,1,5
+37,10,1,1,
+38,10,1,1,
+39,1,1,1,
+39,18,2,6,
+40,1,1,1,
+40,18,2,6,
+41,4,1,1,
+41,3,2,1,
+42,4,1,1,
+42,3,2,1,
+43,12,1,1,
+43,4,2,1,
+44,12,1,1,
+44,4,2,1,
+45,12,1,1,
+45,4,2,1,
+46,7,1,1,
+46,12,2,1,
+47,7,1,1,
+47,12,2,1,
+48,7,1,1,
+48,4,2,1,
+49,7,1,1,
+49,4,2,1,
+50,5,1,1,
+51,5,1,1,
+52,1,1,1,
+53,1,1,1,
+54,11,1,1,
+55,11,1,1,
+56,2,1,1,
+57,2,1,1,
+58,10,1,1,
+59,10,1,1,
+60,11,1,1,
+61,11,1,1,
+62,11,1,1,
+62,2,2,1,
+63,14,1,1,
+64,14,1,1,
+65,14,1,1,
+66,2,1,1,
+67,2,1,1,
+68,2,1,1,
+69,12,1,1,
+69,4,2,1,
+70,12,1,1,
+70,4,2,1,
+71,12,1,1,
+71,4,2,1,
+72,11,1,1,
+72,4,2,1,
+73,11,1,1,
+73,4,2,1,
+74,6,1,1,
+74,5,2,1,
+75,6,1,1,
+75,5,2,1,
+76,6,1,1,
+76,5,2,1,
+77,10,1,1,
+78,10,1,1,
+79,11,1,1,
+79,14,2,1,
+80,11,1,1,
+80,14,2,1,
+81,13,1,1,
+81,9,2,2,
+82,13,1,1,
+82,9,2,2,
+83,1,1,1,
+83,3,2,1,
+84,1,1,1,
+84,3,2,1,
+85,1,1,1,
+85,3,2,1,
+86,11,1,1,
+87,11,1,1,
+87,15,2,1,
+88,4,1,1,
+89,4,1,1,
+90,11,1,1,
+91,11,1,1,
+91,15,2,1,
+92,8,1,1,
+92,4,2,1,
+93,8,1,1,
+93,4,2,1,
+94,8,1,1,
+94,4,2,1,
+95,6,1,1,
+95,5,2,1,
+96,14,1,1,
+97,14,1,1,
+98,11,1,1,
+99,11,1,1,
+100,13,1,1,
+101,13,1,1,
+102,12,1,1,
+102,14,2,1,
+103,12,1,1,
+103,14,2,1,
+104,5,1,1,
+105,5,1,1,
+106,2,1,1,
+107,2,1,1,
+108,1,1,1,
+109,4,1,1,
+110,4,1,1,
+111,5,1,1,
+111,6,2,1,
+112,5,1,1,
+112,6,2,1,
+113,1,1,1,
+114,12,1,1,
+115,1,1,1,
+116,11,1,1,
+117,11,1,1,
+118,11,1,1,
+119,11,1,1,
+120,11,1,1,
+121,11,1,1,
+121,14,2,1,
+122,14,1,1,
+122,18,2,6,
+123,7,1,1,
+123,3,2,1,
+124,15,1,1,
+124,14,2,1,
+125,13,1,1,
+126,10,1,1,
+127,7,1,1,
+128,1,1,1,
+129,11,1,1,
+130,11,1,1,
+130,3,2,1,
+131,11,1,1,
+131,15,2,1,
+132,1,1,1,
+133,1,1,1,
+134,11,1,1,
+135,13,1,1,
+136,10,1,1,
+137,1,1,1,
+138,6,1,1,
+138,11,2,1,
+139,6,1,1,
+139,11,2,1,
+140,6,1,1,
+140,11,2,1,
+141,6,1,1,
+141,11,2,1,
+142,6,1,1,
+142,3,2,1,
+143,1,1,1,
+144,15,1,1,
+144,3,2,1,
+145,13,1,1,
+145,3,2,1,
+146,10,1,1,
+146,3,2,1,
+147,16,1,1,
+148,16,1,1,
+149,16,1,1,
+149,3,2,1,
+150,14,1,1,
+151,14,1,1,
+152,12,1,2,
+153,12,1,2,
+154,12,1,2,
+155,10,1,2,
+156,10,1,2,
+157,10,1,2,
+158,11,1,2,
+159,11,1,2,
+160,11,1,2,
+161,1,1,2,
+162,1,1,2,
+163,1,1,2,
+163,3,2,2,
+164,1,1,2,
+164,3,2,2,
+165,7,1,2,
+165,3,2,2,
+166,7,1,2,
+166,3,2,2,
+167,7,1,2,
+167,4,2,2,
+168,7,1,2,
+168,4,2,2,
+169,4,1,2,
+169,3,2,2,
+170,11,1,2,
+170,13,2,2,
+171,11,1,2,
+171,13,2,2,
+172,13,1,2,
+173,1,1,2,5
+173,18,1,6,
+174,1,1,2,
+174,18,2,6,
+175,1,1,2,5
+175,18,1,6,
+176,1,1,2,5
+176,18,1,6,
+176,3,2,2,
+177,14,1,2,
+177,3,2,2,
+178,14,1,2,
+178,3,2,2,
+179,13,1,2,
+180,13,1,2,
+181,13,1,2,
+182,12,1,2,
+183,11,1,2,
+183,18,2,6,
+184,11,1,2,
+184,18,2,6,
+185,6,1,2,
+186,11,1,2,
+187,12,1,2,
+187,3,2,2,
+188,12,1,2,
+188,3,2,2,
+189,12,1,2,
+189,3,2,2,
+190,1,1,2,
+191,12,1,2,
+192,12,1,2,
+193,7,1,2,
+193,3,2,2,
+194,11,1,2,
+194,5,2,2,
+195,11,1,2,
+195,5,2,2,
+196,14,1,2,
+197,17,1,2,
+198,17,1,2,
+198,3,2,2,
+199,11,1,2,
+199,14,2,2,
+200,8,1,2,
+201,14,1,2,
+202,14,1,2,
+203,1,1,2,
+203,14,2,2,
+204,7,1,2,
+205,7,1,2,
+205,9,2,2,
+206,1,1,2,
+207,5,1,2,
+207,3,2,2,
+208,9,1,2,
+208,5,2,2,
+209,18,1,6,
+209,1,1,2,5
+210,18,1,6,
+210,1,1,2,5
+211,11,1,2,
+211,4,2,2,
+212,7,1,2,
+212,9,2,2,
+213,7,1,2,
+213,6,2,2,
+214,7,1,2,
+214,2,2,2,
+215,17,1,2,
+215,15,2,2,
+216,1,1,2,
+217,1,1,2,
+218,10,1,2,
+219,10,1,2,
+219,6,2,2,
+220,15,1,2,
+220,5,2,2,
+221,15,1,2,
+221,5,2,2,
+222,11,1,2,
+222,6,2,2,
+223,11,1,2,
+224,11,1,2,
+225,15,1,2,
+225,3,2,2,
+226,11,1,2,
+226,3,2,2,
+227,9,1,2,
+227,3,2,2,
+228,17,1,2,
+228,10,2,2,
+229,17,1,2,
+229,10,2,2,
+230,11,1,2,
+230,16,2,2,
+231,5,1,2,
+232,5,1,2,
+233,1,1,2,
+234,1,1,2,
+235,1,1,2,
+236,2,1,2,
+237,2,1,2,
+238,15,1,2,
+238,14,2,2,
+239,13,1,2,
+240,10,1,2,
+241,1,1,2,
+242,1,1,2,
+243,13,1,2,
+244,10,1,2,
+245,11,1,2,
+246,6,1,2,
+246,5,2,2,
+247,6,1,2,
+247,5,2,2,
+248,6,1,2,
+248,17,2,2,
+249,14,1,2,
+249,3,2,2,
+250,10,1,2,
+250,3,2,2,
+251,14,1,2,
+251,12,2,2,
+252,12,1,3,
+253,12,1,3,
+254,12,1,3,
+255,10,1,3,
+256,10,1,3,
+256,2,2,3,
+257,10,1,3,
+257,2,2,3,
+258,11,1,3,
+259,11,1,3,
+259,5,2,3,
+260,11,1,3,
+260,5,2,3,
+261,17,1,3,
+262,17,1,3,
+263,1,1,3,
+264,1,1,3,
+265,7,1,3,
+266,7,1,3,
+267,7,1,3,
+267,3,2,3,
+268,7,1,3,
+269,7,1,3,
+269,4,2,3,
+270,11,1,3,
+270,12,2,3,
+271,11,1,3,
+271,12,2,3,
+272,11,1,3,
+272,12,2,3,
+273,12,1,3,
+274,12,1,3,
+274,17,2,3,
+275,12,1,3,
+275,17,2,3,
+276,1,1,3,
+276,3,2,3,
+277,1,1,3,
+277,3,2,3,
+278,11,1,3,
+278,3,2,3,
+279,11,1,3,
+279,3,2,3,
+280,14,1,3,
+280,18,2,6,
+281,14,1,3,
+281,18,2,6,
+282,14,1,3,
+282,18,2,6,
+283,7,1,3,
+283,11,2,3,
+284,7,1,3,
+284,3,2,3,
+285,12,1,3,
+286,12,1,3,
+286,2,2,3,
+287,1,1,3,
+288,1,1,3,
+289,1,1,3,
+290,7,1,3,
+290,5,2,3,
+291,7,1,3,
+291,3,2,3,
+292,7,1,3,
+292,8,2,3,
+293,1,1,3,
+294,1,1,3,
+295,1,1,3,
+296,2,1,3,
+297,2,1,3,
+298,1,1,3,
+298,18,2,6,
+299,6,1,3,
+300,1,1,3,
+301,1,1,3,
+302,17,1,3,
+302,8,2,3,
+303,9,1,3,
+303,18,2,6,
+304,9,1,3,
+304,6,2,3,
+305,9,1,3,
+305,6,2,3,
+306,9,1,3,
+306,6,2,3,
+307,2,1,3,
+307,14,2,3,
+308,2,1,3,
+308,14,2,3,
+309,13,1,3,
+310,13,1,3,
+311,13,1,3,
+312,13,1,3,
+313,7,1,3,
+314,7,1,3,
+315,12,1,3,
+315,4,2,3,
+316,4,1,3,
+317,4,1,3,
+318,11,1,3,
+318,17,2,3,
+319,11,1,3,
+319,17,2,3,
+320,11,1,3,
+321,11,1,3,
+322,10,1,3,
+322,5,2,3,
+323,10,1,3,
+323,5,2,3,
+324,10,1,3,
+325,14,1,3,
+326,14,1,3,
+327,1,1,3,
+328,5,1,3,
+329,5,1,3,
+329,16,2,3,
+330,5,1,3,
+330,16,2,3,
+331,12,1,3,
+332,12,1,3,
+332,17,2,3,
+333,1,1,3,
+333,3,2,3,
+334,16,1,3,
+334,3,2,3,
+335,1,1,3,
+336,4,1,3,
+337,6,1,3,
+337,14,2,3,
+338,6,1,3,
+338,14,2,3,
+339,11,1,3,
+339,5,2,3,
+340,11,1,3,
+340,5,2,3,
+341,11,1,3,
+342,11,1,3,
+342,17,2,3,
+343,5,1,3,
+343,14,2,3,
+344,5,1,3,
+344,14,2,3,
+345,6,1,3,
+345,12,2,3,
+346,6,1,3,
+346,12,2,3,
+347,6,1,3,
+347,7,2,3,
+348,6,1,3,
+348,7,2,3,
+349,11,1,3,
+350,11,1,3,
+351,1,1,3,
+352,1,1,3,
+353,8,1,3,
+354,8,1,3,
+355,8,1,3,
+356,8,1,3,
+357,12,1,3,
+357,3,2,3,
+358,14,1,3,
+359,17,1,3,
+360,14,1,3,
+361,15,1,3,
+362,15,1,3,
+363,15,1,3,
+363,11,2,3,
+364,15,1,3,
+364,11,2,3,
+365,15,1,3,
+365,11,2,3,
+366,11,1,3,
+367,11,1,3,
+368,11,1,3,
+369,11,1,3,
+369,6,2,3,
+370,11,1,3,
+371,16,1,3,
+372,16,1,3,
+373,16,1,3,
+373,3,2,3,
+374,9,1,3,
+374,14,2,3,
+375,9,1,3,
+375,14,2,3,
+376,9,1,3,
+376,14,2,3,
+377,6,1,3,
+378,15,1,3,
+379,9,1,3,
+380,16,1,3,
+380,14,2,3,
+381,16,1,3,
+381,14,2,3,
+382,11,1,3,
+383,5,1,3,
+384,16,1,3,
+384,3,2,3,
+385,9,1,3,
+385,14,2,3,
+386,14,1,3,
+387,12,1,4,
+388,12,1,4,
+389,12,1,4,
+389,5,2,4,
+390,10,1,4,
+391,10,1,4,
+391,2,2,4,
+392,10,1,4,
+392,2,2,4,
+393,11,1,4,
+394,11,1,4,
+395,11,1,4,
+395,9,2,4,
+396,1,1,4,
+396,3,2,4,
+397,1,1,4,
+397,3,2,4,
+398,1,1,4,
+398,3,2,4,
+399,1,1,4,
+400,1,1,4,
+400,11,2,4,
+401,7,1,4,
+402,7,1,4,
+403,13,1,4,
+404,13,1,4,
+405,13,1,4,
+406,12,1,4,
+406,4,2,4,
+407,12,1,4,
+407,4,2,4,
+408,6,1,4,
+409,6,1,4,
+410,6,1,4,
+410,9,2,4,
+411,6,1,4,
+411,9,2,4,
+412,7,1,4,
+413,7,1,4,
+413,12,2,4,
+414,7,1,4,
+414,3,2,4,
+415,7,1,4,
+415,3,2,4,
+416,7,1,4,
+416,3,2,4,
+417,13,1,4,
+418,11,1,4,
+419,11,1,4,
+420,12,1,4,
+421,12,1,4,
+422,11,1,4,
+423,11,1,4,
+423,5,2,4,
+424,1,1,4,
+425,8,1,4,
+425,3,2,4,
+426,8,1,4,
+426,3,2,4,
+427,1,1,4,
+428,1,1,4,
+429,8,1,4,
+430,17,1,4,
+430,3,2,4,
+431,1,1,4,
+432,1,1,4,
+433,14,1,4,
+434,4,1,4,
+434,17,2,4,
+435,4,1,4,
+435,17,2,4,
+436,9,1,4,
+436,14,2,4,
+437,9,1,4,
+437,14,2,4,
+438,6,1,4,
+439,14,1,4,
+439,18,2,6,
+440,1,1,4,
+441,1,1,4,
+441,3,2,4,
+442,8,1,4,
+442,17,2,4,
+443,16,1,4,
+443,5,2,4,
+444,16,1,4,
+444,5,2,4,
+445,16,1,4,
+445,5,2,4,
+446,1,1,4,
+447,2,1,4,
+448,2,1,4,
+448,9,2,4,
+449,5,1,4,
+450,5,1,4,
+451,4,1,4,
+451,7,2,4,
+452,4,1,4,
+452,17,2,4,
+453,4,1,4,
+453,2,2,4,
+454,4,1,4,
+454,2,2,4,
+455,12,1,4,
+456,11,1,4,
+457,11,1,4,
+458,11,1,4,
+458,3,2,4,
+459,12,1,4,
+459,15,2,4,
+460,12,1,4,
+460,15,2,4,
+461,17,1,4,
+461,15,2,4,
+462,13,1,4,
+462,9,2,4,
+463,1,1,4,
+464,5,1,4,
+464,6,2,4,
+465,12,1,4,
+466,13,1,4,
+467,10,1,4,
+468,1,1,4,5
+468,18,1,6,
+468,3,2,4,
+469,7,1,4,
+469,3,2,4,
+470,12,1,4,
+471,15,1,4,
+472,5,1,4,
+472,3,2,4,
+473,15,1,4,
+473,5,2,4,
+474,1,1,4,
+475,14,1,4,
+475,2,2,4,
+476,6,1,4,
+476,9,2,4,
+477,8,1,4,
+478,15,1,4,
+478,8,2,4,
+479,13,1,4,
+479,8,2,4,
+480,14,1,4,
+481,14,1,4,
+482,14,1,4,
+483,9,1,4,
+483,16,2,4,
+484,11,1,4,
+484,16,2,4,
+485,10,1,4,
+485,9,2,4,
+486,1,1,4,
+487,8,1,4,
+487,16,2,4,
+488,14,1,4,
+489,11,1,4,
+490,11,1,4,
+491,17,1,4,
+492,12,1,4,
+493,1,1,4,
+494,14,1,5,
+494,10,2,5,
+495,12,1,5,
+496,12,1,5,
+497,12,1,5,
+498,10,1,5,
+499,10,1,5,
+499,2,2,5,
+500,10,1,5,
+500,2,2,5,
+501,11,1,5,
+502,11,1,5,
+503,11,1,5,
+504,1,1,5,
+505,1,1,5,
+506,1,1,5,
+507,1,1,5,
+508,1,1,5,
+509,17,1,5,
+510,17,1,5,
+511,12,1,5,
+512,12,1,5,
+513,10,1,5,
+514,10,1,5,
+515,11,1,5,
+516,11,1,5,
+517,14,1,5,
+518,14,1,5,
+519,1,1,5,
+519,3,2,5,
+520,1,1,5,
+520,3,2,5,
+521,1,1,5,
+521,3,2,5,
+522,13,1,5,
+523,13,1,5,
+524,6,1,5,
+525,6,1,5,
+526,6,1,5,
+527,14,1,5,
+527,3,2,5,
+528,14,1,5,
+528,3,2,5,
+529,5,1,5,
+530,5,1,5,
+530,9,2,5,
+531,1,1,5,
+532,2,1,5,
+533,2,1,5,
+534,2,1,5,
+535,11,1,5,
+536,11,1,5,
+536,5,2,5,
+537,11,1,5,
+537,5,2,5,
+538,2,1,5,
+539,2,1,5,
+540,7,1,5,
+540,12,2,5,
+541,7,1,5,
+541,12,2,5,
+542,7,1,5,
+542,12,2,5,
+543,7,1,5,
+543,4,2,5,
+544,7,1,5,
+544,4,2,5,
+545,7,1,5,
+545,4,2,5,
+546,12,1,5,
+546,18,2,6,
+547,12,1,5,
+547,18,2,6,
+548,12,1,5,
+549,12,1,5,
+550,11,1,5,
+551,5,1,5,
+551,17,2,5,
+552,5,1,5,
+552,17,2,5,
+553,5,1,5,
+553,17,2,5,
+554,10,1,5,
+555,10,1,5,
+556,12,1,5,
+557,7,1,5,
+557,6,2,5,
+558,7,1,5,
+558,6,2,5,
+559,17,1,5,
+559,2,2,5,
+560,17,1,5,
+560,2,2,5,
+561,14,1,5,
+561,3,2,5,
+562,8,1,5,
+563,8,1,5,
+564,11,1,5,
+564,6,2,5,
+565,11,1,5,
+565,6,2,5,
+566,6,1,5,
+566,3,2,5,
+567,6,1,5,
+567,3,2,5,
+568,4,1,5,
+569,4,1,5,
+570,17,1,5,
+571,17,1,5,
+572,1,1,5,
+573,1,1,5,
+574,14,1,5,
+575,14,1,5,
+576,14,1,5,
+577,14,1,5,
+578,14,1,5,
+579,14,1,5,
+580,11,1,5,
+580,3,2,5,
+581,11,1,5,
+581,3,2,5,
+582,15,1,5,
+583,15,1,5,
+584,15,1,5,
+585,1,1,5,
+585,12,2,5,
+586,1,1,5,
+586,12,2,5,
+587,13,1,5,
+587,3,2,5,
+588,7,1,5,
+589,7,1,5,
+589,9,2,5,
+590,12,1,5,
+590,4,2,5,
+591,12,1,5,
+591,4,2,5,
+592,11,1,5,
+592,8,2,5,
+593,11,1,5,
+593,8,2,5,
+594,11,1,5,
+595,7,1,5,
+595,13,2,5,
+596,7,1,5,
+596,13,2,5,
+597,12,1,5,
+597,9,2,5,
+598,12,1,5,
+598,9,2,5,
+599,9,1,5,
+600,9,1,5,
+601,9,1,5,
+602,13,1,5,
+603,13,1,5,
+604,13,1,5,
+605,14,1,5,
+606,14,1,5,
+607,8,1,5,
+607,10,2,5,
+608,8,1,5,
+608,10,2,5,
+609,8,1,5,
+609,10,2,5,
+610,16,1,5,
+611,16,1,5,
+612,16,1,5,
+613,15,1,5,
+614,15,1,5,
+615,15,1,5,
+616,7,1,5,
+617,7,1,5,
+618,5,1,5,
+618,13,2,5,
+619,2,1,5,
+620,2,1,5,
+621,16,1,5,
+622,5,1,5,
+622,8,2,5,
+623,5,1,5,
+623,8,2,5,
+624,17,1,5,
+624,9,2,5,
+625,17,1,5,
+625,9,2,5,
+626,1,1,5,
+627,1,1,5,
+627,3,2,5,
+628,1,1,5,
+628,3,2,5,
+629,17,1,5,
+629,3,2,5,
+630,17,1,5,
+630,3,2,5,
+631,10,1,5,
+632,7,1,5,
+632,9,2,5,
+633,17,1,5,
+633,16,2,5,
+634,17,1,5,
+634,16,2,5,
+635,17,1,5,
+635,16,2,5,
+636,7,1,5,
+636,10,2,5,
+637,7,1,5,
+637,10,2,5,
+638,9,1,5,
+638,2,2,5,
+639,6,1,5,
+639,2,2,5,
+640,12,1,5,
+640,2,2,5,
+641,3,1,5,
+642,13,1,5,
+642,3,2,5,
+643,16,1,5,
+643,10,2,5,
+644,16,1,5,
+644,13,2,5,
+645,5,1,5,
+645,3,2,5,
+646,16,1,5,
+646,15,2,5,
+647,11,1,5,
+647,2,2,5,
+648,1,1,5,
+648,14,2,5,
+649,7,1,5,
+649,9,2,5,
+650,12,1,6,
+651,12,1,6,
+652,12,1,6,
+652,2,2,6,
+653,10,1,6,
+654,10,1,6,
+655,10,1,6,
+655,14,2,6,
+656,11,1,6,
+657,11,1,6,
+658,11,1,6,
+658,17,2,6,
+659,1,1,6,
+660,1,1,6,
+660,5,2,6,
+661,1,1,6,
+661,3,2,6,
+662,10,1,6,
+662,3,2,6,
+663,10,1,6,
+663,3,2,6,
+664,7,1,6,
+665,7,1,6,
+666,7,1,6,
+666,3,2,6,
+667,10,1,6,
+667,1,2,6,
+668,10,1,6,
+668,1,2,6,
+669,18,1,6,
+670,18,1,6,
+671,18,1,6,
+672,12,1,6,
+673,12,1,6,
+674,2,1,6,
+675,2,1,6,
+675,17,2,6,
+676,1,1,6,
+677,14,1,6,
+678,14,1,6,
+679,9,1,6,
+679,8,2,6,
+680,9,1,6,
+680,8,2,6,
+681,9,1,6,
+681,8,2,6,
+682,18,1,6,
+683,18,1,6,
+684,18,1,6,
+685,18,1,6,
+686,17,1,6,
+686,14,2,6,
+687,17,1,6,
+687,14,2,6,
+688,6,1,6,
+688,11,2,6,
+689,6,1,6,
+689,11,2,6,
+690,4,1,6,
+690,11,2,6,
+691,4,1,6,
+691,16,2,6,
+692,11,1,6,
+693,11,1,6,
+694,13,1,6,
+694,1,2,6,
+695,13,1,6,
+695,1,2,6,
+696,6,1,6,
+696,16,2,6,
+697,6,1,6,
+697,16,2,6,
+698,6,1,6,
+698,15,2,6,
+699,6,1,6,
+699,15,2,6,
+700,18,1,6,
+701,2,1,6,
+701,3,2,6,
+702,13,1,6,
+702,18,2,6,
+703,6,1,6,
+703,18,2,6,
+704,16,1,6,
+705,16,1,6,
+706,16,1,6,
+707,9,1,6,
+707,18,2,6,
+708,8,1,6,
+708,12,2,6,
+709,8,1,6,
+709,12,2,6,
+710,8,1,6,
+710,12,2,6,
+711,8,1,6,
+711,12,2,6,
+712,15,1,6,
+713,15,1,6,
+714,3,1,6,
+714,16,2,6,
+715,3,1,6,
+715,16,2,6,
+716,18,1,6,
+717,17,1,6,
+717,3,2,6,
+718,16,1,6,
+718,5,2,6,
+719,6,1,6,
+719,18,2,6,
+720,14,1,6,
+720,8,2,6,
+721,10,1,6,
+721,11,2,6,
+722,12,1,7,
+722,3,2,7,
+723,12,1,7,
+723,3,2,7,
+724,12,1,7,
+724,8,2,7,
+725,10,1,7,
+726,10,1,7,
+727,10,1,7,
+727,17,2,7,
+728,11,1,7,
+729,11,1,7,
+730,11,1,7,
+730,18,2,7,
+731,1,1,7,
+731,3,2,7,
+732,1,1,7,
+732,3,2,7,
+733,1,1,7,
+733,3,2,7,
+734,1,1,7,
+735,1,1,7,
+736,7,1,7,
+737,7,1,7,
+737,13,2,7,
+738,7,1,7,
+738,13,2,7,
+739,2,1,7,
+740,2,1,7,
+740,15,2,7,
+741,10,1,7,
+741,3,2,7,
+742,7,1,7,
+742,18,2,7,
+743,7,1,7,
+743,18,2,7,
+744,6,1,7,
+745,6,1,7,
+746,11,1,7,
+747,4,1,7,
+747,11,2,7,
+748,4,1,7,
+748,11,2,7,
+749,5,1,7,
+750,5,1,7,
+751,11,1,7,
+751,7,2,7,
+752,11,1,7,
+752,7,2,7,
+753,12,1,7,
+754,12,1,7,
+755,12,1,7,
+755,18,2,7,
+756,12,1,7,
+756,18,2,7,
+757,4,1,7,
+757,10,2,7,
+758,4,1,7,
+758,10,2,7,
+759,1,1,7,
+759,2,2,7,
+760,1,1,7,
+760,2,2,7,
+761,12,1,7,
+762,12,1,7,
+763,12,1,7,
+764,18,1,7,
+765,1,1,7,
+765,14,2,7,
+766,2,1,7,
+767,7,1,7,
+767,11,2,7,
+768,7,1,7,
+768,11,2,7,
+769,8,1,7,
+769,5,2,7,
+770,8,1,7,
+770,5,2,7,
+771,11,1,7,
+772,1,1,7,
+773,1,1,7,
+774,6,1,7,
+774,3,2,7,
+775,1,1,7,
+776,10,1,7,
+776,16,2,7,
+777,13,1,7,
+777,9,2,7,
+778,8,1,7,
+778,18,2,7,
+779,11,1,7,
+779,14,2,7,
+780,1,1,7,
+780,16,2,7,
+781,8,1,7,
+781,12,2,7,
+782,16,1,7,
+783,16,1,7,
+783,2,2,7,
+784,16,1,7,
+784,2,2,7,
+785,13,1,7,
+785,18,2,7,
+786,14,1,7,
+786,18,2,7,
+787,12,1,7,
+787,18,2,7,
+788,11,1,7,
+788,18,2,7,
+789,14,1,7,
+790,14,1,7,
+791,14,1,7,
+791,9,2,7,
+792,14,1,7,
+792,8,2,7,
+793,6,1,7,
+793,4,2,7,
+794,7,1,7,
+794,2,2,7,
+795,7,1,7,
+795,2,2,7,
+796,13,1,7,
+797,9,1,7,
+797,3,2,7,
+798,12,1,7,
+798,9,2,7,
+799,17,1,7,
+799,16,2,7,
+800,14,1,7,
+801,9,1,7,
+801,18,2,7,
+802,2,1,7,
+802,8,2,7,
+10001,14,1,3,
+10002,14,1,3,
+10003,14,1,3,
+10004,7,1,4,
+10004,5,2,4,
+10005,7,1,4,
+10005,9,2,4,
+10006,12,1,4,
+10006,3,2,4,
+10007,8,1,4,
+10007,16,2,4,
+10008,13,1,4,
+10008,10,2,4,
+10009,13,1,4,
+10009,11,2,4,
+10010,13,1,4,
+10010,15,2,4,
+10011,13,1,4,
+10011,3,2,4,
+10012,13,1,4,
+10012,12,2,4,
+10013,10,1,3,
+10014,11,1,3,
+10015,15,1,3,
+10016,11,1,5,
+10017,10,1,5,
+10017,14,2,5,
+10018,1,1,5,
+10018,2,2,5,
+10019,3,1,5,
+10020,13,1,5,
+10020,3,2,5,
+10021,5,1,5,
+10021,3,2,5,
+10022,16,1,5,
+10022,15,2,5,
+10023,16,1,5,
+10023,15,2,5,
+10024,11,1,5,
+10024,2,2,5,
+10025,14,1,6,
+10026,9,1,6,
+10026,8,2,6,
+10027,8,1,6,
+10027,12,2,6,
+10028,8,1,6,
+10028,12,2,6,
+10029,8,1,6,
+10029,12,2,6,
+10030,8,1,6,
+10030,12,2,6,
+10031,8,1,6,
+10031,12,2,6,
+10032,8,1,6,
+10032,12,2,6,
+10033,12,1,1,
+10033,4,2,1,
+10034,10,1,1,
+10034,16,2,1,
+10035,10,1,1,
+10035,3,2,1,
+10036,11,1,1,
+10037,14,1,1,
+10038,8,1,1,
+10038,4,2,1,
+10039,1,1,1,
+10040,7,1,1,
+10040,3,2,1,
+10041,11,1,1,
+10041,17,2,1,
+10042,6,1,1,
+10042,3,2,1,
+10043,14,1,1,
+10043,2,2,1,
+10044,14,1,1,
+10045,13,1,2,
+10045,16,2,2,
+10046,7,1,2,
+10046,9,2,2,
+10047,7,1,2,
+10047,2,2,2,
+10048,17,1,2,
+10048,10,2,2,
+10049,6,1,2,
+10049,17,2,2,
+10050,10,1,3,
+10050,2,2,3,
+10051,14,1,3,
+10051,18,2,3,
+10052,9,1,3,
+10052,18,2,3,
+10053,9,1,3,
+10054,2,1,3,
+10054,14,2,3,
+10055,13,1,3,
+10056,8,1,3,
+10057,17,1,3,
+10058,16,1,4,
+10058,5,2,4,
+10059,2,1,4,
+10059,9,2,4,
+10060,12,1,4,
+10060,15,2,4,
+10061,18,1,6,
+10062,16,1,3,
+10062,14,2,3,
+10063,16,1,3,
+10063,14,2,3,
+10064,11,1,3,
+10064,5,2,3,
+10065,12,1,3,
+10065,16,2,3,
+10066,17,1,3,
+10066,8,2,3,
+10067,16,1,3,
+10067,18,2,3,
+10068,14,1,4,
+10068,2,2,4,
+10069,1,1,5,
+10069,18,2,5,
+10070,11,1,3,
+10070,17,2,3,
+10071,11,1,1,
+10071,14,2,1,
+10072,9,1,2,
+10072,5,2,2,
+10073,1,1,1,
+10073,3,2,1,
+10074,15,1,3,
+10075,6,1,6,
+10075,18,2,6,
+10076,9,1,3,
+10076,14,2,3,
+10077,11,1,3,
+10078,5,1,3,
+10078,10,2,3,
+10079,16,1,3,
+10079,3,2,3,
+10080,13,1,1,
+10081,13,1,1,
+10082,13,1,1,
+10083,13,1,1,
+10084,13,1,1,
+10085,13,1,1,
+10086,14,1,6,
+10086,17,2,6,
+10087,10,1,3,
+10087,5,2,3,
+10088,1,1,4,
+10088,2,2,4,
+10089,16,1,3,
+10089,3,2,3,
+10090,7,1,1,
+10090,4,2,1,
+10091,17,1,1,
+10091,1,2,1,
+10092,17,1,1,
+10092,1,2,1,
+10093,17,1,1,
+10093,1,2,1,
+10094,13,1,1,
+10095,13,1,1,
+10096,13,1,1,
+10097,13,1,1,
+10098,13,1,1,
+10099,13,1,1,
+10100,13,1,1,
+10100,14,2,1,
+10101,15,1,1,
+10101,9,2,1,
+10102,15,1,1,
+10102,9,2,1,
+10103,15,1,1,
+10104,15,1,1,
+10104,18,2,1,
+10105,5,1,1,
+10105,9,2,1,
+10106,5,1,1,
+10106,9,2,1,
+10107,17,1,1,
+10108,17,1,1,
+10109,6,1,1,
+10109,13,2,1,
+10110,6,1,1,
+10110,13,2,1,
+10111,6,1,1,
+10111,13,2,1,
+10112,4,1,1,
+10112,17,2,1,
+10113,4,1,1,
+10113,17,2,1,
+10114,12,1,1,
+10114,16,2,1,
+10115,10,1,1,
+10115,8,2,1,
+10116,11,1,6,
+10116,17,2,6,
+10117,11,1,6,
+10117,17,2,6,
+10118,16,1,6,
+10118,5,2,6,
+10119,16,1,6,
+10119,5,2,6,
+10120,16,1,6,
+10120,5,2,6,
+10121,1,1,7,
+10122,7,1,7,
+10122,13,2,7,
+10123,13,1,7,
+10123,3,2,7,
+10124,14,1,7,
+10124,3,2,7,
+10125,8,1,7,
+10125,3,2,7,
+10126,6,1,7,
+10127,11,1,7,
+10128,12,1,7,
+10129,4,1,7,
+10129,10,2,7,
+10130,6,1,7,
+10130,3,2,7,
+10131,6,1,7,
+10131,3,2,7,
+10132,6,1,7,
+10132,3,2,7,
+10133,6,1,7,
+10133,3,2,7,
+10134,6,1,7,
+10134,3,2,7,
+10135,6,1,7,
+10135,3,2,7,
+10136,6,1,7,
+10136,3,2,7,
+10137,6,1,7,
+10137,3,2,7,
+10138,6,1,7,
+10138,3,2,7,
+10139,6,1,7,
+10139,3,2,7,
+10140,6,1,7,
+10140,3,2,7,
+10141,6,1,7,
+10141,3,2,7,
+10142,6,1,7,
+10142,3,2,7,
+10143,8,1,7,
+10143,18,2,7,
+10144,8,1,7,
+10144,18,2,7,
+10145,8,1,7,
+10145,18,2,7,
+10146,16,1,7,
+10146,2,2,7,
+10147,9,1,7,
+10147,18,2,7,
diff --git a/pokedex/data/csv/type_efficacy.csv b/pokedex/data/csv/type_efficacy.csv
index 057f025..9ff8816 100644
--- a/pokedex/data/csv/type_efficacy.csv
+++ b/pokedex/data/csv/type_efficacy.csv
@@ -1,126 +1,126 @@
 damage_type_id,target_type_id,damage_modifier,first_generation_id,last_generation_id
 1,8,0,1,
-1,9,50,2,
 1,6,50,1,
-10,6,50,1,
-10,9,200,2,
-10,16,50,1,
-10,15,200,1,
-10,12,200,1,
-10,11,50,1,
-10,10,50,1,
-10,7,200,1,
-11,6,200,1,
-11,5,200,1,
-11,16,50,1,
-11,12,50,1,
-11,11,50,1,
-11,10,200,1,
-12,10,50,1,
-12,7,50,1,
-12,6,200,1,
-12,5,200,1,
-12,4,50,1,
-12,3,50,1,
-12,16,50,1,
-12,12,50,1,
-12,9,50,2,
-12,11,200,1,
-13,11,200,1,
-13,3,200,1,
-13,16,50,1,
-13,13,50,1,
-13,12,50,1,
-13,5,0,1,
-14,9,50,2,
-14,14,50,1,
-14,17,0,2,
-14,2,200,1,
-14,4,200,1,
-15,9,50,2,
-15,10,50,2,
-15,3,200,1,
-15,5,200,1,
-15,11,50,1,
-15,12,200,1,
-15,15,50,1,
-15,16,200,1,
-16,16,200,1,
-16,9,50,2,
-16,18,0,6,
-17,17,50,2,
-17,18,50,6,
-17,9,50,2,5
-17,2,50,2,
-17,8,200,2,
-17,14,200,2,
-18,17,200,6,
-18,9,50,6,
-18,16,200,6,
-18,10,50,6,
-18,2,200,6,
-18,4,50,6,
-2,15,200,1,
-2,14,50,1,
+1,9,50,2,
 2,8,0,1,
-2,7,50,1,
-2,9,200,2,
-2,18,50,6,
-2,17,200,2,
-2,6,200,1,
-2,4,50,1,
 2,3,50,1,
+2,4,50,1,
+2,7,50,1,
+2,14,50,1,
+2,18,50,6,
 2,1,200,1,
-3,9,50,2,
-3,2,200,1,
+2,6,200,1,
+2,9,200,2,
+2,15,200,1,
+2,17,200,2,
 3,6,50,1,
+3,9,50,2,
+3,13,50,1,
+3,2,200,1,
 3,7,200,1,
 3,12,200,1,
-3,13,50,1,
-4,18,200,6,
+4,9,0,2,
 4,4,50,1,
 4,5,50,1,
 4,6,50,1,
 4,8,50,1,
-4,12,200,1,
-4,9,0,2,
 4,7,200,1,1
+4,12,200,1,
+4,18,200,6,
 5,3,0,1,
-5,12,50,1,
-5,13,200,1,
-5,4,200,1,
-5,10,200,1,
-5,6,200,1,
 5,7,50,1,
+5,12,50,1,
+5,4,200,1,
+5,6,200,1,
 5,9,200,2,
-6,7,200,1,
-6,9,50,2,
-6,15,200,1,
-6,10,200,1,
-6,3,200,1,
-6,5,50,1,
+5,10,200,1,
+5,13,200,1,
 6,2,50,1,
-7,9,50,2,
-7,4,50,2,
-7,14,200,1,
-7,12,200,1,
-7,17,200,2,
-7,10,50,1,
-7,8,50,1,
-7,3,50,1,
+6,5,50,1,
+6,9,50,2,
+6,3,200,1,
+6,7,200,1,
+6,10,200,1,
+6,15,200,1,
 7,2,50,1,
+7,3,50,1,
+7,4,50,2,
+7,8,50,1,
+7,9,50,2,
+7,10,50,1,
 7,18,50,6,
 7,4,200,1,1
-8,14,200,2,
+7,12,200,1,
+7,14,200,1,
+7,17,200,2,
 8,1,0,1,
-8,8,200,1,
-8,9,50,2,5
 8,14,0,1,1
+8,9,50,2,5
 8,17,50,2,
-9,11,50,2,
-9,10,50,2,
-9,6,200,2,
+8,8,200,1,
+8,14,200,2,
 9,9,50,2,
+9,10,50,2,
+9,11,50,2,
+9,13,50,2,
+9,6,200,2,
 9,15,200,2,
 9,18,200,6,
-9,13,50,2,
+10,6,50,1,
+10,10,50,1,
+10,11,50,1,
+10,16,50,1,
+10,7,200,1,
+10,9,200,2,
+10,12,200,1,
+10,15,200,1,
+11,11,50,1,
+11,12,50,1,
+11,16,50,1,
+11,5,200,1,
+11,6,200,1,
+11,10,200,1,
+12,3,50,1,
+12,4,50,1,
+12,7,50,1,
+12,9,50,2,
+12,10,50,1,
+12,12,50,1,
+12,16,50,1,
+12,5,200,1,
+12,6,200,1,
+12,11,200,1,
+13,5,0,1,
+13,12,50,1,
+13,13,50,1,
+13,16,50,1,
+13,3,200,1,
+13,11,200,1,
+14,17,0,2,
+14,9,50,2,
+14,14,50,1,
+14,2,200,1,
+14,4,200,1,
+15,9,50,2,
+15,10,50,2,
+15,11,50,1,
+15,15,50,1,
+15,3,200,1,
+15,5,200,1,
+15,12,200,1,
+15,16,200,1,
+16,18,0,6,
+16,9,50,2,
+16,16,200,1,
+17,2,50,2,
+17,9,50,2,5
+17,17,50,2,
+17,18,50,6,
+17,8,200,2,
+17,14,200,2,
+18,4,50,6,
+18,9,50,6,
+18,10,50,6,
+18,2,200,6,
+18,16,200,6,
+18,17,200,6,