# HG changeset patch # User sirebral # Date 1291568010 21600 # Node ID 1df5912db00cf6287bb0fe0fb11cfcfd9e371d35 # Parent 64728b1dfa577002c9c0ac4e3a72d8eeeefe058c Traipse Beta 'OpenRPG' {101205-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 diff -r 64728b1dfa57 -r 1df5912db00c orpg/dieroller/rollers/ironclaw.py --- a/orpg/dieroller/rollers/ironclaw.py Tue Nov 30 05:00:25 2010 -0600 +++ b/orpg/dieroller/rollers/ironclaw.py Sun Dec 05 10:53:30 2010 -0600 @@ -326,8 +326,10 @@ magicPoints = self.NameSpaceVI('magic points', character) cMagic = self.NameSpaceXI('current', magicPoints); cM = int(cMagic.text) mMagic = self.NameSpaceXI('maximum', magicPoints); mM = int(mMagic.text) - vsDice = self.getSkillDice(skills['meditate']) if skills.has_key('meditate') else self.getSkillDice(skills['meditation']) - vsDice += vsDice; vsDice.pop() + vsDice = self.getSkillDice(skills['meditate'], [3,8]) if skills.has_key('meditate') else self.getSkillDice(skills['meditation'], [3,8]) + vsDice += vsDice + skDice = self.getSkillDice(skills['meditate'], [3,4,5,6,7]) if skills.has_key('meditate') else self.getSkillDice(skills['meditation'], [3,4,5,6,7]) + if skDice != 'No Dice Found!': vsDice += skDice myStr = 'Meditates, ' condition = 'easy' vsCondition = [] diff -r 64728b1dfa57 -r 1df5912db00c orpg/dirpath/dirpath_tools.py --- a/orpg/dirpath/dirpath_tools.py Tue Nov 30 05:00:25 2010 -0600 +++ b/orpg/dirpath/dirpath_tools.py Sun Dec 05 10:53:30 2010 -0600 @@ -1,12 +1,4 @@ -import sys -import os -import errno -from orpg.orpg_wx import * - -if WXLOADED: - class tmpApp(wx.App): - def OnInit(self): - return True +import sys, os, errno #------------------------------------------------------- # void load_paths( dir_struct_reference ) @@ -92,6 +84,8 @@ """Notify the user of directory problems and show directory selection dialog """ + #from orpg.orpg_wx import * + if WXLOADED: app = tmpApp(0) app.MainLoop() diff -r 64728b1dfa57 -r 1df5912db00c orpg/networking/meta_server_lib.py --- a/orpg/networking/meta_server_lib.py Tue Nov 30 05:00:25 2010 -0600 +++ b/orpg/networking/meta_server_lib.py Sun Dec 05 10:53:30 2010 -0600 @@ -44,7 +44,7 @@ from random import uniform import urllib2 from urllib import urlopen, urlencode -from orpg.tools.orpg_log import debug +#from orpg.tools.orpg_log import debug from xml.etree.ElementTree import Element, fromstring, parse, tostring metacache_lock = RLock() diff -r 64728b1dfa57 -r 1df5912db00c orpg/networking/mplay_client.py --- a/orpg/networking/mplay_client.py Tue Nov 30 05:00:25 2010 -0600 +++ b/orpg/networking/mplay_client.py Sun Dec 05 10:53:30 2010 -0600 @@ -39,7 +39,7 @@ from orpg.orpgCore import component #from orpg.orpg_xml import xml -from orpg.tools.orpg_log import debug +#from orpg.tools.orpg_log import debug from orpg.tools.settings import settings from xml.etree.ElementTree import ElementTree, Element, iselement diff -r 64728b1dfa57 -r 1df5912db00c orpg/networking/mplay_server.py --- a/orpg/networking/mplay_server.py Tue Nov 30 05:00:25 2010 -0600 +++ b/orpg/networking/mplay_server.py Sun Dec 05 10:53:30 2010 -0600 @@ -61,7 +61,7 @@ from xml.etree.ElementTree import ElementTree, Element, iselement from xml.etree.ElementTree import fromstring, tostring, parse, XML -from orpg.tools.orpg_log import logger, crash, debug +from orpg.tools.orpg_log import logger#, crash, debug from orpg.tools.decorators import debugging # Snag the version number @@ -363,9 +363,9 @@ if self.configDoc.get("admin"): self.boot_pwd = self.configDoc.get("admin") elif self.configDoc.get("boot"): self.boot_pwd = self.configDoc.get("boot") if len(self.boot_pwd) < 1: self.boot_pwd = raw_input("Enter admin password: ") - if not hasattr(self, 'reg') and self.configDoc.get("register"): + if not hasattr(self, 'reg'): self.reg = self.configDoc.get("register") - if not len(self.reg) > 0 or self.reg[0].upper() not in ("Y", "N"): + if (not len(self.reg) > 0) or (self.reg[0].upper() not in ("Y", "N")) or (self.reg == None): opt = raw_input("Do you want to post your server to the OpenRPG Meta Server list? (y,n) ") if len(opt) and (opt[0].upper() == 'Y'): self.reg = 'Y' else: self.reg = 'N' diff -r 64728b1dfa57 -r 1df5912db00c orpg/orpg_version.py --- a/orpg/orpg_version.py Tue Nov 30 05:00:25 2010 -0600 +++ b/orpg/orpg_version.py Sun Dec 05 10:53:30 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 = "101130-02" +BUILD = "101205-00" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r 64728b1dfa57 -r 1df5912db00c orpg/templates/feature.xml --- a/orpg/templates/feature.xml Tue Nov 30 05:00:25 2010 -0600 +++ b/orpg/templates/feature.xml Sun Dec 05 10:53:30 2010 -0600 @@ -415,7 +415,96 @@ - + + + + + AS + AD + AC + AH + + + KS + KD + KC + KH + + + QS + QD + QC + QH + + + JS + JD + JC + JH + + + 10S + 10D + 10C + 10H + + + 9S + 9D + 9C + 9H + + + 8S + 8D + 8C + 8H + + + 7S + 7D + 7C + 7H + + + 6S + 6D + 6C + 6H + + + 5S + 5D + 5C + 5H + + + 4S + 4D + 4C + 4H + + + 3S + 3D + 3C + 3H + + + 2S + 2D + 2C + 2H + + + + + + + + !=52 Card Deck::([#1d13], [#1d4])=! + +