[contraband-cvs] CVS: contraband combat.lisp,1.3,1.4

[Stig E S. <st...@us...>]

Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv466/variants/contraband

Modified Files:
	combat.lisp 
Log Message:
finally killed off game-values object and incorporated the remaining combat-related info in okind and aobj.  also removed any game-values related code.  did some renaming of old functions that made more sense now.

Index: combat.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/combat.lisp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** combat.lisp	1 Jun 2003 23:38:07 -0000	1.3
--- combat.lisp	2 Jun 2003 12:36:33 -0000	1.4
***************
*** 43,47 ****
  			      (player.skills *player*))))
  
!     (* (aobj.base-ac obj) skill-score)))
  
  (defun con/calculate-body-armour-rating (player)
--- 43,47 ----
  			      (player.skills *player*))))
  
!     (* (get-armour-rating obj) skill-score)))
  
  (defun con/calculate-body-armour-rating (player)
***************
*** 212,218 ****
  
      (when wpn
!       (let ((gval (object.game-values wpn)))
! 	(check-type gval game-values)
! 	(setf roll (roll-dice (gval.num-dice gval) (gval.base-dice gval)))))
  
      (when (< roll 1) (setf roll 1))
--- 212,216 ----
  
      (when wpn
!       (setf roll (roll-dice (get-number-of-damage-dice wpn) (get-damage-dice wpn))))
  
      (when (< roll 1) (setf roll 1))