X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Fmisc.py;h=b322afc132a0484f35b988670fb930f34d2b4cbd;hp=c3e19403275c5ed421590c2efc73de150eab2eac;hb=95b58411eb627c2f6213844b579a315197b4085f;hpb=6161f58fe66ce3cbfa236625555ce54280a0dad8 diff --git a/mudpy/misc.py b/mudpy/misc.py index c3e1940..b322afc 100644 --- a/mudpy/misc.py +++ b/mudpy/misc.py @@ -309,9 +309,9 @@ class Element: def portals(self): """Map the portal directions for an area to neighbors.""" portals = {} - if re.match(r"""^area:-?\d+,-?\d+,-?\d+$""", self.key): + if re.match(r"""^area\.-?\d+,-?\d+,-?\d+$""", self.key): coordinates = [(int(x)) - for x in self.key.split(":")[1].split(",")] + for x in self.key.split(".")[-1].split(",")] offsets = dict( (x, self.universe.contents["mudpy.movement.%s" % x].get("vector") @@ -319,7 +319,7 @@ class Element: for portal in self.get("gridlinks"): adjacent = map(lambda c, o: c + o, coordinates, offsets[portal]) - neighbor = "area:" + ",".join( + neighbor = "area." + ",".join( [(str(x)) for x in adjacent] ) if neighbor in self.universe.contents: @@ -944,17 +944,13 @@ class User: def new_avatar(self): """Instantiate a new, unconfigured avatar for this user.""" counter = 0 - while "avatar:" + self.account.get("name") + ":" + str( - counter - ) in universe.categories.get("actor", {}).keys(): + while ("avatar_%s_%s" % (self.account.get("name"), counter) + in universe.categories.get("actor", {}).keys()): counter += 1 self.avatar = Element( - "actor:avatar:" + self.account.get("name") + ":" + str( - counter - ), - universe, old_style=True - ) - self.avatar.append("inherit", "archetype:avatar") + "actor.avatar_%s_%s" % (self.account.get("name"), counter), + universe) + self.avatar.append("inherit", "archetype.avatar") self.account.append("avatars", self.avatar.key) def delete_avatar(self, avatar): @@ -1405,7 +1401,7 @@ def on_pulse(): # add an element for counters if it doesn't exist if "counters" not in universe.categories.get("internal", {}): - Element("internal:counters", universe, old_style=True) + Element("internal.counters", universe) # update the log every now and then if not universe.categories["internal"]["counters"].get("mark"):