# HG changeset patch # User sirebral # Date 1272347909 18000 # Node ID 0ccfb8836b81bfb28399ab8e310adae5439e7a82 # Parent e221cd12b820ed8f054d7a901c315e7865d8b40c Traipse Alpha 'OpenRPG' {100427-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 (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 Fix to URL2Link plugin, modified regex compilation should remove memory leak Fix to mapy.py, a roll back due to zoomed grid issues Fix to whiteboard_handler, Circles work by you clicking the center of the circle diff -r e221cd12b820 -r 0ccfb8836b81 orpg/mapper/map.py --- a/orpg/mapper/map.py Mon Apr 26 16:15:50 2010 -0500 +++ b/orpg/mapper/map.py Tue Apr 27 00:58:29 2010 -0500 @@ -250,8 +250,9 @@ topleft1 = self.GetViewStart() topleft = [topleft1[0]*scrollsize[0], topleft1[1]*scrollsize[1]] if (clientsize[0] > 1) and (clientsize[1] > 1): - self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM) - dc = wx.AutoBufferedPaintDC(self) + dc = wx.MemoryDC() + bmp = wx.EmptyBitmap(clientsize[0]+1, clientsize[1]+1) + dc.SelectObject(bmp) dc.SetPen(wx.TRANSPARENT_PEN) dc.SetBrush(wx.Brush(self.GetBackgroundColour(), wx.SOLID)) dc.DrawRectangle(0,0,clientsize[0]+1,clientsize[1]+1) @@ -266,11 +267,22 @@ self.layers['fog'].layerDraw(dc, topleft, clientsize) dc.SetPen(wx.NullPen) dc.SetBrush(wx.NullBrush) + + dc.SelectObject(wx.NullBitmap) + del dc + wdc = self.preppaint() + wdc.DrawBitmap(bmp, topleft[0], topleft[1]) + if settings.get_setting("AlwaysShowMapScale") == "1": - self.showmapscale(dc) + self.showmapscale(wdc) try: evt.Skip() except: pass + def preppaint(self): + dc = wx.PaintDC(self) + self.PrepareDC(dc) + return (dc) + def showmapscale(self, dc): scalestring = "Scale x" + `self.layers['grid'].mapscale`[:3] (textWidth, textHeight) = dc.GetTextExtent(scalestring) diff -r e221cd12b820 -r 0ccfb8836b81 orpg/mapper/whiteboard_handler.py --- a/orpg/mapper/whiteboard_handler.py Mon Apr 26 16:15:50 2010 -0500 +++ b/orpg/mapper/whiteboard_handler.py Tue Apr 27 00:58:29 2010 -0500 @@ -754,9 +754,9 @@ pos = self.get_snapped_to_logical_pos(evt) size = self.canvas.layers['grid'].unit_size #60 radius = int(int(self.radius.GetValue())/5) - center = wx.Point(pos.x, pos.y+size*radius) + center = wx.Point(pos.x, pos.y) curve = self.calculate_circle(center, radius, size) - if(self.temp_circle): + if self.temp_circle: self.canvas.layers['whiteboard'].del_temp_line(self.temp_circle) self.selected = None self.temp_circle = self.canvas.layers['whiteboard'].add_temp_line(curve) diff -r e221cd12b820 -r 0ccfb8836b81 orpg/orpg_version.py --- a/orpg/orpg_version.py Mon Apr 26 16:15:50 2010 -0500 +++ b/orpg/orpg_version.py Tue Apr 27 00:58:29 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-01" +BUILD = "100427-00" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r e221cd12b820 -r 0ccfb8836b81 orpg/tools/InterParse.py --- a/orpg/tools/InterParse.py Mon Apr 26 16:15:50 2010 -0500 +++ b/orpg/tools/InterParse.py Tue Apr 27 00:58:29 2010 -0500 @@ -38,8 +38,8 @@ def __init__(self): pass - def Post(self, s, tab=True, send=False, myself=False): - if tab: tab = component.get('chat') + def Post(self, s, tab=False, send=False, myself=False): + if not tab: tab = component.get('chat') s = self.Normalize(s, tab) tab.set_colors() tab.Post(s, send, myself) diff -r e221cd12b820 -r 0ccfb8836b81 plugins/xxurl2link.py --- a/plugins/xxurl2link.py Mon Apr 26 16:15:50 2010 -0500 +++ b/plugins/xxurl2link.py Tue Apr 27 00:58:29 2010 -0500 @@ -9,15 +9,11 @@ def __init__(self, plugindb, parent): orpg.pluginhandler.PluginHandler.__init__(self, plugindb, parent) - # The Following code should be edited to contain the proper information self.name = 'URL to link conversion' self.author = 'tdb30 tbaleno@wrathof.com' self.help = "This plugin automaticaly wraps urls in link tags\n" self.help += "making them clickable." - self.url_regex = None - self.mailto_regex = None - def plugin_menu(self): self.menu = wx.Menu() self.toggle = self.menu.AppendCheckItem(wx.ID_ANY, 'On') @@ -29,17 +25,12 @@ pass def plugin_enabled(self): - #This is where you set any variables that need to be initalized when your plugin starts - self.url_regex = re.compile("(?' + m.group(0) + '' - else: - return '' + link + '' + if m.group(1) != None: return '' + m.group(0) + '' + else: return '' + link + ''