main
beiyanpiki 1 year ago
parent 6a944ffb68
commit 38209e5867

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

@ -39743,7 +39743,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPgC",
"set_symbol": "CSM1DC",
"card_no": "DAR",
"set_collect_num": null,
"artist_name": null,
@ -39764,7 +39764,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSM2DC",
"set_symbol": "CSM1DC",
"card_no": "FAI",
"set_collect_num": null,
"artist_name": null,
@ -39785,7 +39785,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPfC",
"set_symbol": "CSM1DC",
"card_no": "FIG",
"set_collect_num": null,
"artist_name": null,
@ -39806,7 +39806,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPbC",
"set_symbol": "CSM1DC",
"card_no": "FIR",
"set_collect_num": null,
"artist_name": null,
@ -39827,7 +39827,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPaC",
"set_symbol": "CSM1DC",
"card_no": "GRA",
"set_collect_num": null,
"artist_name": null,
@ -39848,7 +39848,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPdC",
"set_symbol": "CSM1DC",
"card_no": "LIG",
"set_collect_num": null,
"artist_name": null,
@ -39869,7 +39869,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPhC",
"set_symbol": "CSM1DC",
"card_no": "MET",
"set_collect_num": null,
"artist_name": null,
@ -39890,7 +39890,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPeC",
"set_symbol": "CSM1DC",
"card_no": "PSY",
"set_collect_num": null,
"artist_name": null,
@ -39911,7 +39911,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPcC",
"set_symbol": "CSM1DC",
"card_no": "WAT",
"set_collect_num": null,
"artist_name": null,
@ -57738,7 +57738,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPgC",
"set_symbol": "CSM1DC",
"card_no": "DAR",
"set_collect_num": null,
"artist_name": null,
@ -57759,7 +57759,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSM2DC",
"set_symbol": "CSM1DC",
"card_no": "FAI",
"set_collect_num": null,
"artist_name": null,
@ -57780,7 +57780,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPfC",
"set_symbol": "CSM1DC",
"card_no": "FIG",
"set_collect_num": null,
"artist_name": null,
@ -57801,7 +57801,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPbC",
"set_symbol": "CSM1DC",
"card_no": "FIR",
"set_collect_num": null,
"artist_name": null,
@ -57822,7 +57822,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPaC",
"set_symbol": "CSM1DC",
"card_no": "GRA",
"set_collect_num": null,
"artist_name": null,
@ -57843,7 +57843,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPdC",
"set_symbol": "CSM1DC",
"card_no": "LIG",
"set_collect_num": null,
"artist_name": null,
@ -57864,7 +57864,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPhC",
"set_symbol": "CSM1DC",
"card_no": "MET",
"set_collect_num": null,
"artist_name": null,
@ -57885,7 +57885,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPeC",
"set_symbol": "CSM1DC",
"card_no": "PSY",
"set_collect_num": null,
"artist_name": null,
@ -57906,7 +57906,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPcC",
"set_symbol": "CSM1DC",
"card_no": "WAT",
"set_collect_num": null,
"artist_name": null,
@ -90697,6 +90697,27 @@
"energy_attr": null,
"regulation_mark": "A",
"effect_id": "099fd71f7e7e757cf370184f10e6fb0e"
},
{
"name": "\u57fa\u672c\u94a2\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPhC",
"card_no": "MET",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "M"
},
"regulation_mark": "C",
"effect_id": "4557c01497b81767fdaa0004089ecfb3"
}
],
"cards_num": 25
@ -91371,6 +91392,27 @@
"energy_attr": null,
"regulation_mark": "A",
"effect_id": "099fd71f7e7e757cf370184f10e6fb0e"
},
{
"name": "\u57fa\u672c\u6076\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPgC",
"card_no": "DAR",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "D"
},
"regulation_mark": "C",
"effect_id": "46c769fc57a6c250c560df648bb779f8"
}
],
"cards_num": 25
@ -92025,6 +92067,27 @@
"energy_attr": null,
"regulation_mark": "A",
"effect_id": "099fd71f7e7e757cf370184f10e6fb0e"
},
{
"name": "\u57fa\u672c\u6597\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPfC",
"card_no": "FIG",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "F"
},
"regulation_mark": "C",
"effect_id": "9fedb80a97ddd5cc8b8022a21364c326"
}
],
"cards_num": 25
@ -92664,6 +92727,27 @@
"energy_attr": null,
"regulation_mark": "C",
"effect_id": "28dd06651afde1b9ac4b620615b98958"
},
{
"name": "\u57fa\u672c\u8d85\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPeC",
"card_no": "PSY",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "P"
},
"regulation_mark": "C",
"effect_id": "41b2d1a95fafc35e4cf39383ffae928a"
}
],
"cards_num": 22
@ -93259,6 +93343,27 @@
"energy_attr": null,
"regulation_mark": "A",
"effect_id": "b43e16912251090b70acbc79ad9aa823"
},
{
"name": "\u57fa\u672c\u96f7\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPdC",
"card_no": "LIG",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "L"
},
"regulation_mark": "C",
"effect_id": "45550fd10011f6ade7eef16ba88788cf"
}
],
"cards_num": 22
@ -94006,6 +94111,27 @@
"energy_attr": null,
"regulation_mark": "A",
"effect_id": "b43e16912251090b70acbc79ad9aa823"
},
{
"name": "\u57fa\u672c\u6c34\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPcC",
"card_no": "WAT",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "W"
},
"regulation_mark": "C",
"effect_id": "0cf075ae61b8a0b4e9151e5146c3aa26"
}
],
"cards_num": 26
@ -94731,6 +94857,27 @@
"energy_attr": null,
"regulation_mark": "A",
"effect_id": "b43e16912251090b70acbc79ad9aa823"
},
{
"name": "\u57fa\u672c\u706b\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPbC",
"card_no": "FIR",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "R"
},
"regulation_mark": "C",
"effect_id": "22db5405bf0cce61a00aa8082cdd1e65"
}
],
"cards_num": 26
@ -95417,6 +95564,27 @@
"energy_attr": null,
"regulation_mark": "A",
"effect_id": "b43e16912251090b70acbc79ad9aa823"
},
{
"name": "\u57fa\u672c\u8349\u80fd\u91cf",
"text": "",
"type": "Basic Energy",
"mechanic": null,
"label": null,
"pokemon_attr": null,
"collection_attr": {
"series": "Sun & Moon",
"set_symbol": "CSMPaC",
"card_no": "GRA",
"set_collect_num": null,
"artist_name": null,
"rarity": ""
},
"energy_attr": {
"energy": "G"
},
"regulation_mark": "C",
"effect_id": "5e2d0ce37ca0c539aa45908da10544a0"
}
],
"cards_num": 24
@ -96179,7 +96347,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "DAR",
"set_collect_num": null,
"artist_name": null,
@ -96200,7 +96368,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "FIG",
"set_collect_num": null,
"artist_name": null,
@ -96221,7 +96389,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "FIR",
"set_collect_num": null,
"artist_name": null,
@ -96242,7 +96410,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "GRA",
"set_collect_num": null,
"artist_name": null,
@ -96263,7 +96431,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "LIG",
"set_collect_num": null,
"artist_name": null,
@ -96284,7 +96452,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "MET",
"set_collect_num": null,
"artist_name": null,
@ -96305,7 +96473,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "PSY",
"set_collect_num": null,
"artist_name": null,
@ -96326,7 +96494,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "WAT",
"set_collect_num": null,
"artist_name": null,
@ -105417,7 +105585,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "DAR",
"set_collect_num": null,
"artist_name": null,
@ -105438,7 +105606,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "FIG",
"set_collect_num": null,
"artist_name": null,
@ -105459,7 +105627,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "FIR",
"set_collect_num": null,
"artist_name": null,
@ -105480,7 +105648,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "GRA",
"set_collect_num": null,
"artist_name": null,
@ -105501,7 +105669,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "LIG",
"set_collect_num": null,
"artist_name": null,
@ -105522,7 +105690,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "MET",
"set_collect_num": null,
"artist_name": null,
@ -105543,7 +105711,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "PSY",
"set_collect_num": null,
"artist_name": null,
@ -105564,7 +105732,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS1DC",
"set_symbol": "CSAC",
"card_no": "WAT",
"set_collect_num": null,
"artist_name": null,
@ -151392,7 +151560,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "DAR",
"set_collect_num": null,
"artist_name": null,
@ -151413,7 +151581,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "FIG",
"set_collect_num": null,
"artist_name": null,
@ -151434,7 +151602,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "FIR",
"set_collect_num": null,
"artist_name": null,
@ -151455,7 +151623,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "GRA",
"set_collect_num": null,
"artist_name": null,
@ -151476,7 +151644,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "LIG",
"set_collect_num": null,
"artist_name": null,
@ -151497,7 +151665,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "MET",
"set_collect_num": null,
"artist_name": null,
@ -151518,7 +151686,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "PSY",
"set_collect_num": null,
"artist_name": null,
@ -151539,7 +151707,7 @@
"pokemon_attr": null,
"collection_attr": {
"series": "Sword & Shield",
"set_symbol": "CS3DC",
"set_symbol": "CSAC",
"card_no": "WAT",
"set_collect_num": null,
"artist_name": null,

File diff suppressed because one or more lines are too long

@ -320,8 +320,8 @@ def main():
card_idx, coll_num = get_card_in_coll(card)
artist = card['details'].get('illustratorName', [None])[0]
rarity = get_rarity(card)
card_symbol = card['details'].get('commodityList', [{'commodityCode': set_symbol}])[0].get('commodityCode',
set_symbol)
card_symbol = card['details'].get('commodityList', [{'commodityCode': set_symbol}])[-1].get('commodityCode',
set_symbol)
collect_attr = CollectionAttr(set_series, card_symbol, coll_num, card_idx, artist, rarity)
regulation_mark = card['details'].get('regulationMarkText', None)
pokemon_attr = get_pokemon_attr(card) if card_type == CardType.Pokemon else None
@ -406,11 +406,6 @@ def main():
database['PROMO-1stA'].set_id = 'PROMO-1stA'
database['PROMO-1stB'].set_id = 'PROMO-1stB'
for k, v in database.items():
if k in ['CSMPaC', 'CSMPbC', 'CSMPcC', 'CSMPdC', 'CSMPeC', 'CSMPfC', 'CSMPgC', 'CSMPhC']:
database[k].cards = [c for c in database[k].cards if
not (c.type == CardType.BasicEnergy and c.regulation_mark == 'C')]
for k, v in database.items():
if k == 'SMP':
# PROMO has overlap cards

Loading…
Cancel
Save