[Openrpg-dev] openrpg1/orpg/dieroller die.py,1.12,1.12.2.1

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/dieroller
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15047/orpg/dieroller

Modified Files:
      Tag: BRANCH-1-7-1
	die.py 
Log Message:
Fixed a bug in the server that prevented it from using the port specified in the server_ini.xml (03/13/2007)
Fixed a bug in the VS dice roller code (03/13/2007)

Index: die.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/die.py,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** die.py	11 Nov 2006 23:36:01 -0000	1.12
--- die.py	13 Mar 2007 20:47:43 -0000	1.12.2.1
***************
*** 305,308 ****
--- 305,309 ----
          self.history = None
          self.value = None
+         self.target = None
          self.roll(min)
  
***************
*** 434,438 ****
      def __init__(self,source=[]):
          die_base.__init__(self,source)
-         self.target = None
  
      #  Examples of adding member functions through inheritance.
--- 435,438 ----
***************
*** 487,492 ****
  
  
!     def vs( self, target ):
!         self.target = target
          return self
  
--- 487,493 ----
  
  
!     def vs(self, target):
!         for dn in self.data:
!             dn.target = target
          return self
  
***************
*** 496,505 ****
      ## we only return the number of successful saves.  A negative
      ## value will never be generated.
!     def sum( self ):
          retValue = 0
          for dn in self.data:
              setValue = reduce( lambda x, y : int(x)+int(y), dn.history )
!             if self.target:
!                 if setValue >= self.target:
                      retValue += 1
  
--- 497,506 ----
      ## we only return the number of successful saves.  A negative
      ## value will never be generated.
!     def sum(self):
          retValue = 0
          for dn in self.data:
              setValue = reduce( lambda x, y : int(x)+int(y), dn.history )
!             if dn.target:
!                 if setValue >= dn.target:
                      retValue += 1