From 0ab806f7caf7bcc712f75ecc71852d556919a868 Mon Sep 17 00:00:00 2001
From: Shinmera <shinmera@tymoon.eu>
Date: Mon, 7 Oct 2019 17:52:12 +0200
Subject: [PATCH] Tons of fixes, and some shitty maps.

---
 data/bionic-eye.png | Bin 0 -> 223 bytes
 data/gun.png        | Bin 0 -> 202 bytes
 data/map1.png       | Bin 315 -> 304 bytes
 data/map1/data      |  30 ++++++++++++++++++++++++++++++
 data/map1/meta.lisp |   2 ++
 data/map2.png       | Bin 0 -> 266 bytes
 data/map2/data      |  26 ++++++++++++++++++++++++++
 data/map2/meta.lisp |   2 ++
 data/map3.png       | Bin 0 -> 300 bytes
 data/map3/data      |  32 ++++++++++++++++++++++++++++++++
 data/map3/meta.lisp |   2 ++
 data/radar.png      | Bin 0 -> 320 bytes
 editor.lisp         |  42 ++++++++++++++++++++++--------------------
 goal.lisp           |   5 +++++
 ground.lisp         |   4 +++-
 guard.lisp          |   4 ++--
 keys.lisp           |  15 +++++----------
 main.lisp           |   4 ++--
 moving.lisp         |  27 +++++++++++++++++++++++++--
 pickup.lisp         |   9 ++++++++-
 player.lisp         |  14 +++++++++++---
 v0.lisp             |  15 +++++++++++----
 viewcone2.lisp      |   2 +-
 world.lisp          |  11 ++---------
 24 files changed, 191 insertions(+), 55 deletions(-)
 create mode 100644 data/bionic-eye.png
 create mode 100644 data/gun.png
 create mode 100644 data/map1/data
 create mode 100644 data/map1/meta.lisp
 create mode 100644 data/map2.png
 create mode 100644 data/map2/data
 create mode 100644 data/map2/meta.lisp
 create mode 100644 data/map3.png
 create mode 100644 data/map3/data
 create mode 100644 data/map3/meta.lisp
 create mode 100644 data/radar.png

diff --git a/data/bionic-eye.png b/data/bionic-eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b00879da33e4a59e70b3c1522b7c5becf611df8
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_r3fhFJ8z
zooL8+$UuPQxJD3{O480{jr9xubjm;Defg06ny8|XYmvwiv5gx)HRe?AihO(Tpx$J@
zkWh2QWTo(>8;bd|a|Oi&LqeN9ryeplzTl_KaM$3ndAi(j_3PK4u79Z2xOG~Y)Xw?$
zPA^&3&e6?r?{{eH;jsJnUue!z6%e#CW-eXh5ZtEt(`kqEDxo=&ER%CqGQ9uwidies
VZ9R9lehSc$44$rjF6*2UngHz5Q<?w(

literal 0
HcmV?d00001

diff --git a/data/gun.png b/data/gun.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc3cea015f211a118cb5ca0befd85c6be17b623a
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T0C7GLo9ml
zPCCeYSb@iNzA{^b>W!YGH`-)x98C9nw{%ITlc3CP{m4!GDz<IpvDbguIrFBOj?%ir
ziY+f6PZ6?wK07__Sy)0tl=j-K?e7_qdV+UMG5X@_axQSs_w<slHDPyp&-_yj{abQV
zbHS?bg6dZLbPHM8EZpvfCsxQ`Dh;&$F#iQ>(_zPWJ%0aWpnDiRUHx3vIVCg!06Be6
AegFUf

literal 0
HcmV?d00001

diff --git a/data/map1.png b/data/map1.png
index 78df023573603eb40583052a1b7f9840fb9cbff8..001b9a26a3d91b6775ac32634132275dee4a69f6 100644
GIT binary patch
delta 264
zcmV+j0r&p90<Z#*F@NewL_t(oh3!|{5yT(}#G4dg4K`#6)<y|7L@T+k+%PJ>MkOD&
zUs2+?vKu4@0B%S?MCsHvTvEV$e}us2$SxHa=#b#aMvQSefuaP?Igt#HZ6i=KVJ()D
z>oKz^K?tF_m;(`u1ZrlEG3uM}I{D2P2>`%wx>rJ90zN>*-+%LymEJjky6dGHB9`J&
zNHSV$#W*5@A);H$1Bf^$!AiW#gryVqo|<QBWPMYD)@J;@nY-Zq5|psgjOrOsCm@<o
zYQt97f~*v$4Fn(W=n2&&_!G!HutVo=0vgw{x&-P33=w5NCbO8i4ZjtHY9Ir-4I=;m
O002ovPDHLkU;%=cA96zg

delta 275
zcmV+u0qp*;0=oi`F@N<*L_t(oh3!|{5riNNTy8AD8f?fCtSu$bP+HM1Z!$<QU~b~a
z?U%fl>>3~e*inF)%c>@pW$EfKF=-9!x|$})IS(%m0G~&r9gtv<;Eaa0TXzZMge93L
zi<t?uOxS8G$yv;-O0aF)?O+KasuF0KIp-X2!m0P4cP9X#JAd4sh?hVXi0J!$M#WkO
zv|X>|5H%I|LX&ZxXSJP(keGRo@&FNyN#KchnXtA)>#k*_ddA;MaJQK3H*yxdUxFGu
z%@`hma003cwQHDnF1V!P@&X~tPjA3AgiG)zaPhz|bT$)+IF`dD2q%!3`SLIs#mH%R
Z0R47s|Ea1~UJL*L002ovPDHLkV1jp(e(V4M

diff --git a/data/map1/data b/data/map1/data
new file mode 100644
index 0000000..0af43eb
--- /dev/null
+++ b/data/map1/data
@@ -0,0 +1,30 @@
+(ground :texture (ld45 map1))
+(goal :location (448.0 448.0))
+(bionic-eye :location (416.0 224.0))
+(player :location (368.59894 -454.80005))
+(wall :location (-16.0 -544.0) :size (1120.0 128.0))
+(wall :location (560.0 -32.0) :size (160.0 896.0))
+(wall :location (-576.0 -64.0) :size (192.0 832.0))
+(wall :location (-400.0 416.0) :size (160.0 384.0))
+(wall :location (-160.0 544.0) :size (320.0 128.0))
+(wall :location (-80.0 368.0) :size (160.0 96.0))
+(wall :location (160.0 224.0) :size (192.0 192.0))
+(wall :location (-272.0 368.0) :size (96.0 96.0))
+(wall :location (-368.0 128.0) :size (96.0 64.0))
+(wall :location (-368.0 32.0) :size (96.0 64.0))
+(wall :location (-208.0 32.0) :size (96.0 64.0))
+(wall :location (-208.0 128.0) :size (96.0 64.0))
+(wall :location (-48.0 128.0) :size (96.0 64.0))
+(wall :location (-48.0 -64.0) :size (96.0 64.0))
+(wall :location (-368.0 -64.0) :size (96.0 64.0))
+(wall :location (400.0 144.0) :size (160.0 32.0))
+(wall :location (-192.0 -208.0) :size (128.0 32.0))
+(wall :location (-144.0 -288.0) :size (32.0 128.0))
+(wall :location (-272.0 -368.0) :size (288.0 32.0))
+(wall :location (-400.0 -272.0) :size (32.0 160.0))
+(wall :location (-352.0 -208.0) :size (64.0 32.0))
+(wall :location (160.0 -240.0) :size (192.0 480.0))
+(guard :location (187.0 64.0) :angle 0.0 :route ((64.0 64.0 3) (320.0 64.0 3)) :route-index 1 :route-direction 1 :end-action :loop)
+(guard :location (-448.0 88.0) :angle -1.5707964 :route ((-192.0 192.0 0) (-192.0 224.0 2) (-192.0 192.0 0) (-448.0 192.0 0) (-448.0 -128.0 0) (-192.0 -128.0 0) (-192.0 -96.0 3) (-192.0 -128.0 0) (32.0 -128.0 0) (32.0 192.0 0)) :route-index 4 :route-direction 1 :end-action :loop)
+(wall :location (240.0 368.0) :size (480.0 96.0))
+(wall :location (304.0 544.0) :size (608.0 128.0))
diff --git a/data/map1/meta.lisp b/data/map1/meta.lisp
new file mode 100644
index 0000000..235d70d
--- /dev/null
+++ b/data/map1/meta.lisp
@@ -0,0 +1,2 @@
+(:identifier world :version v0)
+(:title "Untitled" :author "Anonymous" :payload "data")
diff --git a/data/map2.png b/data/map2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c0e798ff263abfea5a1294670f4eb97f3148a25
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?75|Ln2z=
zPQS=|*nq=DKa}kQkIoZ8o7wIOieZ`dTA^N|R~;7Qsopo2KYxewFx!K^MwgV3N7vTr
zuG#vGA!VN*D+9yYt%-@6tPB^b``I^ibuid$E==P!UagaycE^Tcq8H-^ma;1L7)goF
zna`ORtfa#@E;HyvDbC3|_(fosPRE}^XBndMFEebp)HI9nUVM3JXmRU=jyUg=Gq0)q
zSuOCdjrHQ{ZJ9!KUZ2fH$|NJ3${83Qy|eQ-U*29IJn>=Wx~a>V`7=Zvted-6bOHUt
N;OXk;vd$@?2>?S!VblNs

literal 0
HcmV?d00001

diff --git a/data/map2/data b/data/map2/data
new file mode 100644
index 0000000..17fca4f
--- /dev/null
+++ b/data/map2/data
@@ -0,0 +1,26 @@
+(ground :texture (ld45 map2))
+(goal :location (224.0 448.0))
+(radar :location (384.0 0.0))
+(player :location (-422.79883 -443.79874))
+(wall :location (-224.0 -544.0) :size (576.0 128.0))
+(wall :location (272.0 -496.0) :size (416.0 224.0))
+(wall :location (560.0 -48.0) :size (160.0 1120.0))
+(wall :location (-528.0 -32.0) :size (96.0 896.0))
+(wall :location (-384.0 480.0) :size (384.0 128.0))
+(wall :location (144.0 512.0) :size (672.0 64.0))
+(wall :location (-240.0 -368.0) :size (480.0 96.0))
+(wall :location (-64.0 -224.0) :size (128.0 192.0))
+(wall :location (-64.0 176.0) :size (128.0 480.0))
+(wall :location (240.0 400.0) :size (480.0 32.0))
+(wall :location (320.0 240.0) :size (320.0 32.0))
+(wall :location (320.0 80.0) :size (320.0 32.0))
+(wall :location (320.0 -80.0) :size (320.0 32.0))
+(wall :location (320.0 -240.0) :size (320.0 32.0))
+(wall :location (176.0 -288.0) :size (32.0 64.0))
+(wall :location (176.0 -128.0) :size (32.0 64.0))
+(wall :location (176.0 32.0) :size (32.0 64.0))
+(wall :location (176.0 192.0) :size (32.0 64.0))
+(wall :location (176.0 352.0) :size (32.0 64.0))
+(guard :location (-192.0 -102.0) :angle 1.5707964 :route ((-192.0 -256.0 0) (-192.0 352.0 0) (-416.0 352.0 0) (-416.0 160.0 0) (-288.0 160.0 2) (-288.0 -64.0 2) (-416.0 -64.0 0) (-416.0 -256.0 0)) :route-index 1 :route-direction 1 :end-action :loop)
+(guard :location (416.0 320.0) :angle 0.0 :route ((288.0 320.0 10) (416.0 320.0 10)) :route-index 1 :route-direction 1 :end-action :loop)
+(guard :location (224.36588 -351.7566) :angle -2.5545368 :route ((448.0 -288.0 2) (448.0 -352.0 2) (320.0 -288.0 2) (224.0 -352.0 2) (224.0 -288.0 2) (320.0 -352.0 2)) :route-index 3 :route-direction 1 :end-action :loop)
diff --git a/data/map2/meta.lisp b/data/map2/meta.lisp
new file mode 100644
index 0000000..235d70d
--- /dev/null
+++ b/data/map2/meta.lisp
@@ -0,0 +1,2 @@
+(:identifier world :version v0)
+(:title "Untitled" :author "Anonymous" :payload "data")
diff --git a/data/map3.png b/data/map3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a03380a7aeb6c86ccbacb0a99f89b522ab02425
GIT binary patch
literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#=1D|BR9J=Wm(dl2APhwxJxr24oPiOXEh8|4dt?>+(Nm9ALPHzT5AUBM;X%yP
z1OPLP48u?zpQgzgYT?m5!<h&GB4T=Y9LMUoHO?C%LI5y}$k*WBFf)kg{1n^*ZUOO#
zpv+vnU#hf21OPxv>Ek-*Tzsxu3bul}3(!vBuoP$ub`j8G>(?tot%TNiez=M$(B4?U
zmfOF4ptg7mm-7LQod9e3cyaqcQ9#c$>;&}wIX%4!mJ_fzU<qrzYjYy-Y7l-wYeZ`C
ywsT@@H{(t8vfec<n{xMo)(r&_F}LU55D}hiph|)Xv!u)b0000<MNUMnLSTaa1$+kp

literal 0
HcmV?d00001

diff --git a/data/map3/data b/data/map3/data
new file mode 100644
index 0000000..5afafd1
--- /dev/null
+++ b/data/map3/data
@@ -0,0 +1,32 @@
+(ground :texture (ld45 map3))
+(goal :location (-128.0 480.0))
+(goal :location (-96.0 480.0))
+(goal :location (-64.0 480.0))
+(goal :location (-32.0 480.0))
+(goal :location (0.0 480.0))
+(goal :location (32.0 480.0))
+(goal :location (64.0 480.0))
+(gun :location (-256.0 -128.0))
+(player :location (-368.2003 -443.99994))
+(wall :location (-224.0 -368.0) :size (448.0 96.0))
+(wall :location (-464.0 -48.0) :size (32.0 928.0))
+(wall :location (0.0 -496.0) :size (896.0 32.0))
+(wall :location (464.0 -32.0) :size (32.0 960.0))
+(wall :location (272.0 464.0) :size (352.0 96.0))
+(wall :location (-320.0 464.0) :size (320.0 96.0))
+(wall :location (256.0 -112.0) :size (192.0 160.0))
+(wall :location (240.0 80.0) :size (160.0 32.0))
+(wall :location (176.0 144.0) :size (32.0 96.0))
+(wall :location (240.0 208.0) :size (160.0 32.0))
+(wall :location (336.0 192.0) :size (32.0 64.0))
+(wall :location (336.0 96.0) :size (32.0 64.0))
+(wall :location (-240.0 -240.0) :size (224.0 32.0))
+(wall :location (-112.0 -128.0) :size (32.0 256.0))
+(wall :location (-240.0 -16.0) :size (224.0 32.0))
+(wall :location (-368.0 -32.0) :size (32.0 64.0))
+(wall :location (-368.0 -192.0) :size (32.0 128.0))
+(wall :location (272.0 -384.0) :size (288.0 128.0))
+(guard :location (-224.0 -128.0) :angle 3.1415927 :route ((-192.0 -192.0 0) (-320.0 -192.0 0) (-320.0 -96.0 0) (-416.0 -96.0 0) (-416.0 64.0 0) (-416.0 384.0 0) (416.0 384.0 0) (416.0 32.0 0) (128.0 32.0 0) (-416.0 32.0 0) (-416.0 -96.0 0) (-320.0 -96.0 0) (-192.0 -96.0 0) (-192.0 -128.0 0) (-224.0 -128.0 3) (-192.0 -128.0 0)) :route-index 14 :route-direction 1 :end-action :loop)
+(guard :location (256.0 128.0) :angle 0 :route nil :route-index 0 :route-direction 1 :end-action :loop)
+(guard :location (23.0 320.0) :angle 0.0 :route ((128.0 320.0 0) (128.0 32.0 0) (128.0 -256.0 0) (-64.0 -256.0 0) (-64.0 128.0 0) (-96.0 128.0 6) (-64.0 128.0 0) (-32.0 128.0 6) (-64.0 128.0 0) (-64.0 320.0 0)) :route-index 0 :route-direction 1 :end-action :loop)
+(guard :location (-192.0 320.0) :angle 1.5707964 :route ((-288.0 96.0 3) (-192.0 96.0 3) (-192.0 320.0 3) (-288.0 320.0 3)) :route-index 2 :route-direction 1 :end-action :loop)
diff --git a/data/map3/meta.lisp b/data/map3/meta.lisp
new file mode 100644
index 0000000..235d70d
--- /dev/null
+++ b/data/map3/meta.lisp
@@ -0,0 +1,2 @@
+(:identifier world :version v0)
+(:title "Untitled" :author "Anonymous" :payload "data")
diff --git a/data/radar.png b/data/radar.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0a2b032fff938bd4eed260352b5df07fccb8a22
GIT binary patch
literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#`bk7VR5*>5Qag@=Fc5tcZAW9dB;o)OvS^Sf-Rw!Y&YpqvdxyOMQW}hv8>F?|
zP)~};5uagqd6oS<@68))fP-LWp5ISL#a-8JOb!{8Wyy1cLkT2&{I_#DhY%KTBo(dE
zG|h(V`yNC@l*CdI08G=go6LKU(_G9o!#Rh`_XW;5aLvfF3;^(XJ|l#%8R7kjTr<Y&
zxOg0|Be;G|_Vai^YYnZnY_Jxud221Is)DsvHkjl7b>DC?Mku8aWBl7dN|VG&DcQiZ
zMjRpWdkNl)L^pzI&7!+$4e0h-m0=jf2E@#q=Q)a^5DWJ9z<a-3B(drjB<&Ny)PXqT
SQC|`O0000<MNUMnLSTY6Vv3Le

literal 0
HcmV?d00001

diff --git a/editor.lisp b/editor.lisp
index c948e38..d5d4595 100644
--- a/editor.lisp
+++ b/editor.lisp
@@ -1,6 +1,7 @@
 (in-package #:org.shirakumo.fraf.ld45)
 
 (defparameter +grid-size+ 32)
+(defparameter +editable-items+ '(wall guard player goal gun radar bionic-eye))
 
 (define-subject editor (located-entity)
   ((name :initform :editor)
@@ -8,7 +9,8 @@
    (mode :initform :select :accessor mode)
    (vel :initform (vec 0 0) :accessor vel)
    (start-location :initform nil :accessor start-location)
-   (visible-path :initform nil :accessor visible-path)))
+   (visible-path :initform nil :accessor visible-path)
+   (to-place :initform 'wall :accessor to-place)))
 
 (define-subject inactive-editor (editor)
   ())
@@ -46,17 +48,12 @@
 (define-handler (active-editor delete-entity) (ev)
   (setf (mode active-editor) :delete))
 
-(define-handler (active-editor place-wall) (ev)
-  (setf (mode active-editor) :place-wall))
-
-(define-handler (active-editor place-player) (ev)
-  (setf (mode active-editor) :place-player))
-
-(define-handler (active-editor place-guard) (ev)
-  (setf (mode active-editor) :place-guard))
-
-(define-handler (active-editor place-goal) (ev)
-  (setf (mode active-editor) :place-goal))
+(define-handler (active-editor place) (ev)
+  (case (to-place active-editor)
+    (wall (setf (mode active-editor) :place-wall))
+    (player (setf (mode active-editor) :place-player))
+    (guard (setf (mode active-editor) :place-guard))
+    (T (setf (mode active-editor) :place))))
 
 ;;; Entity manipulation
 
@@ -98,6 +95,7 @@
                                  :location location
                                  :size (vec2 0 0))))
        (setf (start-location active-editor) location)
+       (transition wall +world+)
        (enter wall +world+)
        (setf (entity active-editor) wall)
        (setf (mode active-editor) :placing-wall)))
@@ -111,9 +109,9 @@
      (handle-place-guard-press active-editor pos button))
     (:placing-guard
      (handle-placing-guard-press active-editor pos button))
-    (:place-goal
+    (:place
      (let* ((location (nvalign (world-location pos) +grid-size+))
-            (goal (make-instance 'goal
+            (goal (make-instance (to-place active-editor)
                                  :location location)))
        (transition goal +world+)
        (enter goal +world+)
@@ -151,12 +149,16 @@
      (update-scene-cache +world+ +world+))))
 
 (define-handler (active-editor mouse-scroll) (ev delta)
-  (when (or (retained 'key :control)
-            (retained 'key :left-control) (retained 'key :control-l)
-            (retained 'key :right-control) (retained 'key :control-r))
-    (handle-editor-zoom delta))
-  (when (eq :placing-guard (mode active-editor))
-    (handle-modify-guard-delay active-editor (if (< 0 delta) 1 -1))))
+  (cond ((or (retained 'key :control)
+              (retained 'key :left-control) (retained 'key :control-l)
+              (retained 'key :right-control) (retained 'key :control-r))
+         (handle-editor-zoom delta))
+        ((eq :placing-guard (mode active-editor))
+         (handle-modify-guard-delay active-editor (if (< 0 delta) 1 -1)))
+        (T
+         (let ((pos (position (to-place active-editor) +editable-items+)))
+           (setf (to-place active-editor) (elt +editable-items+ (mod (+ pos (round delta)) (length +editable-items+))))
+           (v:info :editor "Now placing ~s." (to-place active-editor))))))
 
 (define-handler (active-editor tick) (ev)
   (update-visible-path active-editor)
diff --git a/goal.lisp b/goal.lisp
index 41e5347..c23c4e7 100644
--- a/goal.lisp
+++ b/goal.lisp
@@ -8,11 +8,16 @@
          (next-level-name (second (member (current-level-name main)
                                           (level-names main)
                                           :test #'string=))))
+    (setf *capabilities* (capabilities player))
     (when next-level-name
       (change-scene main (load-world (level-packet next-level-name)))
       (setf (current-level-name main) next-level-name))))
 
 (defmethod collide ((goal goal) (guard guard) hit))
 
+(defmethod paint :around ((goal goal) target)
+  (when (active-p (unit :editor +world+))
+    (call-next-method)))
+
 (defmethod paint :before ((goal goal) target)
   (scale-by (* 2 (vx (bsize goal))) (* 2 (vy (bsize goal))) 1))
diff --git a/ground.lisp b/ground.lisp
index 526de7d..b7ec354 100644
--- a/ground.lisp
+++ b/ground.lisp
@@ -1,11 +1,13 @@
 (in-package #:org.shirakumo.fraf.ld45)
 
 (define-image map1 #p"map1.png")
+(define-image map2 #p"map2.png")
+(define-image map3 #p"map3.png")
 
 (define-asset (ld45 map-mesh) mesh
     (make-rectangle (* 32 32) (* 32 32)))
 
-(define-shader-entity ground (vertex-entity textured-entity)
+(define-shader-entity ground (vertex-entity textured-entity game-entity)
   ((vertex-array :initform (asset 'ld45 'map-mesh))))
 
 (defmethod paint :around ((ground ground) target)
diff --git a/guard.lisp b/guard.lisp
index dd4964a..af0f3aa 100644
--- a/guard.lisp
+++ b/guard.lisp
@@ -63,8 +63,8 @@
 
 (defmethod paint :around ((guard guard) pass)
   (when (and (not (eql :down (state guard)))
-             ;(capable-of :line-of-sight T)
-             )
+             (or (capable-of :line-of-sight T)
+                 (active-p (unit :editor +world+))))
     (paint (viewcone guard) pass))
   (call-next-method))
 
diff --git a/keys.lisp b/keys.lisp
index 4db5c37..5191fab 100644
--- a/keys.lisp
+++ b/keys.lisp
@@ -11,18 +11,9 @@
 (define-action delete-entity (editor-command)
   (key-press (one-of key :delete)))
 
-(define-action place-wall (editor-command)
+(define-action place (editor-command)
   (key-press (one-of key :f5)))
 
-(define-action place-player (editor-command)
-  (key-press (one-of key :f6)))
-
-(define-action place-guard (editor-command)
-  (key-press (one-of key :f7)))
-
-(define-action place-goal (editor-command)
-  (key-press (one-of key :f8)))
-
 (define-action loop-guard-path (editor-command)
   (key-press (one-of key :l)))
 
@@ -102,3 +93,7 @@
 (define-action continue-game (player-action)
   (key-press (one-of key :enter))
   (gamepad-press (one-of button :start)))
+
+(define-action interact (player-action)
+  (key-press (one-of key :space :enter :e))
+  (gamepad-press (one-of button :a)))
diff --git a/main.lisp b/main.lisp
index 4654299..48e1e45 100644
--- a/main.lisp
+++ b/main.lisp
@@ -2,7 +2,7 @@
 
 (defclass main (trial:main)
   ((scene :initform NIL)
-   (level-names :initform nil :accessor level-names)
+   (level-names :initform () :accessor level-names)
    (current-level-name :initform nil :accessor current-level-name))
   (:default-initargs
    :clear-color (vec4 0 0 0 0)
@@ -48,4 +48,4 @@
     (connect (port blur-pass 'color) (port light 'fog) scene)))
 
 (defun launch (&optional world)
-  (trial:launch 'main :world world))
+  (trial:launch 'main :world world :level-names '("map1/" "map2/" "map3/")))
diff --git a/moving.lisp b/moving.lisp
index 085c0c9..3131505 100644
--- a/moving.lisp
+++ b/moving.lisp
@@ -35,11 +35,34 @@
         (location target) (v+ (bsize source) (bsize target))))
 
 (defmethod collide ((moving moving) (wall wall) hit)
-  (let ((loc (location moving))
+  (let ((bsize (bsize moving))
+        (psize (bsize wall))
+        (loc (location moving))
+        (pos (hit-location hit))
         (vel (velocity moving))
         (nor (hit-normal hit)))
     (nv+ loc (v* vel (hit-time hit)))
     (nv- vel (v* nor (v. vel nor)))
+    (cond ((and (/= 0 (vy nor))
+                (< (vy pos) (vy loc))
+                (< (- (vy loc) (vy bsize))
+                   (+ (vy pos) (vy psize))))
+           (setf (vy loc) (+ (vy pos) (vy psize) (vy bsize))))
+          ((and (/= 0 (vy nor))
+                (< (vy loc) (vy pos))
+                (< (- (vy pos) (vy psize))
+                   (+ (vy loc) (vy bsize))))
+           (setf (vy loc) (- (vy pos) (vy psize) (vy bsize))))
+          ((and (/= 0 (vx nor))
+                (< (vx pos) (vx loc))
+                (< (- (vx loc) (vx bsize))
+                   (+ (vx pos) (vx psize))))
+           (setf (vx loc) (+ (vx pos) (vx psize) (vx bsize))))
+          ((and (/= 0 (vx nor))
+                (< (vx loc) (vx pos))
+                (< (- (vx pos) (vx psize))
+                   (+ (vx loc) (vx bsize))))
+           (setf (vx loc) (- (vx pos) (vx psize) (vx bsize)))))
     T))
 
 (define-subject draggable (moving)
@@ -70,4 +93,4 @@
 (define-shader-subject human (moving animated-sprite-subject)
   ((vertex-array :initform (asset 'ld45 'human))
    (size :initform (vec 32 32))
-   (bsize :initform (vec 16 16))))
+   (bsize :initform (vec 14 14))))
diff --git a/pickup.lisp b/pickup.lisp
index d96d9f5..4bdd575 100644
--- a/pickup.lisp
+++ b/pickup.lisp
@@ -3,15 +3,22 @@
 (define-asset (ld45 pickup-mesh) mesh
     (make-rectangle 16 16))
 
-(define-shader-entity pickup (vertex-entity textured-entity located-entity solid)
+(define-shader-entity pickup (vertex-entity textured-entity located-entity solid game-entity)
   ((vertex-array :initform (asset 'ld45 'pickup-mesh))))
 
+(defmethod scan ((pickup pickup) (moving moving))
+  (aabb (location moving) (velocity moving)
+        (location pickup) (v+ (bsize moving) 8)))
+
 (defmethod collide ((player player) (pickup pickup) hit)
   (setf (interactable player) pickup)
   NIL)
 
 (defgeneric pickup (pickup player))
 
+(defmethod pickup :after ((pickup pickup) thing)
+  (leave pickup +world+))
+
 (define-image gun #p"gun.png")
 
 (define-shader-entity gun (pickup)
diff --git a/player.lisp b/player.lisp
index 960ae05..d34e778 100644
--- a/player.lisp
+++ b/player.lisp
@@ -1,6 +1,7 @@
 (in-package #:org.shirakumo.fraf.ld45)
 
 (define-image player #p"player.png")
+(defvar *capabilities* ())
 
 (define-global +move-speed+ 200)
 (define-global +dragging-move-speed+ 64)
@@ -14,7 +15,7 @@
   ((name :initform :player)
    (texture :initform (asset 'ld45 'player))
    (move-timer :initform 0 :accessor move-timer)
-   (capabilities :initarg :capabilities :initform NIL :accessor capabilities)
+   (capabilities :initarg :capabilities :initform *capabilities* :accessor capabilities)
    (interactable :initform NIL :accessor interactable)
    (viewcone :initform (make-instance 'sector) :reader viewcone))
   (:default-initargs
@@ -23,6 +24,9 @@
                  (drag 9 17)
                  (shoot 17 18))))
 
+(defmethod register-object-for-pass :after (pass (player player))
+  (register-object-for-pass pass (viewcone player)))
+
 (defmethod capable-of (thing (player (eql T)))
   (capable-of thing (unit :player +world+)))
 
@@ -127,8 +131,8 @@
 (define-handler (player continue-game) (ev)
   (when (eq :dead (state player))
     (v:info :player "Restarting...")
-    ;; FIXME: insert restart logic here
-    ))
+    (let ((main (handler *context*)))
+      (change-scene main (load-world (level-packet (current-level-name main)))))))
 
 (define-asset (ld45 bullet-mesh) mesh
     (make-rectangle 8 8))
@@ -167,3 +171,7 @@
       (transition bullet +world+)
       (enter bullet +world+))
     (setf (state player) :shoot)))
+
+(define-handler (player interact) (ev)
+  (when (interactable player)
+    (pickup (interactable player) player)))
diff --git a/v0.lisp b/v0.lisp
index 95888e4..f858ded 100644
--- a/v0.lisp
+++ b/v0.lisp
@@ -21,12 +21,12 @@
         :author (author world)
         :payload "data"))
 
-(define-decoder (player v0) (data _p)
+(define-decoder (located-entity v0) (data _p)
   (destructuring-bind (&key location) data
-    (make-instance 'player :location (decode 'vec2 location))))
+    (make-instance (class-of located-entity) :location (decode 'vec2 location))))
 
-(define-encoder (player v0) (_b _p)
-  `(player :location ,(encode (location player))))
+(define-encoder (located-entity v0) (_b _p)
+  `(,(type-of located-entity) :location ,(encode (location located-entity))))
 
 (define-decoder (wall v0) (data _p)
   (destructuring-bind (&key size location) data
@@ -60,6 +60,13 @@
           :route-direction ,(route-direction guard)
           :end-action ,(end-action guard)))
 
+(define-decoder (ground v0) (data _p)
+  (destructuring-bind (&key texture) data
+    (make-instance (class-of ground) :texture (decode 'asset texture))))
+
+(define-encoder (ground v0) (_b _p)
+  `(,(type-of ground) :texture ,(encode (texture ground))))
+
 (define-decoder (vec2 v0) (data _p)
   (destructuring-bind (x y) data
     (vec2 x y)))
diff --git a/viewcone2.lisp b/viewcone2.lisp
index 09950dd..79ff56b 100644
--- a/viewcone2.lisp
+++ b/viewcone2.lisp
@@ -260,7 +260,7 @@
                             (setf blocker edge))))
                (let ((point-on-arc (or (null tt) (<= 0 (- (+ hit-dist2 EPS) (radius2 sector))))))
                  (when point-on-arc
-                   (let ((unit-ray (vunit ray)))
+                   (let ((unit-ray (if (v= 0 ray) ray (vunit ray))))
                      (setf hit-point (nv+ (v* unit-ray (radius sector)) (location sector)))
                      (when prev-point-on-arc
                        (let ((needs-arc T))
diff --git a/world.lisp b/world.lisp
index 931338b..ad1add4 100644
--- a/world.lisp
+++ b/world.lisp
@@ -31,14 +31,7 @@
   ((packet :initform NIL)))
 
 (defmethod initialize-instance :after ((world empty-world) &key)
-  (enter (make-instance 'ground :texture (asset 'ld45 'map1)) world)
-  (enter (make-instance 'wall :location (vec 0 128)) world)
-  (enter (make-instance 'wall :location (vec -512 0) :size (vec 32 1024)) world)
-  (enter (make-instance 'wall :location (vec +512 0) :size (vec 32 1024)) world)
-  (enter (make-instance 'wall :location (vec 0 -512) :size (vec 1024 32)) world)
-  (enter (make-instance 'wall :location (vec 0 +512) :size (vec 1024 32)) world)
-  ;;  (enter (make-instance 'guard :location (vec 0 256) :route '((128 254 0) (0 512 1) (-128 256 0))) world)
-  (enter (make-instance 'guard :location (vec 0 -256) :name :guard) world)
+  (enter (make-instance 'ground :texture (asset 'ld45 'map3)) world)
   (enter (make-instance 'player) world)
   (update-scene-cache world world)
   (change-class world 'world))
@@ -55,7 +48,7 @@
   (load-world (packet world)))
 
 (defmethod load-world ((pathname pathname))
-  (with-packet (packet pathname :direction :input)
+  (with-packet (packet (pool-path 'ld45 pathname) :direction :input)
     (load-world packet)))
 
 (defmethod load-world ((packet packet))