[Openrpg-dev] openrpg1/orpg/dieroller gurps.py,1.3,1.4

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

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

Modified Files:
	gurps.py 
Log Message:
Update to the GURPS roller by Naryt

Index: gurps.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/gurps.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gurps.py	15 Nov 2006 12:11:22 -0000	1.3
--- gurps.py	4 Apr 2007 16:34:13 -0000	1.4
***************
*** 16,20 ****
  # File: gurps.py
  # Version:
! #   $Id: gurps.py,v 1.2
  #
  # Description: Modified Hero System die roller based on DJM and Heroman's Hero
--- 16,20 ----
  # File: gurps.py
  # Version:
! #   $Id: gurps.py,v 1.3
  #
  # Description: Modified Hero System die roller based on DJM and Heroman's Hero
***************
*** 31,34 ****
--- 31,42 ----
  #
  # Changelog:
+ # V 1.3  2007/03/23  Thomas M. Edwards <tme...@mo...>
+ #   Fixed gurpsskill, gurpsdefaultskill, and gurpssupernatural to correctly
+ #   return a normal failure when the roll is 17 and the effective skill is 27+;
+ #   previously, they would erroneously return a critical failure.  This fix also
+ #   corrects the less serious issue whereby rolls of 17 and an effective skill
+ #   of 17-26 would report "failure by X" instead of merely "failure", which is
+ #   wrong as the only reason the roll failed was because a 17 was rolled, not
+ #   because the roll exceeded the effective skill.
  # V 1.2 29 October 2006, added defaultskill (Rule of 20 [B344]), supernatural
  #   (Rule of 16 [B349]).  The frightcheck roll is now the actual Fright Check
***************
*** 88,92 ****
          return gurpsfrightcheckfail(self,mod)
  
- 
  class gurpsskill(std):
      def __init__(self,source=[],skill=0,mod=0):
--- 96,99 ----
***************
*** 121,126 ****
              if self.sum() == 18:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!             elif self.sum() == 17 and (self.skill+self.mod < 16):
!                 myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
              elif  Diff > 9:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b> by " + str(Diff) +" </font> [B556]"
--- 128,138 ----
              if self.sum() == 18:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
! #            elif self.sum() == 17 and (self.skill+self.mod < 16):
! #                myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!             elif self.sum() == 17:
!                 if (self.skill+self.mod) < 16:
!                     myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!                 else:
!                     myStr += " or less <font color='#ff0000'><b>Failure!</b></font> [B556]"
              elif  Diff > 9:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b> by " + str(Diff) +" </font> [B556]"
***************
*** 174,183 ****
              if self.sum() == 18:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!             elif self.sum() == 17 and (intSkillVal < 16):
!                 myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
              elif  Diff > 9:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b> by " + str(Diff) +"</font> [B556]"
              else:
                  myStr += " or less <font color='#ff0000'><b>Failure!</b> by " + str(Diff) +"</font>"
          myStr += strRule
          return myStr
--- 186,199 ----
              if self.sum() == 18:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!             elif self.sum() == 17:
!                 if intSkillVal < 16:
!                     myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!                 else:
!                     myStr += " or less <font color='#ff0000'><b>Failure!</b></font> [B556]"
              elif  Diff > 9:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b> by " + str(Diff) +"</font> [B556]"
              else:
                  myStr += " or less <font color='#ff0000'><b>Failure!</b> by " + str(Diff) +"</font>"
+                 
          myStr += strRule
          return myStr
***************
*** 240,245 ****
              if self.sum() == 18:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!             elif self.sum() == 17 and (newSkill < 16):
!                 myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
              elif  Diff > 9:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b> by " + str(Diff) +" </font> [B556]"
--- 256,264 ----
              if self.sum() == 18:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!             elif self.sum() == 17:
!                 if newSkill < 16:
!                     myStr += " or less <font color='#ff0000'><b>Critical Failure!</b></font> [B556]"
!                 else:
!                     myStr += " or less <font color='#ff0000'><b>Failure!</b></font> [B556]"
              elif  Diff > 9:
                  myStr += " or less <font color='#ff0000'><b>Critical Failure!</b> by " + str(Diff) +" </font> [B556]"
***************
*** 395,399 ****
          return myStr
  
- 
  class gurpsspellfail(std):
      def __init__(self,source=[],mod=0):
--- 414,417 ----