[Openrpg-dev] openrpg1/orpg/dieroller die.py, 1.12, 1.13 wodex.py, 1.7, 1.8

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

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

Modified Files:
	die.py wodex.py 
Log Message:
Fixed a bug in the VS code
Fixed a Bug in the exault roller that caused the BOTCH to show up when it should not

Index: wodex.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/wodex.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wodex.py	9 Mar 2007 14:07:46 -0000	1.7
--- wodex.py	13 Mar 2007 17:53:42 -0000	1.8
***************
*** 238,243 ****
  
              succ = self.xsum(self.target)
!             if succ == 0:
                  myStr += 'BOTCH!'
              elif succ == 1:
                  myStr += str(succ) + " Success"
--- 238,245 ----
  
              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"
***************
*** 273,278 ****
              succ = self.xsum(self.target)
  
!             if succ == 0:
                  myStr += 'BOTCH!'
              elif succ == 1:
                  myStr += str(succ) + " Success"
--- 275,282 ----
              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"

Index: die.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/die.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** die.py	11 Nov 2006 23:36:01 -0000	1.12
--- die.py	13 Mar 2007 17:53:42 -0000	1.13
***************
*** 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