Mercurial > traipse_dev
diff orpg/gametree/nodehandlers/d20.py @ 195:b633f4c64aae alpha
Traipse Alpha 'OpenRPG' {100219-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 (Patch-2)
New Features:
New Namespace method with two new syntaxes
Fixes:
Fix to Server GUI startup errors
Fix to Server GUI Rooms tab updating
Fix to Chat and Settings if non existant die roller is picked
Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated
Fix to Alias Lib's Export to Tree, Open, Save features
Fix to alias node, now works properly
Fix to Splitter node, minor GUI cleanup
| author | sirebral |
|---|---|
| date | Sat, 24 Apr 2010 08:37:20 -0500 |
| parents | bf799efe7a8a |
| children |
line wrap: on
line diff
--- a/orpg/gametree/nodehandlers/d20.py Fri Jan 15 22:45:51 2010 -0600 +++ b/orpg/gametree/nodehandlers/d20.py Sat Apr 24 08:37:20 2010 -0500 @@ -21,12 +21,12 @@ # Author: Chris Davis # Maintainer: # Version: -# $Id: d20.py,v 1.30 2007/05/22 00:50:57 digitalxero Exp $ +# $Id: d20.py,v Traipse 'Ornery-Orc' prof.ebral Exp $ # # Description: The file contains code for the d20 nodehanlers # -__version__ = "$Id: d20.py,v 1.30 2007/05/22 00:50:57 digitalxero Exp $" +__version__ = "$Id: d20.py,v Traipse 'Ornery-Orc' prof.ebral Exp $" from core import * from containers import * @@ -34,6 +34,7 @@ from xml.etree.ElementTree import ElementTree, Element, iselement from xml.etree.ElementTree import fromstring, tostring, parse, XML from orpg.tools.orpg_log import debug +from orpg.tools.InterParse import Parse D20_EXPORT = wx.NewId() ############################ @@ -991,9 +992,9 @@ for i in range( 0, len( bab ) ): if bab[i] > 0 or i == 0: attack_roll_str = '[1d20%+d]' % (bab[i] + attack_mod) - attack_roll_parsed = self.chat.ParseDice( attack_roll_str ) + attack_roll_parsed = Parse.Dice( attack_roll_str ) damage_roll_str = '[%dd%d%+d%s]' % (num_damage_dice, damage_die, damage_mod, extra_damage) - damage_roll_parsed = self.chat.ParseDice( damage_roll_str ) + damage_roll_parsed = Parse.Dice( damage_roll_str ) txt = '%s (%s): %s ===> Damage: %s' \ % (name, bab_attributes[i], attack_roll_parsed, damage_roll_parsed) self.chat.Post( txt, True, True )