Mercurial > traipse_dev

changeset 193:6debef714365 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {100201-02} 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 (Beta) New Features: New Bookmarks Feature New 'boot' command to remote admin New confirmation window for sent nodes Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG New Zoom Mouse plugin added New Images added to Plugin UI Switching to Element Tree New Map efficiency, from FlexiRPG New Status Bar to Update Manager New TrueDebug Class in orpg_log (See documentation for usage) New Portable Mercurial New Tip of the Day, from Core and community New Reference Syntax added for custom PC sheets New Child Reference for gametree New Parent Reference for gametree New Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added New Dieroller structure from Core New DieRoller portability for odd Dice New 7th Sea die roller; ie [7k3] = [7d10.takeHighest(3).open(10)] New 'Mythos' System die roller added New vs. die roller method for WoD; ie [3v3] = [3d10.vs(3)]. Included for Mythos roller also New Warhammer FRPG Die Roller (Special thanks to Puu-san for the support) New EZ_Tree Reference system. Push a button, Traipse the tree, get a reference (Beta!) New Grids act more like Spreadsheets in Use mode, with Auto Calc Fixes: Fix to allow for portability to an OpenSUSE linux OS Fix to mplay_client for Fedora and OpenSUSE Fix to Text based Server Fix to Remote Admin Commands Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Fix to Map from gametree not showing to all clients Fix to gametree about menus Fix to Password Manager check on startup Fix to PC Sheets from tool nodes. They now use the tabber_panel Fix to Whiteboard ID to prevent random line or text deleting. Fixes to Server, Remote Server, and Server GUI Fix to Update Manager; cleaner clode for saved repositories Fixes made to Settings Panel and now reactive settings when Ok is pressed Fixes to Alternity roller's attack roll. Uses a simple Tuple instead of a Splice Fix to Use panel of Forms and Tabbers. Now longer enters design mode Fix made Image Fetching. New fetching image and new failed image Fix to whiteboard ID's to prevent non updated clients from ruining the fix. default_manifest.xml renamed to default_upmana.xml
author sirebral
date Mon, 01 Feb 2010 14:22:20 -0600
parents fb08f5731b5e
children 44ef45e77880
files orpg/gametree/nodehandlers/core.py orpg/gametree/nodehandlers/d20.py orpg/orpg_version.py plugins/xxchatnotify.py
diffstat 4 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/orpg/gametree/nodehandlers/core.py	Mon Feb 01 11:56:37 2010 -0600
+++ b/orpg/gametree/nodehandlers/core.py	Mon Feb 01 14:22:20 2010 -0600
@@ -29,6 +29,7 @@
 __version__ = "$Id: core.py,v Traipse 'Ornery-Orc' prof.ebral Exp $"
 
 from nodehandler_version import NODEHANDLER_VERSION
+from orpg.tools.InterParse import Parse
 
 try:
     from orpg.orpg_windows import *
@@ -281,7 +282,7 @@
     def get_html_panel(self,parent):
         html_str = "<html><body bgcolor=\"#FFFFFF\" >"+self.tohtml()+"</body></html>"
         wnd = wx.html.HtmlWindow(parent,-1)
-        html_str = self.chat.ParseDice(html_str)
+        html_str = Parse.Dice(html_str)
         wnd.SetPage(html_str)
         return wnd
 
--- a/orpg/gametree/nodehandlers/d20.py	Mon Feb 01 11:56:37 2010 -0600
+++ b/orpg/gametree/nodehandlers/d20.py	Mon Feb 01 14:22:20 2010 -0600
@@ -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 )
--- a/orpg/orpg_version.py	Mon Feb 01 11:56:37 2010 -0600
+++ b/orpg/orpg_version.py	Mon Feb 01 14:22:20 2010 -0600
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse Beta"
 DIS_VER = "Ornery Orc"
-BUILD = "100201-01"
+BUILD = "100201-02"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"
--- a/plugins/xxchatnotify.py	Mon Feb 01 11:56:37 2010 -0600
+++ b/plugins/xxchatnotify.py	Mon Feb 01 14:22:20 2010 -0600
@@ -126,14 +126,15 @@
 
 
     def plugin_incoming_msg(self, text, type, name, player):
-        if (self.notify == 'beep' or self.notify == 'both') and (self.type == 'all' or type == 2):
-            if self.soundfile == 'None':
-                wx.CallAfter(wx.Bell)
-                wx.CallAfter(wx.Bell)
-            else:
-                wx.CallAfter(self.sound_player.play, self.soundfile, self.soundloc)
-        if (self.notify == 'flash' or self.notify == 'both') and (self.type == 'all' or type == 2):
-            wx.CallAfter(self.mainframe.RequestUserAttention)
+        if not self.topframe.IsActive():
+            if (self.notify == 'beep' or self.notify == 'both') and (self.type == 'all' or type == 2):
+                if self.soundfile == 'None':
+                    wx.CallAfter(wx.Bell)
+                    wx.CallAfter(wx.Bell)
+                else:
+                    wx.CallAfter(self.sound_player.play, self.soundfile, self.soundloc)
+            if (self.notify == 'flash' or self.notify == 'both') and (self.type == 'all' or type == 2):
+                wx.CallAfter(self.mainframe.RequestUserAttention)
         return text, type, name