veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Added contest combos.

Browse source
This commit is contained in:
Eevee 2009-09-15 20:04:22 -07:00
parent 6eb581d76e
commit 7aa391c96f
3 changed files with 278 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

247
pokedex/data/csv/contest_combos.csv Normal file
View file

@ -0,0 +1,247 @@
first_move_id,second_move_id
1,3
1,29
1,185
7,8
7,9
8,7
8,9
9,7
9,8
10,154
10,163
11,12
11,20
14,15
14,152
14,163
14,206
14,210
14,306
28,189
30,31
30,32
43,10
43,23
43,30
43,33
43,44
43,137
43,184
43,185
47,195
47,287
57,291
64,31
64,65
74,22
74,71
74,72
74,73
74,75
74,76
74,80
74,202
74,331
74,338
74,345
82,225
82,337
82,349
88,157
88,317
89,90
89,284
93,94
93,100
93,134
93,248
94,93
94,100
94,134
94,248
95,138
95,171
99,37
99,43
99,184
104,97
104,98
104,100
106,33
106,36
106,38
106,182
106,205
111,33
111,205
116,2
116,5
116,21
116,25
116,36
116,38
116,167
116,198
116,223
116,238
116,264
116,280
116,292
116,327
123,108
124,188
125,155
125,198
134,93
134,94
134,100
134,248
135,121
155,125
155,198
156,173
156,214
170,5
170,25
170,26
170,66
170,136
170,223
170,276
170,329
174,180
174,194
174,212
174,288
181,59
184,43
184,44
184,162
184,242
187,156
188,124
189,28
189,300
198,125
198,155
199,87
199,161
199,190
199,192
199,276
201,28
201,189
201,300
201,311
201,328
201,341
203,175
203,179
203,194
203,220
203,283
203,284
204,39
204,45
204,156
204,186
204,260
212,194
212,195
225,82
225,337
225,349
230,77
230,78
230,79
240,3
240,55
240,56
240,57
240,61
240,87
240,127
240,128
240,145
240,152
240,190
240,291
240,308
240,311
240,323
240,330
240,346
240,352
241,7
241,27
241,52
241,53
241,76
241,83
241,126
241,172
241,221
241,234
241,235
241,236
241,257
241,284
241,299
241,307
241,311
241,315
252,69
252,185
252,233
252,282
252,292
254,255
254,256
258,58
258,59
258,62
258,114
258,181
258,196
258,301
258,311
258,329
258,333
268,9
268,84
268,85
268,86
268,87
268,192
268,209
268,344
268,351
269,68
269,197
269,243
281,156
281,303
291,57
300,55
300,189
300,346
319,232
346,55
346,287
346,300
347,60
347,93
347,94
347,96
347,113
347,115
347,138
347,149
347,248
347,295
347,296
347,354
349,82
349,225
349,337
1 first_move_id second_move_id
2 1 3
3 1 29
4 1 185
5 7 8
6 7 9
7 8 7
8 8 9
9 9 7
10 9 8
11 10 154
12 10 163
13 11 12
14 11 20
15 14 15
16 14 152
17 14 163
18 14 206
19 14 210
20 14 306
21 28 189
22 30 31
23 30 32
24 43 10
25 43 23
26 43 30
27 43 33
28 43 44
29 43 137
30 43 184
31 43 185
32 47 195
33 47 287
34 57 291
35 64 31
36 64 65
37 74 22
38 74 71
39 74 72
40 74 73
41 74 75
42 74 76
43 74 80
44 74 202
45 74 331
46 74 338
47 74 345
48 82 225
49 82 337
50 82 349
51 88 157
52 88 317
53 89 90
54 89 284
55 93 94
56 93 100
57 93 134
58 93 248
59 94 93
60 94 100
61 94 134
62 94 248
63 95 138
64 95 171
65 99 37
66 99 43
67 99 184
68 104 97
69 104 98
70 104 100
71 106 33
72 106 36
73 106 38
74 106 182
75 106 205
76 111 33
77 111 205
78 116 2
79 116 5
80 116 21
81 116 25
82 116 36
83 116 38
84 116 167
85 116 198
86 116 223
87 116 238
88 116 264
89 116 280
90 116 292
91 116 327
92 123 108
93 124 188
94 125 155
95 125 198
96 134 93
97 134 94
98 134 100
99 134 248
100 135 121
101 155 125
102 155 198
103 156 173
104 156 214
105 170 5
106 170 25
107 170 26
108 170 66
109 170 136
110 170 223
111 170 276
112 170 329
113 174 180
114 174 194
115 174 212
116 174 288
117 181 59
118 184 43
119 184 44
120 184 162
121 184 242
122 187 156
123 188 124
124 189 28
125 189 300
126 198 125
127 198 155
128 199 87
129 199 161
130 199 190
131 199 192
132 199 276
133 201 28
134 201 189
135 201 300
136 201 311
137 201 328
138 201 341
139 203 175
140 203 179
141 203 194
142 203 220
143 203 283
144 203 284
145 204 39
146 204 45
147 204 156
148 204 186
149 204 260
150 212 194
151 212 195
152 225 82
153 225 337
154 225 349
155 230 77
156 230 78
157 230 79
158 240 3
159 240 55
160 240 56
161 240 57
162 240 61
163 240 87
164 240 127
165 240 128
166 240 145
167 240 152
168 240 190
169 240 291
170 240 308
171 240 311
172 240 323
173 240 330
174 240 346
175 240 352
176 241 7
177 241 27
178 241 52
179 241 53
180 241 76
181 241 83
182 241 126
183 241 172
184 241 221
185 241 234
186 241 235
187 241 236
188 241 257
189 241 284
190 241 299
191 241 307
192 241 311
193 241 315
194 252 69
195 252 185
196 252 233
197 252 282
198 252 292
199 254 255
200 254 256
201 258 58
202 258 59
203 258 62
204 258 114
205 258 181
206 258 196
207 258 301
208 258 311
209 258 329
210 258 333
211 268 9
212 268 84
213 268 85
214 268 86
215 268 87
216 268 192
217 268 209
218 268 344
219 268 351
220 269 68
221 269 197
222 269 243
223 281 156
224 281 303
225 291 57
226 300 55
227 300 189
228 300 346
229 319 232
230 346 55
231 346 287
232 346 300
233 347 60
234 347 93
235 347 94
236 347 96
237 347 113
238 347 115
239 347 138
240 347 149
241 347 248
242 347 295
243 347 296
244 347 354
245 349 82
246 349 225
247 349 337

7
pokedex/data/csv/super_contest_combos.csv Normal file
View file

@ -0,0 +1,7 @@
first_move_id,second_move_id
74,345
96,136
111,205
116,400
244,56
268,422
1 first_move_id second_move_id
2 74 345
3 96 136
4 111 205
5 116 400
6 244 56
7 268 422

24
pokedex/db/tables.py
View file

@ -20,6 +20,11 @@ class Ability(TableBase):
flavor_text = Column(Unicode(64), nullable=False) flavor_text = Column(Unicode(64), nullable=False)
effect = Column(Unicode(255), nullable=False) effect = Column(Unicode(255), nullable=False)
class ContestCombo(TableBase):
__tablename__ = 'contest_combos'
first_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False)
second_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False)
class ContestEffect(TableBase): class ContestEffect(TableBase):
__tablename__ = 'contest_effects' __tablename__ = 'contest_effects'
id = Column(Integer, primary_key=True, nullable=False) id = Column(Integer, primary_key=True, nullable=False)
@ -387,6 +392,11 @@ class Stat(TableBase):
id = Column(Integer, primary_key=True, nullable=False) id = Column(Integer, primary_key=True, nullable=False)
name = Column(Unicode(16), nullable=False) name = Column(Unicode(16), nullable=False)
class SuperContestCombo(TableBase):
__tablename__ = 'super_contest_combos'
first_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False)
second_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False)
class SuperContestEffect(TableBase): class SuperContestEffect(TableBase):
__tablename__ = 'super_contest_effects' __tablename__ = 'super_contest_effects'
id = Column(Integer, primary_key=True, nullable=False) id = Column(Integer, primary_key=True, nullable=False)
@ -419,6 +429,11 @@ class Version(TableBase):
### Relations down here, to avoid ordering problems ### Relations down here, to avoid ordering problems
ContestCombo.first = relation(Move, primaryjoin=ContestCombo.first_move_id==Move.id,
backref='contest_combo_first')
ContestCombo.second = relation(Move, primaryjoin=ContestCombo.second_move_id==Move.id,
backref='contest_combo_second')
Encounter.pokemon = relation(Pokemon, backref='encounters') Encounter.pokemon = relation(Pokemon, backref='encounters')
Encounter.version = relation(Version, backref='encounters') Encounter.version = relation(Version, backref='encounters')
Encounter.location_area = relation(LocationArea, backref='encounters') Encounter.location_area = relation(LocationArea, backref='encounters')
@ -439,6 +454,8 @@ LocationArea.location = relation(Location, backref='areas')
Machine.generation = relation(Generation) Machine.generation = relation(Generation)
Move.contest_effect = relation(ContestEffect, backref='moves') Move.contest_effect = relation(ContestEffect, backref='moves')
Move.contest_combo_next = association_proxy('contest_combo_first', 'second')
Move.contest_combo_prev = association_proxy('contest_combo_second', 'first')
Move.damage_class = relation(MoveDamageClass, backref='moves') Move.damage_class = relation(MoveDamageClass, backref='moves')
Move.flags = association_proxy('move_flags', 'flag') Move.flags = association_proxy('move_flags', 'flag')
Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.generation_id, backref='move') Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.generation_id, backref='move')
@ -448,6 +465,8 @@ Move.machines = relation(Machine, backref='move')
Move.move_effect = relation(MoveEffect, backref='moves') Move.move_effect = relation(MoveEffect, backref='moves')
Move.move_flags = relation(MoveFlag, backref='move') Move.move_flags = relation(MoveFlag, backref='move')
Move.super_contest_effect = relation(SuperContestEffect, backref='moves') Move.super_contest_effect = relation(SuperContestEffect, backref='moves')
Move.super_contest_combo_next = association_proxy('super_contest_combo_first', 'second')
Move.super_contest_combo_prev = association_proxy('super_contest_combo_second', 'first')
Move.target = relation(MoveTarget, backref='moves') Move.target = relation(MoveTarget, backref='moves')
Move.type = relation(Type, backref='moves') Move.type = relation(Type, backref='moves')
@ -505,6 +524,11 @@ PokemonName.language = relation(Language)
PokemonStat.stat = relation(Stat) PokemonStat.stat = relation(Stat)
SuperContestCombo.first = relation(Move, primaryjoin=SuperContestCombo.first_move_id==Move.id,
backref='super_contest_combo_first')
SuperContestCombo.second = relation(Move, primaryjoin=SuperContestCombo.second_move_id==Move.id,
backref='super_contest_combo_second')
Type.damage_efficacies = relation(TypeEfficacy, Type.damage_efficacies = relation(TypeEfficacy,
primaryjoin=Type.id primaryjoin=Type.id
==TypeEfficacy.damage_type_id, ==TypeEfficacy.damage_type_id,