Changeset 121 for adventure/world.py

Timestamp:

10/24/07 13:27:51 (3 years ago)

Author:

elghinn

Message:

* no more bugs

Files:

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

adventure/world.py

@@ -15 +15 @@
         doc = xml_parse(filename)
         doc_getAttribute = doc.documentElement.getAttribute
-        self.node = doc.documentElement.getAttribute('node')
-        self.name = doc.documentElement.getAttribute('name')
-        self.start = doc.documentElement.getAttribute('start')
+        self.node = doc_getAttribute('node')
+        self.name = doc_getAttribute('name')
+        self.start = doc_getAttribute('start')
         get_elements = doc.documentElement.getElementsByTagName
         places = get_elements('place')
         for place in places:
-            place_obj = Place(place.getAttribute('name'),
-                              place.getAttribute('description'))
+            place_obj = Place(
+                place.getAttribute('name'),
+                place.getElementsByTagName('description')[0].firstChild.data)
             self.places[place_obj.name] = place_obj
             gos = place.getElementsByTagName('go')
@@ -30 +31 @@
         #things = get_elements('thing')
         #for thing in things:
-            
+
 
 
@@ -106 +107 @@
             msg.setType('normal')
             msg.setSubject('Adventure component help')
-            msg.setBody('You don\'t need to subscribe to my presence. Simply use your Jabber client to join the MUC or conference at %s' % pres.getTo())
+            msg.setBody('You don\'t need to subscribe to my presence. '
+                        'Simply use your Jabber client to join the MUC or '
+                        'conference at %s' % pres.getTo())
             self.send(None, msg)
             return True
@@ -113 +116 @@
         player = None
         for thing in self.things.values():
-            if isinstance(thing, Player) and pres.getTo().getResource() == thing.name:
+            if (isinstance(thing, Player) and
+                pres.getTo().getResource() == thing.name):
                 player = thing
 
             # Disallow nick changes
-            if isinstance(thing, Player) and (pres.getFrom() == thing.jid) and (player != thing):
-                answer = Error(pres, 'not-acceptable', 'Nickchange not allowed') #False
+            if (isinstance(thing, Player) and pres.getFrom() == thing.jid and
+                player != thing):
+                answer = Error(pres, 'not-acceptable',
+                               'Nickchange not allowed') #False
                 self.send(thing.name, answer)
                 return True
 
         # Either nick-collission or empty nick
-        if player and pres.getFrom() != player.jid or len(pres.getTo().getResource()) < 2:
+        if (player and pres.getFrom() != player.jid or
+            len(pres.getTo().getResource()) < 2):
             answer = None
             if len(pres.getTo().getResource()) > 1:
@@ -138 +145 @@
             self.things[player.name] = player
             self.move_thing(player, self.start)
-            player.send_message('Help!', 'Send "?" to get a list of available commands any time.')
+            player.send_message('Help!', 'Send "?" to get a list of available '
+                                'commands any time.')
         # Or broadcast updated presence
         else:
@@ -158 +166 @@
         player = None
         for thing in self.things.values():
-            if isinstance(thing, Player) and not msg.getTo().getResource() and msg.getFrom() == thing.jid:
+            if (isinstance(thing, Player) and not msg.getTo().getResource() and
+                msg.getFrom() == thing.jid):
                 player = thing
 
@@ -172 +181 @@
     def command(self, player, text):
         if text == '?':
-            player.send_message(None, '(Command) who')
+            player.send_message('Help!', '(Command) who')
             place = self.place(player.place)
             if place:
                 for exit_name in place.exits.keys():
-                    player.send_message(None, '(Command) go %s' % exit_name)
+                    player.send_message('Help!', '(Command) go %s' % exit_name)
             for thing in self.each_thing_by_place(player.place):
                 for c in thing.actions:
-                    player.send_message(None, '(Command) %s %s' % (c.expressions[0], thing.name))
+                    player.send_message('Help!',
+                                        '(Command) %s %s' % (c.expressions[0],
+                                                             thing.name))
             return True
         else:
@@ -189 +200 @@
                 what = ''
             if cmd == 'go':
+                print what
                 oldplace = self.place(player.place)
                 newplace = None
@@ -205 +217 @@
                 for thing in self.things.values():
                     if isinstance(thing, Player):
-                        player.send_message(None, '%s is at/in %s' % (thing.name, thing.place))
+                        player.send_message(None,
+                                            '%s is at/in %s' % (thing.name,
+                                                                thing.place))
                 return True
             else: