Mercurial > traipse

changeset 30:8e77f169f324 ornery-orc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse 'OpenRPG' {100219-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-1) New Features: New custom welcome message for servers. Fixes: Fix to InterParse which caused Unknowns to break Fix to a URL reference in mplay_server Fix to metaserver.cache Template and outdated Meta URLs
author sirebral
date Fri, 19 Feb 2010 19:10:25 -0600
parents df1387bdbad9
children fc48380f0c9f
files orpg/chat/chatwnd.py orpg/networking/meta_server_lib.py orpg/networking/mplay_server.py orpg/orpg_version.py orpg/templates/default_settings.xml orpg/templates/metaservers.cache orpg/tools/InterParse.py
diffstat 7 files changed, 20 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/orpg/chat/chatwnd.py	Wed Feb 03 22:19:40 2010 -0600
+++ b/orpg/chat/chatwnd.py	Fri Feb 19 19:10:25 2010 -0600
@@ -45,7 +45,7 @@
 ##
 import os, time, re, sys, traceback, webbrowser, commands, chat_msg, chat_util
 
-from orpg.orpg_version import VERSION
+from orpg.orpg_version import VERSION, DISTRO, DIS_VER, BUILD
 from orpg.orpg_windows import *
 from orpg.player_list import WG_LIST
 from orpg.dirpath import dir_struct
@@ -763,9 +763,11 @@
         self.chatwnd = chat_html_window(self,-1)
         self.set_colors()
         wx.CallAfter(self.chatwnd.SetPage, self.chatwnd.Header())
+        welcome = "<b>Welcome to <a href='http://www.knowledgearcana.com//content/view/199/128/'>"
+        welcome += DISTRO +'</a> '+ DIS_VER +' {'+BUILD+'},'
+        welcome += ' built on OpenRPG '+ VERSION +'</b>'
         if (self.sendtarget == "all"):
-            wx.CallAfter(self.Post, self.colorize(self.syscolor, 
-                "<b>Welcome to <a href='http://www.openrpg.com'>OpenRPG</a> version " + self.version + "...  </b>"))
+            wx.CallAfter(self.Post, self.colorize(self.syscolor, welcome))
         self.chattxt = orpg.tools.predTextCtrl.predTextCtrl(self, -1, "", 
                         style=wx.TE_PROCESS_ENTER |wx.TE_PROCESS_TAB|wx.TE_LINEWRAP, 
                         keyHook = self.myKeyHook, validator=None )
--- a/orpg/networking/meta_server_lib.py	Wed Feb 03 22:19:40 2010 -0600
+++ b/orpg/networking/meta_server_lib.py	Fri Feb 19 19:10:25 2010 -0600
@@ -312,7 +312,7 @@
 
 def getMetaServerBaseURL():
     # get meta server URL
-    url = "http://www.openrpg.com/openrpg_servers.php"
+    url = "http://orpgmeta.appspot.com/"
     try:
         component.get('validate').config_file("settings.xml","default_settings.xml")
         ini = open(dir_struct["user"]+"settings.xml","r")
@@ -323,6 +323,7 @@
         node_list = tree.getElementsByTagName("MetaServerBaseURL")
         if node_list:
             url = node_list[0].getAttribute("value")
+        print url
         # allow tree to be collected
         try: tree.unlink()
         except: pass
--- a/orpg/networking/mplay_server.py	Wed Feb 03 22:19:40 2010 -0600
+++ b/orpg/networking/mplay_server.py	Fri Feb 19 19:10:25 2010 -0600
@@ -64,7 +64,7 @@
 from orpg.tools.decorators import debugging
 
 # Snag the version number
-from orpg.orpg_version import VERSION, PROTOCOL_VERSION, CLIENT_STRING, SERVER_MIN_CLIENT_VERSION
+from orpg.orpg_version import VERSION, DISTRO, DIS_VER, BUILD, PROTOCOL_VERSION, CLIENT_STRING, SERVER_MIN_CLIENT_VERSION
 
 #Plugins
 from server_plugins import ServerPlugins
@@ -253,7 +253,7 @@
         self.allowRemoteKill = False
         self.allowRemoteAdmin = True
         self.sendLobbySound = False
-        self.lobbySound = 'http://www.digitalxero.net/music/mus_tavern1.bmu' ##used?
+        #self.lobbySound = 'http://www.digitalxero.net/music/mus_tavern1.bmu' ##used?
 
     def initServer(self, **kwargs):
         for atter, value in kwargs.iteritems(): setattr(self, atter, value)
@@ -1107,8 +1107,8 @@
             (remote_host,remote_port) = newsock.getpeername()
             bad_xml_string =  "Your client sent an illegal message to the server and will be disconnected. "
             bad_xml_string += "Please report this bug to the development team at:<br /> "
-            bad_xml_string += "<a href=\"http://sourceforge.net/tracker/?group_id=2237&atid=102237\">OpenRPG bugs "
-            bad_xml_string += "(http://sourceforge.net/tracker/?group_id=2237&atid=102237)</a><br />"
+            bad_xml_string += "<a href='http://www.assembla.com/spaces/traipse_dev/tickets/'>Traipse-Dev "
+            bad_xml_string += "(http://www.assembla.com/spaces/traipse_dev/tickets/)</a><br />"
             self.sendMsg( newsock, "<msg to='" + props['id'] + "' from='" + props['id'] + "' group_id='0' />" + bad_xml_string, 
                             new_stub.useCompression, new_stub.compressionType)
 
@@ -1234,8 +1234,9 @@
         #  prepend this server's version string to the the lobby message
         """
         try:
-            lobbyMsg = "You have connected to an <a href=\"http://www.openrpg.com\">OpenRPG</a> "
-            lobbyMsg += "server, version '" + VERSION + "'"
+            lobbyMsg = "You have connected to a <a href='http://www.knowledgearcana.com//content/view/199/128/'>"
+            lobbyMsg += DISTRO +'</a> '+ DIS_VER +' {'+ BUILD+'}'
+            lobbyMsg += " server, built on OpenRPG version '" + VERSION + "'"
 
             # See if we have a server name to report!
             if len(self.serverName): lobbyMsg += ", named '" + self.serverName + "'."
--- a/orpg/orpg_version.py	Wed Feb 03 22:19:40 2010 -0600
+++ b/orpg/orpg_version.py	Fri Feb 19 19:10:25 2010 -0600
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse"
 DIS_VER = "Ornery Orc"
-BUILD = "100203-01"
+BUILD = "100219-00"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"
--- a/orpg/templates/default_settings.xml	Wed Feb 03 22:19:40 2010 -0600
+++ b/orpg/templates/default_settings.xml	Fri Feb 19 19:10:25 2010 -0600
@@ -2,9 +2,8 @@
     <tab name="General" type="tab">
         <tab name="Networking" type="grid">
             <Heartbeat options="bool" value="1" help="This sends a message to the server to keep alive your connection when idle." />
-            <MetaServerBaseURL help="This is the URL that contains the server list." options="URL" value="http://www.openrpg.com/openrpg_servers.php"/>
+            <MetaServerBaseURL help="This is the URL that contains the server list." options="URL" value="http://orpgmeta.appspot.com/"/>
             <ImageServerBaseURL help="This is the URL that contains the server list." options="URL" value="http://openrpg.digitalxero.net/imgupload/index.php"/>
-            <LocalImageBaseURL help="This is the URL that contains the server list." options="URL" value="http://127.0.0.1:6774/webfiles/"/>
             <LocalorRemote help="Decide to load files locally or remotely. CherryPy must be running for local files." options="Local | Remote" value="Local"/>
         </tab>
         <tab name="Sound" type="grid">
--- a/orpg/templates/metaservers.cache	Wed Feb 03 22:19:40 2010 -0600
+++ b/orpg/templates/metaservers.cache	Fri Feb 19 19:10:25 2010 -0600
@@ -1,1 +1,1 @@
-http://www.openrpg.com/openrpg_servers.php 1 2
+http://orpgmeta.appspot.com 1 2
--- a/orpg/tools/InterParse.py	Wed Feb 03 22:19:40 2010 -0600
+++ b/orpg/tools/InterParse.py	Fri Feb 19 19:10:25 2010 -0600
@@ -77,7 +77,7 @@
             lb = "Replace '?' with: "
             if len(matches[i][0]):
                 lb = matches[i][1] + "?: "
-            dlg = TextEntryDialog(self, lb, "Missing Value?")
+            dlg = TextEntryDialog(component.get('chat'), lb, "Missing Value?")
             dlg.SetValue('')
             if matches[i][0] != '':
                 dlg.SetTitle("Enter Value for " + matches[i][1])
@@ -208,6 +208,8 @@
         grid = node.find('grid')
         rows = grid.findall('row')
         col = rows[int(self.Dice(cell[0]))-1].findall('cell')
+        try: s = self.NodeParent(col[int(self.Dice(cell[1]))-1].text, node.get('map')) or 'No Cell Data'
+        except: s = 'Invalid Grid Reference!'
         try: s = self.NodeMap(col[int(self.Dice(cell[1]))-1].text, node) or 'No Cell Data'
         except: s = 'Invalid Grid Reference!'
         return s