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

adding grass and slobber.

Browse Source
This commit is contained in:
Remington Covert
2014-11-14 16:34:03 -08:00
parent 3fb29d463e
commit 949d7f71c1
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/cursor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

2
desktop/src-common/advent/screens/items.clj
View File

@@ -55,3 +55,5 @@
(def glass-eye {:name "Choicest of glass eyes" :value :glass-eye :cursor :glass-eye}) (def glass-eye {:name "Choicest of glass eyes" :value :glass-eye :cursor :glass-eye})
(def motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes}) (def motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes})
(def used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs}) (def used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs})
(def grass {:name "Huge grass" :value :grass :cursor :grass})
(def slobber {:name "Bull slobber" :value :slobber :cursor :slobber})

8
desktop/src-common/advent/screens/rooms/outside_castle.clj
View File

@@ -120,6 +120,12 @@
:stand) :stand)
:steer (assoc (texture "outside-castle/steer.png" ) :x 203 :y 155 :baseline 80 :steer (assoc (texture "outside-castle/steer.png" ) :x 203 :y 155 :baseline 80
:script (actions/get-script entities :script (actions/get-script entities
(actions/talk entities :ego "That is one buff bull!")))} (actions/talk entities :ego "That is one buff bull!"))
:scripts {:grass (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities items/grass)
(actions/talk entities :ego "Eww! He slobbered on my hand.")
(actions/give entities items/slobber))})}
:collision "outside-castle/collision.png" :collision "outside-castle/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)))) :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00))))

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

@@ -219,7 +219,7 @@
:inside-fangald (make-music "inside-fangald.ogg")} :inside-fangald (make-music "inside-fangald.ogg")}
:state {:object nil :state {:object nil
:active? true :active? true
:inventory [items/flask-1-with-cream-of-mushroom items/recipe] :inventory [items/grass]
:clues #{} :clues #{}
:mints-eaten 0} :mints-eaten 0}
:actions {:object nil :actions {:object nil

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)})] (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
(println (:input-x screen) (:input-y screen) "->" x y))) (println (:input-x screen) (:input-y screen) "->" x y)))
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs]) (def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber])
(defn cursor [filename which] (defn cursor [filename which]
(let [scale 2 (let [scale 2