From f11058dd2f31bbc17c4bedd47a8b8b9a1ccc2d5a Mon Sep 17 00:00:00 2001
From: "Lynn \"Zhorken\" Vaughan" <zhorken@gmail.com>
Date: Tue, 7 Aug 2012 00:13:00 -0400
Subject: [PATCH] Toss the capacity column now that it's a stat.
---
pokedex/data/csv/conquest_warrior_ranks.csv | 486 ++++++++++----------
pokedex/db/tables.py | 2 -
2 files changed, 243 insertions(+), 245 deletions(-)
diff --git a/pokedex/data/csv/conquest_warrior_ranks.csv b/pokedex/data/csv/conquest_warrior_ranks.csv
index e695028..127e2fe 100644
--- a/pokedex/data/csv/conquest_warrior_ranks.csv
+++ b/pokedex/data/csv/conquest_warrior_ranks.csv
@@ -1,243 +1,243 @@
-id,warrior_id,rank,skill_id,capacity
-1,1,1,3,4
-2,1,2,24,6
-3,1,3,25,8
-4,2,1,3,4
-5,2,2,24,6
-6,2,3,25,8
-7,3,1,26,5
-8,3,2,27,8
-9,4,1,6,4
-10,4,2,28,5
-11,5,1,15,6
-12,5,2,29,7
-13,5,3,30,8
-14,6,1,4,6
-15,6,2,31,7
-16,7,1,5,5
-17,7,2,32,6
-18,8,1,8,7
-19,8,2,33,8
-20,9,1,10,5
-21,9,2,34,6
-22,10,1,7,6
-23,10,2,35,7
-24,11,1,4,5
-25,11,2,36,6
-26,12,1,4,7
-27,12,2,37,8
-28,13,1,5,7
-29,13,2,38,8
-30,14,1,5,7
-31,14,2,39,8
-32,15,1,17,5
-33,15,2,40,6
-34,16,1,8,7
-35,16,2,41,8
-36,17,1,13,5
-37,17,2,42,6
-38,18,1,15,5
-39,18,2,43,6
-40,19,1,8,8
-41,19,2,44,8
-42,20,1,13,5
-43,20,2,45,6
-44,21,1,14,5
-45,21,2,46,6
-46,22,1,11,6
-47,22,2,47,7
-48,23,1,13,5
-49,23,2,48,5
-50,24,1,11,5
-51,24,2,49,6
-52,25,1,18,5
-53,25,2,50,5
-54,26,1,7,6
-55,26,2,51,7
-56,27,1,10,6
-57,27,2,52,7
-58,28,1,4,7
-59,28,2,53,7
-60,29,1,6,5
-61,29,2,54,5
-62,30,1,15,5
-63,30,2,55,6
-64,31,1,18,3
-65,31,2,56,4
-66,32,1,16,4
-67,32,2,57,5
-68,33,1,14,6
-69,33,2,58,6
-70,34,1,10,5
-71,34,2,59,6
-72,35,1,7,6
-73,35,2,60,7
-74,36,1,11,5
-75,36,2,61,5
-76,37,1,16,5
-77,37,2,62,6
-78,38,1,14,5
-79,38,2,63,6
-80,39,1,19,7
-81,40,1,15,6
-82,41,1,7,6
-83,42,1,21,7
-84,43,1,8,7
-85,44,1,20,7
-86,45,1,19,2
-87,46,1,2,4
-88,47,1,20,4
-89,48,1,11,6
-90,49,1,16,5
-91,50,1,4,6
-92,51,1,9,2
-93,52,1,5,5
-94,53,1,14,6
-95,54,1,3,6
-96,55,1,21,5
-97,56,1,1,5
-98,57,1,6,2
-99,58,1,10,2
-100,59,1,18,5
-101,60,1,7,4
-102,61,1,13,6
-103,62,1,16,6
-104,63,1,17,6
-105,64,1,20,5
-106,65,1,19,3
-107,66,1,19,3
-108,67,1,17,5
-109,68,1,1,5
-110,69,1,10,2
-111,70,1,2,3
-112,71,1,22,4
-113,72,1,9,2
-114,73,1,13,3
-115,74,1,6,4
-116,75,1,3,3
-117,76,1,10,5
-118,77,1,8,6
-119,78,1,9,5
-120,79,1,21,4
-121,80,1,5,4
-122,81,1,2,5
-123,82,1,17,3
-124,83,1,11,7
-125,84,1,4,7
-126,85,1,4,6
-127,86,1,17,6
-128,87,1,2,4
-129,88,1,3,5
-130,89,1,22,3
-131,90,1,7,7
-132,91,1,1,7
-133,92,1,2,5
-134,93,1,9,5
-135,94,1,18,2
-136,95,1,8,6
-137,96,1,9,5
-138,97,1,21,5
-139,98,1,14,5
-140,99,1,16,3
-141,100,1,19,3
-142,101,1,22,3
-143,102,1,7,6
-144,103,1,2,6
-145,104,1,20,5
-146,105,1,2,5
-147,106,1,3,5
-148,107,1,14,7
-149,108,1,12,5
-150,109,1,5,4
-151,110,1,8,3
-152,111,1,23,4
-153,112,1,5,3
-154,113,1,5,3
-155,114,1,9,3
-156,115,1,10,5
-157,116,1,12,3
-158,117,1,7,6
-159,118,1,15,5
-160,119,1,17,6
-161,120,1,8,5
-162,121,1,17,5
-163,122,1,18,7
-164,123,1,14,6
-165,124,1,12,3
-166,125,1,10,4
-167,126,1,1,5
-168,127,1,2,6
-169,128,1,5,5
-170,129,1,1,4
-171,130,1,12,3
-172,131,1,17,5
-173,132,1,9,5
-174,133,1,20,4
-175,134,1,13,4
-176,135,1,11,6
-177,136,1,4,6
-178,137,1,21,5
-179,138,1,7,5
-180,139,1,23,5
-181,140,1,19,5
-182,141,1,14,4
-183,142,1,20,4
-184,143,1,22,5
-185,144,1,8,4
-186,145,1,22,7
-187,146,1,13,1
-188,147,1,15,6
-189,148,1,4,5
-190,149,1,7,6
-191,150,1,23,3
-192,151,1,3,4
-193,152,1,9,2
-194,153,1,15,7
-195,154,1,11,7
-196,155,1,22,5
-197,156,1,1,7
-198,157,1,21,7
-199,158,1,8,6
-200,159,1,23,4
-201,160,1,4,4
-202,161,1,16,3
-203,162,1,15,8
-204,163,1,23,5
-205,164,1,4,5
-206,165,1,13,6
-207,166,1,5,4
-208,167,1,19,5
-209,168,1,6,3
-210,169,1,21,3
-211,170,1,3,3
-212,171,1,10,3
-213,172,1,9,3
-214,173,1,3,3
-215,174,1,16,6
-216,175,1,18,6
-217,176,1,11,6
-218,177,1,19,3
-219,178,1,19,5
-220,179,1,23,5
-221,180,1,13,2
-222,181,1,20,2
-223,182,1,14,3
-224,183,1,10,4
-225,184,1,13,4
-226,185,1,20,4
-227,186,1,5,4
-228,187,1,15,4
-229,188,1,16,4
-230,189,1,20,4
-231,190,1,9,4
-232,191,1,3,4
-233,192,1,12,4
-234,193,1,12,4
-235,194,1,1,4
-236,195,1,18,6
-237,196,1,23,3
-238,197,1,15,6
-239,198,1,14,5
-240,199,1,7,5
-241,200,1,4,4
-242,201,1,6,3
+id,warrior_id,rank,skill_id
+1,1,1,3
+2,1,2,24
+3,1,3,25
+4,2,1,3
+5,2,2,24
+6,2,3,25
+7,3,1,26
+8,3,2,27
+9,4,1,6
+10,4,2,28
+11,5,1,15
+12,5,2,29
+13,5,3,30
+14,6,1,4
+15,6,2,31
+16,7,1,5
+17,7,2,32
+18,8,1,8
+19,8,2,33
+20,9,1,10
+21,9,2,34
+22,10,1,7
+23,10,2,35
+24,11,1,4
+25,11,2,36
+26,12,1,4
+27,12,2,37
+28,13,1,5
+29,13,2,38
+30,14,1,5
+31,14,2,39
+32,15,1,17
+33,15,2,40
+34,16,1,8
+35,16,2,41
+36,17,1,13
+37,17,2,42
+38,18,1,15
+39,18,2,43
+40,19,1,8
+41,19,2,44
+42,20,1,13
+43,20,2,45
+44,21,1,14
+45,21,2,46
+46,22,1,11
+47,22,2,47
+48,23,1,13
+49,23,2,48
+50,24,1,11
+51,24,2,49
+52,25,1,18
+53,25,2,50
+54,26,1,7
+55,26,2,51
+56,27,1,10
+57,27,2,52
+58,28,1,4
+59,28,2,53
+60,29,1,6
+61,29,2,54
+62,30,1,15
+63,30,2,55
+64,31,1,18
+65,31,2,56
+66,32,1,16
+67,32,2,57
+68,33,1,14
+69,33,2,58
+70,34,1,10
+71,34,2,59
+72,35,1,7
+73,35,2,60
+74,36,1,11
+75,36,2,61
+76,37,1,16
+77,37,2,62
+78,38,1,14
+79,38,2,63
+80,39,1,19
+81,40,1,15
+82,41,1,7
+83,42,1,21
+84,43,1,8
+85,44,1,20
+86,45,1,19
+87,46,1,2
+88,47,1,20
+89,48,1,11
+90,49,1,16
+91,50,1,4
+92,51,1,9
+93,52,1,5
+94,53,1,14
+95,54,1,3
+96,55,1,21
+97,56,1,1
+98,57,1,6
+99,58,1,10
+100,59,1,18
+101,60,1,7
+102,61,1,13
+103,62,1,16
+104,63,1,17
+105,64,1,20
+106,65,1,19
+107,66,1,19
+108,67,1,17
+109,68,1,1
+110,69,1,10
+111,70,1,2
+112,71,1,22
+113,72,1,9
+114,73,1,13
+115,74,1,6
+116,75,1,3
+117,76,1,10
+118,77,1,8
+119,78,1,9
+120,79,1,21
+121,80,1,5
+122,81,1,2
+123,82,1,17
+124,83,1,11
+125,84,1,4
+126,85,1,4
+127,86,1,17
+128,87,1,2
+129,88,1,3
+130,89,1,22
+131,90,1,7
+132,91,1,1
+133,92,1,2
+134,93,1,9
+135,94,1,18
+136,95,1,8
+137,96,1,9
+138,97,1,21
+139,98,1,14
+140,99,1,16
+141,100,1,19
+142,101,1,22
+143,102,1,7
+144,103,1,2
+145,104,1,20
+146,105,1,2
+147,106,1,3
+148,107,1,14
+149,108,1,12
+150,109,1,5
+151,110,1,8
+152,111,1,23
+153,112,1,5
+154,113,1,5
+155,114,1,9
+156,115,1,10
+157,116,1,12
+158,117,1,7
+159,118,1,15
+160,119,1,17
+161,120,1,8
+162,121,1,17
+163,122,1,18
+164,123,1,14
+165,124,1,12
+166,125,1,10
+167,126,1,1
+168,127,1,2
+169,128,1,5
+170,129,1,1
+171,130,1,12
+172,131,1,17
+173,132,1,9
+174,133,1,20
+175,134,1,13
+176,135,1,11
+177,136,1,4
+178,137,1,21
+179,138,1,7
+180,139,1,23
+181,140,1,19
+182,141,1,14
+183,142,1,20
+184,143,1,22
+185,144,1,8
+186,145,1,22
+187,146,1,13
+188,147,1,15
+189,148,1,4
+190,149,1,7
+191,150,1,23
+192,151,1,3
+193,152,1,9
+194,153,1,15
+195,154,1,11
+196,155,1,22
+197,156,1,1
+198,157,1,21
+199,158,1,8
+200,159,1,23
+201,160,1,4
+202,161,1,16
+203,162,1,15
+204,163,1,23
+205,164,1,4
+206,165,1,13
+207,166,1,5
+208,167,1,19
+209,168,1,6
+210,169,1,21
+211,170,1,3
+212,171,1,10
+213,172,1,9
+214,173,1,3
+215,174,1,16
+216,175,1,18
+217,176,1,11
+218,177,1,19
+219,178,1,19
+220,179,1,23
+221,180,1,13
+222,181,1,20
+223,182,1,14
+224,183,1,10
+225,184,1,13
+226,185,1,20
+227,186,1,5
+228,187,1,15
+229,188,1,16
+230,189,1,20
+231,190,1,9
+232,191,1,3
+233,192,1,12
+234,193,1,12
+235,194,1,1
+236,195,1,18
+237,196,1,23
+238,197,1,15
+239,198,1,14
+240,199,1,7
+241,200,1,4
+242,201,1,6
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 18dfda4..572910b 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -471,8 +471,6 @@ class ConquestWarriorRank(TableBase):
info=dict(description=u'The rank number.'))
skill_id = Column(Integer, ForeignKey('conquest_warrior_skills.id'), nullable=False,
info=dict(description=u"The ID of this warrior rank's warrior skill."))
- capacity = Column(Integer, nullable=False,
- info=dict(description=u'The number of Pokémon this warrior rank can be linked with at a time.'))
__table_args__ = (
UniqueConstraint(warrior_id, rank),