Mercurial > traipse_dev

comparison orpg/dieroller/utils.py @ 239:56c1f2729413 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {100811-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. 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
author sirebral
date Wed, 11 Aug 2010 13:52:30 -0500
parents dcae32e219f1
children 3bbfd84619c0
comparison
equal deleted inserted replaced
238:b44dad398833 239:56c1f2729413
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (C) 2000-2001 The OpenRPG Project 2 # Copyright (C) 2000-2010 The OpenRPG Project
3 # 3 #
4 # openrpg-dev@lists.sourceforge.net 4 # owner@madmathlabs.com
5 # 5 #
6 # This program is free software; you can redistribute it and/or modify 6 # This program is free software; you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License as published by 7 # it under the terms of the GNU General Public License as published by
8 # the Free Software Foundation; either version 2 of the License, or 8 # the Free Software Foundation; either version 2 of the License, or
9 # (at your option) any later version. 9 # (at your option) any later version.
18 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 18 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 # -- 19 # --
20 # 20 #
21 # File: dieroller/utils.py 21 # File: dieroller/utils.py
22 # Author: OpenRPG Team 22 # Author: OpenRPG Team
23 # Maintainer: 23 # Maintainer (Traipse): Tyler Starke
24 # Version: 24 # Version:
25 # $Id: utils.py,v Traipse 'Ornery-Orc' prof.ebral Exp $ 25 # $Id: utils.py,v Traipse 'Ornery-Orc' prof.ebral Exp $
26 # 26 #
27 # Description: Classes to help manage the die roller 27 # Description: Classes to help manage the die roller
28 # 28 #
29
30 __version__ = "$Id: utils.py,v Traipse 'Ornery-Orc' prof.ebral Exp Exp $"
31 29
32 import re 30 import re
33 31
34 import orpg.dieroller.rollers 32 import orpg.dieroller.rollers
35 from orpg.dieroller.base import die_rollers 33 from orpg.dieroller.base import die_rollers
53 return self.roller_class.name 51 return self.roller_class.name
54 52
55 def listRollers(self): 53 def listRollers(self):
56 return die_rollers.keys() 54 return die_rollers.keys()
57 55
56 def completeMath(self, matches):
57 s = matches.group(0)
58 return str(eval(s))
59
58 def stdDieToDClass(self, match): 60 def stdDieToDClass(self, match):
59 s = match.group(0); self.eval = str(match.string) 61 s = match.group(0)
60 num_sides = s.split('d') 62 num_sides = s.split('d')
61 if len(num_sides) > 1: 63 if len(num_sides) > 1:
62 num_sides; num = num_sides[0]; sides = num_sides[1] 64 num_sides; num = num_sides[0]; sides = num_sides[1]
63 if sides.strip().upper() == 'F': sides = "'f'" 65 if sides.strip().upper() == 'F': sides = "'f'"
64 try: 66 try:
65 if int(num) > 100 or int(sides) > 10000: return None 67 if int(num) > 100 or int(sides) > 10000: return None
66 except: pass 68 except: pass
67 ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](", 69 ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](",
68 sides.strip(), '))'] 70 sides.strip(), '))']
69 s = ''.join(ret) 71 s = ''.join(ret)
70 self.eval = s
71 return s 72 return s
72 73
73 ## Portable Non Standard Die Characters #Prof-Ebral 74 # Use this to convert ndm-style (3d6) dice to d_base format
74 else: s = die_rollers._rollers[self.getRoller()]().non_stdDie(s); return s 75 def convertTheDieString(self, s):
76 """
77 Die Roller Changes:
78 I've made some changes for ease of reading. Below you see the new formula and the old depricated formula. The new formula is easier to understand
79 and works a little better with math. Try this: [(2+4)+4d(6+8)+(4*4)] with both formulas. Traipse succeeds, Standard (1.7.1) fails.
75 80
76 # Use this to convert ndm-style (3d6) dice to d_base format 81 The new formula deals only with numbers of the Fudge roller. The math has a required process flow, which is unliked currently by me but I am not
77 def convertTheDieString(self,s): 82 going to spend more time on at currently to correct it. It occurs when using paranthesis on the facet. If paranthesis are used no modifier can be added
83 at the end, but you can added it before the roll.
84
85 This is the standard roller formula: (Math D Numbers or Math or Fudge). If that fails the new non_stdDie looks for a regExpression formula inside
86 the current die roller, set under the name. So all of that bloat to include the english language in the Gilcrease 1.8.0 remains bloat and Traipse's
87 dice can be liberated to do what they want, where they want, when they want.
88 """
78 self.result = '' 89 self.result = ''
79 reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") 90 math = '[\(0-9\/\*\-\+\)]+'
91 reg = re.compile(math+'d\s*([0-9]+|'+math+'|[fF])')
92
93 #reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") ## Original
80 (result, num_matches) = reg.subn(self.stdDieToDClass, s) 94 (result, num_matches) = reg.subn(self.stdDieToDClass, s)
95
81 if num_matches == 0 or result is None: 96 if num_matches == 0 or result is None:
82 reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[a-zA-Z]+") ## Prof Ebral 97 reg = re.compile(math)
83 (result, num_matches) = reg.subn(self.stdDieToDClass, s) ## Prof Ebral 98 (result, math_matches) = reg.subn(self.completeMath, s)
84 """try: ## Kinda pointless when you can create new Regular Expressions 99
85 s2 = self.roller_class + "(0)." + s ## Broken method 100 if num_matches == 0 or result is None:
86 test = eval(s2) 101 try:
87 return s2 102 reg = re.compile(die_rollers._rollers[self.getRoller()].regExpression)
88 except Exception, e: print e; pass""" 103 (result, num_matches) = reg.subn(self.roller_class().non_stdDie, s)
89 self.result = result 104 self.result = result
90 try: return self.do_math(s)
91 except: pass 105 except: pass
92 return result 106 return result
93
94 def do_math(self, s):
95 return str(eval(s))
96 107
97 def proccessRoll(self, s): 108 def proccessRoll(self, s):
98 v = self.convertTheDieString(s) 109 v = self.convertTheDieString(s)
99 try: b = str(eval(v)) 110 try: b = str(eval(v))
100 except: 111 except:
101 if v == self.eval: b = s 112 if v == '': b = s
102 else: b = str(v) ##Fail safe for non standard dice. 113 else: b = str(v) ##Fail safe for non standard dice.
103 return b 114 return b
104 115