[langband-cvs] CVS: langband print.lisp,1.118.4.2,1.118.4.3

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

Update of /cvsroot/langband/langband
In directory sc8-pr-cvs1:/tmp/cvs-serv16931

Modified Files:
      Tag: v017_loop_experiment_2
	print.lisp 
Log Message:
tweaked in more control of what is printed

Index: print.lisp
===================================================================
RCS file: /cvsroot/langband/langband/print.lisp,v
retrieving revision 1.118.4.2
retrieving revision 1.118.4.3
diff -C2 -d -r1.118.4.2 -r1.118.4.3
*** print.lisp	22 Sep 2003 16:16:59 -0000	1.118.4.2
--- print.lisp	22 Sep 2003 22:30:56 -0000	1.118.4.3
***************
*** 96,136 ****
  
  
! (defun print-level (player setting)
    "Prints level in the left frame."
-   
-   (let* ((lev (player.power-lvl player))
- 	 (row (setting-lookup setting "level"))
- 	 (lower-lvl-p (< lev (player.max-level player))))
  
!     (output-string! +charinfo-frame+ 0 row +term-white+ "Level")
! 
!     (print-number +charinfo-frame+ (if lower-lvl-p +term-yellow+ +term-l-green+)
! 		  lev 6 row 5)
!     ))
  
! (defun print-xp (player setting)
    "Prints xp in the left frame."
-   (let* ((xp (player.current-xp player))
- 	 (row (setting-lookup setting "xp"))
- 	 (lower-xp-p (< xp (player.maximum-xp player))))
  
!     (output-string! +charinfo-frame+ 0 row +term-white+ "Xp")
!     
!     (print-number +charinfo-frame+ (if lower-xp-p +term-yellow+ +term-l-green+)
! 		  xp 8 row 3)
!     ))
  
  
! (defun print-gold (player setting)
    "Prints gold to left frame."
-   
-   (let ((gold (player.gold player))
- 	(row (setting-lookup setting "gold")))
  
!     (output-string! +charinfo-frame+ 0 row +term-white+ "Au")
! 
!     (print-number +charinfo-frame+ +term-l-green+ gold 9 row 2)
! 
!     ))
  
  
--- 96,141 ----
  
  
! (defun print-level (variant player setting)
    "Prints level in the left frame."
  
!   (when (basic-frame-shown? variant)
!     (let* ((lev (player.power-lvl player))
! 	   (row (setting-lookup setting "level"))
! 	   (lower-lvl-p (< lev (player.max-level player))))
!       
!       (output-string! +charinfo-frame+ 0 row +term-white+ "Level")
!       
!       (print-number +charinfo-frame+ (if lower-lvl-p +term-yellow+ +term-l-green+)
! 		    lev 6 row 5)
!       t)))
  
! (defun print-xp (variant player setting)
    "Prints xp in the left frame."
  
!   (when (basic-frame-shown? variant)
!     (let* ((xp (player.current-xp player))
! 	   (row (setting-lookup setting "xp"))
! 	   (lower-xp-p (< xp (player.maximum-xp player))))
!       
!       (output-string! +charinfo-frame+ 0 row +term-white+ "Xp")
!       
!       (print-number +charinfo-frame+ (if lower-xp-p +term-yellow+ +term-l-green+)
! 		    xp 8 row 3)
!       
!       t)))
  
  
! (defun print-gold (variant player setting)
    "Prints gold to left frame."
  
!   (when (basic-frame-shown? variant)
!     (let ((gold (player.gold player))
! 	  (row (setting-lookup setting "gold")))
!       
!       (output-string! +charinfo-frame+ 0 row +term-white+ "Au")
!       
!       (print-number +charinfo-frame+ +term-l-green+ gold 9 row 2)
!       
!       t)))
  
  
***************
*** 138,151 ****
    "Prints AC to left frame."
    
!   (let* ((perc (player.perceived-abilities player))
! 	 (ac (+ (get-armour-rating perc)
! 		(get-armour-modifier perc)))
! 	 (row (setting-lookup setting "ac")))
! 
!     (output-string! +charinfo-frame+ 0 row +term-white+ "Armour")
  
!     (print-number +charinfo-frame+ +term-l-green+
! 		   ac 5 row 6)
!     ))
  
  
--- 143,158 ----
    "Prints AC to left frame."
    
!   (when (basic-frame-shown? variant)
  
!     (let* ((perc (player.perceived-abilities player))
! 	   (ac (+ (get-armour-rating perc)
! 		  (get-armour-modifier perc)))
! 	   (row (setting-lookup setting "ac")))
!       
!       (output-string! +charinfo-frame+ 0 row +term-white+ "Armour")
!       
!       (print-number +charinfo-frame+ +term-l-green+
! 		    ac 5 row 6)
!       t)))
  
  
***************
*** 235,240 ****
      (print-field (get-class-name player) 0 (setting-lookup pr-set "class") +charinfo-frame+)
      
!     (print-level player pr-set)
!     (print-xp player pr-set) 
      
      (dotimes (i stat-len)
--- 242,247 ----
      (print-field (get-class-name player) 0 (setting-lookup pr-set "class") +charinfo-frame+)
      
!     (print-level variant player pr-set)
!     (print-xp variant player pr-set) 
      
      (dotimes (i stat-len)
***************
*** 246,250 ****
      (print-speed variant player pr-set)
      
!     (print-gold player pr-set))
  
      #||
--- 253,257 ----
      (print-speed variant player pr-set)
      
!     (print-gold variant player pr-set))
  
      #||