Convert sample data to new style

[mudpy.git] / mudpy / misc.py

diff --git a/mudpy/misc.py b/mudpy/misc.py
index 231858a..b322afc 100644 (file)
--- 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:
@@ -950,7 +950,7 @@ class User:
         self.avatar = Element(
             "actor.avatar_%s_%s" % (self.account.get("name"), counter),
             universe)
-        self.avatar.append("inherit", "archetype:avatar")
+        self.avatar.append("inherit", "archetype.avatar")
         self.account.append("avatars", self.avatar.key)
 
     def delete_avatar(self, avatar):
@@ -1401,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"):