Mercurial > traipse_dev
changeset 242:72e0cce81a47 beta
Traipse Beta 'OpenRPG' {100817-00}
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 (Closing/Closed)
New Features:
New to Map, can re-order Grid, Miniatures, and Whiteboard layer draw order
New to Server GUI, can now clear log
New Earthdawn Dieroller
Updates:
Update to Warhammer PC Sheet. Rollers set as macros. Should work with little maintanence.
Update to Browser Server window. Display rooms with ' " & cleaner
Update to Server. Handles ' " & cleaner
Update to Dieroller. Cleaner, more effecient expression system
Update to Hidden Die plugin, allows for non standard dice rolls
Fixes:
Fix to InterParse that was causing an Infernal Loop with Namespace Internal
Fix to XML data, removed old Minidom and switched to Element Tree
Fix to Server that was causing eternal attempt to find a Server ID, in Register Rooms thread
Fix to metaservers.xml file not being created
Fix to Single and Double quotes in Whiteboard text
Fix to Background images not showing when using the Image Server
Fix to Duplicate chat names appearing
Fix to Server GUI's logging output
Fix to FNB.COLORFUL_TABS bug
Fix to Gametree for XSLT Sheets
Fix to Gametree for locating gametree files
Fix to Send to Chat from Gametree
| author | sirebral |
|---|---|
| date | Tue, 17 Aug 2010 14:53:04 -0500 |
| parents | 6919a88b788c |
| children | 3bbfd84619c0 |
| files | orpg/dieroller/rollers/7sea.py orpg/dieroller/rollers/alternity.py orpg/dieroller/rollers/mythos.py orpg/gametree/nodehandlers/core.py orpg/gametree/nodehandlers/forms.py orpg/gametree/nodehandlers/map_miniature_nodehandler.py orpg/orpg_version.py orpg/tools/InterParse.py plugins/xxhiddendice.py |
| diffstat | 9 files changed, 35 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/dieroller/rollers/7sea.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/dieroller/rollers/7sea.py Tue Aug 17 14:53:04 2010 -0500 @@ -38,12 +38,13 @@ class seventhsea(std): name = "7sea" + regExpression = "[\(0-9\*\-\+\)]+[a-zA-Z]+[0-9]+" def __init__(self,source=[]): std.__init__(self,source) - def non_stdDie(self, s): - print '7th Sea' + def non_stdDie(self, match): + s = match.group(0) num_sides = s.split('k') if len(num_sides) > 1: num_sides; num = num_sides[0]; sides = '10'; target = num_sides[1]
--- a/orpg/dieroller/rollers/alternity.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/dieroller/rollers/alternity.py Tue Aug 17 14:53:04 2010 -0500 @@ -118,7 +118,6 @@ elif ( self.dieRoll <= self.score / 2 ): self.success = 'G' elif ( self.dieRoll <= self.score ): self.success = 'O' else: self.success = 'F' - if ( self.d20 == 20 ): self.success = 'CF' return myStr def __str__(self): @@ -218,31 +217,17 @@ myStr = " <b><font color='#E42217'>ACTION CHECK : </font></b>"+myStr successes = {'CS': " <b><font size=2 color='#8D38C9'>CRITICAL SUCCESS</font></b>", - 'CF': " <b><font size=2 color='#151B54'>CRITICAL FAILURE</font></b><BR> -2 Step make up bonus next Action Check", + 'CF': " <b><font size=2 color='#151B54'>CRITICAL FAILURE</font></b>", 'A': " <b><font size=2 color='#E42217'>AMAZING Success</font></b>", 'G': " <b><font size=2 color='#306EFF'>Good Success</font></b>", 'O': " <b><font size=2 color='#52D017'>Ordinary Success</font></b>", 'F': " <b><font size=2 color='#41627E'>Marginal failure</font></b>"} - if ( self.d20 == 1 ): myStr += successes['CS'] # SEG Dec 19 2009 - myStr += successes[self.success] - if ( self.d20 == 1 ) and (self.success == 'F') : - myStr += " final result ==> " - myStr += successes['O'] # SEG JAN 23 2010 - if ( self.d20 != 1 ) and (self.success == 'F') : - myStr += "<BR> -1 Step make up bonus next Action Check" - + if self.d20 == 1: + myStr += successes['CS'] + myStr += ' (' +successes[self.success]+ ' )' + elif self.d20 == 20: + myStr += successes['CF'] + myStr += ' (' +successes[self.success]+ ' )' + else: myStr += successes[self.success] return myStr - - - - - - - - - - - - -
--- a/orpg/dieroller/rollers/mythos.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/dieroller/rollers/mythos.py Tue Aug 17 14:53:04 2010 -0500 @@ -30,8 +30,8 @@ # Targetthr is the Threshhold target # for compatibility with Mage die rolls. # Threshhold addition by robert t childers - -from std import std + +from std import std from orpg.dieroller.base import * __version__ = "$Id: wod.py,v Traipse 'Ornery-Orc' prof.ebral Exp $" @@ -39,6 +39,7 @@ class mythos(std): name = "mythos" + regExpression = "[\(0-9\*\-\+\)]+[a-zA-Z]+[0-9]+" def __init__(self,source=[],target=0,targetthr=0): std.__init__(self,source) @@ -85,7 +86,8 @@ else: myStr += "] vs " +str(self.target)+" result of (" + str(self.sum()) + ")" return myStr - def non_stdDie(self, s): + def non_stdDie(self, match): + s = match.group(0) num_sides = s.split('v') if len(num_sides) > 1: num_sides; num = num_sides[0]; sides = num_sides[1]
--- a/orpg/gametree/nodehandlers/core.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/gametree/nodehandlers/core.py Tue Aug 17 14:53:04 2010 -0500 @@ -214,7 +214,7 @@ pass def on_send_to_chat(self,evt): - self.chat.ParsePost(self.tohtml(),True,True) + Parse.Post(self.tohtml(),False) def on_drop(self, evt): drag_obj = self.tree.drag_obj
--- a/orpg/gametree/nodehandlers/forms.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/gametree/nodehandlers/forms.py Tue Aug 17 14:53:04 2010 -0500 @@ -222,8 +222,9 @@ def tohtml(self): txt = self.get_value() - txt = string.replace(txt,'\n',"<br />") - if not self.is_hide_title(): txt = "<b>"+self.xml.get("name")+":</b> "+txt + if txt == None: txt = '' + txt = txt.replace('\n','<br />') + if not self.is_hide_title(): txt = '<b>'+self.xml.get('name')+':</b> '+txt return txt def get_value(self):
--- a/orpg/gametree/nodehandlers/map_miniature_nodehandler.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/gametree/nodehandlers/map_miniature_nodehandler.py Tue Aug 17 14:53:04 2010 -0500 @@ -124,7 +124,7 @@ def tohtml(self): html_str = "<table><tr><td>" - html_str += "<center><img src='" + self.xml.get("path") + "'>" + html_str += "<center><img src='" + self.miniature_xml.get("path") + "'>" html_str += "</center></td></tr>\n" html_str += "<tr><td><center>" + self.xml.get("name") + "</center></td></tr></table>" return html_str
--- a/orpg/orpg_version.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/orpg_version.py Tue Aug 17 14:53:04 2010 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Beta" DIS_VER = "Ornery Orc" -BUILD = "100811-02" +BUILD = "100817-00" # This version is for network capability. PROTOCOL_VERSION = "1.2"
--- a/orpg/tools/InterParse.py Wed Aug 11 14:12:47 2010 -0500 +++ b/orpg/tools/InterParse.py Tue Aug 17 14:53:04 2010 -0500 @@ -52,7 +52,8 @@ #s = self.NodeParent(s, node) return s - def Normalize(self, s, tab): + def Normalize(self, s, tab=False): + if not tab: tab = component.get('chat') for plugin_fname in tab.activeplugins.keys(): plugin = tab.activeplugins[plugin_fname] try: s = plugin.pre_parse(s)
--- a/plugins/xxhiddendice.py Wed Aug 11 14:12:47 2010 -0500 +++ b/plugins/xxhiddendice.py Tue Aug 17 14:53:04 2010 -0500 @@ -1,6 +1,8 @@ import os, re, wx import orpg.pluginhandler from orpg.tools.InterParse import Parse +from orpg.dieroller.base import die_rollers +from orpg.dieroller.utils import roller_manager class Plugin(orpg.pluginhandler.PluginHandler): # Initialization subroutine. @@ -21,7 +23,7 @@ #You can set variables below here. Always set them to a blank value in this section. Use plugin_enabled #to set their proper values. self.hiddenrolls = [] - self.dicere = "\{([0-9]*d[0-9]*.+)\}" + #self.dicere = "\{([0-9]*d[0-9]*.+)\}" def plugin_menu(self): self.menu = wx.Menu() @@ -40,12 +42,18 @@ def pre_parse(self, text): if self.toggle.IsChecked() == True: - m = re.search(self.dicere, text) + ## Changes added for non standard dice rolls. Prof.Ebral (TaS) + math = '[\(0-9\/\*\-\+\)]+' + dicere = '\{('+math+'d\s*([0-9]+|'+math+'|[fF]))\}' + m = re.search(dicere, text) + if m is None: + dicere = '\{('+die_rollers._rollers[roller_manager().getRoller()].regExpression+')\}' + m = re.search(dicere, text) while m: roll = "[" + m.group(1) + "]" self.hiddenrolls += [Parse.Dice(roll)] text = text[:m.start()] + "(hidden roll)" + text[m.end():] - m = re.search(self.dicere, text) + m = re.search(dicere, text) return text def post_msg(self, text, myself):