Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1550 from TehomCD/extended_room_update_descs

Browse source 
Refactor ExtendedRoom return_appearance to extract desc update into its own method.
This commit is contained in:
Griatch 2018-01-08 15:15:25 +01:00 • committed by GitHub
commit f2d4b5f266
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
evennia/contrib/extended_room.py
View file

@ -213,37 +213,39 @@ class ExtendedRoom(DefaultRoom):
return detail return detail
return None return None
def return_appearance(self, looker): def return_appearance(self, looker, **kwargs):
""" """
This is called when e.g. the look command wants to retrieve This is called when e.g. the look command wants to retrieve
the description of this object. the description of this object.
Args: Args:
looker (Object): The object looking at us. looker (Object): The object looking at us.
**kwargs (dict): Arbitrary, optional arguments for users
overriding the call (unused by default).
Returns: Returns:
description (str): Our description. description (str): Our description.
""" """
update = False # ensures that our description is current based on time/season
self.update_current_description()
# run the normal return_appearance method, now that desc is updated.
return super(ExtendedRoom, self).return_appearance(looker, **kwargs)
def update_current_description(self):
"""
This will update the description of the room if the time or season
has changed since last checked.
"""
update = False
# get current time and season # get current time and season
curr_season, curr_timeslot = self.get_time_and_season() curr_season, curr_timeslot = self.get_time_and_season()
# compare with previously stored slots # compare with previously stored slots
last_season = self.ndb.last_season last_season = self.ndb.last_season
last_timeslot = self.ndb.last_timeslot last_timeslot = self.ndb.last_timeslot
if curr_season != last_season: if curr_season != last_season:
# season changed. Load new desc, or a fallback. # season changed. Load new desc, or a fallback.
if curr_season == 'spring': new_raw_desc = self.attributes.get("%s_desc" % curr_season)
new_raw_desc = self.db.spring_desc
elif curr_season == 'summer':
new_raw_desc = self.db.summer_desc
elif curr_season == 'autumn':
new_raw_desc = self.db.autumn_desc
else:
new_raw_desc = self.db.winter_desc
if new_raw_desc: if new_raw_desc:
raw_desc = new_raw_desc raw_desc = new_raw_desc
else: else:
@ -252,19 +254,15 @@ class ExtendedRoom(DefaultRoom):
self.db.raw_desc = raw_desc self.db.raw_desc = raw_desc
self.ndb.last_season = curr_season self.ndb.last_season = curr_season
update = True update = True
if curr_timeslot != last_timeslot: if curr_timeslot != last_timeslot:
# timeslot changed. Set update flag. # timeslot changed. Set update flag.
self.ndb.last_timeslot = curr_timeslot self.ndb.last_timeslot = curr_timeslot
update = True update = True
if update: if update:
# if anything changed we have to re-parse # if anything changed we have to re-parse
# the raw_desc for time markers # the raw_desc for time markers
# and re-save the description again. # and re-save the description again.
self.db.desc = self.replace_timeslots(self.db.raw_desc, curr_timeslot) self.db.desc = self.replace_timeslots(self.db.raw_desc, curr_timeslot)
# run the normal return_appearance method, now that desc is updated.
return super(ExtendedRoom, self).return_appearance(looker)
# Custom Look command supporting Room details. Add this to # Custom Look command supporting Room details. Add this to