notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more interactions.

Browse Source
This commit is contained in:
Remington Covert
2014-09-19 16:46:06 -07:00
parent 6544c1487a
commit 17d42adaf5
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
desktop/src-common/advent/screens/scene.clj
View File

@@ -210,7 +210,21 @@
(actions/talk entities :ego "I can see Fangald, the wizard inside.")
(actions/talk entities :ego "It looks like he's opening his Magi-safe.")
(actions/talk entities :ego "[todo: sounds play.]")
(actions/talk entities :ego "A lot of good it'll do me to know his password while he's still there."))}}
(actions/talk entities :ego "A lot of good it'll do me to know his password while he's still there."))}
:mushrooms {:box [247 59 269 76]
:script (actions/get-script
entities
(if ((get-in @entities [:background :entities :ego :inventory]) :mushrooms)
(actions/talk entities :ego "I've already got a junk ton of mushrooms.")
(do
(actions/walk-to entities :ego [242 75])
(actions/give entities :ego :mushrooms)
(actions/talk entities :ego "Perfectly ripe mushrooms!"))))}
:window {:box [103 44 130 140]
:script (actions/get-script
entities
(actions/walk-to entities :ego [128 100])
(actions/talk entities :ego "I can see Fangald moving around in there but it's hard to see at this angle."))}}
:layers [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "behindhouse/house.png") :x 0 :y 0 :baseline 122)
(assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240)]
@@ -273,8 +287,7 @@
:override nil}
:background (assoc-in (:outside-house backgrounds)
[:entities :ego] (get-ego screen))
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)
}))
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)}))
:on-render
(fn [screen [entities]]

2
desktop/src-common/advent/utils.clj
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 :look :talk :right :down :left :up])
(def +all-cursors+ [:main :wool :mushrooms :talk :right :down :left :up])
(defn cursor [filename which]
(let [scale 2