Changeset 143

Timestamp:

04/26/08 19:31:59 (23 months ago)

Author:

thib

Message:

Gestion de l'attribut count pour l'action give, et affichage automatisé des sorties

Location:

adventure

Files:

• place.py (modified) (1 diff)
• thing.py (modified) (2 diffs)
• tower/tower.xml (modified) (1 diff)
• world.dtd (modified) (1 diff)
• world.py (modified) (1 diff)

adventure/place.py

@@ -113 +113 @@
                             '\n******\n\n\n\n**********\n'
                             'Entering %s\n**********'
-                            '\n\n%s\n' % (self.name.capitalize(),
-                                          self.description))
+                            '\n\n%s\nYou can go %s.' % (self.name.capitalize(),
+                                                        self.description,
+                                                        ', '.join(self.exits.keys())))
         
         # Trigger on-enter events

adventure/thing.py

@@ -73 +73 @@
         action_obj = dict()
         action_obj['name'] = action_element.localName
-        action_obj['target'] = action_element.getAttribute('target')
+        for i in ('target', 'count'):
+            action_obj[i] = action_element.getAttribute(i)
+        
         if action_element.firstChild and action_element.firstChild.data:
             action_obj['params'] = action_element.firstChild.data.strip()
@@ -161 +163 @@
                 target = player
             if target:
-                target.inventory.append(params)
+                if action['count'] or target.inventory.count(params) < count:
+                    target.inventory.append(params)
         #   <use target="target">object</give>
         elif action['name'] == 'use':

adventure/tower/tower.xml

@@ -172 +172 @@
                 <command signal="Spider_take_the_key">
                     <narration>The kind spider helps you to get the key</narration>
-                    <give>wizard's key</give>
+                    <give count="1">wizard's key</give>
                 </command>
             </commands>

adventure/world.dtd

@@ -60 +60 @@
 <!ELEMENT give (#EMPTY)>
 <!ATTLIST give
- target CDATA #IMPLIED>
+ target CDATA #IMPLIED
+ count CDATA #IMPLIED>
 
 <!ELEMENT signal (#PCDATA)>

adventure/world.py

@@ -273 +273 @@
 
     def handle_message(self, msg):
-        """ Handle message stanzas coming to the room """
+        """ Handle message stanzas coming to the MUC """
         player = None