# HG changeset patch # User sirebral # Date 1272316550 18000 # Node ID e221cd12b820ed8f054d7a901c315e7865d8b40c # Parent fcd6aafbe232376c2ce7b77cd0f53033c47609de Traipse Alpha 'OpenRPG' {100426-01} 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 (Patch-2) New Features: New Namespace method with two new syntaxes New Namespace Internal is context sensitive, always! New Namespace External is 'as narrow as you make it' New Namespace FutureCheck helps ensure you don't receive an incorrect node New PluginDB access for URL2Link plugin New to Forms, they now show their content in Design Mode Fixes: Fix to Server GUI startup errors Fix to Server GUI Rooms tab updating Fix to Chat and Settings if non existant die roller is picked Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated Fix to Alias Lib's Export to Tree, Open, Save features Fix to alias node, now works properly Fix to Splitter node, minor GUI cleanup Fix to Backgrounds not loading through remote loader Fix to Node name errors Fix to rolling dice in chat Whispers Fix to Splitters Sizing issues Daily: Fix I had to push this again because I got a little amitions with getiterator, breaking Internal diff -r fcd6aafbe232 -r e221cd12b820 orpg/orpg_version.py --- a/orpg/orpg_version.py Mon Apr 26 14:30:16 2010 -0500 +++ b/orpg/orpg_version.py Mon Apr 26 16:15:50 2010 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Alpha" DIS_VER = "Ornery Orc" -BUILD = "100426-00" +BUILD = "100426-01" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r fcd6aafbe232 -r e221cd12b820 orpg/tools/InterParse.py --- a/orpg/tools/InterParse.py Mon Apr 26 14:30:16 2010 -0500 +++ b/orpg/tools/InterParse.py Mon Apr 26 16:15:50 2010 -0500 @@ -130,8 +130,8 @@ def LocationCheck(self, x, roots, root_list, tree_map): roots.append(tree_map[x]) root_list.append(self.get_node(roots)) - namespace = root_list[x].getiterator('nodehandler') - return namespace + node = root_list[x] + return node, roots, root_list def FutureCheck(self, node, next): future = node.getiterator('nodehandler') @@ -143,17 +143,21 @@ reg = re.compile("(!=(.*?)=!)") matches = reg.findall(s) newstr = False + nodeable = ['rpg_grid_handler', 'container_handler', + 'group_handler', 'tabber_handler', + 'splitter_handler', 'form_handler', 'textctrl_handler'] for i in xrange(0,len(matches)): tree_map = node.get('map').split('::') roots = []; root_list = [] find = matches[i][1].split('::') node = self.get_node([tree_map[0]]) for x in xrange(0, len(tree_map)): - namespace = self.LocationCheck(x, roots, root_list, tree_map) + (node, roots, root_list) = self.LocationCheck(x, roots, root_list, tree_map) for x in xrange(0, len(find)): namespace = node.getiterator('nodehandler') for node in namespace: if find[x] == node.get('name'): + if node.get('class') not in nodeable: continue if node.get('class') == 'rpg_grid_handler': newstr = self.NameSpaceGrid(find[x+1], node); break try: @@ -171,6 +175,9 @@ reg = re.compile("(!&(.*?)&!)") matches = reg.findall(s) newstr = False + nodeable = ['rpg_grid_handler', 'container_handler', + 'group_handler', 'tabber_handler', + 'splitter_handler', 'form_handler', 'textctrl_handler'] for i in xrange(0,len(matches)): find = matches[i][1].split('::') node = component.get('tree').xml_root @@ -182,6 +189,7 @@ namespace = node.getiterator('nodehandler') for node in namespace: if find[x] == node.get('name'): + if node.get('class') not in nodeable: continue if node.get('class') == 'rpg_grid_handler': newstr = self.NameSpaceGrid(find[x+1], node); break try: @@ -264,7 +272,7 @@ def resolve_get_loop(self, node, path, step, depth): if step == depth: return node else: - child_list = node.getiterator('nodehandler') + child_list = node.getchildren() for child in child_list: if step == depth: break if child.get('name') == path[step]: