[contraband-cvs] CVS: contraband/tasks trader.lisp,1.9,1.10

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

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

Modified Files:
	trader.lisp 
Log Message:
renamed several .id function to use one generic called GET-ID

Index: trader.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/tasks/trader.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** trader.lisp	20 Apr 2003 09:26:24 -0000	1.9
--- trader.lisp	28 May 2003 10:34:30 -0000	1.10
***************
*** 60,64 ****
    (call-next-method)
    ;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
!   (assert (equal (monster.id quest-giver) "trader-farethan"))
    (let ((strategy (make-instance 'peaceful-mover)))
      (setf (strategy.destinations strategy) '((10 35) (10 46)
--- 60,64 ----
    (call-next-method)
    ;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
!   (assert (equal (get-id quest-giver) "trader-farethan"))
    (let ((strategy (make-instance 'peaceful-mover)))
      (setf (strategy.destinations strategy) '((10 35) (10 46)
***************
*** 82,86 ****
    ;;(warn "Finish ~s" quest)
    ;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
!   (assert (equal (monster.id (quest.giver quest)) "trader-farethan"))
    (let ((strategy (first (amon.strategies (quest.giver quest)))))
      (check-type strategy peaceful-mover)
--- 82,86 ----
    ;;(warn "Finish ~s" quest)
    ;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
!   (assert (equal (get-id (quest.giver quest)) "trader-farethan"))
    (let ((strategy (first (amon.strategies (quest.giver quest)))))
      (check-type strategy peaceful-mover)