Mercurial > traipse

comparison orpg/dieroller/utils.py @ 36:d02e9197c066 ornery-orc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse 'OpenRPG' {101220-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 (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 New ShapeShifter PC Sheet 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 Update to location.py, allows for more portable references when starting Traipse Update to the Features node 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 Server, removing wxPython dependencies where not needed 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 Fix to aliaslib, prevents error caused when SafeHTML is sent None
author sirebral
date Sun, 19 Dec 2010 22:44:36 -0600
parents ff154cf3350c
children
comparison
equal deleted inserted replaced
35:ee890f424e16 36:d02e9197c066
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 29
30 __version__ = "$Id: utils.py,v Traipse 'Ornery-Orc' prof.ebral Exp Exp $"
31
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
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 """
36 48
37 class roller_manager(object): 49 class roller_manager(object):
38 def __new__(cls): 50 def __new__(cls):
39 it = cls.__dict__.get("__it__") 51 it = cls.__dict__.get("__it__")
40 if it is not None: return it 52 if it is not None: return it
53 return self.roller_class.name 65 return self.roller_class.name
54 66
55 def listRollers(self): 67 def listRollers(self):
56 return die_rollers.keys() 68 return die_rollers.keys()
57 69
58 def stdDieToDClass(self, match): 70 def completeMath(self, matches):
59 s = match.group(0); self.eval = str(match.string) 71 s = matches.group(0)
72 try: doMath = str(eval(s))
73 except: doMath = s
74 return doMath
75
76 def stdDie_Class(self, match):
77 s = match.group(0)
60 num_sides = s.split('d') 78 num_sides = s.split('d')
61 if len(num_sides) > 1: 79 if len(num_sides) > 1:
62 num_sides; num = num_sides[0]; sides = num_sides[1] 80 num_sides; num = num_sides[0]; sides = num_sides[1]
63 if sides.strip().upper() == 'F': sides = "'f'" 81 if sides.strip().upper() == 'F': sides = "'f'"
64 try: 82 try:
65 if int(num) > 100 or int(sides) > 10000: return None 83 if int(num) > 100 or int(sides) > 10000: return None
66 except: pass 84 except: pass
67 ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](", 85 ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](",
68 sides.strip(), '))'] 86 sides.strip(), '))']
69 s = ''.join(ret) 87 s = ''.join(ret)
70 self.eval = s
71 return s 88 return s
72 89
73 ## Portable Non Standard Die Characters #Prof-Ebral 90 # 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 91 def stdDie(self, s):
92 math = '[\(0-9\/\*\-\+\)]+'
93 reg = re.compile('[0-9]+d\s*([0-9]+|'+math+'|[fF])')
94 #reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") ## Original
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)
75 109
76 # Use this to convert ndm-style (3d6) dice to d_base format 110 def nonStdDie(self, s):
77 def convertTheDieString(self,s): 111 math = '[\(0-9\/\*\-\+\)]+'
78 self.result = '' 112 reg = re.compile(math)
79 reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+") 113 (result, math_matches) = reg.subn(self.completeMath, s)
80 (result, num_matches) = reg.subn(self.stdDieToDClass, s)
81 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
83 (result, num_matches) = reg.subn(self.stdDieToDClass, s) ## Prof Ebral
84 """try: ## Kinda pointless when you can create new Regular Expressions
85 s2 = self.roller_class + "(0)." + s ## Broken method
86 test = eval(s2)
87 return s2
88 except Exception, e: print e; pass"""
89 self.result = result
90 try: return self.do_math(s)
91 except: pass
92 return result
93 114
94 def do_math(self, s): 115 reg = re.compile(die_rollers._rollers[self.getRoller()].regExpression)
95 return str(eval(s)) 116 (result, num_matches) = reg.subn(self.roller_class().non_stdDie, s) ## Currently skipping math
117
118 if num_matches == 0 or result is None: return s
119 else: return result
96 120
97 def proccessRoll(self, s): 121 def proccessRoll(self, s):
98 v = self.convertTheDieString(s) 122 ## Re arranged to allow the non standard dice to use the built in roller methods,
99 try: b = str(eval(v)) 123 ## not re-written roller methods.
100 except: 124 b = self.stdDie(s)
101 if v == self.eval: b = s 125 try: b = str(eval(b))
102 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
103 return b 130 return b
104 131
132