diff orpg/dieroller/rollers/mythos.py @ 242:72e0cce81a47 beta

Traipse Beta 'OpenRPG' {100817-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 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
author sirebral
date Tue, 17 Aug 2010 14:53:04 -0500
parents dcae32e219f1
children
line wrap: on
line diff
--- a/orpg/dieroller/rollers/mythos.py	Wed Aug 11 14:12:47 2010 -0500
+++ b/orpg/dieroller/rollers/mythos.py	Tue Aug 17 14:53:04 2010 -0500
@@ -30,8 +30,8 @@
 # Targetthr is the Threshhold target
 # for compatibility with Mage die rolls.
 # Threshhold addition by robert t childers
-
-from std import std
+
+from std import std
 from orpg.dieroller.base import *
 
 __version__ = "$Id: wod.py,v Traipse 'Ornery-Orc' prof.ebral Exp $"
@@ -39,6 +39,7 @@
 
 class mythos(std):
     name = "mythos"
+    regExpression = "[\(0-9\*\-\+\)]+[a-zA-Z]+[0-9]+"
 
     def __init__(self,source=[],target=0,targetthr=0):
         std.__init__(self,source)
@@ -85,7 +86,8 @@
             else: myStr += "] vs " +str(self.target)+" result of (" + str(self.sum()) + ")"
         return myStr
 
-    def non_stdDie(self, s):
+    def non_stdDie(self, match):
+        s = match.group(0)
         num_sides = s.split('v')
         if len(num_sides) > 1: 
             num_sides; num = num_sides[0]; sides = num_sides[1]