projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use area instead of location or room
[mudpy.git]
/
lib
/
mudpy
/
misc.py
diff --git
a/lib/mudpy/misc.py
b/lib/mudpy/misc.py
index
02db563
..
28b92fb
100644
(file)
--- a/
lib/mudpy/misc.py
+++ b/
lib/mudpy/misc.py
@@
-263,9
+263,9
@@
class Element:
def update_location(self):
"""Make sure the location's contents contain this element."""
def update_location(self):
"""Make sure the location's contents contain this element."""
-
location
= self.get("location")
- if
location
in self.universe.contents:
- self.universe.contents[
location
].contents[self.key] = self
+
area
= self.get("location")
+ if
area
in self.universe.contents:
+ self.universe.contents[
area
].contents[self.key] = self
def clean_contents(self):
"""Make sure the element's contents aren't bogus."""
def clean_contents(self):
"""Make sure the element's contents aren't bogus."""
@@
-273,15
+273,15
@@
class Element:
if element.get("location") != self.key:
del self.contents[element.key]
if element.get("location") != self.key:
del self.contents[element.key]
- def go_to(self,
location
):
- """Relocate the element to a specific
location
."""
+ def go_to(self,
area
):
+ """Relocate the element to a specific
area
."""
current = self.get("location")
if current and self.key in self.universe.contents[current].contents:
del universe.contents[current].contents[self.key]
current = self.get("location")
if current and self.key in self.universe.contents[current].contents:
del universe.contents[current].contents[self.key]
- if
location
in self.universe.contents:
- self.set("location",
location
)
- self.universe.contents[
location
].contents[self.key] = self
- self.look_at(
location
)
+ if
area
in self.universe.contents:
+ self.set("location",
area
)
+ self.universe.contents[
area
].contents[self.key] = self
+ self.look_at(
area
)
def go_home(self):
"""Relocate the element to its default location."""
def go_home(self):
"""Relocate the element to its default location."""
@@
-366,9
+366,9
@@
class Element:
self.send(message)
def portals(self):
self.send(message)
def portals(self):
- """Map the portal directions for a
room
to neighbors."""
+ """Map the portal directions for a
n area
to neighbors."""
portals = {}
portals = {}
- if re.match("""^
location
:-?\d+,-?\d+,-?\d+$""", self.key):
+ if re.match("""^
area
:-?\d+,-?\d+,-?\d+$""", self.key):
coordinates = [(int(x))
for x in self.key.split(":")[1].split(",")]
directions = self.universe.categories["internal"]["directions"]
coordinates = [(int(x))
for x in self.key.split(":")[1].split(",")]
directions = self.universe.categories["internal"]["directions"]
@@
-382,7
+382,7
@@
class Element:
for portal in self.getlist("gridlinks"):
adjacent = map(lambda c, o: c + o,
coordinates, offsets[portal])
for portal in self.getlist("gridlinks"):
adjacent = map(lambda c, o: c + o,
coordinates, offsets[portal])
- neighbor = "
location
:" + ",".join(
+ neighbor = "
area
:" + ",".join(
[(str(x)) for x in adjacent]
)
if neighbor in self.universe.contents:
[(str(x)) for x in adjacent]
)
if neighbor in self.universe.contents:
@@
-479,12
+479,12
@@
class Universe:
# go through all elements to clear out inactive avatar locations
for element in self.contents.values():
# go through all elements to clear out inactive avatar locations
for element in self.contents.values():
-
location
= element.get("location")
- if element in inactive_avatars and
location
:
- if
location
in self.contents and element.key in self.contents[
- location
+
area
= element.get("location")
+ if element in inactive_avatars and
area
:
+ if
area
in self.contents and element.key in self.contents[
+ area
].contents:
].contents:
- del self.contents[
location
].contents[element.key]
+ del self.contents[
area
].contents[element.key]
element.set("default_location", location)
element.remove_facet("location")
element.set("default_location", location)
element.remove_facet("location")
@@
-2065,7
+2065,7
@@
def command_look(actor, parameters):
def command_say(actor, parameters):
def command_say(actor, parameters):
- """Speak to others in the same
room
."""
+ """Speak to others in the same
area
."""
# check for replacement macros and escape them
parameters = escape_macros(parameters)
# check for replacement macros and escape them
parameters = escape_macros(parameters)
@@
-2129,7
+2129,7
@@
def command_say(actor, parameters):
# capitalize the first letter
message = message[0].upper() + message[1:]
# capitalize the first letter
message = message[0].upper() + message[1:]
- # tell the
room
+ # tell the
area
if message:
actor.echo_to_location(
actor.get("name") + " " + action + "s, \"" + message + "\""
if message:
actor.echo_to_location(
actor.get("name") + " " + action + "s, \"" + message + "\""