Changeset 114

Timestamp:

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

Author:

elghinn

Message:

 

Location:

adventure

Files:

• adventuremuc.py (modified) (2 diffs)
• player.py (modified) (1 diff)
• thing.py (modified) (2 diffs)
• world.py (modified) (8 diffs)

adventure/adventuremuc.py

@@ -32 +32 @@
     def send(self, worldnode, worldresource, stanza):
         stanza.setFrom(JID(node=worldnode, domain=self.jid.domain, resource=worldresource))
-        self.send(stanza)
+        Component.send(self, stanza)
 
-    def handle_iq(self, iq):
+    def handle_iq(self, _, iq):
         #print "iq: from #{iq.from} type #{iq.type} to #{iq.to}: #{iq.queryns}"
 
@@ -87 +87 @@
     #    self.component.send(answer)
 
-    def handle_presence(self, pres):
+    def handle_presence(self, _, pres):
         print 'presence: from %s type %s to %s' % (pres.getFrom(), pres.getType(), pres.getTo())
     
-        world = self.worlds[pres.to.node]
+        world = self.worlds[pres.getTo().getNode()]
         if not world:
-            answer = pres.answer
+            answer = pres.buildReply()
             answer.setType('error')
             #answer.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
             self.component.send(answer)
         else:
-            world.handle_presence(pres)
+            world.handle_presence(self,pres)
         return True
 
-    def handle_message(msg):
+    def handle_message(self, _, msg):
         print 'message: from %s type %s to %s: %s' % (msg.getFrom(), msg.getType(), msg.getTo(), repr(msg.getBody()))
 

adventure/player.py

@@ -22 +22 @@
 
     def send_message(self, fromresource, text, subject=None):
-        msg = Message(jid, text)
+        msg = Message(self.jid, text)
         msg.setType('groupchat')
         if subject:

adventure/thing.py

@@ -14 +14 @@
         self.UID = 0
         self.place = None
-        
-    def command_name(self):
-        if attributes['command-name']:
-            return attributes['command-name']
-        return self.iname()
 
-    def jid():
+    def jid(self):
         return None
 
-    def presence():
+    def presence(self):
         xe = None
         #for pres in each_element('presence'):
@@ -33 +28 @@
         return xe
 
-    def see(place):
+    def see(self, place):
         pass
 
-    def send_message(fromresource, text, subject=None):
+    def send_message(self, fromresource, text, subject=None):
         pass
 
-    def send_message_to_place(fromresource, text):
+    def send_message_to_place(self, fromresource, text):
         for thing in self.world.each_element('thing'):
             if thing.place == place:
                 thing.send_message(fromresource, text)
   
-    def on_enter(thing, from_):
+    def on_enter(self, thing, from_):
         for c in each_element('on-enter'):
             command(thing, c, [from_])
 
-    def on_leave(thing, to):
+    def on_leave(self, thing, to):
         for c in each_element('on-leave'):
             command(thing, c, [to])
 
-    def command(source, command, arguments):
+    def command(self, source, command, arguments):
             if command.action[1]:
                 text = command.action[1]

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')