tutorial

lyrra · Dec 8, 2009 · 19dfa9d · 19dfa9d
1 parent 5c44709
commit 19dfa9d
Show file tree

Hide file tree

Showing 42 changed files with 498 additions and 39 deletions.
diff --git a/cells.lisp b/cells.lisp
@@ -222,7 +222,8 @@ You must provide at least a :base value."
 (define-method draw cell (x y image)
   "Use XE2 drawing commands to render a presentation of this cell at
 X, Y to the offscreen image IMAGE.  This method is invoked to draw a
-cell when no :tile field is present. See also viewport.lisp."
+cell when its TILE field is nil, or when it is in the
+category :drawn. See also viewport.lisp." 
   nil)
 
 ;;; Cell categories
@@ -244,6 +245,7 @@ interpretation:
       cells participate in the Action Points system.
  -    :target --- This cell is susceptible to targeting.
  -    :proxy --- This cell is a proxy for another cell.
+ -    :drawn --- This cell has a [draw] method used for custom drawing.
  -    :proxied  --- This cell is an occupant of a proxy.
  -    :dead --- This cell is no longer receiving run messages.
  -    :player --- Only one cell (your player avatar) has this category.
@@ -501,9 +503,9 @@ is in the way."
       (unless (eq cell self) 
 	[step cell self]))))
 
-(define-method drop cell (cell)
+(define-method drop cell (cell &key loadout)
   "Add CELL to the world at the current location."
-  [drop-cell *world* cell <row> <column>])
+  [drop-cell *world* cell <row> <column> :loadout loadout])
 
 (define-method drop-sprite cell (sprite x y)
   "Add SPRITE to the world at location X,Y."

diff --git a/viewport.lisp b/viewport.lisp
@@ -102,25 +102,26 @@
       (dotimes (i origin-height)
 	(dotimes (j origin-width)
 	  ;; is this square lit? 
-	    (if (and (array-in-bounds-p grid (+ i origin-y) (+ j origin-x))
-		     (or (eq :total ambient-light)
-			 (= 1 (aref light-grid (+ i origin-y) (+ j origin-x)))))
-		(progn 
-		  (setf objects (aref grid 
-				      (+ i origin-y)
-				      (+ j origin-x)))
-		  (dotimes (k (fill-pointer objects))
-		    (setf cell (aref objects k))
-		    (when (object-p cell)
-		      (let ((j0 (* j tile-size))
-			    (i0 (* i tile-size)))
+	  (if (and (array-in-bounds-p grid (+ i origin-y) (+ j origin-x))
+		   (or (eq :total ambient-light)
+		       (= 1 (aref light-grid (+ i origin-y) (+ j origin-x)))))
+	      (progn 
+		(setf objects (aref grid 
+				    (+ i origin-y)
+				    (+ j origin-x)))
+		(dotimes (k (fill-pointer objects))
+		  (setf cell (aref objects k))
+		  (when (object-p cell)
+		    (let ((j0 (* j tile-size))
+			  (i0 (* i tile-size)))
 		      (setf tile (field-value :tile cell))
-		      (if tile (draw-resource-image tile j0 i0 :destination image)
-			  ;; no tile; save it as a pending draw op
-			  (vector-push-extend cell pending-draws))))))
-		;; not in bounds, or not lit; draw blackness
-		(draw-resource-image ".blackness" (* j tile-size) (* i tile-size)
-				     :destination image))))
+		      (when tile (draw-resource-image tile j0 i0 :destination image))
+		      (when (or (member :drawn (field-value :categories cell))
+				(null tile))
+			(vector-push-extend cell pending-draws))))))
+	      ;; not in bounds, or not lit; draw blackness
+	      (draw-resource-image ".blackness" (* j tile-size) (* i tile-size)
+				   :destination image))))
       ;; draw the sprites
       (dolist (sprite sprites)
 	;; pull image and calculate screen coordinates
@@ -129,12 +130,12 @@
 	       (x1 (- x0 (* tile-size origin-x)))
 	       (y0 (field-value :y sprite))
 	       (y1 (- y0 (* tile-size origin-y))))
-	(draw-resource-image graphics x1 y1 :destination image)))
+	  (draw-resource-image graphics x1 y1 :destination image)))
       ;; draw the pending ops
       (map nil #'(lambda (cell)
 		   (multiple-value-bind (x y) [viewport-coordinates cell]
 		     [draw cell x y image]))
-	   pending-draws)
+		   pending-draws)
       ;; update geometry
       (let ((width (* tile-size origin-width))
 	    (height (* tile-size origin-height)))

diff --git a/worlds.lisp b/worlds.lisp
@@ -991,6 +991,11 @@ narrator, and VIEWPORT as the viewport."
   (categories :initform '(:gateway :exclusive))
   (address :initform nil))
 
+(define-method initialize gateway (&key address tile name)
+  (when tile (setf <tile> tile))
+  (when address (setf <address> address))
+  (when name (setf <name> name)))
+
 (define-method activate gateway ()
   [play *universe* :address <address> :player [get-player *world*]])
 

diff --git a/xong/enemy.png b/xong/enemy.png
diff --git a/xong/floor.png b/xong/floor.png
diff --git a/xong/npc.png b/xong/npc.png
diff --git a/xong/objects.png b/xong/objects.png
diff --git a/xong/plasma1.png b/xong/plasma1.png
diff --git a/xong/plasma2.png b/xong/plasma2.png
diff --git a/xong/plasma3.png b/xong/plasma3.png
diff --git a/xong/plasma4.png b/xong/plasma4.png
diff --git a/xong/player-black-svg.png b/xong/player-black-svg.png
diff --git a/xong/player-blue-svg.png b/xong/player-blue-svg.png
diff --git a/xong/player-green-svg.png b/xong/player-green-svg.png
diff --git a/xong/player-orange-svg.png b/xong/player-orange-svg.png
diff --git a/xong/player-other-svg.png b/xong/player-other-svg.png
diff --git a/xong/player-purple-svg.png b/xong/player-purple-svg.png
diff --git a/xong/player-red-svg.png b/xong/player-red-svg.png
diff --git a/xong/player-white-svg.png b/xong/player-white-svg.png
diff --git a/xong/player-yellow-svg.png b/xong/player-yellow-svg.png
diff --git a/xong/portal.png b/xong/portal.png
diff --git a/xong/puckup.png b/xong/puckup.png
diff --git a/xong/rezblur1.png b/xong/rezblur1.png
diff --git a/xong/rezblur2.png b/xong/rezblur2.png
diff --git a/xong/rezblur3.png b/xong/rezblur3.png
diff --git a/xong/rezblur4.png b/xong/rezblur4.png
diff --git a/xong/rezblur5.png b/xong/rezblur5.png
diff --git a/xong/rezlight1.png b/xong/rezlight1.png
diff --git a/xong/rezlight2.png b/xong/rezlight2.png
diff --git a/xong/rezlight3.png b/xong/rezlight3.png
diff --git a/xong/rezlight4.png b/xong/rezlight4.png
diff --git a/xong/rezlight5.png b/xong/rezlight5.png
diff --git a/xong/talk.wav b/xong/talk.wav