Mercurial > traipse_dev
diff orpg/dieroller/utils.py @ 227:81d0bfd5e800 alpha
Traipse Alpha 'OpenRPG' {100612-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 (Preparing to close updates)
New Features:
New to Map, can re-order Grid, Miniatures, and Whiteboard layer draw order
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
| author | sirebral |
|---|---|
| date | Sat, 12 Jun 2010 03:50:37 -0500 |
| parents | 5609ac142298 |
| children |
line wrap: on
line diff
--- a/orpg/dieroller/utils.py Fri Jan 15 22:45:51 2010 -0600 +++ b/orpg/dieroller/utils.py Sat Jun 12 03:50:37 2010 -0500 @@ -22,12 +22,12 @@ # Author: OpenRPG Team # Maintainer: # Version: -# $Id: utils.py,v 1.22 2007/05/05 05:30:10 digitalxero Exp $ +# $Id: utils.py,v Traipse 'Ornery-Orc' prof.ebral Exp $ # # Description: Classes to help manage the die roller # -__version__ = "$Id: utils.py,v 1.22 2007/05/05 05:30:10 digitalxero Exp $" +__version__ = "$Id: utils.py,v Traipse 'Ornery-Orc' prof.ebral Exp Exp $" import re @@ -56,8 +56,7 @@ return die_rollers.keys() def stdDieToDClass(self, match): - s = match.group(0) - self.mod = str(match.string[len(s):]) + s = match.group(0); self.eval = str(match.string) num_sides = s.split('d') if len(num_sides) > 1: num_sides; num = num_sides[0]; sides = num_sides[1] @@ -66,13 +65,17 @@ if int(num) > 100 or int(sides) > 10000: return None except: pass ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](", - sides.strip(), '))'+self.mod] - s = ''.join(ret); s = str(eval(s)); return s ## Moved eval here for portability. + sides.strip(), '))'] + s = ''.join(ret) + self.eval = s + return s + ## Portable Non Standard Die Characters #Prof-Ebral - else: s = die_rollers._rollers[self.getRoller()]().non_stdDie(s); self.mod = ''; return s + else: s = die_rollers._rollers[self.getRoller()]().non_stdDie(s); return s # Use this to convert ndm-style (3d6) dice to d_base format def convertTheDieString(self,s): + self.result = '' reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") (result, num_matches) = reg.subn(self.stdDieToDClass, s) if num_matches == 0 or result is None: @@ -83,15 +86,19 @@ test = eval(s2) return s2 except Exception, e: print e; pass""" + self.result = result 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[:len(v)-len(self.mod)] + v = self.convertTheDieString(s) + try: b = str(eval(v)) + except: + if v == self.eval: b = s + else: b = str(v) ##Fail safe for non standard dice. + return b