Changeset 102

Timestamp:

10/14/07 10:08:04 (3 years ago)

Author:

elghinn

Message:

some stuff

Location:

adventure

Files:

• adventuremuc.py (modified) (4 diffs)
• place.py (modified) (1 diff)
• player.py (modified) (1 diff)
• world.py (modified) (8 diffs)

adventure/adventuremuc.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-from xmpp import Component
+from xmpp import Component, JID
 from sys import argv
 from world import World
@@ -8 +8 @@
 class AdventureMUC(Component):
     def __init__(self, jid, password, server, port=5347):
+        Component.__init__(server, port)
         self.worlds = {}
     
-        Component.__init__(server, port)
         if not self.connect(server, port):
-            raise Exception, 'Unable to connect to %s:%s' % (server, port))
+            raise Exception, 'Unable to connect to %s:%s' % (server, port)
         if not self.auth(jid, password):
             raise Exception, 'Unable to autenticate as %s' % jid
@@ -29 +29 @@
 
     def send(self, worldnode, worldresource, stanza):
-        stanza.from = Jabber::JID::new(worldnode, self.component.jid.domain, worldresource)
-        self.component.send(stanza)
+        stanza.setFrom(JID(node=worldnode, domain=self.jid.domain, resource=worldresource))
+        self.send(stanza)
 
     def handle_iq(self, iq):
@@ -101 +101 @@
         print "message: from #{msg.from} type #{msg.type} to #{msg.to}: #{msg.body.inspect}"
 
-        world = self.worlds[msg.to.node]
-        if world.nil? :
-            answer = msg.answer
-            answer.type = :error
-            answer.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
-            self.component.send(answer)
+        world = self.worlds[msg.getTo()]
+        if not world:
+            answer = msg.buildReply()
+            answer.type = 'error'
+            #answer.add(Jabber::Error.new('item-not-found', 'The world you are trying to reach is currently unavailable.'))
+            self.send(answer)
         else:
-            msg.body=REXML::Text::unnormalize(msg.body)
+            #msg.body=REXML::Text::unnormalize(msg.body)
             world.handle_message(msg)
         return True

adventure/place.py

@@ -2 +2 @@
 
 class Place:
-    def _init__(self, name):
+    def _init__(self, name, description):
         self.name = name
+        self.description = description
         self.visitors = list()
         self.participants = list()

adventure/player.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+class Player:#(Thing):
+    def __init__(self, world, name, jid):
+        self.world = world
+        self.name = name
+        self.jid = unicode(jid)
+        self.place = None
+  
+    def see(place):
+        if not place:
+            return
+
+        for line in place.description.split('\n'):
+            send_message(None, line.strip())
+
+        send_message(None, ' ')
+        send_message(None, 'You can go %s}' % ', '.join(place.exits.keys()))
+
+    def send_message(fromresource, text, subject=None):
+        msg = Jabber::Message.new(jid, text)
+        msg.type = :groupchat
+        msg.subject = subject unless subject.nil?
+        self.world.send(fromresource, msg)
+
+    def on_enter(self, thing, from_):
+        if thing != self:
+            if from_:
+                send_message(None, '%s enters %s coming from %s' % (thing.name, place, from_))
+            else:
+                send_message(None, '%s spawns' % thing.name)
+
+    def on_leave(self, thing, to):
+        if thing != self:
+            if to:
+                send_message(None, '%s leaves %s going to %s' % (thing.name, place, to))
+            else:
+                send_message(None, '%s disintegrates' % thing.name)
+

adventure/world.py

@@ -2 +2 @@
 
 from place import Place
+from player import Player
 from xml.dom.minidom import parse as xml_parse
 
@@ -12 +13 @@
 
         doc = xml_parse(filename).documentElement
+        doc_getAttribute = doc.documentElement.getAttribute
+        self.node = doc.documentElement.getAttribute('node')
+        self.name = doc.documentElement.getAttribute('name')
+        self.start = doc.documentElement.getAttribute('start')
         get_elements = doc.documentElement.getElementsByTagName
-
         places = get_elements('places')
         for place in places:
-            name = place.getAttribute('name')
-            place_obj = Place(name)
+            place_obj = Place(place.getAttribute('name'),
+                              place.getAttribute('description'))
             gos = place.getElementsByTagName('go')
             for go in gos:
@@ -27 +31 @@
 
 
-    def send(resource, stanza):
+    def send(self, resource, stanza):
         # Avoid sending to things without JID
-        if stanza.to != None:
-            self.muc.send(node, resource, stanza)
-
-    def place(placename):
+        if stanza.getTo() != None:
+            self.muc.send(self.node, resource, stanza)
+
+    def place(self, placename):
         if self.places.has_key(placename):
             return self.places[placename]
@@ -50 +54 @@
             if t.presence:
                 pres = Jabber::Presence.import(t.presence)
-                pres.type = :unavailable
-                pres.to = thing.jid
+                pres.setType('unavailable')
+                pres.SetTo(thing.jid)
                 send(t.iname, pres) unless t.jid == thing.jid
 
@@ -57 +61 @@
             if thing.presence:
                 pres = Jabber::Presence.import(thing.presence)
-                pres.type = :unavailable
+                pres.type = 'unavailable'
                 pres.to = t.jid
                 send(thing.iname, pres) unless thing.jid == t.jid
@@ -78 +82 @@
                 send(thing.iname, pres)
 
-        thing.send_message(nil, " ")
-        subject = newplace.nil? ? " " : newplace.dup
-        subject[0] = subject[0,1].upcase
-        thing.send_message(nil, "Entering #{newplace}", subject)
-        thing.send_message(nil, " ")
+        thing.send_message(None, ' ')
+        if newplace:
+            subject = newplace.dup.capitalize()
+        else:
+            subject = ' '
+        thing.send_message(None, 'Entering %s' % newplace, subject)
+        thing.send_message(None, ' ')
         thing.see(place(newplace))
 
@@ -126 +132 @@
         # Add the valid player
         if not player:
-            player = add(Player.new(self, pres.to.resource, pres.from))
+            player = add(Player(self, pres.getTo().getResource(), pres.getFrom()))
             player.presence = pres
             move_thing(player, attributes['start'])
@@ -285 +291 @@
                     source.send_message(sender, text)
 
-class Player(Thing):
-    def initialize(world, iname, jid):
-        super(world)
-        attributes['name'] = iname
-        attributes['jid'] = jid.to_s
-  
-    def jid():
-        if attributes['jid']:
-            return Jabber::JID::new(attributes['jid'])
-        else:
-            return None
-
-    def see(place):
-        if not place:
-            return
-
-        for line in place.text.strip.split(/\n/).each:
-            send_message(None, line.strip)
-
-        send_message(None, " ")
-
-        directions = []
-        for go in place.each_element('go'):
-            directions.push(go.attributes['spec'])
-        send_message(None, "You can go #{directions.join(', ')}")
-
-    def send_message(fromresource, text, subject=None):
-        msg = Jabber::Message.new(jid, text)
-        msg.type = :groupchat
-        msg.subject = subject unless subject.nil?
-        self.world.send(fromresource, msg)
-
-    def on_enter(thing, from):
-        if thing != self:
-            if from:
-                send_message(nil, "#{thing.iname} enters #{place} coming from #{from}")
-            else:
-                send_message(nil, "#{thing.iname} spawns")
-
-    def on_leave(thing, to):
-        if thing != self:
-            if to:
-                send_message(nil, "#{thing.iname} leaves #{place} going to #{to}")
-            else:
-                send_message(nil, "#{thing.iname} disintegrates")
-