# HG changeset patch # User sirebral # Date 1263525741 21600 # Node ID 5609ac14229893e1d5da5d90a73bcbbfa16e1d0f # Parent ff19dd30064b2aa38eefb87b4cc81a38b3397d3d Traipse Alpha 'OpenRPG' {100114-03} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Keeping up with Beta) New Features: Added Bookmarks Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager New TrueDebug Class in orpg_log (See documentation for usage) Portable Mercurial Tip of the Day added, from Core and community New Reference Syntax added for custom PC sheets New Child Reference for gametree New Parent Reference for gametree New Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added Dieroller structure from Core New DieRoller portability for odd Dice Added 7th Sea die roller; ie [7k3] = [7d10.takeHighest(3).open(10)] New 'Mythos' System die roller added Added new vs. die roller method for WoD; ie [3v3] = [3d10.vs(3)]. Included for Mythos roller also New Warhammer FRPG Die Roller (Special thanks to Puu-san for the support) New EZ_Tree Reference system. Push a button, Traipse the tree, get a reference (Beta!) Fixes: Fix to Text based Server Fix to Remote Admin Commands Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Fix to Map from gametree not showing to all clients Fix to gametree about menus Fix to Password Manager check on startup Fix to PC Sheets from tool nodes. They now use the tabber_panel Fix to Whiteboard ID to prevent random line or text deleting. Fixes to Server, Remote Server, and Server GUI Fix to Update Manager; cleaner clode for saved repositories Fixes made to Settings Panel and now reactive settings when Ok is pressed Fixes to Alternity roller's attack roll. Uses a simple Tuple instead of a Splice Fix to Use panel of Forms and Tabbers. Now longer enters design mode Fix made Image Fetching. New fetching image and new failed image Modified ID's to prevent non updated clients from ruining the fix. default_manifest.xml renamed to default_upmana.xml diff -r ff19dd30064b -r 5609ac142298 orpg/dieroller/utils.py --- 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)] diff -r ff19dd30064b -r 5609ac142298 orpg/networking/mplay_server.py --- 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 + "") + self.send_to_all("0","" + 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:
" - bad_xml_string += "OpenRPG bugs " - bad_xml_string += "(http://sourceforge.net/tracker/?group_id=2237&atid=102237)
" +########## + bad_xml_string += "Traipse OpenRPG bugs " + bad_xml_string += "(http://www.assembla.com/wiki/show/traipse_dev)
" self.sendMsg( newsock, "" + 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 = ("" + data + "") + data = ("" + data + "") 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 = "" - groutstring += "Group " + str(k) + ": " + self.groups[k].name + "" + groupstring += "Group " + str(k) + ": " + self.groups[k].name + "" groupstring += " Password: " + self.groups[k].pwd + "" groupstring += " Boot: " + self.groups[k].boot_pwd + "" pl += groupstring @@ -2550,7 +2539,7 @@ pl += "" pl += "Statistics: groups: " + str(len(self.groups)) + " " pl += "players: " + str(len(self.players)) + "" - except Exception, e: self.log_msg(str(e)) + except Exception, e: print e; self.log_msg(str(e)) self.p_lock.release() return pl diff -r ff19dd30064b -r 5609ac142298 orpg/orpg_version.py --- 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"