--- a/orpg/dieroller/utils.py	Thu Jan 14 12:45:14 2010 -0600
+++ b/orpg/dieroller/utils.py	Thu Jan 14 21:22:21 2010 -0600
@@ -57,6 +57,7 @@
 
     def stdDieToDClass(self, match):
         s = match.group(0)
+        self.mod = str(match.string[len(s):])
         num_sides = s.split('d')
         if len(num_sides) > 1: 
             num_sides; num = num_sides[0]; sides = num_sides[1]
@@ -65,11 +66,10 @@
                 if int(num) > 100 or int(sides) > 10000: return None
             except: pass
             ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](",
-                    sides.strip(), '))']
-            s =  ''.join(ret); return str(eval(s)) ## Moved eval here for portability.
-
-        ## Portable Non Standard Die Characters (for Puu-san)
-        else: s = die_rollers._rollers[self.getRoller()]().non_stdDie(s); return s
+                    sides.strip(), '))'+self.mod]
+            s =  ''.join(ret); s = str(eval(s)); return s ## Moved eval here for portability.
+        ## Portable Non Standard Die Characters #Prof-Ebral
+        else: s = die_rollers._rollers[self.getRoller()]().non_stdDie(s); self.mod = ''; return s
 
     #  Use this to convert ndm-style (3d6) dice to d_base format
     def convertTheDieString(self,s):
@@ -83,9 +83,15 @@
                 test = eval(s2)
                 return s2
             except Exception, e: print e; pass"""
+            try: return self.do_math(s)
+            except: pass
         return result
 
+    def do_math(self, s):
+        self.mod = ''
+        return str(eval(s))
+
     def proccessRoll(self, s):
         v = str(self.convertTheDieString(s))
-        return v
+        return v[:len(v)-len(self.mod)]
 

--- a/orpg/networking/mplay_server.py	Thu Jan 14 12:45:14 2010 -0600
+++ b/orpg/networking/mplay_server.py	Thu Jan 14 21:22:21 2010 -0600
@@ -887,7 +887,7 @@
         print
 
     def broadcast(self,msg):
-        self.send_to_all("0","<msg to='all' from='0' group_id='1'><font color='#FF0000'>" + msg + "</font></msg>")
+        self.send_to_all("0","<msg to='all' from='0' group_id='1'><chat alias='Server Administrator' type='1' version]'1.0'><font color='#FF0000'>" + msg + "</font></chat></msg>")
 
     def console_log(self):
         if self.log_to_console == 1:
@@ -1107,8 +1107,9 @@
             (remote_host,remote_port) = newsock.getpeername()
             bad_xml_string =  "Your client sent an illegal message to the server and will be disconnected. "
             bad_xml_string += "Please report this bug to the development team at:<br /> "
-            bad_xml_string += "<a href=\"http://sourceforge.net/tracker/?group_id=2237&atid=102237\">OpenRPG bugs "
-            bad_xml_string += "(http://sourceforge.net/tracker/?group_id=2237&atid=102237)</a><br />"
+##########
+            bad_xml_string += "<a href='http://www.assembla.com/wiki/show/traipse_dev'>Traipse OpenRPG bugs "
+            bad_xml_string += "(http://www.assembla.com/wiki/show/traipse_dev)</a><br />"
             self.sendMsg( newsock, "<msg to='" + props['id'] + "' from='" + props['id'] + "' group_id='0' />" + bad_xml_string, 
                             new_stub.useCompression, new_stub.compressionType)
 
@@ -1320,16 +1321,6 @@
             try: newsock.close()
             except: pass
             return #returning causes connection thread instance to terminate
-        #  Clear out the xml_dom in preparation for new stuff, if necessary
-        """try: if xml_dom: xml_dom.unlink()
-
-        except:
-            self.log_msg( "The following exception caught unlinking xml_dom:")
-            self.log_msg("Continuing")
-            try: newsock.close()
-            except: pass
-            return #returning causes connection thread instance to terminate
-        #  Parse the XML received from the connecting client"""
         try:
             xml_dom = XML(data)
 
@@ -2159,7 +2150,7 @@
             self.log_msg("Exception: send_to_all(): " + str(e))
 
     def send_to_group(self, from_id, group_id, data):
-        #data = ("<msg to='all' from='0' group_id='"+str(group_id)+"'><font color='#FF0000'>" + data + "</font>")
+        data = ("<msg to='all' from='0' group_id='"+str(group_id)+"'>" + data + "</msg>")
         data = ServerPlugins.postParseIncoming(data) #Function breaks here.
         try:
             self.p_lock.acquire()
@@ -2184,10 +2175,8 @@
 
     def send_group_list(self, to_id, action="new"):
         try:
-            print self.groups
             for key in self.groups:
                 xml = self.groups[key].toxml(action)
-                print xml, key
                 self.players[to_id].outbox.put(xml)
         except Exception, e:
             self.log_msg("Exception: send_group_list(): (client #"+to_id+") : " + str(e))
@@ -2520,7 +2509,7 @@
             keys.sort(id_compare)
             for k in keys:
                 groupstring = "<tr><td bgcolor='" + COLOR2 + "' colspan='2'>"
-                groutstring += "<b>Group " + str(k)  + ": " +  self.groups[k].name  + "</b>"
+                groupstring += "<b>Group " + str(k)  + ": " +  self.groups[k].name  + "</b>"
                 groupstring += "</td><td bgcolor=" + COLOR2 + " > <i>Password: " + self.groups[k].pwd + "</td>"
                 groupstring += "<td bgcolor=" + COLOR2 + " > Boot: " + self.groups[k].boot_pwd + "</i></td></tr>"
                 pl += groupstring
@@ -2550,7 +2539,7 @@
             pl += "<tr><td colspan='4' bgcolor=" + COLOR1 + ">"
             pl += "<font color=" + COLOR4 + "><b><i>Statistics: groups: " + str(len(self.groups)) + "  "
             pl += "players: " +  str(len(self.players)) + "</i></b></font></td></tr></table>"
-        except Exception, e: self.log_msg(str(e))
+        except Exception, e: print e; self.log_msg(str(e))
         self.p_lock.release()
         return pl
 

--- a/orpg/orpg_version.py	Thu Jan 14 12:45:14 2010 -0600
+++ b/orpg/orpg_version.py	Thu Jan 14 21:22:21 2010 -0600
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse Alpha"
 DIS_VER = "Ornery Orc"
-BUILD = "100114-02"
+BUILD = "100114-03"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"