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

Format code with black. Add makefile to run fmt/tests

Browse source
This commit is contained in:
Griatch 2019-09-28 18:18:11 +02:00
parent d00bce9288
commit c2c7fa311a
299 changed files with 19037 additions and 11611 deletions
Download patch file Download diff file Expand all files Collapse all files

68
evennia/contrib/wilderness.py
View file

@ -335,8 +335,7 @@ class WildernessScript(DefaultScript):
self._destroy_room(old_room)
except KeyError:
# There is no room yet at new_location
if (old_room and not inherits_from(old_room, WildernessRoom)) or \
(not old_room):
if (old_room and not inherits_from(old_room, WildernessRoom)) or (not old_room):
# Obj doesn't originally come from a wilderness room.
# We'll create a new one then.
room = self._create_room(new_coordinates, obj)
@ -390,26 +389,30 @@ class WildernessScript(DefaultScript):
# No more unused rooms...time to make a new one.
# First, create the room
room = create_object(typeclass=self.mapprovider.room_typeclass,
key="Wilderness",
report_to=report_to)
room = create_object(
typeclass=self.mapprovider.room_typeclass, key="Wilderness", report_to=report_to
)
# Then the exits
exits = [("north", "n"),
("northeast", "ne"),
("east", "e"),
("southeast", "se"),
("south", "s"),
("southwest", "sw"),
("west", "w"),
("northwest", "nw")]
exits = [
("north", "n"),
("northeast", "ne"),
("east", "e"),
("southeast", "se"),
("south", "s"),
("southwest", "sw"),
("west", "w"),
("northwest", "nw"),
]
for key, alias in exits:
create_object(typeclass=self.mapprovider.exit_typeclass,
key=key,
aliases=[alias],
location=room,
destination=room,
report_to=report_to)
create_object(
typeclass=self.mapprovider.exit_typeclass,
key=key,
aliases=[alias],
location=room,
destination=room,
report_to=report_to,
)
room.ndb.active_coordinates = coordinates
room.ndb.wildernessscript = self
@ -490,8 +493,7 @@ class WildernessRoom(DefaultRoom):
Returns:
name (str)
"""
return self.wilderness.mapprovider.get_location_name(
self.coordinates)
return self.wilderness.mapprovider.get_location_name(self.coordinates)
@property
def coordinates(self):
@ -651,8 +653,7 @@ class WildernessExit(DefaultExit):
"""
return self.wilderness.mapprovider
def at_traverse_coordinates(self, traversing_object, current_coordinates,
new_coordinates):
def at_traverse_coordinates(self, traversing_object, current_coordinates, new_coordinates):
"""
Called when an object wants to travel from one place inside the
wilderness to another place inside the wilderness.
@ -692,22 +693,24 @@ class WildernessExit(DefaultExit):
current_coordinates = itemcoordinates[traversing_object]
new_coordinates = get_new_coordinates(current_coordinates, self.key)
if not self.at_traverse_coordinates(traversing_object,
current_coordinates,
new_coordinates):
if not self.at_traverse_coordinates(
traversing_object, current_coordinates, new_coordinates
):
return False
if not traversing_object.at_before_move(None):
return False
traversing_object.location.msg_contents("{} leaves to {}".format(
traversing_object.key, new_coordinates),
exclude=[traversing_object])
traversing_object.location.msg_contents(
"{} leaves to {}".format(traversing_object.key, new_coordinates),
exclude=[traversing_object],
)
self.location.wilderness.move_obj(traversing_object, new_coordinates)
traversing_object.location.msg_contents("{} arrives from {}".format(
traversing_object.key, current_coordinates),
exclude=[traversing_object])
traversing_object.location.msg_contents(
"{} arrives from {}".format(traversing_object.key, current_coordinates),
exclude=[traversing_object],
)
traversing_object.at_after_move(None)
return True
@ -719,6 +722,7 @@ class WildernessMapProvider(object):
This is a simple provider that just creates an infinite large grid area.
"""
room_typeclass = WildernessRoom
exit_typeclass = WildernessExit