# HG changeset patch # User sirebral # Date 1264442868 21600 # Node ID 15488fe94f52abdc62fa8e62e1846a453b25d832 # Parent 7c1a8b36b7293ca9a9bfb7c55eabd81053d90d19 Traipse Beta 'OpenRPG' {100125-01} 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: New Bookmarks Feature New 'boot' command to remote admin New confirmation window for sent nodes Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG New Zoom Mouse plugin added New Images added to Plugin UI Switching to Element Tree New Map efficiency, from FlexiRPG New Status Bar to Update Manager New TrueDebug Class in orpg_log (See documentation for usage) New Portable Mercurial New Tip of the Day, from Core and community New Reference Syntax added for custom PC sheets New Child Reference for gametree New Parent Reference for gametree New Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added New Dieroller structure from Core New DieRoller portability for odd Dice New 7th Sea die roller; ie [7k3] = [7d10.takeHighest(3).open(10)] New 'Mythos' System die roller added New vs. die roller method for WoD; ie [3v3] = [3d10.vs(3)]. Included for Mythos roller also New Warhammer FRPG Die Roller (Special thanks to Puu-san for the support) New EZ_Tree Reference system. Push a button, Traipse the tree, get a reference (Beta!) New Grids act more like Spreadsheets in Use mode, with Auto Calc Fixes: Fix to allow for portability to an OpenSUSE linux OS Fix to mplay_client for Fedora and OpenSUSE 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 Fix to Whiteboard ID to prevent random line or text deleting. Fixes to Server, Remote Server, and Server GUI Fix to Update Manager; cleaner clode for saved repositories Fixes made to Settings Panel and now reactive settings when Ok is pressed Fixes to Alternity roller's attack roll. Uses a simple Tuple instead of a Splice Fix to Use panel of Forms and Tabbers. Now longer enters design mode Fix made Image Fetching. New fetching image and new failed image Fix to whiteboard ID's to prevent non updated clients from ruining the fix. default_manifest.xml renamed to default_upmana.xml diff -r 7c1a8b36b729 -r 15488fe94f52 orpg/gametree/nodehandlers/rpg_grid.py --- a/orpg/gametree/nodehandlers/rpg_grid.py Mon Jan 25 10:03:16 2010 -0600 +++ b/orpg/gametree/nodehandlers/rpg_grid.py Mon Jan 25 12:07:48 2010 -0600 @@ -327,6 +327,7 @@ cells[i].text = text if self.mode == 0: s = component.get('chat').ParseMap(text, self.handler.xml) + s = component.get('chat').ParseParent(s, self.handler.xml.get('map')) try: text = str(eval(s)) except: text = s self.SetCellValue(rowi,i,text) diff -r 7c1a8b36b729 -r 15488fe94f52 orpg/orpg_version.py --- a/orpg/orpg_version.py Mon Jan 25 10:03:16 2010 -0600 +++ b/orpg/orpg_version.py Mon Jan 25 12:07:48 2010 -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 = "100125-00" +BUILD = "100125-01" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r 7c1a8b36b729 -r 15488fe94f52 orpg/templates/nodes/4e_char_sheet.xml --- a/orpg/templates/nodes/4e_char_sheet.xml Mon Jan 25 10:03:16 2010 -0600 +++ b/orpg/templates/nodes/4e_char_sheet.xml Mon Jan 25 12:07:48 2010 -0600 @@ -1,4 +1,4 @@ -This node is designed to be as generic as possible. It should contain the core basics for users to fill out with game information that is specific to their character. +This node is designed to be as generic as possible. It should contain the core basics for users to fill out with game information that is specific to their character. The node is also designed to be organized with speed of use in mind. Since the majority of nodes are inside Tabbers you can easily use the top node and find all of your data inside. In fact, that is how I am writing this. @@ -13,7 +13,7 @@ Combat: This contains grids so you can reference your weapon dice, armor bonuses, feat bonuses .. and they too can use references so if you change a number the software does the math. -Inventory: You guess it. It comes with a Back Pack text node that you can clone to make bags and other containers.Inside the Rollers tab you will find 5 lists. You can use these lists to add new references to nodes. The Rollers tab is also a Tabber node itself, so you can just double click the Rollers node to get all of your rollers in one window. You can also edit all of your rollers in one window when you enter into the Design mode of the Rollers tabber.This form contains a some text nodes that hold basic information about your character. In some Powers the Level and Tier are used to calculate bonuses. You can reference those nodes to make the math easierThe Abilities Grid contains the 6 abilities all set at values of 8. The third column is the math calculation for the modifier. You can reference that grid column to assist in your math calculations.The Combat Tabber contains a number of Grid nodes to assist in your combat calculations. Some grids contain a grid cell called Total. +Inventory: You guess it. It comes with a Back Pack text node that you can clone to make bags and other containers.Inside the Rollers tab you will find 5 lists. You can use these lists to add new references to nodes. The Rollers tab is also a Tabber node itself, so you can just double click the Rollers node to get all of your rollers in one window. You can also edit all of your rollers in one window when you enter into the Design mode of the Rollers tabber.This form contains a some text nodes that hold basic information about your character. In some Powers the Level and Tier are used to calculate bonuses. You can reference those nodes to make the math easierThe Abilities Grid contains the 6 abilities all set at values of 8. The third column is the math calculation for the modifier. You can reference that grid column to assist in your math calculations.The Combat Tabber contains a number of Grid nodes to assist in your combat calculations. Some grids contain a grid cell called Total. To Hit: The To Hit Bonus. This Grid contains a cell called Total. You can add new rows to the grid when you are granted bonuses and then add those references to the total. @@ -23,54 +23,124 @@ AC Bonus: This Grid contains a cell called Total. You can add new rows to the grid when you are granted bonuses and then add those references to the total. -Feats: Some feats add bonusus to hit or damage. When these bonuses are calculated you can add them here and the math easier for you.This Tabber contains a Tabber for At Will, Encounter and Daily. Each tabber contains a node for levels 0 and 1. You can add new tabbers when you reach higher levels. +Feats: Some feats add bonusus to hit or damage. When these bonuses are calculated you can add them here and the math easier for you.This Tabber contains a Tabber for At Will, Encounter and Daily. Each tabber contains a node for levels 0 and 1. You can add new tabbers when you reach higher levels. Inside the 0 Level tabber for each Utility there is a text node that contains a an attack roll and a damage roll. -** I went with this format so users could create their Utility nodes and share with others. The nodes can contain Role Play information as well as attack and damage rolls. Also, the nodes can be completely genric, referencing the Name Text node and still look specific **It's just a node to hold your Inventory +** I went with this format so users could create their Utility nodes and share with others. The nodes can contain Role Play information as well as attack and damage rolls. Also, the nodes can be completely genric, referencing the Name Text node and still look specific **It's just a node to hold your Inventory This bears repeating: -It comes with a Back Pack text node that you can clone to make bags and other containers. - - - - +It comes with a Back Pack text node that you can clone to make bags and other containers. + + + + - + - - + + - - - + + + - - + + - - + + - - + + text - + text - + + text + text - - text - + + 1 + 1 - - 1 - + + + + Weapon + Damage + + + Sword + d6 + + Maced8 + + + + + + + Armor + Bonus + + + Total + !!To Hit::(3,2)!! + !!To Hit::(4,2)!! + + BAB15Str Mod!#Abilities::(1,3)#! + + + + + + + Armor + Bonus + + + Total + !!AC Bonus::(3,2)!!+!!AC Bonus::(4,2)!! + + Armor!!Armor::(2,2)!! + + + + + + + Armor + Bonus + + + Total + !!Armor::(3,2)!! + + Base10ArmorShield + + + + + + + Armor + Bonus + Descripton + + Total + !!Feats::(3,2)!! + + Feat0 + + + + Str - 8 + 12 (!!Abilities::(1,2)!!-10)/2 Dex @@ -78,11 +148,11 @@ (!!Abilities::(2,2)!!-10)/2 Con - 8 + 14 (!!Abilities::(3,2)!!-10)/2 Int - 8 + 18 (!!Abilities::(4,2)!!-10)/2 Wis @@ -96,88 +166,24 @@ - - - - Armor - Bonus - - - Total - !!To Hit::(2,3)!! + !!To Hit::(2,4)!! - - BAB0Str Mod!#Abilities::(1,3)#! - - - - - - - Weapon - Damage - - - Sword - d6 - - Maced8 - - - - - - - Armor - Bonus - - - Total - !!AC Bonus::(2,3)!! - - Misc0 - - - - - - - Armor - Bonus - - - Total - !!Armor::(2,3)!! - - Base10 - - - - - - - Armor - Bonus - Descripton - - Total - !!Feats(2,3)!! - - Feat0 - - - - + /me uses an At Will <b>Attack:</b> [1d20+2+!#Abilities::(2,3)#!] <b>Damage:</b> [2!#Combat::Weapons::(2,2)#!] - + /me uses an Encounter <b>Attack:</b> [1d20+2+!#Abilities::(2,3)#!] <b>Damage:</b> [2!#Combat::Weapons::(2,2)#!] - + /me uses an Daily <b>Attack:</b> [1d20+2+!#Abilities::(2,3)#!] <b>Damage:</b> [2!#Combat::Weapons::(2,2)#!] - - Empty. - \ No newline at end of file + + Nothing + + Nothing + + Nothing + + Nothing + \ No newline at end of file diff -r 7c1a8b36b729 -r 15488fe94f52 plugins/xxblank.py --- a/plugins/xxblank.py Mon Jan 25 10:03:16 2010 -0600 +++ b/plugins/xxblank.py Mon Jan 25 12:07:48 2010 -0600 @@ -1,4 +1,4 @@ -import os +import os, wx import orpg.pluginhandler class Plugin(orpg.pluginhandler.PluginHandler): @@ -18,6 +18,16 @@ #to set their proper values. self.sample_variable = {} + def plugin_menu(self): + ## This is a standardized Menu item. It connects to plugin_toggle where you can set events. + self.menu = wx.Menu() + self.toggle = self.menu.AppendCheckItem(wx.ID_ANY, 'On') + self.topframe.Bind(wx.EVT_MENU, self.plugin_toggle, self.toggle) + self.toggle.Check(True) + + def plugin_toggle(self, evt): + pass + def plugin_enabled(self): #You can add new /commands like diff -r 7c1a8b36b729 -r 15488fe94f52 plugins/xxgsc.py --- a/plugins/xxgsc.py Mon Jan 25 10:03:16 2010 -0600 +++ b/plugins/xxgsc.py Mon Jan 25 12:07:48 2010 -0600 @@ -1,9 +1,7 @@ -import os -from orpg.orpg_wx import * +import os, wx import random import orpg.pluginhandler - ID_ROLL = wx.NewId() class Plugin(orpg.pluginhandler.PluginHandler): @@ -29,9 +27,11 @@ self.frame = RollerFrame(None, -1, "Game Status Controller (GSC)", self) self.frame.Hide() - item = wx.MenuItem(self.menu, wx.ID_ANY, "GSC Window", "GSC Window", wx.ITEM_CHECK) - self.topframe.Bind(wx.EVT_MENU, self._toggleWindow, item) - self.menu.AppendItem(item) + def plugin_menu(self): + self.menu = wx.Menu() + self.toggle = self.menu.AppendCheckItem(wx.ID_ANY, 'GSC Window') + self.topframe.Bind(wx.EVT_MENU, self._toggleWindow, self.toggle) + self.toggle.Check(False) def plugin_disabled(self): self.plugin_removecmd('/gsc') @@ -48,14 +48,12 @@ #Events def _toggleWindow(self, evt): - id = evt.GetId() - item = self.menu.FindItemById(id) if self.frame.IsShown(): self.frame.Hide() - item.Check(False) + self.toggle.Check(False) else: self.frame.Show() - item.Check(True) + self.toggle.Check(True) class RollerFrame(wx.Frame): diff -r 7c1a8b36b729 -r 15488fe94f52 plugins/xxhiddendice.py --- a/plugins/xxhiddendice.py Mon Jan 25 10:03:16 2010 -0600 +++ b/plugins/xxhiddendice.py Mon Jan 25 12:07:48 2010 -0600 @@ -1,5 +1,4 @@ -import os -import re +import os, re, wx import orpg.pluginhandler class Plugin(orpg.pluginhandler.PluginHandler): @@ -23,32 +22,39 @@ self.hiddenrolls = [] self.dicere = "\{([0-9]*d[0-9]*.+)\}" + def plugin_menu(self): + self.menu = wx.Menu() + self.toggle = self.menu.AppendCheckItem(wx.ID_ANY, 'On') + self.topframe.Bind(wx.EVT_MENU, self.plugin_toggle, self.toggle) + self.toggle.Check(True) + + def plugin_toggle(self, evt): + pass def plugin_enabled(self): pass - def plugin_disabled(self): pass - def pre_parse(self, text): - m = re.search(self.dicere, text) - while m: - roll = "[" + m.group(1) + "]" - self.hiddenrolls += [self.chat.ParseDice(roll)] - text = text[:m.start()] + "(hidden roll)" + text[m.end():] + if self.toggle.IsChecked() == True: m = re.search(self.dicere, text) + while m: + roll = "[" + m.group(1) + "]" + self.hiddenrolls += [self.chat.ParseDice(roll)] + text = text[:m.start()] + "(hidden roll)" + text[m.end():] + m = re.search(self.dicere, text) return text def post_msg(self, text, myself): - c = 0 - a = text.find("(hidden roll)") - - while len(self.hiddenrolls) > c and a > -1: - text = text[:a+14].replace("(hidden roll)", self.hiddenrolls[c]) + text[a+14:] + if self.toggle.IsChecked() == True: + c = 0 a = text.find("(hidden roll)") - c += 1 - if c > 0: - self.hiddenrolls = [] + while len(self.hiddenrolls) > c and a > -1: + text = text[:a+14].replace("(hidden roll)", self.hiddenrolls[c]) + text[a+14:] + a = text.find("(hidden roll)") + c += 1 + if c > 0: + self.hiddenrolls = [] return text diff -r 7c1a8b36b729 -r 15488fe94f52 plugins/xxmouse-zoom.py --- a/plugins/xxmouse-zoom.py Mon Jan 25 10:03:16 2010 -0600 +++ b/plugins/xxmouse-zoom.py Mon Jan 25 12:07:48 2010 -0600 @@ -19,6 +19,17 @@ self.help += 'wheel and the map will zoom in or out. And FAST too! \n' self.help += 'This plugin is designed for Grumpy Goblin and Ornery Orc.' + def plugin_menu(self): + self.menu = wx.Menu() + self.toggle = self.menu.AppendCheckItem(wx.ID_ANY, 'On') + self.topframe.Bind(wx.EVT_MENU, self.plugin_toggle, self.toggle) + self.toggle.Check(True) + + def plugin_toggle(self, evt): + if self.toggle.IsChecked() == False: self.canvas.Disconnect(-1, -1, wx.wxEVT_MOUSEWHEEL) + if self.toggle.IsChecked() == True: + self.canvas.Bind(wx.EVT_MOUSEWHEEL, self.MouseWheel) + def plugin_enabled(self): try: self.canvas = component.get('map').canvas except: self.canvas = open_rpg.get_component('map').canvas @@ -26,12 +37,12 @@ def MouseWheel(self, evt): if evt.CmdDown(): - print evt.GetWheelRotation() if evt.GetWheelRotation() > 0: self.canvas.on_zoom_in(None) elif evt.GetWheelRotation() < 0: self.canvas.on_zoom_out(None) else: pass else: self.canvas.on_scroll(evt) def plugin_disabled(self): - self.canvas.Disconnect(-1, -1, wx.wxEVT_MOUSEWHEEL) + try: self.canvas.Disconnect(-1, -1, wx.wxEVT_MOUSEWHEEL) + except: pass diff -r 7c1a8b36b729 -r 15488fe94f52 plugins/xxspell.py --- a/plugins/xxspell.py Mon Jan 25 10:03:16 2010 -0600 +++ b/plugins/xxspell.py Mon Jan 25 12:07:48 2010 -0600 @@ -1,4 +1,4 @@ -import os +import os, wx import orpg.pluginhandler class Plugin(orpg.pluginhandler.PluginHandler): @@ -17,6 +17,15 @@ self.help += "even corrects other people's spelling." self.checklist = {} + def plugin_menu(self): + self.menu = wx.Menu() + self.toggle = self.menu.AppendCheckItem(wx.ID_ANY, 'On') + self.topframe.Bind(wx.EVT_MENU, self.plugin_toggle, self.toggle) + self.toggle.Check(True) + + def plugin_toggle(self, evt): + pass + def plugin_enabled(self): #This is where you set any variables that need to be initalized when your plugin starts #You can add new /commands like @@ -34,11 +43,13 @@ return text def plugin_incoming_msg(self, text, type, name, player): - text = self.replace(text) + if self.toggle.IsChecked() == True: + text = self.replace(text) return text, type, name def pre_parse(self, text): - text = self.replace(text) + if self.toggle.IsChecked() == True: + text = self.replace(text) return text def on_spell(self, cmdargs): diff -r 7c1a8b36b729 -r 15488fe94f52 plugins/xxurl2link.py --- a/plugins/xxurl2link.py Mon Jan 25 10:03:16 2010 -0600 +++ b/plugins/xxurl2link.py Mon Jan 25 12:07:48 2010 -0600 @@ -1,6 +1,5 @@ -import os +import os, re, wx import orpg.pluginhandler -import re class Plugin(orpg.pluginhandler.PluginHandler): # Initialization subroutine. @@ -19,6 +18,15 @@ 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') + self.topframe.Bind(wx.EVT_MENU, self.plugin_toggle, self.toggle) + self.toggle.Check(True) + + def plugin_toggle(self, evt): + 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("(?