[contraband-cvs] CVS: contraband print.lisp,1.5,1.6 combat.lisp,1.4,1.5

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

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

Modified Files:
	print.lisp combat.lisp 
Log Message:
renamed pl-ability functions to use same names as the combat slots in aobj and okind

Index: print.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/print.lisp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** print.lisp	1 May 2003 22:23:19 -0000	1.5
--- print.lisp	3 Jun 2003 11:07:28 -0000	1.6
***************
*** 95,102 ****
    "Prints AC to left frame."
    
!   (let* (;;(perc (player.perceived-abilities player))
! 	 ;;(ac (+ (pl-ability.base-ac perc)
! 	 ;;(pl-ability.ac-modifier perc)))
! 	 (ac-set (setting-lookup setting "ac")))
  
      (output-string! +charinfo-frame+ 0 ac-set +term-white+ "Defence")
--- 95,99 ----
    "Prints AC to left frame."
    
!   (let* ((ac-set (setting-lookup setting "ac")))
  
      (output-string! +charinfo-frame+ 0 ac-set +term-white+ "Defence")

Index: combat.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/combat.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** combat.lisp	2 Jun 2003 12:36:33 -0000	1.4
--- combat.lisp	3 Jun 2003 11:07:29 -0000	1.5
***************
*** 194,201 ****
      (let ((actual (player.actual-abilities player))
  	  (perc (player.perceived-abilities player)))
!       (setf (pl-ability.base-ac actual) sum
! 	    (pl-ability.ac-modifier actual) 0
! 	    (pl-ability.base-ac perc) sum
! 	    (pl-ability.ac-modifier perc) 0))
  
      
--- 194,201 ----
      (let ((actual (player.actual-abilities player))
  	  (perc (player.perceived-abilities player)))
!       (setf (get-armour-rating actual) sum
! 	    (get-armour-modifier actual) 0
! 	    (get-armour-rating perc) sum
! 	    (get-armour-modifier perc) 0))