Added some missing item icons and fixed TMs/Data Cards. #248

diff --git a/pokedex/data/csv/machines.csv b/pokedex/data/csv/machines.csv
index 2e300de..942ea19 100644 (file)
--- a/pokedex/data/csv/machines.csv
+++ b/pokedex/data/csv/machines.csv
@@ -1,699 +1,699 @@
-machine_number,version_group_id,move_id
-1,1,5
-1,2,5
-1,3,223
-1,4,223
-1,5,264
-1,6,264
-1,7,264
-1,8,264
-1,9,264
-1,10,264
-2,1,13
-2,2,13
-2,3,29
-2,4,29
-2,5,337
-2,6,337
-2,7,337
-2,8,337
-2,9,337
-2,10,337
-3,1,14
-3,2,14
-3,3,174
-3,4,174
-3,5,352
-3,6,352
-3,7,352
-3,8,352
-3,9,352
-3,10,352
-4,1,18
-4,2,18
-4,3,205
-4,4,205
-4,5,347
-4,6,347
-4,7,347
-4,8,347
-4,9,347
-4,10,347
-5,1,25
-5,2,25
-5,3,46
-5,4,46
-5,5,46
-5,6,46
-5,7,46
-5,8,46
-5,9,46
-5,10,46
-6,1,92
-6,2,92
-6,3,92
-6,4,92
-6,5,92
-6,6,92
-6,7,92
-6,8,92
-6,9,92
-6,10,92
-7,1,32
-7,2,32
-7,3,192
-7,4,192
-7,5,258
-7,6,258
-7,7,258
-7,8,258
-7,9,258
-7,10,258
-8,1,34
-8,2,34
-8,3,249
-8,4,249
-8,5,339
-8,6,339
-8,7,339
-8,8,339
-8,9,339
-8,10,339
-9,1,36
-9,2,36
-9,3,244
-9,4,244
-9,5,331
-9,6,331
-9,7,331
-9,8,331
-9,9,331
-9,10,331
-10,1,38
-10,2,38
-10,3,237
-10,4,237
-10,5,237
-10,6,237
-10,7,237
-10,8,237
-10,9,237
-10,10,237
-11,1,61
-11,2,61
-11,3,241
-11,4,241
-11,5,241
-11,6,241
-11,7,241
-11,8,241
-11,9,241
-11,10,241
-12,1,55
-12,2,55
-12,3,230
-12,4,230
-12,5,269
-12,6,269
-12,7,269
-12,8,269
-12,9,269
-12,10,269
-13,1,58
-13,2,58
-13,3,173
-13,4,173
-13,5,58
-13,6,58
-13,7,58
-13,8,58
-13,9,58
-13,10,58
-14,1,59
-14,2,59
-14,3,59
-14,4,59
-14,5,59
-14,6,59
-14,7,59
-14,8,59
-14,9,59
-14,10,59
-15,1,63
-15,2,63
-15,3,63
-15,4,63
-15,5,63
-15,6,63
-15,7,63
-15,8,63
-15,9,63
-15,10,63
-16,1,6
-16,2,6
-16,3,196
-16,4,196
-16,5,113
-16,6,113
-16,7,113
-16,8,113
-16,9,113
-16,10,113
-17,1,66
-17,2,66
-17,3,182
-17,4,182
-17,5,182
-17,6,182
-17,7,182
-17,8,182
-17,9,182
-17,10,182
-18,1,68
-18,2,68
-18,3,240
-18,4,240
-18,5,240
-18,6,240
-18,7,240
-18,8,240
-18,9,240
-18,10,240
-19,1,69
-19,2,69
-19,3,202
-19,4,202
-19,5,202
-19,6,202
-19,7,202
-19,8,202
-19,9,202
-19,10,202
-20,1,99
-20,2,99
-20,3,203
-20,4,203
-20,5,219
-20,6,219
-20,7,219
-20,8,219
-20,9,219
-20,10,219
-21,1,72
-21,2,72
-21,3,218
-21,4,218
-21,5,218
-21,6,218
-21,7,218
-21,8,218
-21,9,218
-21,10,218
-22,1,76
-22,2,76
-22,3,76
-22,4,76
-22,5,76
-22,6,76
-22,7,76
-22,8,76
-22,9,76
-22,10,76
-23,1,82
-23,2,82
-23,3,231
-23,4,231
-23,5,231
-23,6,231
-23,7,231
-23,8,231
-23,9,231
-23,10,231
-24,1,85
-24,2,85
-24,3,225
-24,4,225
-24,5,85
-24,6,85
-24,7,85
-24,8,85
-24,9,85
-24,10,85
-25,1,87
-25,2,87
-25,3,87
-25,4,87
-25,5,87
-25,6,87
-25,7,87
-25,8,87
-25,9,87
-25,10,87
-26,1,89
-26,2,89
-26,3,89
-26,4,89
-26,5,89
-26,6,89
-26,7,89
-26,8,89
-26,9,89
-26,10,89
-27,1,90
-27,2,90
-27,3,216
-27,4,216
-27,5,216
-27,6,216
-27,7,216
-27,8,216
-27,9,216
-27,10,216
-28,1,91
-28,2,91
-28,3,91
-28,4,91
-28,5,91
-28,6,91
-28,7,91
-28,8,91
-28,9,91
-28,10,91
-29,1,94
-29,2,94
-29,3,94
-29,4,94
-29,5,94
-29,6,94
-29,7,94
-29,8,94
-29,9,94
-29,10,94
-30,1,100
-30,2,100
-30,3,247
-30,4,247
-30,5,247
-30,6,247
-30,7,247
-30,8,247
-30,9,247
-30,10,247
-31,1,102
-31,2,102
-31,3,189
-31,4,189
-31,5,280
-31,6,280
-31,7,280
-31,8,280
-31,9,280
-31,10,280
-32,1,104
-32,2,104
-32,3,104
-32,4,104
-32,5,104
-32,6,104
-32,7,104
-32,8,104
-32,9,104
-32,10,104
-33,1,115
-33,2,115
-33,3,8
-33,4,8
-33,5,115
-33,6,115
-33,7,115
-33,8,115
-33,9,115
-33,10,115
-34,1,117
-34,2,117
-34,3,207
-34,4,207
-34,5,351
-34,6,351
-34,7,351
-34,8,351
-34,9,351
-34,10,351
-35,1,118
-35,2,118
-35,3,214
-35,4,214
-35,5,53
-35,6,53
-35,7,53
-35,8,53
-35,9,53
-35,10,53
-36,1,120
-36,2,120
-36,3,188
-36,4,188
-36,5,188
-36,6,188
-36,7,188
-36,8,188
-36,9,188
-36,10,188
-37,1,121
-37,2,121
-37,3,201
-37,4,201
-37,5,201
-37,6,201
-37,7,201
-37,8,201
-37,9,201
-37,10,201
-38,1,126
-38,2,126
-38,3,126
-38,4,126
-38,5,126
-38,6,126
-38,7,126
-38,8,126
-38,9,126
-38,10,126
-39,1,129
-39,2,129
-39,3,129
-39,4,129
-39,5,317
-39,6,317
-39,7,317
-39,8,317
-39,9,317
-39,10,317
-40,1,130
-40,2,130
-40,3,111
-40,4,111
-40,5,332
-40,6,332
-40,7,332
-40,8,332
-40,9,332
-40,10,332
-41,1,135
-41,2,135
-41,3,9
-41,4,9
-41,5,259
-41,6,259
-41,7,259
-41,8,259
-41,9,259
-41,10,259
-42,1,138
-42,2,138
-42,3,138
-42,4,138
-42,5,263
-42,6,263
-42,7,263
-42,8,263
-42,9,263
-42,10,263
-43,1,143
-43,2,143
-43,3,197
-43,4,197
-43,5,290
-43,6,290
-43,7,290
-43,8,290
-43,9,290
-43,10,290
-44,1,156
-44,2,156
-44,3,156
-44,4,156
-44,5,156
-44,6,156
-44,7,156
-44,8,156
-44,9,156
-44,10,156
-45,1,86
-45,2,86
-45,3,213
-45,4,213
-45,5,213
-45,6,213
-45,7,213
-45,8,213
-45,9,213
-45,10,213
-46,1,149
-46,2,149
-46,3,168
-46,4,168
-46,5,168
-46,6,168
-46,7,168
-46,8,168
-46,9,168
-46,10,168
-47,1,153
-47,2,153
-47,3,211
-47,4,211
-47,5,211
-47,6,211
-47,7,211
-47,8,211
-47,9,211
-47,10,211
-48,1,157
-48,2,157
-48,3,7
-48,4,7
-48,5,285
-48,6,285
-48,7,285
-48,8,285
-48,9,285
-48,10,285
-49,1,161
-49,2,161
-49,3,210
-49,4,210
-49,5,289
-49,6,289
-49,7,289
-49,8,289
-49,9,289
-49,10,289
-50,1,164
-50,2,164
-50,3,171
-50,4,171
-50,5,315
-50,6,315
-50,7,315
-50,8,315
-50,9,315
-50,10,315
-51,8,355
-51,9,355
-51,10,355
-52,8,411
-52,9,411
-52,10,411
-53,8,412
-53,9,412
-53,10,412
-54,8,206
-54,9,206
-54,10,206
-55,8,362
-55,9,362
-55,10,362
-56,8,374
-56,9,374
-56,10,374
-57,8,451
-57,9,451
-57,10,451
-58,8,203
-58,9,203
-58,10,203
-59,8,406
-59,9,406
-59,10,406
-60,8,409
-60,9,409
-60,10,409
-61,8,261
-61,9,261
-61,10,261
-62,8,318
-62,9,318
-62,10,318
-63,8,373
-63,9,373
-63,10,373
-64,8,153
-64,9,153
-64,10,153
-65,8,421
-65,9,421
-65,10,421
-66,8,371
-66,9,371
-66,10,371
-67,8,278
-67,9,278
-67,10,278
-68,8,416
-68,9,416
-68,10,416
-69,8,397
-69,9,397
-69,10,397
-70,8,148
-70,9,148
-70,10,148
-71,8,444
-71,9,444
-71,10,444
-72,8,419
-72,9,419
-72,10,419
-73,8,86
-73,9,86
-73,10,86
-74,8,360
-74,9,360
-74,10,360
-75,8,14
-75,9,14
-75,10,14
-76,8,446
-76,9,446
-76,10,446
-77,8,244
-77,9,244
-77,10,244
-78,8,445
-78,9,445
-78,10,445
-79,8,399
-79,9,399
-79,10,399
-80,8,157
-80,9,157
-80,10,157
-81,8,404
-81,9,404
-81,10,404
-82,8,214
-82,9,214
-82,10,214
-83,8,363
-83,9,363
-83,10,363
-84,8,398
-84,9,398
-84,10,398
-85,8,138
-85,9,138
-85,10,138
-86,8,447
-86,9,447
-86,10,447
-87,8,207
-87,9,207
-87,10,207
-88,8,365
-88,9,365
-88,10,365
-89,8,369
-89,9,369
-89,10,369
-90,8,164
-90,9,164
-90,10,164
-91,8,430
-91,9,430
-91,10,430
-92,8,433
-92,9,433
-92,10,433
-101,1,15
-101,2,15
-101,3,15
-101,4,15
-101,5,15
-101,6,15
-101,7,15
-101,8,15
-101,9,15
-101,10,15
-102,1,19
-102,2,19
-102,3,19
-102,4,19
-102,5,19
-102,6,19
-102,7,19
-102,8,19
-102,9,19
-102,10,19
-103,1,57
-103,2,57
-103,3,57
-103,4,57
-103,5,57
-103,6,57
-103,7,57
-103,8,57
-103,9,57
-103,10,57
-104,1,70
-104,2,70
-104,3,70
-104,4,70
-104,5,70
-104,6,70
-104,7,70
-104,8,70
-104,9,70
-104,10,70
-105,1,148
-105,2,148
-105,3,148
-105,4,148
-105,5,148
-105,6,148
-105,7,148
-105,8,432
-105,9,432
-105,10,250
-106,3,250
-106,4,250
-106,5,249
-106,6,249
-106,7,249
-106,8,249
-106,9,249
-106,10,249
-107,3,127
-107,4,127
-107,5,127
-107,6,127
-107,7,127
-107,8,127
-107,9,127
-107,10,127
-108,5,291
-108,6,291
-108,7,291
-108,8,431
-108,9,431
-108,10,431
+machine_number,version_group_id,item_id,move_id
+1,1,305,5
+1,2,305,5
+1,3,305,223
+1,4,305,223
+1,5,305,264
+1,6,305,264
+1,7,305,264
+1,8,305,264
+1,9,305,264
+1,10,305,264
+2,1,306,13
+2,2,306,13
+2,3,306,29
+2,4,306,29
+2,5,306,337
+2,6,306,337
+2,7,306,337
+2,8,306,337
+2,9,306,337
+2,10,306,337
+3,1,307,14
+3,2,307,14
+3,3,307,174
+3,4,307,174
+3,5,307,352
+3,6,307,352
+3,7,307,352
+3,8,307,352
+3,9,307,352
+3,10,307,352
+4,1,308,18
+4,2,308,18
+4,3,308,205
+4,4,308,205
+4,5,308,347
+4,6,308,347
+4,7,308,347
+4,8,308,347
+4,9,308,347
+4,10,308,347
+5,1,309,25
+5,2,309,25
+5,3,309,46
+5,4,309,46
+5,5,309,46
+5,6,309,46
+5,7,309,46
+5,8,309,46
+5,9,309,46
+5,10,309,46
+6,1,310,92
+6,2,310,92
+6,3,310,92
+6,4,310,92
+6,5,310,92
+6,6,310,92
+6,7,310,92
+6,8,310,92
+6,9,310,92
+6,10,310,92
+7,1,311,32
+7,2,311,32
+7,3,311,192
+7,4,311,192
+7,5,311,258
+7,6,311,258
+7,7,311,258
+7,8,311,258
+7,9,311,258
+7,10,311,258
+8,1,312,34
+8,2,312,34
+8,3,312,249
+8,4,312,249
+8,5,312,339
+8,6,312,339
+8,7,312,339
+8,8,312,339
+8,9,312,339
+8,10,312,339
+9,1,313,36
+9,2,313,36
+9,3,313,244
+9,4,313,244
+9,5,313,331
+9,6,313,331
+9,7,313,331
+9,8,313,331
+9,9,313,331
+9,10,313,331
+10,1,314,38
+10,2,314,38
+10,3,314,237
+10,4,314,237
+10,5,314,237
+10,6,314,237
+10,7,314,237
+10,8,314,237
+10,9,314,237
+10,10,314,237
+11,1,315,61
+11,2,315,61
+11,3,315,241
+11,4,315,241
+11,5,315,241
+11,6,315,241
+11,7,315,241
+11,8,315,241
+11,9,315,241
+11,10,315,241
+12,1,316,55
+12,2,316,55
+12,3,316,230
+12,4,316,230
+12,5,316,269
+12,6,316,269
+12,7,316,269
+12,8,316,269
+12,9,316,269
+12,10,316,269
+13,1,317,58
+13,2,317,58
+13,3,317,173
+13,4,317,173
+13,5,317,58
+13,6,317,58
+13,7,317,58
+13,8,317,58
+13,9,317,58
+13,10,317,58
+14,1,318,59
+14,2,318,59
+14,3,318,59
+14,4,318,59
+14,5,318,59
+14,6,318,59
+14,7,318,59
+14,8,318,59
+14,9,318,59
+14,10,318,59
+15,1,319,63
+15,2,319,63
+15,3,319,63
+15,4,319,63
+15,5,319,63
+15,6,319,63
+15,7,319,63
+15,8,319,63
+15,9,319,63
+15,10,319,63
+16,1,320,6
+16,2,320,6
+16,3,320,196
+16,4,320,196
+16,5,320,113
+16,6,320,113
+16,7,320,113
+16,8,320,113
+16,9,320,113
+16,10,320,113
+17,1,321,66
+17,2,321,66
+17,3,321,182
+17,4,321,182
+17,5,321,182
+17,6,321,182
+17,7,321,182
+17,8,321,182
+17,9,321,182
+17,10,321,182
+18,1,322,68
+18,2,322,68
+18,3,322,240
+18,4,322,240
+18,5,322,240
+18,6,322,240
+18,7,322,240
+18,8,322,240
+18,9,322,240
+18,10,322,240
+19,1,323,69
+19,2,323,69
+19,3,323,202
+19,4,323,202
+19,5,323,202
+19,6,323,202
+19,7,323,202
+19,8,323,202
+19,9,323,202
+19,10,323,202
+20,1,324,99
+20,2,324,99
+20,3,324,203
+20,4,324,203
+20,5,324,219
+20,6,324,219
+20,7,324,219
+20,8,324,219
+20,9,324,219
+20,10,324,219
+21,1,325,72
+21,2,325,72
+21,3,325,218
+21,4,325,218
+21,5,325,218
+21,6,325,218
+21,7,325,218
+21,8,325,218
+21,9,325,218
+21,10,325,218
+22,1,326,76
+22,2,326,76
+22,3,326,76
+22,4,326,76
+22,5,326,76
+22,6,326,76
+22,7,326,76
+22,8,326,76
+22,9,326,76
+22,10,326,76
+23,1,327,82
+23,2,327,82
+23,3,327,231
+23,4,327,231
+23,5,327,231
+23,6,327,231
+23,7,327,231
+23,8,327,231
+23,9,327,231
+23,10,327,231
+24,1,328,85
+24,2,328,85
+24,3,328,225
+24,4,328,225
+24,5,328,85
+24,6,328,85
+24,7,328,85
+24,8,328,85
+24,9,328,85
+24,10,328,85
+25,1,329,87
+25,2,329,87
+25,3,329,87
+25,4,329,87
+25,5,329,87
+25,6,329,87
+25,7,329,87
+25,8,329,87
+25,9,329,87
+25,10,329,87
+26,1,330,89
+26,2,330,89
+26,3,330,89
+26,4,330,89
+26,5,330,89
+26,6,330,89
+26,7,330,89
+26,8,330,89
+26,9,330,89
+26,10,330,89
+27,1,331,90
+27,2,331,90
+27,3,331,216
+27,4,331,216
+27,5,331,216
+27,6,331,216
+27,7,331,216
+27,8,331,216
+27,9,331,216
+27,10,331,216
+28,1,332,91
+28,2,332,91
+28,3,332,91
+28,4,332,91
+28,5,332,91
+28,6,332,91
+28,7,332,91
+28,8,332,91
+28,9,332,91
+28,10,332,91
+29,1,333,94
+29,2,333,94
+29,3,333,94
+29,4,333,94
+29,5,333,94
+29,6,333,94
+29,7,333,94
+29,8,333,94
+29,9,333,94
+29,10,333,94
+30,1,334,100
+30,2,334,100
+30,3,334,247
+30,4,334,247
+30,5,334,247
+30,6,334,247
+30,7,334,247
+30,8,334,247
+30,9,334,247
+30,10,334,247
+31,1,335,102
+31,2,335,102
+31,3,335,189
+31,4,335,189
+31,5,335,280
+31,6,335,280
+31,7,335,280
+31,8,335,280
+31,9,335,280
+31,10,335,280
+32,1,336,104
+32,2,336,104
+32,3,336,104
+32,4,336,104
+32,5,336,104
+32,6,336,104
+32,7,336,104
+32,8,336,104
+32,9,336,104
+32,10,336,104
+33,1,337,115
+33,2,337,115
+33,3,337,8
+33,4,337,8
+33,5,337,115
+33,6,337,115
+33,7,337,115
+33,8,337,115
+33,9,337,115
+33,10,337,115
+34,1,338,117
+34,2,338,117
+34,3,338,207
+34,4,338,207
+34,5,338,351
+34,6,338,351
+34,7,338,351
+34,8,338,351
+34,9,338,351
+34,10,338,351
+35,1,339,118
+35,2,339,118
+35,3,339,214
+35,4,339,214
+35,5,339,53
+35,6,339,53
+35,7,339,53
+35,8,339,53
+35,9,339,53
+35,10,339,53
+36,1,340,120
+36,2,340,120
+36,3,340,188
+36,4,340,188
+36,5,340,188
+36,6,340,188
+36,7,340,188
+36,8,340,188
+36,9,340,188
+36,10,340,188
+37,1,341,121
+37,2,341,121
+37,3,341,201
+37,4,341,201
+37,5,341,201
+37,6,341,201
+37,7,341,201
+37,8,341,201
+37,9,341,201
+37,10,341,201
+38,1,342,126
+38,2,342,126
+38,3,342,126
+38,4,342,126
+38,5,342,126
+38,6,342,126
+38,7,342,126
+38,8,342,126
+38,9,342,126
+38,10,342,126
+39,1,343,129
+39,2,343,129
+39,3,343,129
+39,4,343,129
+39,5,343,317
+39,6,343,317
+39,7,343,317
+39,8,343,317
+39,9,343,317
+39,10,343,317
+40,1,344,130
+40,2,344,130
+40,3,344,111
+40,4,344,111
+40,5,344,332
+40,6,344,332
+40,7,344,332
+40,8,344,332
+40,9,344,332
+40,10,344,332
+41,1,345,135
+41,2,345,135
+41,3,345,9
+41,4,345,9
+41,5,345,259
+41,6,345,259
+41,7,345,259
+41,8,345,259
+41,9,345,259
+41,10,345,259
+42,1,346,138
+42,2,346,138
+42,3,346,138
+42,4,346,138
+42,5,346,263
+42,6,346,263
+42,7,346,263
+42,8,346,263
+42,9,346,263
+42,10,346,263
+43,1,347,143
+43,2,347,143
+43,3,347,197
+43,4,347,197
+43,5,347,290
+43,6,347,290
+43,7,347,290
+43,8,347,290
+43,9,347,290
+43,10,347,290
+44,1,348,156
+44,2,348,156
+44,3,348,156
+44,4,348,156
+44,5,348,156
+44,6,348,156
+44,7,348,156
+44,8,348,156
+44,9,348,156
+44,10,348,156
+45,1,349,86
+45,2,349,86
+45,3,349,213
+45,4,349,213
+45,5,349,213
+45,6,349,213
+45,7,349,213
+45,8,349,213
+45,9,349,213
+45,10,349,213
+46,1,350,149
+46,2,350,149
+46,3,350,168
+46,4,350,168
+46,5,350,168
+46,6,350,168
+46,7,350,168
+46,8,350,168
+46,9,350,168
+46,10,350,168
+47,1,351,153
+47,2,351,153
+47,3,351,211
+47,4,351,211
+47,5,351,211
+47,6,351,211
+47,7,351,211
+47,8,351,211
+47,9,351,211
+47,10,351,211
+48,1,352,157
+48,2,352,157
+48,3,352,7
+48,4,352,7
+48,5,352,285
+48,6,352,285
+48,7,352,285
+48,8,352,285
+48,9,352,285
+48,10,352,285
+49,1,353,161
+49,2,353,161
+49,3,353,210
+49,4,353,210
+49,5,353,289
+49,6,353,289
+49,7,353,289
+49,8,353,289
+49,9,353,289
+49,10,353,289
+50,1,354,164
+50,2,354,164
+50,3,354,171
+50,4,354,171
+50,5,354,315
+50,6,354,315
+50,7,354,315
+50,8,354,315
+50,9,354,315
+50,10,354,315
+51,8,355,355
+51,9,355,355
+51,10,355,355
+52,8,356,411
+52,9,356,411
+52,10,356,411
+53,8,357,412
+53,9,357,412
+53,10,357,412
+54,8,358,206
+54,9,358,206
+54,10,358,206
+55,8,359,362
+55,9,359,362
+55,10,359,362
+56,8,360,374
+56,9,360,374
+56,10,360,374
+57,8,361,451
+57,9,361,451
+57,10,361,451
+58,8,362,203
+58,9,362,203
+58,10,362,203
+59,8,363,406
+59,9,363,406
+59,10,363,406
+60,8,364,409
+60,9,364,409
+60,10,364,409
+61,8,365,261
+61,9,365,261
+61,10,365,261
+62,8,366,318
+62,9,366,318
+62,10,366,318
+63,8,367,373
+63,9,367,373
+63,10,367,373
+64,8,368,153
+64,9,368,153
+64,10,368,153
+65,8,369,421
+65,9,369,421
+65,10,369,421
+66,8,370,371
+66,9,370,371
+66,10,370,371
+67,8,371,278
+67,9,371,278
+67,10,371,278
+68,8,372,416
+68,9,372,416
+68,10,372,416
+69,8,373,397
+69,9,373,397
+69,10,373,397
+70,8,374,148
+70,9,374,148
+70,10,374,148
+71,8,375,444
+71,9,375,444
+71,10,375,444
+72,8,376,419
+72,9,376,419
+72,10,376,419
+73,8,377,86
+73,9,377,86
+73,10,377,86
+74,8,378,360
+74,9,378,360
+74,10,378,360
+75,8,379,14
+75,9,379,14
+75,10,379,14
+76,8,380,446
+76,9,380,446
+76,10,380,446
+77,8,381,244
+77,9,381,244
+77,10,381,244
+78,8,382,445
+78,9,382,445
+78,10,382,445
+79,8,383,399
+79,9,383,399
+79,10,383,399
+80,8,384,157
+80,9,384,157
+80,10,384,157
+81,8,385,404
+81,9,385,404
+81,10,385,404
+82,8,386,214
+82,9,386,214
+82,10,386,214
+83,8,387,363
+83,9,387,363
+83,10,387,363
+84,8,388,398
+84,9,388,398
+84,10,388,398
+85,8,389,138
+85,9,389,138
+85,10,389,138
+86,8,390,447
+86,9,390,447
+86,10,390,447
+87,8,391,207
+87,9,391,207
+87,10,391,207
+88,8,392,365
+88,9,392,365
+88,10,392,365
+89,8,393,369
+89,9,393,369
+89,10,393,369
+90,8,394,164
+90,9,394,164
+90,10,394,164
+91,8,395,430
+91,9,395,430
+91,10,395,430
+92,8,396,433
+92,9,396,433
+92,10,396,433
+101,1,397,15
+101,2,397,15
+101,3,397,15
+101,4,397,15
+101,5,397,15
+101,6,397,15
+101,7,397,15
+101,8,397,15
+101,9,397,15
+101,10,397,15
+102,1,398,19
+102,2,398,19
+102,3,398,19
+102,4,398,19
+102,5,398,19
+102,6,398,19
+102,7,398,19
+102,8,398,19
+102,9,398,19
+102,10,398,19
+103,1,399,57
+103,2,399,57
+103,3,399,57
+103,4,399,57
+103,5,399,57
+103,6,399,57
+103,7,399,57
+103,8,399,57
+103,9,399,57
+103,10,399,57
+104,1,400,70
+104,2,400,70
+104,3,400,70
+104,4,400,70
+104,5,400,70
+104,6,400,70
+104,7,400,70
+104,8,400,70
+104,9,400,70
+104,10,400,70
+105,1,401,148
+105,2,401,148
+105,3,401,148
+105,4,401,148
+105,5,401,148
+105,6,401,148
+105,7,401,148
+105,8,401,432
+105,9,401,432
+105,10,401,250
+106,3,402,250
+106,4,402,250
+106,5,402,249
+106,6,402,249
+106,7,402,249
+106,8,402,249
+106,9,402,249
+106,10,402,249
+107,3,403,127
+107,4,403,127
+107,5,403,127
+107,6,403,127
+107,7,403,127
+107,8,403,127
+107,9,403,127
+107,10,403,127
+108,5,404,291
+108,6,404,291
+108,7,404,291
+108,8,404,431
+108,9,404,431
+108,10,404,431

diff --git a/pokedex/data/media/items/gracidea.png b/pokedex/data/media/items/gracidea.png
new file mode 100644 (file)
index 0000000..cb71c3c
Binary files /dev/null and b/pokedex/data/media/items/gracidea.png differ

diff --git a/pokedex/data/media/items/griseous-orb.png b/pokedex/data/media/items/griseous-orb.png
new file mode 100644 (file)
index 0000000..05a76be
Binary files /dev/null and b/pokedex/data/media/items/griseous-orb.png differ

diff --git a/pokedex/data/media/items/vs-recorder.png b/pokedex/data/media/items/vs-recorder.png
new file mode 100644 (file)
index 0000000..c3af011
Binary files /dev/null and b/pokedex/data/media/items/vs-recorder.png differ

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index b9a5fea..39a2948 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -3,7 +3,8 @@
 from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.associationproxy import association_proxy

-from sqlalchemy.orm import backref, relation
+from sqlalchemy.orm import backref, eagerload_all, relation
+from sqlalchemy.orm.session import Session

 from sqlalchemy.sql import and_
 from sqlalchemy.types import *
 
 from sqlalchemy.sql import and_
 from sqlalchemy.types import *
 


@@ -286,8 +287,13 @@ class Machine(TableBase):
     __tablename__ = 'machines'
     machine_number = Column(Integer, primary_key=True, nullable=False, autoincrement=False)
     version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False)
     __tablename__ = 'machines'
     machine_number = Column(Integer, primary_key=True, nullable=False, autoincrement=False)
     version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False)

+    item_id = Column(Integer, ForeignKey('items.id'), nullable=False)

     move_id = Column(Integer, ForeignKey('moves.id'), nullable=False)
 
     move_id = Column(Integer, ForeignKey('moves.id'), nullable=False)
 

+    @property
+    def is_hm(self):
+        return self.machine_number >= 100
+

 class MoveBattleStyle(TableBase):
     __tablename__ = 'move_battle_styles'
     id = Column(Integer, primary_key=True, nullable=False)
 class MoveBattleStyle(TableBase):
     __tablename__ = 'move_battle_styles'
     id = Column(Integer, primary_key=True, nullable=False)


@@ -686,6 +692,7 @@ Item.berry = relation(Berry, uselist=False, backref='item')
 Item.flags = relation(ItemFlag, secondary=ItemFlagMap.__table__)
 Item.flavor_text = relation(ItemFlavorText, order_by=ItemFlavorText.version_group_id.asc(), backref='item')
 Item.fling_effect = relation(ItemFlingEffect, backref='items')
 Item.flags = relation(ItemFlag, secondary=ItemFlagMap.__table__)
 Item.flavor_text = relation(ItemFlavorText, order_by=ItemFlavorText.version_group_id.asc(), backref='item')
 Item.fling_effect = relation(ItemFlingEffect, backref='items')

+Item.machines = relation(Machine, order_by=Machine.version_group_id.asc())

 Item.category = relation(ItemCategory)
 Item.pocket = association_proxy('category', 'pocket')
 
 Item.category = relation(ItemCategory)
 Item.pocket = association_proxy('category', 'pocket')
 


@@ -700,6 +707,7 @@ Location.region = relation(Region, backref='locations')
 
 LocationArea.location = relation(Location, backref='areas')
 
 
 LocationArea.location = relation(Location, backref='areas')
 

+Machine.item = relation(Item)

 Machine.version_group = relation(VersionGroup)
 
 Move.contest_effect = relation(ContestEffect, backref='moves')
 Machine.version_group = relation(VersionGroup)
 
 Move.contest_effect = relation(ContestEffect, backref='moves')