Mercurial > traipse_dev

comparison orpg/dieroller/utils.py @ 243:3bbfd84619c0 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {101018-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 New IronClaw roller, sheet, and image 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 Fix to Gametree, renaming and remapping operates correctly
author sirebral
date Mon, 18 Oct 2010 23:48:49 -0500
parents 56c1f2729413
children
comparison
equal deleted inserted replaced
242:72e0cce81a47 243:3bbfd84619c0
30 import re 30 import re
31 31
32 import orpg.dieroller.rollers 32 import orpg.dieroller.rollers
33 from orpg.dieroller.base import die_rollers 33 from orpg.dieroller.base import die_rollers
34 34
35 """
36 Die Roller Changes:
37 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
38 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.
39
40 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
41 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
42 at the end, but you can added it before the roll.
43
44 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
45 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
46 dice can be liberated to do what they want, where they want, when they want.
47 """
48
35 class roller_manager(object): 49 class roller_manager(object):
36 def __new__(cls): 50 def __new__(cls):
37 it = cls.__dict__.get("__it__") 51 it = cls.__dict__.get("__it__")
38 if it is not None: return it 52 if it is not None: return it
39 cls.__it__ = it = object.__new__(cls) 53 cls.__it__ = it = object.__new__(cls)
53 def listRollers(self): 67 def listRollers(self):
54 return die_rollers.keys() 68 return die_rollers.keys()
55 69
56 def completeMath(self, matches): 70 def completeMath(self, matches):
57 s = matches.group(0) 71 s = matches.group(0)
58 return str(eval(s)) 72 try: doMath = str(eval(s))
73 except: doMath = s
74 return doMath
59 75
60 def stdDieToDClass(self, match): 76 def stdDie_Class(self, match):
61 s = match.group(0) 77 s = match.group(0)
62 num_sides = s.split('d') 78 num_sides = s.split('d')
63 if len(num_sides) > 1: 79 if len(num_sides) > 1:
64 num_sides; num = num_sides[0]; sides = num_sides[1] 80 num_sides; num = num_sides[0]; sides = num_sides[1]
65 if sides.strip().upper() == 'F': sides = "'f'" 81 if sides.strip().upper() == 'F': sides = "'f'"
70 sides.strip(), '))'] 86 sides.strip(), '))']
71 s = ''.join(ret) 87 s = ''.join(ret)
72 return s 88 return s
73 89
74 # Use this to convert ndm-style (3d6) dice to d_base format 90 # Use this to convert ndm-style (3d6) dice to d_base format
75 def convertTheDieString(self, s): 91 def stdDie(self, s):
76 """ 92 math = '[\(0-9\/\*\-\+\)]+'
77 Die Roller Changes: 93 reg = re.compile('[0-9]+d\s*([0-9]+|'+math+'|[fF])')
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 94 #reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") ## Original
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. 95 try:
96 (result, num_matches) = reg.subn(self.stdDie_Class, s)
97 #print 'main', result, num_matches
98 if num_matches == 0 or result is None:
99 reg = re.compile(math)
100 (result, math_matches) = reg.subn(self.completeMath, s)
101 #print 'math1', result, num_matches
102 reg = re.compile('[0-9]+d\s*([0-9]+|'+math+'|[fF])')
103 (result, num_matches) = reg.subn(self.stdDie_Class, result)
104 #print 'math2', result, num_matches
105 except Exception, e:
106 print 'Die string conversion failed,', e
107 return s
108 return str(result)
80 109
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 110 def nonStdDie(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 111 math = '[\(0-9\/\*\-\+\)]+'
83 at the end, but you can added it before the roll. 112 reg = re.compile(math)
113 (result, math_matches) = reg.subn(self.completeMath, s)
84 114
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 115 reg = re.compile(die_rollers._rollers[self.getRoller()].regExpression)
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 116 (result, num_matches) = reg.subn(self.roller_class().non_stdDie, s) ## Currently skipping math
87 dice can be liberated to do what they want, where they want, when they want.
88 """
89 self.result = ''
90 math = '[\(0-9\/\*\-\+\)]+'
91 reg = re.compile(math+'d\s*([0-9]+|'+math+'|[fF])')
92 117
93 #reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") ## Original 118 if num_matches == 0 or result is None: return s
94 (result, num_matches) = reg.subn(self.stdDieToDClass, s) 119 else: return result
95
96 if num_matches == 0 or result is None:
97 reg = re.compile(math)
98 (result, math_matches) = reg.subn(self.completeMath, s)
99
100 if num_matches == 0 or result is None:
101 try:
102 reg = re.compile(die_rollers._rollers[self.getRoller()].regExpression)
103 (result, num_matches) = reg.subn(self.roller_class().non_stdDie, s)
104 self.result = result
105 except: pass
106 return result
107 120
108 def proccessRoll(self, s): 121 def proccessRoll(self, s):
109 v = self.convertTheDieString(s) 122 ## Re arranged to allow the non standard dice to use the built in roller methods,
110 try: b = str(eval(v)) 123 ## not re-written roller methods.
111 except: 124 b = self.stdDie(s)
112 if v == '': b = s 125 try: b = str(eval(b))
113 else: b = str(v) ##Fail safe for non standard dice. 126 except:
127 b = self.nonStdDie(s)
128 try: b = str(eval(b))
129 except: pass
114 return b 130 return b
115 131
132