Thread: [Openrpg-dev] openrpg1/plugins inittool2.xml, 1.2, 1.3 inittool2_player.xml, 1.1, 1.2 xxcherrypy.py

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/openrpg/openrpg1/plugins
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1941/plugins

Modified Files:
	inittool2.xml inittool2_player.xml xxcherrypy.py xxinit2.py 
Log Message:
Cherrypy now remembers it's last state (on or off) -- Veggiesama
Updated to version 2.28 of the Init tool -- Veggiesama

Index: xxcherrypy.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/xxcherrypy.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** xxcherrypy.py	15 Nov 2006 12:11:26 -0000	1.9
--- xxcherrypy.py	30 Mar 2007 19:18:04 -0000	1.10
***************
*** 1,3 ****
--- 1,4 ----
  import os
+ import orpg.plugindb # VEG
  import orpg.pluginhandler
  import thread
***************
*** 5,8 ****
--- 6,11 ----
  import socket
  
+  # VEG (march 21, 2007): Now remembers your last web server on/off setting
+  
  class Plugin(orpg.pluginhandler.PluginHandler):
      # Initialization subroutine.
***************
*** 31,35 ****
              self.host = ip
              if ip[:7] == '192.168' or ip[:3] == '10.' or ip == '127.0.0.1' or (ip[:3] == '172' and (int(ip[5:6]) >= 16 and int(ip[5:6]) <=32)) :
!                 self.chat.InfoPost("[WARNING] Cherrypy has detected you may be behind a router, This is your internal IP. For other users to properly connect, you may have to use your external IP, with port forwarding on port XXXX [80?]<br />This feature is not suported in any way.")
  
  
--- 34,41 ----
              self.host = ip
              if ip[:7] == '192.168' or ip[:3] == '10.' or ip == '127.0.0.1' or (ip[:3] == '172' and (int(ip[5:6]) >= 16 and int(ip[5:6]) <=32)) :
!                 self.chat.InfoPost("[WARNING] Cherrypy has detected that you may be behind a router. This is your internal IP. For other users to properly connect, you may have to use your external IP, with port forwarding on port 80.<br />This feature is not suported in any way.")
! 
!         if str(self.plugindb.GetString("xxcherrypy", "auto_start", "off")) == "on":  # VEG
!             self.on_cherrypy("on")                                                   # VEG
  
  
***************
*** 52,55 ****
--- 58,62 ----
              self.webserver = thread.start_new_thread(self.startServer, (80,))
              self.isServerRunning = 'on'
+             self.plugindb.SetString("xxcherrypy", "auto_start", "on") # VEG
  
          elif args[0] == 'off' and self.isServerRunning == 'on':
***************
*** 57,60 ****
--- 64,69 ----
              self.isServerRunning = 'off'
              self.chat.InfoPost("CherryPy Web Server is now disabled")
+             self.plugindb.SetString("xxcherrypy", "auto_start", "off") # VEG
+ 
  
      def startServer(self, port):

Index: inittool2.xml
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/inittool2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** inittool2.xml	4 Feb 2007 15:58:02 -0000	1.2
--- inittool2.xml	30 Mar 2007 19:18:04 -0000	1.3
***************
*** 1,4 ****
  
! <nodehandler class="group_handler" icon="labtop" module="containers" name="GM's Initiative Tool v2.2.7" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="macro_handler" icon="oriental" module="chatmacro" name="Start/Clear" version="1.0">
--- 1,4 ----
  
! <nodehandler class="group_handler" icon="labtop" module="containers" name="GM's Initiative Tool" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="macro_handler" icon="oriental" module="chatmacro" name="Start/Clear" version="1.0">

Index: xxinit2.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/xxinit2.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xxinit2.py	4 Feb 2007 21:58:50 -0000	1.5
--- xxinit2.py	30 Mar 2007 19:18:04 -0000	1.6
***************
*** 30,34 ****
  import random
  
! __version__ = "2.2.7"
  
  class v:
--- 30,34 ----
  import random
  
! __version__ = "2.2.8"
  
  class v:
***************
*** 82,86 ****
          self.sandglass_status = 0# 0 = running, 1 = pause
          self.sandglass_skip_interval = 0 # after a number of interval, do a init_next(). 0 = disable
!         self.autosave_delay  = 0 # 0 = off, else, will autosave every 'autosave' seconds
          self.autosave_count  = 0 # current count of the number of seconds since last autosave
          self.hide_id       = 0 # 1 = do not show IDs to everyone; 0 = show IDs to everyone
--- 82,86 ----
          self.sandglass_status = 0# 0 = running, 1 = pause
          self.sandglass_skip_interval = 0 # after a number of interval, do a init_next(). 0 = disable
!         self.autosave_delay  = 60 # 0 = off, else, will autosave every 'autosave' seconds - VEG 2.2.8 (set to 60)
          self.autosave_count  = 0 # current count of the number of seconds since last autosave
          self.hide_id       = 0 # 1 = do not show IDs to everyone; 0 = show IDs to everyone
***************
*** 144,147 ****
--- 144,149 ----
          self.plugin_add_msg_handler("xxinit2_returnloaded", self.received_returnloaded) #VEG 2.2.6
  
+         self.init_load(0) #VEG 2.2.8 - auto-loads last autosave at startup (helps if you crash)
+ 
      def plugin_disabled(self):
          self.plugin_removecmd("/inittool2")
***************
*** 237,254 ****
                  if text.find(" effect ") != -1:
                      effect=text[text.rfind("'>")+2:text.find("[")]
!                     duration=text[text.rfind("effect ")+7:text.find("</font>")] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[:text.find("[")]
!                     passes=text[text.find("init ")+5:text.find("</font>")] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("(")+1:text.rfind(")")]
              else:
                  if text.find(" effect ") != -1:
                      effect=text[text.find("</b>: ")+6:text.find("[")]
!                     duration=text[text.find("effect ")+7:-7] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[text.find("</b>: ")+6:text.find("[")]
!                     passes=text[text.find("init ")+5:-7] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("(")+1:text.rfind(")")]
              try:
--- 239,256 ----
                  if text.find(" effect ") != -1:
                      effect=text[text.rfind("'>")+2:text.find("[")]
!                     duration=text[text.rfind("effect ")+7:text.find("</font>")]
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[:text.find("[")]
!                     passes=text[text.find("init ")+5:text.find("</font>")]
                      init=text[text.rfind("(")+1:text.rfind(")")]
              else:
                  if text.find(" effect ") != -1:
                      effect=text[text.find("</b>: ")+6:text.find("[")]
!                     duration=text[text.find("effect ")+7:-7]
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[text.find("</b>: ")+6:text.find("[")]
!                     passes=text[text.find("init ")+5:-7]
                      init=text[text.rfind("(")+1:text.rfind(")")]
              try:
***************
*** 1626,1630 ****
            self.sandglass_status = 0
            self.sandglass_skip_interval = 0
!           self.autosave_delay = 300
            self.autosave_count = 0
            self.hide_id = 0
--- 1628,1632 ----
            self.sandglass_status = 0
            self.sandglass_skip_interval = 0
!           self.autosave_delay = 60
            self.autosave_count = 0
            self.hide_id = 0

Index: inittool2_player.xml
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/inittool2_player.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** inittool2_player.xml	4 Feb 2007 21:56:43 -0000	1.1
--- inittool2_player.xml	30 Mar 2007 19:18:04 -0000	1.2
***************
*** 1,4 ****
  
! <nodehandler class="group_handler" icon="player" module="containers" name="Player's Initiative Tool 2.2.7" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="textctrl_handler" icon="note" module="forms" name="READ ME FIRST!!" version="1.0">
--- 1,4 ----
  
! <nodehandler class="group_handler" icon="player" module="containers" name="Player's Initiative Tool" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="textctrl_handler" icon="note" module="forms" name="READ ME FIRST!!" version="1.0">
***************
*** 26,29 ****
--- 26,35 ----
  --- For effects in particular, sometimes it's easier just to memorize the formula rather than change it every time you want to add something.</text>
    </nodehandler>
+   <nodehandler class="macro_handler" icon="die" module="chatmacro" name="Switch to D20 Dieroller" version="1.0">
+     <text>/dieroller d20</text>
+   </nodehandler>
+   <nodehandler class="macro_handler" icon="die" module="chatmacro" name="Switch to SR4 Dieroller" version="1.0">
+     <text>/dieroller sr4</text>
+   </nodehandler>
    <nodehandler class="macro_handler" icon="rome" module="chatmacro" name="Next Turn" version="1.0">
      <text>&lt;!---Advances the initiative to the next turn; use only at end of your turn and not other people's turns---&gt;
***************
*** 51,60 ****
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
    <nodehandler class="macro_handler" icon="wizard1" module="chatmacro" name="Roll Init (SR4 Astral)" version="1.0">
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
  </nodehandler>
\ No newline at end of file
--- 57,66 ----
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Virtual Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
    <nodehandler class="macro_handler" icon="wizard1" module="chatmacro" name="Roll Init (SR4 Astral)" version="1.0">
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Astral Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
  </nodehandler>
\ No newline at end of file

Thread: [Openrpg-dev] openrpg1/plugins inittool2.xml, 1.2, 1.3 inittool2_player.xml, 1.1, 1.2 xxcherrypy.py

openrpg-dev