# HG changeset patch
# User sirebral
# Date 1259151349 21600
# Node ID 06f10429eedc46d0584fb898ca4d33260ed2461a
# Parent c2caca988a11492acf5f26dcb2254d627098d0ac
Traipse Alpha 'OpenRPG' {091125-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 (Cleaning up for Beta)
Added Bookmarks
Fix to Remote Admin Commands
Minor fix to text based Server
Fix to Pretty Print, from Core
Fix to Splitter Nodes not being created
Fix to massive amounts of images loading, from Core
Added 'boot' command to remote admin
Added confirmation window for sent nodes
Minor changes to allow for portability to an OpenSUSE linux OS
Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG
Zoom Mouse plugin added
Images added to Plugin UI
Switching to Element Tree
Map efficiency, from FlexiRPG
Added Status Bar to Update Manager
default_manifest.xml renamed to default_upmana.xml
Cleaner clode for saved repositories
New TrueDebug Class in orpg_log (See documentation for usage)
Mercurial's hgweb folder is ported to upmana
Pretty important update that can help remove thousands of dead children from your
gametree.
Children, , , , , , , etc... are all tags now. Check your gametree and look for dead children!!
New Gametree Recursion method, mapping, and context sensitivity. !Infinite Loops
return error instead of freezing the software!
New Syntax added for custom PC sheets
Tip of the Day added, from Core and community
Fixed Whiteboard ID to prevent random line or text deleting. Modified ID's to
prevent non updated clients from ruining the fix.
diff -r c2caca988a11 -r 06f10429eedc orpg/chat/chatwnd.py
--- a/orpg/chat/chatwnd.py Tue Nov 24 17:17:42 2009 -0600
+++ b/orpg/chat/chatwnd.py Wed Nov 25 06:15:49 2009 -0600
@@ -1993,7 +1993,8 @@
path = s.split('::')
depth = len(path)
self.gametree = component.get('tree')
- node = self.gametree.tree_map[path[0]]['node']
+ try: node = self.gametree.tree_map[path[0]]['node']
+ except: return self.data
if node.get('class') in ('dnd35char_handler', "SWd20char_handler", "d20char_handler", "dnd3echar_handler"): self.resolve_cust_loop(node, path, 1, depth)
elif node.get('class') == 'rpg_grid_handler': self.resolve_grid(node, path, 1, depth)
else: self.resolve_loop(node, path, 1, depth)
diff -r c2caca988a11 -r 06f10429eedc orpg/gametree/gametree.py
--- a/orpg/gametree/gametree.py Tue Nov 24 17:17:42 2009 -0600
+++ b/orpg/gametree/gametree.py Wed Nov 25 06:15:49 2009 -0600
@@ -35,10 +35,7 @@
from orpg.orpgCore import component
from orpg.dirpath import dir_struct
from nodehandlers import core
-import string
-import urllib
-import time
-import os
+import string, urllib, time, os
from orpg.orpg_xml import xml
from orpg.tools.validate import validate
@@ -87,9 +84,6 @@
def __init__(self, parent, id):
wx.TreeCtrl.__init__(self,parent,id, wx.DefaultPosition,
wx.DefaultSize,style=wx.TR_EDIT_LABELS | wx.TR_HAS_BUTTONS)
- #self.xml = component.get('xml') #
- self.settings = component.get('settings')
- self.session = component.get('session')
self.chat = component.get('chat')
self.mainframe = component.get('frame')
self.build_img_list()
@@ -127,8 +121,7 @@
else: logger.debug("Nodehandler for " + nodehandler + " already exists!")
def remove_nodehandler(self, nodehandler):
- if self.nodehandlers.has_key(nodehandler):
- del self.nodehandlers[nodehandler]
+ if self.nodehandlers.has_key(nodehandler): del self.nodehandlers[nodehandler]
else: logger.debug("No nodehandler for " + nodehandler + " exists!")
def init_nodehandlers(self):
@@ -154,9 +147,6 @@
self.add_nodehandler('node_loader', core.node_loader)
self.add_nodehandler('url_loader', core.url_loader)
self.add_nodehandler('min_map', core.min_map)
-
- # event = wxKeyEvent
- # set to be called by wxWindows by EVT_CHAR macro in __init__
def on_key_up(self, evt):
key_code = evt.GetKeyCode()
@@ -189,7 +179,7 @@
if curSelection:
nextSelect = self.GetItemParent(curSelection)
self.on_del(evt)
- try:
+ try:
if self.GetItemText(nextSelect) != "": self.SelectItem(nextSelect)
except: pass
elif key_code == wx.WXK_F2:
@@ -218,8 +208,7 @@
def load_tree(self, filename=dir_struct["user"]+'tree.xml', error=0):
- self.settings.change("gametree", filename)
- #check file exists
+ settings.change("gametree", filename)
if not os.path.exists(filename):
emsg = "Gametree Missing!\n"+filename+" cannot be found.\n\n"\
"Would you like to locate it?\n"\
@@ -227,13 +216,10 @@
self.locate_valid_tree("Gametree Error", emsg)
return
try:
- f = open(filename, "rb")
- tree = parse(f)
+ tree = parse(filename)
self.xml_root = tree.getroot()
except:
- f.close()
self.xml_root = None
- ### Alpha ### Doing some work on Gametree to add Element Tree, slowly at first.
if not self.xml_root:
os.rename(filename,filename+".corrupt")
@@ -348,14 +334,12 @@
self.Bind(wx.EVT_MENU, self.on_tree_prop, id=TOP_TREE_PROP)
self.Bind(wx.EVT_MENU, self.on_insert_features, id=TOP_FEATURES)
-
def do_std_menu(self, evt, obj):
try: self.std_menu.Enable(STD_MENU_MAP, obj.checkToMapMenu())
except: self.std_menu.Enable(STD_MENU_MAP, obj.map_aware())
self.std_menu.Enable(STD_MENU_CLONE, obj.can_clone())
self.PopupMenu(self.std_menu)
-
def strip_html(self, player):
ret_string = ""
x = 0
@@ -369,7 +353,6 @@
logger.debug(ret_string)
return ret_string
-
def on_receive_data(self, data):
self.insert_xml(data)
@@ -396,11 +379,9 @@
if len(selections) == len(opts): self.chat.ParsePost(obj.tohtml(),True,True)
else:
player_ids = []
- for s in selections:
- player_ids.append(players[s][2])
+ for s in selections: player_ids.append(players[s][2])
self.chat.whisper_to_players(obj.tohtml(),player_ids)
-
def on_export_html(self, evt):
f = wx.FileDialog(self,"Select a file", self.last_save_dir,"","HTML (*.html)|*.html",wx.SAVE)
if f.ShowModal() == wx.ID_OK:
@@ -410,36 +391,30 @@
with open(f.GetPath(),"w") as f:
data = "
"+obj.xml.get("name")+""
data += ""+obj.tohtml()+""
- for tag in ("","","","","