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

Don't group ribbons into one attribute

Browse source
This commit is contained in:
Petr Viktorin 2012-10-14 13:51:40 +02:00
parent 483ec7cd1a
commit 8483e57c5d
1 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pokedex/struct/__init__.py
View file

@ -285,8 +285,9 @@ class SaveFilePokemon(object):
save(result, 'pokerus data', self.pokerus) save(result, 'pokerus data', self.pokerus)
save(result, 'nicknamed', self.is_nicknamed) save(result, 'nicknamed', self.is_nicknamed)
save(result, 'gender', condition=lambda g: g != 'genderless') save(result, 'gender', condition=lambda g: g != 'genderless')
save(result, 'ribbons', for name in 'sinnoh ribbons', 'sinnoh contest ribbons', 'hoenn ribbons':
sorted(r.replace('_', ' ') for r in self.ribbons)) save(result, name, transform=lambda ribbons:
sorted(r.replace('_', ' ') for r in ribbons))
for loc_type in 'egg', 'met': for loc_type in 'egg', 'met':
loc_dict = dict() loc_dict = dict()
@ -430,8 +431,10 @@ class SaveFilePokemon(object):
if 'egg received' in dct: if 'egg received' in dct:
self.date_egg_received = datetime.datetime.strptime( self.date_egg_received = datetime.datetime.strptime(
dct['egg received'], '%Y-%m-%d').date() dct['egg received'], '%Y-%m-%d').date()
if 'ribbons' in dct: for name in 'sinnoh ribbons', 'sinnoh contest ribbons', 'hoenn ribbons':
self.ribbons = (r.replace(' ', '_') for r in dct['ribbons']) if name in dct:
setattr(self, name.replace(' ', '_'),
(r.replace(' ', '_') for r in dct[name]))
if 'moves' in dct: if 'moves' in dct:
pp_reset_indices = [] pp_reset_indices = []
for i, movedict in enumerate(dct['moves']): for i, movedict in enumerate(dct['moves']):
@ -761,26 +764,6 @@ class SaveFilePokemon(object):
hoenn_ribbons = struct_frozenset_proxy('hoenn_ribbons') hoenn_ribbons = struct_frozenset_proxy('hoenn_ribbons')
sinnoh_contest_ribbons = struct_frozenset_proxy('sinnoh_contest_ribbons') sinnoh_contest_ribbons = struct_frozenset_proxy('sinnoh_contest_ribbons')
@property
def ribbons(self):
return frozenset(
self.sinnoh_ribbons |
self.hoenn_ribbons |
self.sinnoh_contest_ribbons)
@ribbons.setter
def ribbons(self, ribbons):
ribbons = set(ribbons)
for ribbonset_name in (
'sinnoh_ribbons', 'hoenn_ribbons', 'sinnoh_contest_ribbons'):
ribbonset = self.structure[ribbonset_name]
for ribbon_name in ribbonset:
ribbonset[ribbon_name] = (ribbon_name in ribbons)
ribbons.discard(ribbon_name)
if ribbons:
raise ValueError('Unknown ribbons: {0}'.format(', '.join(ribbons)))
del self.blob
@property @property
def nickname(self): def nickname(self):
return self.structure.nickname return self.structure.nickname