From 75a52aa3b1969c6e02e417f90dada2db744a1c37 Mon Sep 17 00:00:00 2001
From: Christoph Senjak <christoph@christoph-senjaks-macbook-pro.local>
Date: Thu, 20 Aug 2009 16:07:53 +0200
Subject: [PATCH] added doors and keys.

---
 door.png           | Bin 0 -> 4137 bytes
 on-collision.lisp  |  19 +++++++++++++++++++
 player.lisp        |  14 +++++++++++---
 small-classes.lisp |  32 +++++++++++++++++++++++++++++++-
 testing-room.lisp  |  22 ++++++++++++++++++++++
 5 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 door.png

diff --git a/door.png b/door.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc4f01adbcd00663814c447e82450a5027796bf7
GIT binary patch
literal 4137
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

literal 0
HcmV?d00001

diff --git a/on-collision.lisp b/on-collision.lisp
index 9f9f329..8fbaf2a 100755
--- a/on-collision.lisp
+++ b/on-collision.lisp
@@ -24,6 +24,25 @@
       )
   (collide-blocks moving-rectangle standing-rectangle collision))
 
+(defmethod on-collision
+    ((moving-rectangle player)
+     (standing-rectangle door)
+     (collision collision))
+
+  (cond ((find (dungeon standing-rectangle) (keys moving-rectangle))
+	 (setf (keys moving-rectangle) (delete (dungeon standing-rectangle) (keys moving-rectangle) :count 1))
+	 (setf (visible standing-rectangle) nil)
+	 (setf (active standing-rectangle) nil)
+	 (setf (colliding standing-rectangle) nil))
+	((eql (direction collision) :DOWN)
+	 ;; "bottom" - allow jumping again
+	 (setf (mayjump moving-rectangle) T))
+	 ;; "ceiling" - dont allow continuing jump
+	((eql (direction collision) :UP)
+	 (setf (maycontjump moving-rectangle) nil)))
+  (collide-blocks moving-rectangle standing-rectangle collision))
+
+
 (defmethod on-collision
     ((moving-rectangle player)
      (standing-rectangle tulip)
diff --git a/player.lisp b/player.lisp
index bbfb7d1..9e56626 100755
--- a/player.lisp
+++ b/player.lisp
@@ -75,10 +75,12 @@
 	       :documentation "after hit by an enemy you wont be
 	       wounded by another enemy for that ammount of
 	       frames.")
-   (keys :initform 0
+   (keys :initform nil
+	 :initarg :keys
 	 :accessor keys
-	 :documentation "Number of keys for doors")
-   ))
+	 :documentation "List of Key-Dungeons of keys (i.e. for every
+   key its key-dungeon is pushed on that list, for every door, its
+   removed again).")  ))
 
 
 ;; Interaction with enemies
@@ -118,6 +120,12 @@
 	  (class-name (class-of item))
 	  (class-name (class-of player))))
 
+(defmethod item-catch ((item key) (player player) &rest args)
+  (declare (ignore args))
+  (push (dungeon item) (keys player))
+  (setf (visible item) nil)
+  (setf (colliding item) nil))
+
 (defmethod (setf animation) ((new-value animation) (object player))
   (setf (x new-value) (+ (x object) (x(animation-translation object))))
   (setf (y new-value) (+ (y object) (y(animation-translation object))))
diff --git a/small-classes.lisp b/small-classes.lisp
index a78c607..6470951 100755
--- a/small-classes.lisp
+++ b/small-classes.lisp
@@ -26,4 +26,34 @@
 	  :initform 128)
    (height :initarg :height
 	   :accessor :height
-	   :initform 128)))
\ No newline at end of file
+	   :initform 128)))
+
+(defclass key (standing-item)
+  ((animation :initarg :animation
+	      :accessor animation
+	      :initform (make-animation 0 |key|))
+   (width :initarg :width
+	  :accessor width
+	  :initform 128)
+   (height :initarg :height
+	   :accessor height
+	   :initform 128)
+   (dungeon :initarg :dungeon
+	    :accessor dungeon
+	    :initform nil
+	    :documentation "To provide information in which rooms this key can be used.")))
+
+(defclass door (stone)
+  ((animation :initarg :animation
+	      :accessor animation
+	      :initform (make-animation 0 |door|))
+   (width :initarg :width
+	  :accessor width
+	  :initform 128)
+   (height :initarg :height
+	   :accessor height
+	   :initform 128)
+   (dungeon :initarg :dungeon
+	    :accessor dungeon
+	    :initform nil
+	    :documentation "To provide information in which room this door is.")))
\ No newline at end of file
diff --git a/testing-room.lisp b/testing-room.lisp
index b9e4649..a65e9db 100755
--- a/testing-room.lisp
+++ b/testing-room.lisp
@@ -38,6 +38,14 @@ level-editor instead!"
 			       :visible t
 			       :redraw t) ret)
 
+;;***************************
+    (add-object (make-instance 'key
+			       :x (* 128 56)
+			       :y (* 128 8)
+			       :dungeon :testing-room
+			       :visible t
+			       :redraw t) ret)
+
 
     (add-object (make-instance 'burning-marshmallow
 			       :x (* 128 60)
@@ -282,6 +290,20 @@ level-editor instead!"
     (add-object (make-instance 'flying-nasobem
 			       :x (* 128 87)
 			       :y (* 128 2)) ret)
+    ;;*******************************
+    (add-object (make-instance 'door
+			       :x (* 128 87)
+			       :y (* 128 1)
+			       :dungeon :testing-room
+			       :visible t
+			       :redraw t) ret)
+    (add-object (make-instance 'door
+			       :x (* 128 89)
+			       :y (* 128 1)
+			       :dungeon :testing-room
+			       :visible t
+			       :redraw t) ret)
+
     (add-object (make-instance 'flying-nasobem
 			       :x (* 128 110)
 			       :y (* 128 4)) ret)
-- 
2.20.1