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

giving item.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-22 14:53:16 -08:00
parent 85cf347b87
commit fb0dc333c6
5 changed files with 3 additions and 2 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: 9.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
desktop/resources/cursor_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

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

@@ -142,7 +142,7 @@
:feather {:name "Feather" :value :feather :cursor :feather :scripts (mix-ingredients :feather)}
:spell-component {:name "Spell component" :value :spell-component :cursor :spell-component}
:money {:name "Money" :value :money :cursor :money}
:watch {:name "Watch" :value :watch :cursor :watch}
:charcoal {:name "Piece of charcoal" :value :charcoal :cursor :charcoal}
:broken-clock {:name "Sliced time-keeping device" :value :broken-clock :cursor :broken-clock}
:slingshot {:name "The Slinger's Shot" :value :slingshot :cursor :slingshot}
:note-2 {:name "Bingo card" :value :note-2 :cursor :note-2}

1
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -794,6 +794,7 @@
(actions/play-animation entities :ego :start-squat-2 :stop? false)
(Thread/sleep 200)
(actions/remove-entity entities :charcoal)
(actions/give entities :charcoal)
(actions/play-animation entities :ego :end-squat)
(actions/talk entities :ego "It's a small, sharp piece of charcoal.")
)

2
desktop/src-common/advent/utils.clj
View File

@@ -26,7 +26,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 :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :watch :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot :active-main :shovel :broom])
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :charcoal :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot :active-main :shovel :broom])
(def settings (atom {:music-volume 50.0
:sound-volume 75.0