This commit is contained in:
2014-10-31 13:05:43 -07:00
parent 3836a1191a
commit 805a30b4f9
4 changed files with 4 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@@ -36,7 +36,7 @@
(actions/give entities flask-1-with-mushrooms)
(actions/talk entities :ego "I'll just put a few of these in here."))}})
(def cards {:name "Warlock's Tower cards" :value :cards :cursor :cards})
(def trophy {:name "Trophy of wisdom" :value :trophy :cursor :trophy})
(def cheat-deck {:name "Warlock's Tower cheat deck" :value :cheat-deck :cursor :cheat-deck})
(def cat-toy {:name "Cat toy" :value :cat-toy :cursor :cat-toy})

View File

@@ -97,7 +97,8 @@
(actions/do-dialogue entities
:game-player "Wow! That's right!"
:game-player "I guess I'm not the wisest person in Remington."
:game-player "You have earned my trophy."))}
:game-player "You have earned my trophy.")
(actions/give entities items/trophy))}
:anim nil
:talk game-player-talk)}
:collision "inside-castle/collision.png"

View File

@@ -11,7 +11,7 @@
(let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
(println (:input-x screen) (:input-y screen) "->" x y)))
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck :stick :cat-toy :balloon :frog-legs])
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :cheat-deck :stick :cat-toy :balloon :frog-legs])
(defn cursor [filename which]
(let [scale 2