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

Fix for #1362 - Wilderness.py item manifest breaks when objects are deleted

Browse source 
Also some minor typo fixes
This commit is contained in:
BigJMoney 2017-07-16 16:44:57 -04:00
parent 1248428d13
commit fce5dc3af6
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/contrib/wilderness.py
View file

@ -88,7 +88,7 @@ Customisation example:
def at_prepare_room(self, coordinates, caller, room): def at_prepare_room(self, coordinates, caller, room):
"Any other changes done to the room before showing it" "Any other changes done to the room before showing it"
x, y = coordinates x, y = coordinates
desc = "This is a room in the pyramid. desc = "This is a room in the pyramid."
if y == 3 : if y == 3 :
desc = "You can see far and wide from the top of the pyramid." desc = "You can see far and wide from the top of the pyramid."
room.db.desc = desc room.db.desc = desc
@ -157,7 +157,7 @@ def enter_wilderness(obj, coordinates=(0, 0), name="default"):
default one default one
Returns: Returns:
bool: True if obj succesfully moved into the wilderness. bool: True if obj successfully moved into the wilderness.
""" """
if not WildernessScript.objects.filter(db_key=name).exists(): if not WildernessScript.objects.filter(db_key=name).exists():
return False return False
@ -253,6 +253,11 @@ class WildernessScript(DefaultScript):
room.ndb.wildernessscript = self room.ndb.wildernessscript = self
room.ndb.active_coordinates = coordinates room.ndb.active_coordinates = coordinates
for item in self.db.itemcoordinates.keys(): for item in self.db.itemcoordinates.keys():
# Items deleted from the wilderness leave None type 'ghosts'
# that must be cleaned out
if item is None:
del self.db.itemcoordinates[item]
continue
item.ndb.wilderness = self item.ndb.wilderness = self
def is_valid_coordinates(self, coordinates): def is_valid_coordinates(self, coordinates):
@ -298,6 +303,11 @@ class WildernessScript(DefaultScript):
""" """
result = [] result = []
for item, item_coordinates in self.itemcoordinates.items(): for item, item_coordinates in self.itemcoordinates.items():
# Items deleted from the wilderness leave None type 'ghosts'
# that must be cleaned out
if item is None:
del self.db.itemcoordinates[item]
continue
if coordinates == item_coordinates: if coordinates == item_coordinates:
result.append(item) result.append(item)
return result return result