Mercurial > traipse_dev
changeset 248:1df5912db00c beta tip
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
| author | sirebral |
|---|---|
| date | Sun, 05 Dec 2010 10:53:30 -0600 |
| parents | 64728b1dfa57 |
| children | |
| files | orpg/dieroller/rollers/ironclaw.py orpg/dirpath/dirpath_tools.py orpg/networking/meta_server_lib.py orpg/networking/mplay_client.py orpg/networking/mplay_server.py orpg/orpg_version.py orpg/templates/feature.xml |
| diffstat | 7 files changed, 103 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- 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 = []
--- 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()
--- 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()
--- 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
--- 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'
--- 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"
--- 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 @@ </nodehandler> </nodehandler> </nodehandler> - <nodehandler class="form_handler" frame="400,400,501,72" height="600" icon="orc" map="Traipse OpenRPG::Bonus Nodes" module="forms" name="Encounters" version="1.0" width="400"> + <nodehandler class="form_handler" frame="409,414,422,76" height="600" icon="wizard1" map="Traipse OpenRPG::Bonus Nodes" module="forms" name="Deck" version="1.0" width="400"> + <nodehandler class="rpg_grid_handler" frame="400,400,425,69" icon="grid" map="Traipse OpenRPG::Bonus Nodes::Deck" module="rpg_grid" name="52 Card Deck" version="1.0"> + <grid autosize="1" border="1"> + <row version="1.0"> + <cell>AS</cell> + <cell>AD</cell> + <cell>AC</cell> + <cell>AH</cell> + </row> + <row version="1.0"> + <cell>KS</cell> + <cell>KD</cell> + <cell>KC</cell> + <cell>KH</cell> + </row> + <row version="1.0"> + <cell>QS</cell> + <cell>QD</cell> + <cell>QC</cell> + <cell>QH</cell> + </row> + <row version="1.0"> + <cell>JS</cell> + <cell>JD</cell> + <cell>JC</cell> + <cell>JH</cell> + </row> + <row version="1.0"> + <cell>10S</cell> + <cell>10D</cell> + <cell>10C</cell> + <cell>10H</cell> + </row> + <row version="1.0"> + <cell>9S</cell> + <cell>9D</cell> + <cell>9C</cell> + <cell>9H</cell> + </row> + <row version="1.0"> + <cell>8S</cell> + <cell>8D</cell> + <cell>8C</cell> + <cell>8H</cell> + </row> + <row version="1.0"> + <cell>7S</cell> + <cell>7D</cell> + <cell>7C</cell> + <cell>7H</cell> + </row> + <row version="1.0"> + <cell>6S</cell> + <cell>6D</cell> + <cell>6C</cell> + <cell>6H</cell> + </row> + <row version="1.0"> + <cell>5S</cell> + <cell>5D</cell> + <cell>5C</cell> + <cell>5H</cell> + </row> + <row version="1.0"> + <cell>4S</cell> + <cell>4D</cell> + <cell>4C</cell> + <cell>4H</cell> + </row> + <row version="1.0"> + <cell>3S</cell> + <cell>3D</cell> + <cell>3C</cell> + <cell>3H</cell> + </row> + <row version="1.0"> + <cell>2S</cell> + <cell>2D</cell> + <cell>2C</cell> + <cell>2H</cell> + </row> + </grid> + <macros> + <macro name="" /> + </macros> + </nodehandler> + <nodehandler class="textctrl_handler" frame="400,90,320,145" icon="note" map="Traipse OpenRPG::Bonus Nodes::Deck" module="forms" name="Draw" version="1.0"> + <text hide_title="0" multiline="0" raw_mode="1" send_button="1">!=52 Card Deck::([#1d13], [#1d4])=!</text> + </nodehandler> + </nodehandler><nodehandler class="form_handler" frame="400,400,501,72" height="600" icon="orc" map="Traipse OpenRPG::Bonus Nodes" module="forms" name="Encounters" version="1.0" width="400"> <nodehandler class="listbox_handler" frame="400,153,348,150" icon="gear" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="forms" name="Roll" version="1.0"> <list hide_title="0" raw_mode="1" send_button="1" type="1"> <option caption="" selected="0" value="">!=Chart::([#1d3],1)=!</option>