Mercurial > traipse_dev
changeset 162:e3714f232f2f beta
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
| author | sirebral |
|---|---|
| date | Sat, 28 Nov 2009 01:25:58 -0600 |
| parents | 52100f68dfe1 |
| children | d263c8ff4d7c |
| files | orpg/chat/chatwnd.py orpg/main.py orpg/orpg_version.py orpg/templates/feature.xml |
| diffstat | 4 files changed, 56 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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):
--- 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"
--- 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 @@ <nodehandler class="tabber_handler" icon="help" module="containers" name="Traipse OpenRPG" version="1.0"> <nodehandler border="0" class="group_handler" cols="1" icon="goblin" map="Traipse OpenRPG" module="containers" name="Bonus Nodes" version="1.0"> - <nodehandler border="1" class="group_handler" cols="1" map="Traipse OpenRPG::Bonus Nodes" module="containers" name="Encounters" version="1.0"> - <nodehandler class="textctrl_handler" frame="400,400,0,48" icon="note" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="forms" name="Roll" version="1.0"> - <text multiline="1" raw_mode="1" send_button="1">!!Random::([#1d3-1],0)!!</text> -</nodehandler><nodehandler class="rpg_grid_handler" icon="grid" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="rpg_grid" name="Random" version="1.0"> - <grid autosize="0" border="1"> + <nodehandler class="form_handler" frame="409,414,406,127" height="600" icon="wizard1" map="Traipse OpenRPG::Bonus Nodes" module="forms" name="Deck" version="1.0" width="400"> + <nodehandler class="rpg_grid_handler" frame="400,400,425,69" icon="grid" map="Traipse OpenRPG::Bonus Nodes::Deck" module="rpg_grid" name="52 Card Deck" version="1.0"> + <grid autosize="1" border="1"> <row version="1.0"> - <cell>!!Set 1::Enc 1!!</cell> - </row> + <cell>AS</cell> + <cell>AD</cell> + <cell>AC</cell><cell>AH</cell></row> <row version="1.0"> - <cell>!!Set 1::Enc 2!!</cell> - </row> - <row version="1.0"><cell>!!Set 1::Enc 3!!</cell></row></grid> + <cell>KS</cell> + <cell>KD</cell> + <cell>KC</cell><cell>KH</cell></row> + <row version="1.0"><cell>QS</cell><cell>QD</cell><cell>QC</cell><cell>QH</cell></row><row version="1.0"><cell>JS</cell><cell>JD</cell><cell>JC</cell><cell>JH</cell></row><row version="1.0"><cell>10S</cell><cell>10D</cell><cell>10C</cell><cell>10H</cell></row><row version="1.0"><cell>9S</cell><cell>9D</cell><cell>9C</cell><cell>9H</cell></row><row version="1.0"><cell>8S</cell><cell>8D</cell><cell>8C</cell><cell>8H</cell></row><row version="1.0"><cell>7S</cell><cell>7D</cell><cell>7C</cell><cell>7H</cell></row><row version="1.0"><cell>6S</cell><cell>6D</cell><cell>6C</cell><cell>6H</cell></row><row version="1.0"><cell>5S</cell><cell>5D</cell><cell>5C</cell><cell>5H</cell></row><row version="1.0"><cell>4S</cell><cell>4D</cell><cell>4C</cell><cell>4H</cell></row><row version="1.0"><cell>3S</cell><cell>3D</cell><cell>3C</cell><cell>3H</cell></row><row version="1.0"><cell>2S</cell><cell>2D</cell><cell>2C</cell><cell>2H</cell></row></grid> <macros> <macro name="" /> </macros> -</nodehandler><nodehandler border="1" class="group_handler" cols="1" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="containers" name="Set 1" version="1.0"> +</nodehandler><nodehandler class="textctrl_handler" frame="400,90,497,106" icon="note" map="Traipse OpenRPG::Bonus Nodes::Deck" module="forms" name="Draw" version="1.0"> + <text multiline="0" raw_mode="1" send_button="1">!!52 Card Deck::([#1d13], [#1d4])!!</text> +</nodehandler></nodehandler><nodehandler class="form_handler" frame="400,400,501,72" height="600" icon="orc" map="Traipse OpenRPG::Bonus Nodes" module="forms" name="Encounters" version="1.0" width="400"> + <nodehandler class="listbox_handler" frame="400,153,348,150" icon="gear" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="forms" name="Roll" version="1.0"> + <list raw_mode="1" send_button="1" type="1"> + <option selected="0" value="">!!Chart::([#1d3],0)!!</option> + <option selected="1" value="">!!Chart::([#1d2],1)!!</option> + <option selected="0" value="">Option Text III</option> + </list> +</nodehandler><nodehandler class="rpg_grid_handler" frame="400,400,0,48" icon="grid" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="rpg_grid" name="Chart" version="1.0"> + <grid autosize="0" border="1"> + <row version="1.0"> + <cell size="119">!!Set 1::Enc 1!!</cell> + <cell size="115">!!Set 2::Enc 1!!</cell></row> + <row version="1.0"> + <cell>!!Set 1::Enc 2!!</cell> + <cell>!!Set 2::Enc 2!!</cell></row> + <row version="1.0"><cell>!!Set 1::Enc 3!!</cell><cell /></row></grid> + <macros> + <macro name="" /> + </macros> +</nodehandler><nodehandler border="1" class="group_handler" cols="1" icon="ninja" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="containers" name="Set 2" version="1.0"> + <nodehandler class="textctrl_handler" frame="400,400,0,48" icon="note" map="Traipse OpenRPG::Bonus Nodes::Encounters::Set 2" module="forms" name="Enc 2" version="1.0"> + <text multiline="1" send_button="1">Hoot Hoot. It's an owl.</text> +</nodehandler><nodehandler class="textctrl_handler" frame="400,400,0,48" icon="note" map="Traipse OpenRPG::Bonus Nodes::Encounters::Set 2" module="forms" name="Enc 1" version="1.0"> + <text multiline="1" send_button="1">Set 2 Random Encounter.</text> +</nodehandler><group_atts border="1" cols="1" /> +</nodehandler><nodehandler border="1" class="group_handler" cols="1" icon="knight" map="Traipse OpenRPG::Bonus Nodes::Encounters" module="containers" name="Set 1" version="1.0"> <nodehandler class="textctrl_handler" frame="400,400,0,48" icon="note" map="Traipse OpenRPG::Bonus Nodes::Encounters::Set 1" module="forms" name="Enc 2" version="1.0"> <text multiline="1" send_button="1">Dark Elves. Watch out!</text> </nodehandler><nodehandler class="textctrl_handler" frame="400,400,0,48" icon="note" map="Traipse OpenRPG::Bonus Nodes::Encounters::Set 1" module="forms" name="Enc 3" version="1.0"> @@ -23,8 +50,7 @@ </nodehandler><nodehandler class="textctrl_handler" frame="400,400,0,48" icon="note" map="Traipse OpenRPG::Bonus Nodes::Encounters::Set 1" module="forms" name="Enc 1" version="1.0"> <text multiline="1" send_button="1">A Wandering Minotaur</text> </nodehandler><group_atts border="1" cols="1" /> -</nodehandler><group_atts border="1" cols="1" /> -</nodehandler><nodehandler border="1" class="group_handler" cols="1" map="Traipse OpenRPG::Bonus Nodes" module="containers" name="Book" version="1.0"> +</nodehandler></nodehandler><nodehandler border="1" class="group_handler" cols="1" map="Traipse OpenRPG::Bonus Nodes" module="containers" name="Book" version="1.0"> <nodehandler class="listbox_handler" frame="400,400,0,48" icon="gear" map="Traipse OpenRPG::Bonus Nodes::Book" module="forms" name="Index" version="1.0"> <list hide_title="0" raw_mode="1" send_button="1" type="1"> <option selected="1" value="">!!Chapter 1::Part 1!!</option> @@ -46,24 +72,6 @@ An introduction to your adventure module can be placed here.</text> </nodehandler><group_atts border="1" cols="1" /> </nodehandler><group_atts border="1" cols="1" /> -</nodehandler><nodehandler border="1" class="group_handler" cols="1" map="Traipse OpenRPG::Bonus Nodes" module="containers" name="Deck" version="1.0"> - <nodehandler class="textctrl_handler" frame="400,400,66,87" icon="note" map="Traipse OpenRPG::Bonus Nodes::Deck" module="forms" name="Draw" version="1.0"> - <text multiline="1" raw_mode="1" send_button="1">!!52 Card Deck::([#1d13-1], [#1d4-1])!!</text> -</nodehandler><nodehandler class="rpg_grid_handler" icon="grid" map="Traipse OpenRPG::Bonus Nodes::Deck" module="rpg_grid" name="52 Card Deck" version="1.0"> - <grid autosize="1" border="1"> - <row version="1.0"> - <cell>AS</cell> - <cell>AD</cell> - <cell>AC</cell><cell>AH</cell></row> - <row version="1.0"> - <cell>KS</cell> - <cell>KD</cell> - <cell>KC</cell><cell>KH</cell></row> - <row version="1.0"><cell>QS</cell><cell>QD</cell><cell>QC</cell><cell>QH</cell></row><row version="1.0"><cell>JS</cell><cell>JD</cell><cell>JC</cell><cell>JH</cell></row><row version="1.0"><cell>10S</cell><cell>10D</cell><cell>10C</cell><cell>10H</cell></row><row version="1.0"><cell>9S</cell><cell>9D</cell><cell>9C</cell><cell>9H</cell></row><row version="1.0"><cell>8S</cell><cell>8D</cell><cell>8C</cell><cell>8H</cell></row><row version="1.0"><cell>7S</cell><cell>7D</cell><cell>7C</cell><cell>7H</cell></row><row version="1.0"><cell>6S</cell><cell>6D</cell><cell>6C</cell><cell>6H</cell></row><row version="1.0"><cell>5S</cell><cell>5D</cell><cell>5C</cell><cell>5H</cell></row><row version="1.0"><cell>4S</cell><cell>4D</cell><cell>4C</cell><cell>4H</cell></row><row version="1.0"><cell>3S</cell><cell>3D</cell><cell>3C</cell><cell>3H</cell></row><row version="1.0"><cell>2S</cell><cell>2D</cell><cell>2C</cell><cell>2H</cell></row></grid> - <macros> - <macro name="" /> - </macros> -</nodehandler><group_atts border="1" cols="1" /> </nodehandler><group_atts border="1" cols="1" /> </nodehandler><nodehandler border="1" class="group_handler" cols="1" icon="labtop" map="Traipse OpenRPG" module="containers" name="User Manual" version="1.0"> <nodehandler class="link_handler" icon="html" map="Traipse OpenRPG::User Manual" module="forms" name="Traipse User Guide" version="1.0"> @@ -123,13 +131,13 @@ </text></nodehandler><nodehandler class="textctrl_handler" frame="400,400,452,36" icon="note" map="Traipse OpenRPG::User Manual" module="forms" name="Gametree Additions & Tips" version="1.0"><text hide_title="0" multiline="1" raw_mode="0" send_button="0"> 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.