Mercurial > traipse_dev
changeset 83:f38df4bf9715 alpha
Traipse Alpha 'OpenRPG' {090909-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:
Fixes problems with Text nodes. Fixes log problem in Fog. Fixes Mini Lib loading problem. Fixes problem with whispers in Alias Lib.
Creates new Alpha Branch.
| author | sirebral |
|---|---|
| date | Wed, 09 Sep 2009 17:11:39 -0500 |
| parents | 2fa8bd6785a5 |
| children | 5c12918d6bb2 bdbeafcb2ef4 |
| files | orpg/gametree/nodehandlers/forms.py orpg/gametree/nodehandlers/minilib.py orpg/mapper/fog.py orpg/orpg_version.py orpg/tools/aliaslib.py upmana/updatemana.py |
| diffstat | 6 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/gametree/nodehandlers/forms.py Thu Aug 27 00:51:22 2009 -0500 +++ b/orpg/gametree/nodehandlers/forms.py Wed Sep 09 17:11:39 2009 -0500 @@ -28,7 +28,8 @@ __version__ = "$Id: forms.py,v 1.53 2007/04/21 23:00:51 digitalxero Exp $" -from containers import * +from containers import * +from orpg.orpg_xml import xml from wx.lib.scrolledpanel import ScrolledPanel def bool2int(b): @@ -285,7 +286,7 @@ def on_text(self,evt): txt = self.text.GetValue() - txt = strip_text(txt) + txt = xml.strip_text(txt) self.handler.text._set_nodeValue(txt) def on_send(self,evt): @@ -364,7 +365,7 @@ self.handler.rename(txt) if id == F_TEXT: txt = self.text.GetValue() - txt = strip_text(txt) + txt = xml.strip_text(txt) self.handler.text._set_nodeValue(txt) def on_button(self,evt):
--- a/orpg/gametree/nodehandlers/minilib.py Thu Aug 27 00:51:22 2009 -0500 +++ b/orpg/gametree/nodehandlers/minilib.py Wed Sep 09 17:11:39 2009 -0500 @@ -36,6 +36,7 @@ import string import map_miniature_nodehandler import orpg.mapper.map_msg +import orpg.minidom as minidom # import scriptkit # Constants @@ -218,7 +219,7 @@ label = mini.getAttribute( ATTRIBUTE_NAME ) else: label = '' - return msg().get_all_xml() + return msg.get_all_xml() def is_unique( self, mini ): unique = mini.getAttribute( ATTRIBUTE_UNIQUE )
--- a/orpg/mapper/fog.py Thu Aug 27 00:51:22 2009 -0500 +++ b/orpg/mapper/fog.py Wed Sep 09 17:11:39 2009 -0500 @@ -33,6 +33,7 @@ class FogArea: def __init__(self, outline, log): + self.log = log self.outline = outline def set_fog_props(self, str): @@ -79,6 +80,7 @@ class fog_layer(layer_base): def __init__(self, canvas): self.canvas = canvas + self.log = component.get('log') layer_base.__init__(self) self.color = wx.Color(128,128,128) if "__WXGTK__" not in wx.PlatformInfo: self.color = wx.Color(128,128,128, 128)
--- a/orpg/orpg_version.py Thu Aug 27 00:51:22 2009 -0500 +++ b/orpg/orpg_version.py Wed Sep 09 17:11:39 2009 -0500 @@ -2,9 +2,9 @@ SERVER_MIN_CLIENT_VERSION = "1.7.1" #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) -DISTRO = "Traipse Dev" +DISTRO = "Traipse Alpha" DIS_VER = "Ornery Orc" -BUILD = "090827-00" +BUILD = "090909-00" # This version is for network capability. PROTOCOL_VERSION = "1.2"
--- a/orpg/tools/aliaslib.py Thu Aug 27 00:51:22 2009 -0500 +++ b/orpg/tools/aliaslib.py Wed Sep 09 17:11:39 2009 -0500 @@ -325,15 +325,16 @@ defaultcolor = settings.get_setting("mytextcolor") settings.set_setting("mytextcolor", self.alias[1]) self.chat.set_colors() - opts = [] + opts = []; idlist = [] myid = self.session.get_id() for p in players: if p[2] != myid: opts.append("(" + p[2] + ") " + self.chat.html_strip(p[0])) + if p[2] != myid: idlist.append(p[2]) dlg = orpgMultiCheckBoxDlg(self, opts, "Select Players:", "Whisper To", []) sendto = [] if dlg.ShowModal() == wx.ID_OK: selections = dlg.get_selections() - for s in selections: sendto.append(players[s][2]) + for s in selections: sendto.append(idlist[s]) line = self.textWnd.GetValue().replace("\n", "<br />") if self.checkFilterText.IsChecked() and self.filter != self.chat.defaultFilterName: for rule in self.filterRegEx: line = re.sub(rule[0], rule[1], line)
--- a/upmana/updatemana.py Thu Aug 27 00:51:22 2009 -0500 +++ b/upmana/updatemana.py Wed Sep 09 17:11:39 2009 -0500 @@ -508,6 +508,7 @@ i = event.GetIndex() self.revlist.Select(i, True) self.revlist.Focus(i) + self.BranchInfo(self.current) if self.currev != self.revlist.GetItemText( self.revlist.GetFirstSelected() ): self.RevInfo(self.currev) @@ -619,7 +620,7 @@ logger.note("Updater Start") self.manifest = manifest.ManifestChanges() component.add('validate', validate) - self.updater = updaterFrame(self, "OpenRPG Update Manager 0.7.2 (open beta)", + self.updater = updaterFrame(self, "OpenRPG Update Manager 0.8 (open beta)", component, self.manifest, self.main) if self.manifest.GetString("updatemana", "auto_update", "") == 'on' and self.main == False: self.AutoUpdate(); self.OnExit()