# HG changeset patch # User sirebral # Date 1259393158 21600 # Node ID e3714f232f2fc837336fa185d7565fcc5136e9f7 # Parent 52100f68dfe17a548942a1ec5dc1360826d5203a Traipse Beta 'OpenRPG' {091128-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: Added Bookmarks 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 New TrueDebug Class in orpg_log (See documentation for usage) Portable Mercurial Tip of the Day added, from Core and community New Reference Syntax added for custom PC sheets New Child Reference for gametree New Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added Fixes: 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 Fixed Whiteboard ID to prevent random line or text deleting. Modified ID's to prevent non updated clients from ruining the fix. *Whiteboard from Core not showing* default_manifest.xml renamed to default_upmana.xml Fix to Update Manager; cleaner clode for saved repositories diff -r 52100f68dfe1 -r e3714f232f2f orpg/chat/chatwnd.py --- a/orpg/chat/chatwnd.py Thu Nov 26 14:25:47 2009 -0600 +++ b/orpg/chat/chatwnd.py Sat Nov 28 01:25:58 2009 -0600 @@ -1881,8 +1881,8 @@ cell = tuple(path[step].strip('(').strip(')').split(',')) grid = node.find('grid') rows = grid.findall('row') - col = rows[int(self.ParseDice(cell[0]))].findall('cell') - try: self.data = self.ParseMap(col[int(self.ParseDice(cell[1]))].text, node) or 'No Cell Data' + col = rows[int(self.ParseDice(cell[0]))-1].findall('cell') + try: self.data = self.ParseMap(col[int(self.ParseDice(cell[1]))-1].text, node) or 'No Cell Data' except: self.data = 'Invalid Grid Reference!' return diff -r 52100f68dfe1 -r e3714f232f2f orpg/main.py --- a/orpg/main.py Thu Nov 26 14:25:47 2009 -0600 +++ b/orpg/main.py Sat Nov 28 01:25:58 2009 -0600 @@ -98,6 +98,7 @@ "on_password_signal":self.on_password_signal, "orpgFrame":self} self.session = orpg.networking.mplay_client.mplay_client(settings.get("player"), call_backs) + component.add("session", self.session) self.poll_timer = wx.Timer(self, wx.NewId()) self.Bind(wx.EVT_TIMER, self.session.poll, self.poll_timer) self.poll_timer.Start(100) @@ -110,19 +111,13 @@ #create password manager --SD 8/03 self.password_manager = component.get('password_manager') - component.add("session", self.session) - component.add('frame', self) # build frame windows + component.add('frame', self) self.build_menu() self.build_gui() self.build_hotkeys() - logger.debug("GUI Built") - component.add("chat",self.chat) - component.add("map",self.map) - component.add("alias", self.aliaslib) - logger.debug("openrpg components all added") self.tree.load_tree(settings.get("gametree")) logger.debug("Tree Loaded") @@ -138,9 +133,7 @@ try: tipotday_start = int(tipotday_start) except TypeError: tipotday_start = 0 - self.TipOfTheDay = wx.CreateFileTipProvider(dir_struct['data']+'tips.txt', tipotday_start) - #Load Update Manager component.add('updatemana', self.updateMana) logger.debug("update manager reloaded") @@ -164,7 +157,6 @@ if settings.get('tipotday_enabled').lower() != '0': self.ShowTipOfTheDay() except: self.add_setting('Tip of the Day') - def add_setting(self, setting): if setting == 'Tip of the Day': settings.add_tab('General', 'Tip of the Day', 'grid') @@ -204,7 +196,6 @@ else: pass except: traceback.print_exc() - def build_menu(self): menu = \ [[ @@ -583,7 +574,6 @@ self._mgr.GetPane("Map Tool Bar").Show() self._mgr.Update() - #Help Menu #Needs a custom Dialog because it is ugly on Windows def OnMB_HelpAbout(self): if self.AboutORPG.IsShown() == True: self.AboutORPG.Hide() else: self.AboutORPG.Show() @@ -732,6 +722,7 @@ #Create the Alias Lib Window self.aliaslib = orpg.tools.aliaslib.AliasLib() + component.add("alias", self.aliaslib) self.aliaslib.Hide() logger.debug("Alias Window Created") menuid = wx.NewId() @@ -747,9 +738,11 @@ logger.debug("AUI Bindings Done") #Load the layout if one exists - layout = xml_dom.find("DockLayout") - self._mgr.LoadPerspective(layout.text) - logger.debug("Perspective Loaded") + try: + layout = xml_dom.find("DockLayout") + self._mgr.LoadPerspective(layout.text) + logger.debug("Perspective Loaded") + except: pass self._mgr.GetPane("Browse Server Window").Hide() self._mgr.Update() self.Maximize(maximized) @@ -785,6 +778,8 @@ elif name == "map": temp_wnd = orpg.mapper.map.map_wnd(parent_wnd, -1) self.map = temp_wnd + component.add("map",self.map) + elif name == "tree": temp_wnd = orpg.gametree.gametree.game_tree(parent_wnd, -1) self.tree = temp_wnd @@ -799,6 +794,7 @@ temp_wnd = orpg.chat.chatwnd.chat_notebook(parent_wnd, wx.DefaultSize) self.chattabs = temp_wnd self.chat = temp_wnd.MainChatPanel + component.add("chat",self.chat) elif name == "player": temp_wnd = orpg.player_list.player_list(parent_wnd) @@ -840,7 +836,6 @@ self._mgr.AddPane(temp_wnd, wndinfo) return temp_wnd - def onPaneClose(self, evt): pane = evt.GetPane() #Arbitrary If ELIF fix. Items had incorrect ID's set. Finding correct ID will fix it for the iteration. @@ -855,7 +850,6 @@ evt.Skip() self._mgr.Update() - def saveLayout(self): filename = dir_struct["user"] + "layout.xml" layout = parse(filename) @@ -869,14 +863,12 @@ xml_dom.set("posx", str(x_pos)) xml_dom.set("posy", str(y_pos)) xml_dom.set("maximized", str(max)) - try: - xml_dom.find("DockLayout").text = str(self._mgr.SavePerspective()) + try: xml_dom.find("DockLayout").text = str(self._mgr.SavePerspective()) except: elem = Element('DockLayout') elem.set("DO_NO_EDIT","True") elem.text = str(self._mgr.SavePerspective()) xml_dom.append(elem) - layout.write(filename) def build_hotkeys(self): diff -r 52100f68dfe1 -r e3714f232f2f orpg/orpg_version.py --- a/orpg/orpg_version.py Thu Nov 26 14:25:47 2009 -0600 +++ b/orpg/orpg_version.py Sat Nov 28 01:25:58 2009 -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 = "091126-00" +BUILD = "091128-00" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r 52100f68dfe1 -r e3714f232f2f orpg/templates/feature.xml --- a/orpg/templates/feature.xml Thu Nov 26 14:25:47 2009 -0600 +++ b/orpg/templates/feature.xml Sat Nov 28 01:25:58 2009 -0600 @@ -1,21 +1,48 @@ - - - !!Random::([#1d3-1],0)!! - - + + + - !!Set 1::Enc 1!! - + AS + AD + ACAH - !!Set 1::Enc 2!! - - !!Set 1::Enc 3!! + KS + KD + KCKH + QSQDQCQHJSJDJCJH10S10D10C10H9S9D9C9H8S8D8C8H7S7D7C7H6S6D6C6H5S5D5C5H4S4D4C4H3S3D3C3H2S2D2C2H - + + !!52 Card Deck::([#1d13], [#1d4])!! + + + + + + + + + + + !!Set 1::Enc 1!! + !!Set 2::Enc 1!! + + !!Set 1::Enc 2!! + !!Set 2::Enc 2!! + !!Set 1::Enc 3!! + + + + + + Hoot Hoot. It's an owl. + + Set 2 Random Encounter. + + Dark Elves. Watch out! @@ -23,8 +50,7 @@ A Wandering Minotaur - - + @@ -46,24 +72,6 @@ An introduction to your adventure module can be placed here. - - - !!52 Card Deck::([#1d13-1], [#1d4-1])!! - - - - AS - AD - ACAH - - KS - KD - KCKH - QSQDQCQHJSJDJCJH10S10D10C10H9S9D9C9H8S8D8C8H7S7D7C7H6S6D6C6H5S5D5C5H4S4D4C4H3S3D3C3H2S2D2C2H - - - - @@ -123,13 +131,13 @@ With the new additions to the gametree using nodes has never been easier nor has it ever been more fluid. Included here is a list of the additions to the gametree referencing model as well as some tips on how to make the gametree work the way it was intended. Grid Nodes: - Grid nodes are now referenceable with the coordinates of the grid. Example: !@Grid::(0,0)@! + Grid nodes are now referenceable with the coordinates of the grid. Example: !@Grid::(1,1)@! The example will return the top left most cell data. The grid understands coordinates like this (Row, Column) Grid nodes can reference node data just like any other node can. With a new added feature grids are even more useful. By using a new die rolling syntax you can draw just the number of the modified roll. While this will not pass during game play, you can use it with the grid node to create a random chart. The new die roll syntax is [#XdY]. # works just like q, yet it returns only the modified die result. Here is an example with a 3 x 3 Grid -Example: !@Grid::([#1d3-1], [#1d3-1])@! +Example: !@Grid::([#1d3], [#1d3])@! The result will be a random event from the grid.