Traipse Beta 'OpenRPG' {100201-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 (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

--- a/orpg/gametree/gametree.py	Mon Jan 25 12:07:48 2010 -0600
+++ b/orpg/gametree/gametree.py	Mon Feb 01 09:57:07 2010 -0600
@@ -37,7 +37,7 @@
 from orpg.orpgCore import component
 from orpg.dirpath import dir_struct
 from nodehandlers import core
-import string, urllib, time, os
+import string, urllib, time, os, shutil
 
 from orpg.orpg_xml import xml
 from orpg.tools.validate import validate
@@ -82,6 +82,12 @@
 TOP_FEATURES = wx.NewId()
 EZ_REF = wx.NewId()
 
+def exists(path):
+    try:
+        os.stat(path)
+        return True
+    except: return False
+
 class game_tree(wx.TreeCtrl):
     
     def __init__(self, parent, id):
@@ -233,11 +239,14 @@
             self.xml_root = None
 
         if not self.xml_root:
-            os.rename(filename,filename+".corrupt")
+            count = 1
+            while exists(filename[:len(filename)-4]+'-bad-'+str(count)+'.xml'): count += 1
+            shutil.copy(filename, filename[:len(filename)-4]+'-bad-'+str(count)+'.xml')
+            shutil.copyfile(dir_struct["template"]+'default_tree.xml', filename)
             emsg = "Your gametree is being regenerated.\n\n"\
                  "To salvage a recent version of your gametree\n"\
                  "exit OpenRPG and copy the lastgood.xml file in\n"\
-                 "your myfiles directory to "+filename+ "\n"\
+                 "your myfiles directory to "+filename[:len(filename)-4]+'-bad-'+str(count)+'.xml'+ "\n"\
                  "in your myfiles directory.\n\n"\
                  "lastgood.xml WILL BE OVERWRITTEN NEXT TIME YOU RUN OPENRPG.\n\n"\
                  "Would you like to select a different gametree file to use?\n"\
@@ -279,8 +288,11 @@
 
         except Exception, e:
             logger.exception(traceback.format_exc())
+            count = 1
+            while exists(filename[:len(filename)-4]+'-bad-'+str(count)+'.xml'): count += 1
+            shutil.copy(filename, filename[:len(filename)-4]+'-bad-'+str(count)+'.xml')
+            shutil.copyfile(dir_struct["template"]+'default_tree.xml', filename)
             wx.MessageBox("Corrupt Tree!\nYour game tree is being regenerated. To\nsalvage a recent version of your gametree\nexit OpenRPG and copy the lastgood.xml\nfile in your myfiles directory\nto "+filename+ "\nin your myfiles directory.\nlastgood.xml WILL BE OVERWRITTEN NEXT TIME YOU RUN OPENRPG.")
-            os.rename(filename,filename+".corrupt")
             validate.config_file("tree.xml","default_tree.xml")
             self.load_tree(error=1)