Mercurial > traipse_dev

diff orpg/dieroller/utils.py @ 184:dcae32e219f1 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {100117-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 (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
author sirebral
date Sun, 17 Jan 2010 21:37:34 -0600
parents 0d9b746b5751
children 56c1f2729413
line wrap: on
line diff
--- a/orpg/dieroller/utils.py	Fri Jan 15 23:01:42 2010 -0600
+++ b/orpg/dieroller/utils.py	Sun Jan 17 21:37:34 2010 -0600
@@ -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