Menu
▾
▴
openrpg-dev — Developer mailing list for OpenRPG1 (Python)
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(5) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(4) |
Feb
(5) |
Mar
(56) |
Apr
(110) |
May
(187) |
Jun
(317) |
Jul
(280) |
Aug
(191) |
Sep
(42) |
Oct
(104) |
Nov
(123) |
Dec
(80) |
| 2002 |
Jan
(281) |
Feb
(251) |
Mar
(238) |
Apr
(70) |
May
(118) |
Jun
(117) |
Jul
(74) |
Aug
(104) |
Sep
(42) |
Oct
(36) |
Nov
(60) |
Dec
(60) |
| 2003 |
Jan
(183) |
Feb
(45) |
Mar
(111) |
Apr
(89) |
May
(38) |
Jun
(37) |
Jul
(14) |
Aug
(31) |
Sep
(37) |
Oct
(87) |
Nov
(179) |
Dec
(93) |
| 2004 |
Jan
(32) |
Feb
(31) |
Mar
(1) |
Apr
(5) |
May
(76) |
Jun
(20) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
(5) |
Nov
(5) |
Dec
(30) |
| 2005 |
Jan
(33) |
Feb
(30) |
Mar
(41) |
Apr
(20) |
May
(73) |
Jun
(33) |
Jul
(151) |
Aug
(104) |
Sep
(76) |
Oct
(34) |
Nov
(86) |
Dec
(151) |
| 2006 |
Jan
(136) |
Feb
(39) |
Mar
(17) |
Apr
(18) |
May
(62) |
Jun
(92) |
Jul
(13) |
Aug
(15) |
Sep
(47) |
Oct
(207) |
Nov
(217) |
Dec
(48) |
| 2007 |
Jan
(66) |
Feb
(199) |
Mar
(130) |
Apr
(90) |
May
(70) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Digital X. <dig...@us...> - 2007-05-09 19:31:41
|
Update of /cvsroot/openrpg/openrpg1/orpg In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23172/orpg Modified Files: orpg_version.py Log Message: Index: orpg_version.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** orpg_version.py 5 May 2007 19:44:05 -0000 1.121 --- orpg_version.py 9 May 2007 19:31:30 -0000 1.122 *************** *** 3,7 **** #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) ! BUILD = "0700505-00" --- 3,7 ---- #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) ! BUILD = "0700509-00" |
|
From: Digital X. <dig...@us...> - 2007-05-09 19:30:36
|
Update of /cvsroot/openrpg/openrpg1/orpg/mapper In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22781/orpg/mapper Modified Files: Tag: BRANCH-1-7-3 grid.py Log Message: Fix for the hex grid issue Index: grid.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid.py,v retrieving revision 1.26 retrieving revision 1.26.2.1 diff -C2 -d -r1.26 -r1.26.2.1 *** grid.py 4 May 2007 03:15:17 -0000 1.26 --- grid.py 9 May 2007 19:30:36 -0000 1.26.2.1 *************** *** 482,491 **** self.unit_size = int(xml_dom.getAttribute("size")) self.unit_size_y = self.unit_size - if self.mode == GRID_RECTANGLE: - self.unit_size_y = self.unit_size - if self.mode == GRID_ISOMETRIC: - self.unit_size_y = self.unit_size - elif self.mode == GRID_HEXAGON: - self.unit_size_y = self.unit_size*(3**0.5) if xml_dom.hasAttribute("snap"): --- 482,485 ---- |
|
From: Digital X. <dig...@us...> - 2007-05-09 19:29:39
|
Update of /cvsroot/openrpg/openrpg1/orpg/mapper In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22350/orpg/mapper Modified Files: grid.py Log Message: Fix for the hex grid issue Index: grid.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** grid.py 4 May 2007 03:15:17 -0000 1.26 --- grid.py 9 May 2007 19:29:37 -0000 1.27 *************** *** 482,491 **** self.unit_size = int(xml_dom.getAttribute("size")) self.unit_size_y = self.unit_size - if self.mode == GRID_RECTANGLE: - self.unit_size_y = self.unit_size - if self.mode == GRID_ISOMETRIC: - self.unit_size_y = self.unit_size - elif self.mode == GRID_HEXAGON: - self.unit_size_y = self.unit_size*(3**0.5) if xml_dom.hasAttribute("snap"): --- 482,485 ---- |
Update of /cvsroot/openrpg/openrpg1/orpg/templates In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/templates Modified Files: about.html default_LobbyMessage.html default_ban_list.xml default_layout.xml default_plugindb.xml default_tree.xml feature.xml Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: default_LobbyMessage.html =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/default_LobbyMessage.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** default_LobbyMessage.html 11 Jul 2005 18:01:42 -0000 1.11 --- default_LobbyMessage.html 6 May 2007 16:42:59 -0000 1.12 *************** *** 19,24 **** Thomas Baleno, Andrew Bennett, Lex Berezhny, Ted Berg, Bernhard Bergbauer, Chris Blocher ,Ben Collins-Sussman, Robin Cook, Greg Copeland, ! Chris Davis, Michael Edwards, Andrew Ettinger, Dj Gilcrease, Todd Faris, ! Christopher Hickman, Paul Hosking, Scott Mackay, Brian Manning, Jesse McConnell, Brian Osman, Rome Reginelli, Christopher Rouse, Dave Sanders and Mark Tarrabain. </td> --- 19,24 ---- Thomas Baleno, Andrew Bennett, Lex Berezhny, Ted Berg, Bernhard Bergbauer, Chris Blocher ,Ben Collins-Sussman, Robin Cook, Greg Copeland, ! Chris Davis, Michael Edwards, Andrew Ettinger, Dj Gilcrease, Todd Faris, ! Christopher Hickman, Paul Hosking, Scott Mackay, Brian Manning, Jesse McConnell, Brian Osman, Rome Reginelli, Christopher Rouse, Dave Sanders and Mark Tarrabain. </td> Index: default_tree.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/default_tree.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** default_tree.xml 18 Oct 2006 21:50:18 -0000 1.8 --- default_tree.xml 6 May 2007 16:43:00 -0000 1.9 *************** *** 100,102 **** </nodehandler> </nodehandler> ! </gametree> \ No newline at end of file --- 100,102 ---- </nodehandler> </nodehandler> ! </gametree> Index: default_plugindb.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/default_plugindb.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** default_plugindb.xml 9 Mar 2005 14:19:12 -0000 1.1 --- default_plugindb.xml 6 May 2007 16:42:59 -0000 1.2 *************** *** 1 **** ! <plugindb></plugindb> \ No newline at end of file --- 1 ---- ! <plugindb></plugindb> Index: default_ban_list.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/default_ban_list.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** default_ban_list.xml 18 Feb 2007 16:14:47 -0000 1.2 --- default_ban_list.xml 6 May 2007 16:42:59 -0000 1.3 *************** *** 1 **** ! <server></server> \ No newline at end of file --- 1 ---- ! <server></server> Index: about.html =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/about.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** about.html 6 Dec 2005 06:34:19 -0000 1.10 --- about.html 6 May 2007 16:42:59 -0000 1.11 *************** *** 26,31 **** Thomas Baleno, Andrew Bennett, Lex Berezhny, Ted Berg, Bernhard Bergbauer, Chris Blocher, Ben Collins-Sussman, Robin Cook, Greg Copeland, ! Chris Davis, Michael Edwards, Andrew Ettinger, Todd Faris, Dj Gilcrease, ! Christopher Hickman, Paul Hosking, Brian Manning, Scott Mackay, Jesse McConnell, Brian Osman, Rome Reginelli, Christopher Rouse, Dave Sanders and Mark Tarrabain. </td> --- 26,31 ---- Thomas Baleno, Andrew Bennett, Lex Berezhny, Ted Berg, Bernhard Bergbauer, Chris Blocher, Ben Collins-Sussman, Robin Cook, Greg Copeland, ! Chris Davis, Michael Edwards, Andrew Ettinger, Todd Faris, Dj Gilcrease, ! Christopher Hickman, Paul Hosking, Brian Manning, Scott Mackay, Jesse McConnell, Brian Osman, Rome Reginelli, Christopher Rouse, Dave Sanders and Mark Tarrabain. </td> Index: feature.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/feature.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** feature.xml 13 Feb 2007 15:32:20 -0000 1.28 --- feature.xml 6 May 2007 16:43:00 -0000 1.29 *************** *** 106,108 **** </nodehandler> </nodehandler> ! </nodehandler> \ No newline at end of file --- 106,108 ---- </nodehandler> </nodehandler> ! </nodehandler> Index: default_layout.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/default_layout.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** default_layout.xml 18 Nov 2006 00:02:34 -0000 1.6 --- default_layout.xml 6 May 2007 16:42:59 -0000 1.7 *************** *** 4,6 **** <player dockable="1" height="356" width="200" caption="Player List" direction="Left" layer="3" pos="1" /> <map dockable="1" height="357" width="824" caption="Map Window" direction="Center" layer="2" pos="0" /> ! </orpg_gui> \ No newline at end of file --- 4,6 ---- <player dockable="1" height="356" width="200" caption="Player List" direction="Left" layer="3" pos="1" /> <map dockable="1" height="357" width="824" caption="Map Window" direction="Center" layer="2" pos="0" /> ! </orpg_gui> |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:30
|
Update of /cvsroot/openrpg/openrpg1/orpg/networking In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/networking Modified Files: mplay_groups.py mplay_messaging.py mplay_server.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: mplay_messaging.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_messaging.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mplay_messaging.py 12 Nov 2006 00:10:38 -0000 1.4 --- mplay_messaging.py 6 May 2007 16:42:59 -0000 1.5 *************** *** 505,507 **** if __name__ == "__main__": test = messenger(None) ! print test.build_message('hello', "This is a test message", attrib1="hello world", attrib2="hello world2", attrib3="hello world3") \ No newline at end of file --- 505,507 ---- if __name__ == "__main__": test = messenger(None) ! print test.build_message('hello', "This is a test message", attrib1="hello world", attrib2="hello world2", attrib3="hello world3") Index: mplay_server.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_server.py,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** mplay_server.py 29 Apr 2007 17:09:25 -0000 1.145 --- mplay_server.py 6 May 2007 16:42:59 -0000 1.146 *************** *** 2841,2843 **** self.log_msg(str(e)) self.p_lock.release() ! return pl \ No newline at end of file --- 2841,2843 ---- self.log_msg(str(e)) self.p_lock.release() ! return pl Index: mplay_groups.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_groups.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mplay_groups.py 18 Oct 2006 22:21:25 -0000 1.1 --- mplay_groups.py 6 May 2007 16:42:59 -0000 1.2 *************** *** 79,81 **** xml_data += "\" players=\"" + str(self.get_num_players()) xml_data += "\" action=\"" + act + "\" />" ! return xml_data \ No newline at end of file --- 79,81 ---- xml_data += "\" players=\"" + str(self.get_num_players()) xml_data += "\" action=\"" + act + "\" />" ! return xml_data |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:29
|
Update of /cvsroot/openrpg/openrpg1/orpg/mapper In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/mapper Modified Files: miniatures.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: miniatures.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/miniatures.py,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** miniatures.py 9 Mar 2007 14:11:55 -0000 1.43 --- miniatures.py 6 May 2007 16:42:56 -0000 1.44 *************** *** 880,882 **** urllib.urlcleanup() ! self.lock.release() \ No newline at end of file --- 880,882 ---- urllib.urlcleanup() ! self.lock.release() |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:26
|
Update of /cvsroot/openrpg/openrpg1/orpg/dieroller In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/dieroller Modified Files: gurps.py savage.py sr4.py wod.py wodex.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: wodex.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/wodex.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wodex.py 13 Mar 2007 17:53:42 -0000 1.8 --- wodex.py 6 May 2007 16:42:55 -0000 1.9 *************** *** 284,286 **** myStr += str(succ) + " Successes" ! return myStr \ No newline at end of file --- 284,286 ---- myStr += str(succ) + " Successes" ! return myStr Index: wod.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/wod.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wod.py 4 Nov 2006 21:24:19 -0000 1.12 --- wod.py 6 May 2007 16:42:55 -0000 1.13 *************** *** 1,87 **** ! ## a vs die roller as used by WOD games ! #!/usr/bin/env python ! # Copyright (C) 2000-2001 The OpenRPG Project ! # ! # ope...@li... ! # ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! # ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! # -- ! # ! # File: wod.py ! # Author: OpenRPG Dev Team ! # Maintainer: ! # Version: ! # $Id$ ! # ! # Description: WOD die roller ! # ! # Targetthr is the Threshhold target ! # for compatibility with Mage die rolls. ! # Threshhold addition by robert t childers ! from die import * ! ! __version__ = "$Id$" ! ! ! class wod(std): ! def __init__(self,source=[],target=0,targetthr=0): ! std.__init__(self,source) ! self.target = target ! self.targetthr = targetthr ! ! def vs(self,target): ! self.target = target ! return self ! ! def thr(self,targetthr): ! self.targetthr = targetthr ! return self ! ! def sum(self): ! rolls = [] ! s = 0 ! s1 = self.targetthr ! botch = 0 ! for a in self.data: ! rolls.extend(a.gethistory()) ! for r in rolls: ! if r >= self.target or r == 10: ! s += 1 ! if s1 >0: ! s1 -= 1 ! s -= 1 ! else: ! botch = 1 ! elif r == 1: ! s -= 1 ! if botch == 1 and s < 0: ! s = 0 ! return s ! ! def __str__(self): ! if len(self.data) > 0: ! myStr = "[" + str(self.data[0]) ! for a in self.data[1:]: ! myStr += "," ! myStr += str(a) ! if self.sum() < 0: ! myStr += "] vs " +str(self.target)+" result of a botch" ! elif self.sum() == 0: ! myStr += "] vs " +str(self.target)+" result of a failure" ! else: ! myStr += "] vs " +str(self.target)+" result of (" + str(self.sum()) + ")" ! ! ! return myStr --- 1 ---- ! __all__ = ['dice', 'rollers', 'die', 'd20', 'std', 'hackmaster', 'hero', 'shadowrun', 'sr4', 'srex', 'utils', 'wod', 'wodex', 'utils'] Index: savage.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/savage.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** savage.py 18 Apr 2007 21:49:50 -0000 1.1 --- savage.py 6 May 2007 16:42:55 -0000 1.2 *************** *** 37,50 **** def fright(self,fearmod=0): return fright(self,fearmod=0) ! def kob(self,wnd,loc): return kob(self,wnd=1,loc="rnd") ! def ooc(self): return ooc(self) ! def ract(self,chmod=0): return ract(self,chmod=0) ! def vcrit(self): return vcrit(self) --- 37,50 ---- def fright(self,fearmod=0): return fright(self,fearmod=0) ! def kob(self,wnd,loc): return kob(self,wnd=1,loc="rnd") ! def ooc(self): return ooc(self) ! def ract(self,chmod=0): return ract(self,chmod=0) ! def vcrit(self): return vcrit(self) *************** *** 52,64 **** def fortune(self): return fortune(self) ! def freak(self): return freak(self) ! def swdhelps(self): return swdhelps(self) - ! class fright(std): #-----------------The Fright Table # Rolls on the Fright - which is a 1d20 roll modified by the fear level of a monster. This function automatically generates --- 52,64 ---- def fortune(self): return fortune(self) ! def freak(self): return freak(self) ! def swdhelps(self): return swdhelps(self) ! ! class fright(std): #-----------------The Fright Table # Rolls on the Fright - which is a 1d20 roll modified by the fear level of a monster. This function automatically generates *************** *** 74,78 **** #def sum(self): ! def __str__(self): global fear --- 74,78 ---- #def sum(self): ! def __str__(self): global fear *************** *** 103,111 **** return myStr ! class kob(std): #-------------------The Knockout Blow Table ! # This table used when a character has sustained more than 3 wounds. The number wounds taken that sends a character to the # Knockout Blow Table is what gets sent with the kob command - not the total number of wounds the character currently has. ! # For example - a character has 2 wounds and is hit takes 2 more wounds, this will result in a total of 4 wounds, but the # number that gets sent to the kob roll is 2, because that is the number of wounds sustained that sent the character to the kob # table. --- 103,111 ---- return myStr ! class kob(std): #-------------------The Knockout Blow Table ! # This table used when a character has sustained more than 3 wounds. The number wounds taken that sends a character to the # Knockout Blow Table is what gets sent with the kob command - not the total number of wounds the character currently has. ! # For example - a character has 2 wounds and is hit takes 2 more wounds, this will result in a total of 4 wounds, but the # number that gets sent to the kob roll is 2, because that is the number of wounds sustained that sent the character to the kob # table. *************** *** 151,155 **** wdescription = "Your hero has suffered a life-threatening wound and will not recover without aid. He is Incapacitated and must roll on the Injury Table. He must also make a Vigor roll at the start of each round. If the roll is failed, he passes on. A Healing roll stabilizes the victim but leaves him Incapacitated." itbl = "yes" ! if itbl == "yes": #Determine if a Hit location was specified already --- 151,155 ---- wdescription = "Your hero has suffered a life-threatening wound and will not recover without aid. He is Incapacitated and must roll on the Injury Table. He must also make a Vigor roll at the start of each round. If the roll is failed, he passes on. A Healing roll stabilizes the victim but leaves him Incapacitated." itbl = "yes" ! if itbl == "yes": #Determine if a Hit location was specified already *************** *** 222,231 **** if loca != "h" and loca != "g" and loca != "c" and loca != "rl" and loca != "ll" and loca != "ra" and loca != "la": idescription +="<br><br><b>***If the attack that caused the Injury was directed at a specific body part, use that location instead of rolling randomly.***</b>" ! myStr = "[" + wtype + "] ==>" + wdescription + "<br><br><b>Injury Table Result ("+ str(iroll) +"): </b> [" + iloc + "] ==> " + idescription else: myStr = "[" + wtype + "] ==>" + wdescription return myStr ! class ract(std): #----------------------The Reaction Table # This is used to randomly determine the general mood of NPCs toward the player characters. This simulates a 2d6 roll --- 222,231 ---- if loca != "h" and loca != "g" and loca != "c" and loca != "rl" and loca != "ll" and loca != "ra" and loca != "la": idescription +="<br><br><b>***If the attack that caused the Injury was directed at a specific body part, use that location instead of rolling randomly.***</b>" ! myStr = "[" + wtype + "] ==>" + wdescription + "<br><br><b>Injury Table Result ("+ str(iroll) +"): </b> [" + iloc + "] ==> " + idescription else: myStr = "[" + wtype + "] ==>" + wdescription return myStr ! class ract(std): #----------------------The Reaction Table # This is used to randomly determine the general mood of NPCs toward the player characters. This simulates a 2d6 roll *************** *** 263,268 **** myStr = "["+str(r1roll)+"+"+str(charisma)+"(charisma modifier)="+str(rroll)+"] ==> "+reaction+": "+rdescription return myStr ! ! class ooc(std): #--------------------The Out of Control Vehicle Table # This table is used when a vehicle is injured during combat and must determine what happens to the vehicle. This is a 2d6 --- 263,268 ---- myStr = "["+str(r1roll)+"+"+str(charisma)+"(charisma modifier)="+str(rroll)+"] ==> "+reaction+": "+rdescription return myStr ! ! class ooc(std): #--------------------The Out of Control Vehicle Table # This table is used when a vehicle is injured during combat and must determine what happens to the vehicle. This is a 2d6 *************** *** 272,276 **** def __init__(self): std.__init__(self) ! def __str__(self): ooroll = randint(2,12) --- 272,276 ---- def __init__(self): std.__init__(self) ! def __str__(self): ooroll = randint(2,12) *************** *** 309,313 **** sroll = randint(1,4) oodescription += "Move the vehicle "+str(sroll)+"\" left or right (in the direction of a failed maneuver, or away from a damaging attack)." ! oodescription += "<br><br>For flying vehicles conducting combat in the air, the vehicle" altchange = randint(2,12) --- 309,313 ---- sroll = randint(1,4) oodescription += "Move the vehicle "+str(sroll)+"\" left or right (in the direction of a failed maneuver, or away from a damaging attack)." ! oodescription += "<br><br>For flying vehicles conducting combat in the air, the vehicle" altchange = randint(2,12) *************** *** 326,330 **** return myStr ! class vcrit(std): #----------------The Critical Hit Vehicle Table # This table generates a 2d6 roll to determine the Critical Hit results every time a vehicle takes a wound. There are no --- 326,330 ---- return myStr ! class vcrit(std): #----------------The Critical Hit Vehicle Table # This table generates a 2d6 roll to determine the Critical Hit results every time a vehicle takes a wound. There are no *************** *** 334,338 **** def __init__(self): std.__init__(self) ! def __str__(self): chitroll = randint(2,12) --- 334,338 ---- def __init__(self): std.__init__(self) ! def __str__(self): chitroll = randint(2,12) *************** *** 368,380 **** myStr = "["+cheffect+" ("+str(chitroll)+")] ==> "+chdescription return myStr ! def ooc(self): return vcritooc(self) ! ! class swdhelps(std): #Display help information for this die roller - it will list all the available commands, and how to use them def __init__(self): std.__init__(self) ! def __str__(self): myStr = "<table border='1' valign='top'>\ --- 368,380 ---- myStr = "["+cheffect+" ("+str(chitroll)+")] ==> "+chdescription return myStr ! def ooc(self): return vcritooc(self) ! ! class swdhelps(std): #Display help information for this die roller - it will list all the available commands, and how to use them def __init__(self): std.__init__(self) ! def __str__(self): myStr = "<table border='1' valign='top'>\ *************** *** 420,428 **** </table>" return myStr ! class fortune(std): def __init___(self): std.__init__(self) ! def __str__(self): forroll = randint(2,12) --- 420,428 ---- </table>" return myStr ! class fortune(std): def __init___(self): std.__init__(self) ! def __str__(self): forroll = randint(2,12) *************** *** 453,464 **** myStr = "["+fortune+" ("+str(forroll)+")] ==>"+fdescription return myStr ! def freak(self): return fortunefreak(self) ! class freak(std): def __init__(self): std.__init__(self) ! def __str__(self): feroll = randint(1,10) --- 453,464 ---- myStr = "["+fortune+" ("+str(forroll)+")] ==>"+fdescription return myStr ! def freak(self): return fortunefreak(self) ! class freak(std): def __init__(self): std.__init__(self) ! def __str__(self): feroll = randint(1,10) *************** *** 505,507 **** def __str__(self): ! return myStr \ No newline at end of file --- 505,507 ---- def __str__(self): ! return myStr Index: gurps.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/gurps.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gurps.py 4 Apr 2007 16:34:13 -0000 1.4 --- gurps.py 6 May 2007 16:42:55 -0000 1.5 *************** *** 195,199 **** else: myStr += " or less <font color='#ff0000'><b>Failure!</b> by " + str(Diff) +"</font>" ! myStr += strRule return myStr --- 195,199 ---- else: myStr += " or less <font color='#ff0000'><b>Failure!</b> by " + str(Diff) +"</font>" ! myStr += strRule return myStr Index: sr4.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/sr4.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sr4.py 18 Oct 2006 21:50:11 -0000 1.5 --- sr4.py 6 May 2007 16:42:55 -0000 1.6 *************** *** 1,7 **** ! ## a vs die roller as used by WOD games #!/usr/bin/env python # Copyright (C) 2000-2001 The OpenRPG Project # ! # ope...@li... # # This program is free software; you can redistribute it and/or modify --- 1,7 ---- ! ## a vs die roller as used by WOD games #!/usr/bin/env python # Copyright (C) 2000-2001 The OpenRPG Project # ! # ope...@li... # # This program is free software; you can redistribute it and/or modify |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:26
|
Update of /cvsroot/openrpg/openrpg1/orpg/gametree/nodehandlers In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/gametree/nodehandlers Modified Files: dnd35.py voxchat.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: voxchat.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/nodehandlers/voxchat.py,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** voxchat.py 16 Nov 2006 16:53:36 -0000 1.36 --- voxchat.py 6 May 2007 16:42:55 -0000 1.37 *************** *** 66,68 **** aliasLib = self.openrpg.get_component('alias') aliasLib.ImportFromTree(self.node) ! return None \ No newline at end of file --- 66,68 ---- aliasLib = self.openrpg.get_component('alias') aliasLib.ImportFromTree(self.node) ! return None Index: dnd35.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/nodehandlers/dnd35.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dnd35.py 15 Nov 2006 12:11:24 -0000 1.3 --- dnd35.py 6 May 2007 16:42:55 -0000 1.4 *************** *** 2374,2376 **** self.grid.SetColSize(0,col_w*3) for i in range(1,cols): ! self.grid.SetColSize(i,col_w) \ No newline at end of file --- 2374,2376 ---- self.grid.SetColSize(0,col_w*3) for i in range(1,cols): ! self.grid.SetColSize(i,col_w) |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:25
|
Update of /cvsroot/openrpg/openrpg1/orpg/gametree In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/gametree Modified Files: __init__.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: __init__.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/__init__.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** __init__.py 18 Oct 2006 21:50:12 -0000 1.6 --- __init__.py 6 May 2007 16:42:55 -0000 1.7 *************** *** 1 **** ! __all__ = ['nodehandlers'] --- 1 ---- ! __all__ = ['nodehandlers'] |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:25
|
Update of /cvsroot/openrpg/openrpg1/orpg/chat In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/chat Modified Files: chatwnd.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: chatwnd.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/chat/chatwnd.py,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** chatwnd.py 22 Apr 2007 00:19:17 -0000 1.170 --- chatwnd.py 6 May 2007 16:42:54 -0000 1.171 *************** *** 2456,2460 **** loop = False if len(node_path_list) == 1: ! loop = True for nodeName in node_path_list: (found, node) = self.resolve_loop(dom, nodeName, loop) --- 2456,2460 ---- loop = False if len(node_path_list) == 1: ! loop = True for nodeName in node_path_list: (found, node) = self.resolve_loop(dom, nodeName, loop) *************** *** 2473,2475 **** self.log.log("Exit chat_panel->resolve_nodes(self, s)", ORPG_DEBUG) ! return value \ No newline at end of file --- 2473,2475 ---- self.log.log("Exit chat_panel->resolve_nodes(self, s)", ORPG_DEBUG) ! return value |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:07
|
Update of /cvsroot/openrpg/openrpg1/orpg/tools In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/orpg/tools Modified Files: aliaslib.py metamenus.py orpg_log.py orpg_sound.py predTextCtrl.py validate.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: orpg_sound.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/orpg_sound.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** orpg_sound.py 16 Mar 2007 18:20:51 -0000 1.29 --- orpg_sound.py 6 May 2007 16:43:03 -0000 1.30 *************** *** 216,218 **** if __name__ == "__main__": app = BlankApp(0) ! app.MainLoop() \ No newline at end of file --- 216,218 ---- if __name__ == "__main__": app = BlankApp(0) ! app.MainLoop() Index: predTextCtrl.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/predTextCtrl.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** predTextCtrl.py 2 Nov 2006 23:42:44 -0000 1.9 --- predTextCtrl.py 6 May 2007 16:43:03 -0000 1.10 *************** *** 595,597 **** return ! # End of class predTextCtrl! \ No newline at end of file --- 595,597 ---- return ! # End of class predTextCtrl! Index: orpg_log.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/orpg_log.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** orpg_log.py 12 Nov 2006 00:10:38 -0000 1.8 --- orpg_log.py 6 May 2007 16:43:02 -0000 1.9 *************** *** 60,62 **** def getLogToConsol(self): ! return self.logToConsol \ No newline at end of file --- 60,62 ---- def getLogToConsol(self): ! return self.logToConsol Index: metamenus.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/metamenus.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** metamenus.py 3 Apr 2007 00:14:35 -0000 1.5 --- metamenus.py 6 May 2007 16:43:02 -0000 1.6 *************** *** 1416,1418 **** # ## ! ### eof \ No newline at end of file --- 1416,1418 ---- # ## ! ### eof Index: validate.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/validate.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** validate.py 18 Oct 2006 21:50:20 -0000 1.3 --- validate.py 6 May 2007 16:43:03 -0000 1.4 *************** *** 1,32 **** ! # file: config_files.py ! # ! # Author: Todd Faris (Snowdog) ! # Date: 5/10/2005 ! # ! # Misc. config file service methods ! # ! ! import orpg.dirpath ! import os ! ! class Validate: ! def config_file(self, user_file, template_file): ! #STEP 1: verify the template exists ! if (not os.path.exists(orpg.dirpath.dir_struct["template"] + template_file)): ! return 0 ! ! #STEP 2: verify the user file exists. If it doesn't then create it from template ! if (not os.path.exists(orpg.dirpath.dir_struct["user"]+user_file)): ! default = open(orpg.dirpath.dir_struct["template"] + template_file,"r") ! file = default.read() ! newfile = open(orpg.dirpath.dir_struct["user"] + user_file,"w") ! newfile.write(file) ! default.close() ! newfile.close() ! return 2 #returning 2 (True) so calling method will know if file was created ! ! #STEP 3: user file exists (is openable) return 1 indicating no-create operation required ! else: return 1 ! ! def ini_entry(self, entry_name, ini_file): ! pass --- 1,32 ---- ! # file: config_files.py ! # ! # Author: Todd Faris (Snowdog) ! # Date: 5/10/2005 ! # ! # Misc. config file service methods ! # ! ! import orpg.dirpath ! import os ! ! class Validate: ! def config_file(self, user_file, template_file): ! #STEP 1: verify the template exists ! if (not os.path.exists(orpg.dirpath.dir_struct["template"] + template_file)): ! return 0 ! ! #STEP 2: verify the user file exists. If it doesn't then create it from template ! if (not os.path.exists(orpg.dirpath.dir_struct["user"]+user_file)): ! default = open(orpg.dirpath.dir_struct["template"] + template_file,"r") ! file = default.read() ! newfile = open(orpg.dirpath.dir_struct["user"] + user_file,"w") ! newfile.write(file) ! default.close() ! newfile.close() ! return 2 #returning 2 (True) so calling method will know if file was created ! ! #STEP 3: user file exists (is openable) return 1 indicating no-create operation required ! else: return 1 ! ! def ini_entry(self, entry_name, ini_file): ! pass Index: aliaslib.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/aliaslib.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** aliaslib.py 27 Feb 2007 03:08:07 -0000 1.17 --- aliaslib.py 6 May 2007 16:43:02 -0000 1.18 *************** *** 1198,1200 **** if __name__ == "__main__": app = BlankApp(0) ! app.MainLoop() \ No newline at end of file --- 1198,1200 ---- if __name__ == "__main__": app = BlankApp(0) ! app.MainLoop() |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:07
|
Update of /cvsroot/openrpg/openrpg1/plugins In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600/plugins Modified Files: inittool.xml inittool2.xml inittool2_player.xml quotebox.xml xxsimpleinit.py xxurl2link.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: inittool2_player.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/plugins/inittool2_player.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** inittool2_player.xml 30 Mar 2007 19:18:04 -0000 1.2 --- inittool2_player.xml 6 May 2007 16:43:03 -0000 1.3 *************** *** 64,66 **** Astral Veggiesama [5d6.init(5)] init 2</text> </nodehandler> ! </nodehandler> \ No newline at end of file --- 64,66 ---- Astral Veggiesama [5d6.init(5)] init 2</text> </nodehandler> ! </nodehandler> Index: xxsimpleinit.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/plugins/xxsimpleinit.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xxsimpleinit.py 14 Apr 2007 22:34:16 -0000 1.7 --- xxsimpleinit.py 6 May 2007 16:43:03 -0000 1.8 *************** *** 808,810 **** def onCancel(self, evt): ! self.Close() \ No newline at end of file --- 808,810 ---- def onCancel(self, evt): ! self.Close() Index: inittool2.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/plugins/inittool2.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** inittool2.xml 30 Mar 2007 19:18:04 -0000 1.3 --- inittool2.xml 6 May 2007 16:43:03 -0000 1.4 *************** *** 383,387 **** /initload (slot_#) - will load the initiative list previously saved on the given slot. Default is to load slot #1. ! /initautosave 300 - will auto save the current initiative list every 300 seconds on the special autosaving slot. --- 383,387 ---- /initload (slot_#) - will load the initiative list previously saved on the given slot. Default is to load slot #1. ! /initautosave 300 - will auto save the current initiative list every 300 seconds on the special autosaving slot. *************** *** 465,475 **** Hussar ! Playtesting slyfax ! Explanations for RuneQuest support and playtesting Zalarian ! Bugfix with ending effects --- 465,475 ---- Hussar ! Playtesting slyfax ! Explanations for RuneQuest support and playtesting Zalarian ! Bugfix with ending effects *************** *** 494,496 **** </nodehandler> </nodehandler> ! </nodehandler> \ No newline at end of file --- 494,496 ---- </nodehandler> </nodehandler> ! </nodehandler> Index: inittool.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/plugins/inittool.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** inittool.xml 18 Oct 2006 21:50:21 -0000 1.5 --- inittool.xml 6 May 2007 16:43:03 -0000 1.6 *************** *** 121,123 **** </list> </nodehandler> ! </nodehandler> \ No newline at end of file --- 121,123 ---- </list> </nodehandler> ! </nodehandler> Index: quotebox.xml =================================================================== RCS file: /cvsroot/openrpg/openrpg1/plugins/quotebox.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** quotebox.xml 19 Feb 2007 04:21:28 -0000 1.1 --- quotebox.xml 6 May 2007 16:43:03 -0000 1.2 *************** *** 57,59 **** To change your QuoteBox's font color, size, etc., look in Settings under this node of your gametree.</text> </nodehandler> ! </nodehandler> \ No newline at end of file --- 57,59 ---- To change your QuoteBox's font color, size, etc., look in Settings under this node of your gametree.</text> </nodehandler> ! </nodehandler> Index: xxurl2link.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/plugins/xxurl2link.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** xxurl2link.py 17 Nov 2006 19:02:21 -0000 1.19 --- xxurl2link.py 6 May 2007 16:43:03 -0000 1.20 *************** *** 50,52 **** return '<a href="' + m.group(1).lower() + link + '">' + m.group(0) + '</a>' else: ! return '<a href="http://' + link + '">' + link + '</a>' \ No newline at end of file --- 50,52 ---- return '<a href="' + m.group(1).lower() + link + '">' + m.group(0) + '</a>' else: ! return '<a href="http://' + link + '">' + link + '</a>' |
|
From: Digital X. <dig...@us...> - 2007-05-06 16:43:04
|
Update of /cvsroot/openrpg/openrpg1 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32600 Modified Files: start.py Log Message: Reconvert every file to unix line ending. This is the 3rd time I have done this, and no clue why they get switched back Index: start.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/start.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** start.py 20 Feb 2007 10:19:53 -0000 1.14 --- start.py 6 May 2007 16:43:03 -0000 1.15 *************** *** 18,20 **** import orpg.main app = orpg.main.orpgApp(0) ! app.MainLoop() \ No newline at end of file --- 18,20 ---- import orpg.main app = orpg.main.orpgApp(0) ! app.MainLoop() |
|
From: Digital X. <dig...@us...> - 2007-05-05 20:05:38
|
Update of /cvsroot/openrpg/openrpg1/orpg In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7307/orpg Modified Files: Tag: BRANCH-1-7-3 orpg_version.py Log Message: Index: orpg_version.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v retrieving revision 1.121.2.1 retrieving revision 1.121.2.2 diff -C2 -d -r1.121.2.1 -r1.121.2.2 *** orpg_version.py 5 May 2007 20:04:08 -0000 1.121.2.1 --- orpg_version.py 5 May 2007 20:05:38 -0000 1.121.2.2 *************** *** 1,4 **** ! VERSION = "1.7.2" ! SERVER_MIN_CLIENT_VERSION = "1.7.3" #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) --- 1,4 ---- ! VERSION = "1.7.3" ! SERVER_MIN_CLIENT_VERSION = "1.7.0" #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) |
|
From: Digital X. <dig...@us...> - 2007-05-05 20:04:11
|
Update of /cvsroot/openrpg/openrpg1/orpg In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6880/orpg Modified Files: Tag: BRANCH-1-7-3 orpg_version.py Log Message: Index: orpg_version.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v retrieving revision 1.121 retrieving revision 1.121.2.1 diff -C2 -d -r1.121 -r1.121.2.1 *** orpg_version.py 5 May 2007 19:44:05 -0000 1.121 --- orpg_version.py 5 May 2007 20:04:08 -0000 1.121.2.1 *************** *** 1,4 **** VERSION = "1.7.2" ! SERVER_MIN_CLIENT_VERSION = "1.7.2" #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) --- 1,4 ---- VERSION = "1.7.2" ! SERVER_MIN_CLIENT_VERSION = "1.7.3" #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) *************** *** 9,13 **** PROTOCOL_VERSION = "1.2" ! CLIENT_STRING = 'OpenRPG+ v' + VERSION + ':{' + BUILD + '}' # These two are used in pyver.py to ensure a minimum python is available --- 9,13 ---- PROTOCOL_VERSION = "1.2" ! CLIENT_STRING = 'OpenRPG v' + VERSION + ':{' + BUILD + '}' # These two are used in pyver.py to ensure a minimum python is available |
|
From: Digital X. <dig...@us...> - 2007-05-05 19:58:48
|
Update of /cvsroot/openrpg/openrpg1/orpg/tools In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4567/orpg/tools Removed Files: Tag: BRANCH-1-7-3 NotebookCtrl.py PyAUI.py Log Message: --- NotebookCtrl.py DELETED --- --- PyAUI.py DELETED --- |
|
From: Digital X. <dig...@us...> - 2007-05-05 19:58:48
|
Update of /cvsroot/openrpg/openrpg1/orpg/networking In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4567/orpg/networking Removed Files: Tag: BRANCH-1-7-3 mplay_groups.py mplay_messaging.py Log Message: --- mplay_messaging.py DELETED --- --- mplay_groups.py DELETED --- |
|
From: Digital X. <dig...@us...> - 2007-05-05 19:56:36
|
Update of /cvsroot/openrpg/openrpg1/orpg In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3787/orpg Modified Files: Tag: BRANCH-1-7-3 orpg_wx.py Log Message: Index: orpg_wx.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_wx.py,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** orpg_wx.py 1 Mar 2007 22:25:40 -0000 1.16 --- orpg_wx.py 5 May 2007 19:56:36 -0000 1.16.2.1 *************** *** 1,21 **** try: import wxversion ! wxversion.select(["2.7", "2.8"]) import wx import wx.html - import wx.lib.wxpTag import wx.grid import wx.media from wx.lib.filebrowsebutton import * ! try: ! import wx.aui as AUI ! except: ! import orpg.tools.PyAUI as AUI ! ! if wx.VERSION_STRING < "2.7.2" and wx.VERSION_STRING > "2.7.0": ! AUI.AuiManager = AUI.FrameManager ! AUI.AuiManagerEvent = AUI.FrameManagerEvent ! AUI.AuiPaneInfo = AUI.PaneInfo ! AUI.AuiFloatingPane = AUI.FloatingPane try: --- 1,11 ---- try: import wxversion ! wxversion.select(["2.8"]) import wx import wx.html import wx.grid import wx.media from wx.lib.filebrowsebutton import * ! import wx.aui as AUI try: *************** *** 26,32 **** import orpg.tools.FlatNotebook as FNB - if wx.VERSION_STRING < "2.7": - wx.Rect.Contains = lambda self, point: wx.Rect.Inside(self, point) - WXLOADED = True except ImportError: --- 16,19 ---- |
|
From: Digital X. <dig...@us...> - 2007-05-05 19:52:01
|
Update of /cvsroot/openrpg/openrpg1/orpg/map In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1848/orpg/map Removed Files: Tag: BRANCH-1-7-3 __init__.py _background.py _canvas.py _circles.py _fog.py _grid.py _lines.py _minis.py _object.py _text.py _tiles.py Log Message: --- __init__.py DELETED --- --- _lines.py DELETED --- --- _canvas.py DELETED --- --- _grid.py DELETED --- --- _object.py DELETED --- --- _background.py DELETED --- --- _minis.py DELETED --- --- _tiles.py DELETED --- --- _text.py DELETED --- --- _fog.py DELETED --- --- _circles.py DELETED --- |
|
From: Digital X. <dig...@us...> - 2007-05-05 19:44:09
|
Update of /cvsroot/openrpg/openrpg1/orpg In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31276/orpg Modified Files: orpg_version.py Log Message: Index: orpg_version.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** orpg_version.py 29 Apr 2007 17:15:55 -0000 1.120 --- orpg_version.py 5 May 2007 19:44:05 -0000 1.121 *************** *** 3,7 **** #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) ! BUILD = "070429-00" --- 3,7 ---- #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) ! BUILD = "0700505-00" |
|
From: Digital X. <dig...@us...> - 2007-05-05 19:42:36
|
Update of /cvsroot/openrpg/openrpg1/orpg In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30764/orpg Modified Files: Tag: BRANCH-1-7-1 orpg_version.py Log Message: Index: orpg_version.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v retrieving revision 1.98.2.18 retrieving revision 1.98.2.19 diff -C2 -d -r1.98.2.18 -r1.98.2.19 *** orpg_version.py 29 Apr 2007 17:12:18 -0000 1.98.2.18 --- orpg_version.py 5 May 2007 19:42:31 -0000 1.98.2.19 *************** *** 3,7 **** #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) ! BUILD = "070429-00" --- 3,7 ---- #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) ! BUILD = "070505-00" |
|
From: Digital X. <dig...@us...> - 2007-05-05 05:32:03
|
Update of /cvsroot/openrpg/openrpg1/orpg/mapper In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23493/orpg/mapper Modified Files: Tag: BRANCH-1-7-1 grid.py Log Message: Fix for the hex grid issue Index: grid.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid.py,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -C2 -d -r1.24.2.1 -r1.24.2.2 *** grid.py 9 Mar 2007 14:30:46 -0000 1.24.2.1 --- grid.py 5 May 2007 05:31:26 -0000 1.24.2.2 *************** *** 487,496 **** if xml_dom.hasAttribute("size"): self.unit_size = int(xml_dom.getAttribute("size")) ! if self.mode == GRID_RECTANGLE: ! self.unit_size_y = self.unit_size ! if self.mode == GRID_ISOMETRIC: ! self.unit_size_y = self.unit_size ! elif self.mode == GRID_HEXAGON: ! self.unit_size_y = self.unit_size*(3**0.5) if xml_dom.hasAttribute("snap"): --- 487,491 ---- if xml_dom.hasAttribute("size"): self.unit_size = int(xml_dom.getAttribute("size")) ! self.unit_size_y = self.unit_size if xml_dom.hasAttribute("snap"): |
|
From: Digital X. <dig...@us...> - 2007-05-05 05:30:17
|
Update of /cvsroot/openrpg/openrpg1/orpg/dieroller In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22720/orpg/dieroller Modified Files: utils.py Added Files: trinity.py Log Message: Added the exalted and trinity rollers Index: utils.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/utils.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** utils.py 18 Apr 2007 21:49:50 -0000 1.21 --- utils.py 5 May 2007 05:30:10 -0000 1.22 *************** *** 43,50 **** from runequest import * from savage import * import re ! rollers = ['std','wod','d20','hero','shadowrun', 'sr4','hackmaster','srex','wodex', 'gurps', 'runequest', 'sw'] class roller_manager: --- 43,51 ---- from runequest import * from savage import * + from trinity import * import re ! rollers = ['std','wod','d20','hero','shadowrun', 'sr4','hackmaster','srex','wodex', 'gurps', 'runequest', 'sw', 'trinity'] class roller_manager: --- NEW FILE: trinity.py --- ## a vs die roller as used by WOD games #!/usr/bin/env python # Copyright (C) 2000-2001 The OpenRPG Project # # ope...@li... # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -- # # File: trinity.py # Author: Jacob Matthew, Talisan Creations # Maintainer: # Version: # $Id: trinity.py,v 1.2 2007/05/05 05:30:10 digitalxero Exp $ # # Description: Aeon Trinity die roller # Modified from the WoD dieroller "$Id: trinity.py,v 1.2 2007/05/05 05:30:10 digitalxero Exp $" # Targetthr is the Threshhold target # for compatibility with Mage die rolls. # Threshhold addition by robert t childers # Threshhold functionality removed, some tags remain in code. from die import * __version__ = "$Id: trinity.py,v 1.2 2007/05/05 05:30:10 digitalxero Exp $" class trinity(std): def __init__(self,source=[],target=7,targetthr=0): std.__init__(self,source) self.target = target self.targetthr = targetthr def vs(self,target): self.target = target return self def thr(self,targetthr): self.targetthr = targetthr return self def sum(self): rolls = [] s = 0 b = 0 for a in self.data: rolls.extend(a.gethistory()) for r in rolls: if r >= self.target: s += 1 elif r == 1: b -= 1 if s == 0: return b else: return s def __str__(self): if len(self.data) > 0: myStr = "[" + str(self.data[0]) for a in self.data[1:]: myStr += "," myStr += str(a) if self.sum() < 0: myStr += "] result of a (" + str(self.sum()) + ") botch" elif self.sum() == 0: myStr += "] result of a failure" else: myStr += "] result of (" + str(self.sum()) + ") success" return myStr |
|
From: Digital X. <dig...@us...> - 2007-05-05 05:28:37
|
Update of /cvsroot/openrpg/openrpg1/orpg/dieroller In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22296/orpg/dieroller Modified Files: Tag: BRANCH-1-7-1 utils.py wodex.py Added Files: Tag: BRANCH-1-7-1 trinity.py Log Message: Added the exalted and trinity rollers Index: utils.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/utils.py,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -C2 -d -r1.20.2.1 -r1.20.2.2 *** utils.py 18 Apr 2007 21:54:31 -0000 1.20.2.1 --- utils.py 5 May 2007 05:28:37 -0000 1.20.2.2 *************** *** 43,50 **** from runequest import * from savage import * import re ! rollers = ['std','wod','d20','hero','shadowrun', 'sr4','hackmaster','srex','wodex', 'gurps', 'runequest', 'sw'] class roller_manager: --- 43,51 ---- from runequest import * from savage import * + from trinity import * import re ! rollers = ['std','wod','d20','hero','shadowrun', 'sr4','hackmaster','srex','wodex', 'gurps', 'runequest', 'sw', 'trinity'] class roller_manager: Index: wodex.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/wodex.py,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** wodex.py 4 Nov 2006 21:24:19 -0000 1.6 --- wodex.py 5 May 2007 05:28:37 -0000 1.6.2.1 *************** *** 46,49 **** --- 46,55 ---- return newwodVs(self,actualtarget,(8)) + def exalt(self, actualtarget=7): + return exaltVs(self, actualtarget) + + def exaltDmg(self, actualtarget=7): + return exaltDmg(self, actualtarget) + def vswide(self,actualtarget=6,maxtarget=10): #wide simply means it reports TNs from 2 to a specified max. return oldwodVs(self,actualtarget,2,maxtarget) *************** *** 200,201 **** --- 206,286 ---- return myStr + + class exaltVs(std): + def __init__(self, source=[], actualtarget=7): + std.__init__(self, source) + + if actualtarget > 10: + actualtarget = 10 + + if actualtarget < 2: + self.target = 2 + else: + self.target = actualtarget + + + def xsum(self, target): + s = 0 + + for r in self.data: + if r >= target: + s += 1 + if r == 10: + s += 1 + + return s + + + def __str__(self): + if len(self.data) > 0: + myStr = str(self.data) + myStr += " Results: " + + succ = self.xsum(self.target) + if succ == 0 and 1 in self.data: + myStr += 'BOTCH!' + elif succ == 0: + myStr += str(succ) + " Failure" + elif succ == 1: + myStr += str(succ) + " Success" + else: + myStr += str(succ) + " Successes" + + return myStr + + class exaltDmg(std): + def __init__(self, source=[], actualtarget=7): + std.__init__(self, source) + if actualtarget > 10: + actualtarget = 10 + + if actualtarget < 2: + self.target = 2 + else: + self.target = actualtarget + + def xsum(self, target): + s = 0 + + for r in self.data: + if r >= target: + s += 1 + return s + + def __str__(self): + if len(self.data) > 0: + myStr = str(self.data) + myStr += " Results: " + + succ = self.xsum(self.target) + + if succ == 0 and 1 in self.data: + myStr += 'BOTCH!' + elif succ == 0: + myStr += str(succ) + " Failure" + elif succ == 1: + myStr += str(succ) + " Success" + else: + myStr += str(succ) + " Successes" + + return myStr \ No newline at end of file --- NEW FILE: trinity.py --- ## a vs die roller as used by WOD games #!/usr/bin/env python # Copyright (C) 2000-2001 The OpenRPG Project # # ope...@li... # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -- # # File: trinity.py # Author: Jacob Matthew, Talisan Creations # Maintainer: # Version: # $Id: trinity.py,v 1.1.2.1 2007/05/05 05:28:37 digitalxero Exp $ # # Description: Aeon Trinity die roller # Modified from the WoD dieroller "$Id: trinity.py,v 1.1.2.1 2007/05/05 05:28:37 digitalxero Exp $" # Targetthr is the Threshhold target # for compatibility with Mage die rolls. # Threshhold addition by robert t childers # Threshhold functionality removed, some tags remain in code. from die import * __version__ = "$Id: trinity.py,v 1.1.2.1 2007/05/05 05:28:37 digitalxero Exp $" class trinity(std): def __init__(self,source=[],target=7,targetthr=0): std.__init__(self,source) self.target = target self.targetthr = targetthr def vs(self,target): self.target = target return self def thr(self,targetthr): self.targetthr = targetthr return self def sum(self): rolls = [] s = 0 b = 0 for a in self.data: rolls.extend(a.gethistory()) for r in rolls: if r >= self.target: s += 1 elif r == 1: b -= 1 if s == 0: return b else: return s def __str__(self): if len(self.data) > 0: myStr = "[" + str(self.data[0]) for a in self.data[1:]: myStr += "," myStr += str(a) if self.sum() < 0: myStr += "] result of a (" + str(self.sum()) + ") botch" elif self.sum() == 0: myStr += "] result of a failure" else: myStr += "] result of (" + str(self.sum()) + ") success" return myStr |
|
From: Digital X. <dig...@us...> - 2007-05-04 03:15:19
|
Update of /cvsroot/openrpg/openrpg1/orpg/mapper In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4172/orpg/mapper Modified Files: grid.py Log Message: Fix for the hix grid issue Index: grid.py =================================================================== RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** grid.py 9 Mar 2007 14:11:55 -0000 1.25 --- grid.py 4 May 2007 03:15:17 -0000 1.26 *************** *** 397,402 **** sz = self.canvas.size - # Enable DC optimizations if available on a platform - dc.BeginDrawing() x = 0 us = self.unit_size/self.size_ratio --- 397,400 ---- *************** *** 427,434 **** dc.DrawLines(lineArray) - - # Enable DC optimizations if available on a platform - dc.EndDrawing() - dc.SetPen(wx.NullPen) --- 425,428 ---- *************** *** 487,490 **** --- 481,485 ---- if xml_dom.hasAttribute("size"): self.unit_size = int(xml_dom.getAttribute("size")) + self.unit_size_y = self.unit_size if self.mode == GRID_RECTANGLE: self.unit_size_y = self.unit_size |
2309 messages has been excluded from this view by a project administrator.