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

added red balloon.

Browse Source
This commit is contained in:
Remington Covert
2014-10-31 12:26:47 -07:00
parent b6d3c2ea66
commit 98d8a17fba
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,5 +41,6 @@
(def cat-toy {:name "Cat toy" :value :cat-toy :cursor :cat-toy})
(def stick {:name "Stick" :value :stick :cursor :stick :scripts {:wool make-cat-toy}})
(def balloon {:name "Choicest of balloons" :value :balloon :cursor :balloon})

7
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -83,7 +83,12 @@
(actions/do-dialogue entities
:game-player "That's right! Now for your second riddle:"
:game-player "Filled with air, light as a feather,"
:game-player "If you want to keep it, best have a tether."))}
:game-player "If you want to keep it, best have a tether."))
:balloon (actions/get-script entities
(actions/do-dialogue entities
:game-player "That's right! Now for your third riddle:"
:game-player "Hippity-hop, I jump really far,"
:game-player "Now I'm dead, or at least a have a scar."))}
:anim nil
:talk game-player-talk)}
:collision "inside-castle/collision.png"

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

@@ -52,13 +52,13 @@
:peddler "I have the choicest of all types of wares..."
:peddler "...I'm well stocked on used earplugs..."
:peddler "...glass eyes, motivational tapes... "
:peddler "...and useful books like this:"
:peddler "'Checkers Mastery in Less Than 10 Seconds'"
:ego "I sure am interested on that book on checkers."
:peddler "An excellent selection! It is the choicest of checkers book you'll ever find."
:peddler "This book will only set you back 75 sheckels."
:peddler "... and this nice, big, red balloon."
:ego "I sure am interested in that balloon."
:peddler "An excellent selection! It is the choicest of balloons you'll ever find."
:peddler "This bundle of joy will only set you back 75 sheckels."
:ego "But I haven't got any money!"
:peddler "Then you won't have the choicest of checkers books."))}}
:peddler "Then you won't have the choicest of balloons.")
(actions/give entities items/balloon))}}
:layers [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]
:entities {:peddler (actions/start-animation screen
(assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim 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)})]
(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])
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck :stick :cat-toy :balloon])
(defn cursor [filename which]
(let [scale 2