Changeset 114 for adventure/world.py

Timestamp:

10/14/07 17:08:42 (3 years ago)

Author:

elghinn

Message:

 

Files:

• adventure/world.py (modified) (8 diffs)

adventure/world.py

@@ -49 +49 @@
 
     def move_thing(self, thing, newplace):
-        for t in each_thing_by_place(thing.place):
+        for t in self.each_thing_by_place(thing.place):
             # Call leave hooks
             t.on_leave(thing, newplace)
@@ -73 +73 @@
         thing.place = newplace
 
-        for t in each_thing_by_place(thing.place):
+        for t in self.each_thing_by_place(thing.place):
             # Broadcast availability presence to enterer
             if t.presence:
@@ -95 +95 @@
         thing.see(place(newplace))
 
-        for t in each_thing_by_place(thing.place):
+        for t in self.each_thing_by_place(thing.place):
             # Call enter hooks
             t.on_enter(thing, oldplace)
 
-    def handle_presence(pres):
+    def handle_presence(self, _, pres):
         # A help for the irritated first:
         if pres.getType() == 'subscribe':
@@ -139 +139 @@
             player.presence = pres
             self.players[player.name] = player
-            move_thing(player, attributes['start'])
+            self.move_thing(player, self.start)
             player.send_message('Help!', 'Send "?" to get a list of available commands any time.')
         # Or broadcast updated presence
@@ -145 +145 @@
             player.presence = pres
 
-            for t in each_thing_by_place(player.place):
+            for t in self.each_thing_by_place(player.place):
                 # Broadcast presence to all who are here
                 pres = Presence(node=player.presence)
@@ -156 +156 @@
             del self.players[player.name]
 
-    def handle_message(msg):
+    def handle_message(self, _, msg):
         player = None
         for thing in self.things.values():
@@ -170 +170 @@
 
         if not command(player, msg.getBody()):
-            for thing in each_thing_by_place(player.place):
+            for thing in self.each_thing_by_place(player.place):
                 thing.send_message(player.iname, msg.body)
 
-    def command(player, text):
+    def command(self, player, text):
         if text == '?':
             player.send_message(None, '(Command) who')
@@ -195 +195 @@
                 newplace = None
 
-                for go in oldplace.each_element('go'):
-                    if go.attributes['spec'] == what:
-                        newplace = go.attributes['place']
+                for name, place in oldplace.exits.items():
+                    if name == what:
+                        newplace = place
 
                 if newplace:
-                    move_thing(player, newplace)
+                    self.move_thing(player, newplace)
                 else:
                     player.send_message(None, 'You cannot go there')