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

added winning arm wrestling.

Browse Source
This commit is contained in:
Remington Covert
2014-11-18 16:54:06 -08:00
parent d161328e1a
commit e7081b3ae4
5 changed files with 19 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: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

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

@@ -70,3 +70,5 @@
(def flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents (def flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents
:scripts {:slobber (make-strength-potion)}}) :scripts {:slobber (make-strength-potion)}})
(def medal {:name "Medal of strength" :value :medal :cursor :medal})

16
desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
View File

@@ -35,7 +35,21 @@
:warriors "Young esquire, thou art valiant in heart. " :warriors "Young esquire, thou art valiant in heart. "
:warriors "Departeth henceforth and go hitherto, unto the gym.")} :warriors "Departeth henceforth and go hitherto, unto the gym.")}
"I challenge you to a arm wrestling match to prove my strength." "I challenge you to a arm wrestling match to prove my strength."
{:run #(actions/respond entities % :warriors "[TODO] You lose.")} {:run (fn [msg]
(actions/respond entities msg :warriors "Prepare thyself, thy task is not for the feint of heart")
(if ((set (get-in @entities [:state :inventory])) items/flask-1-strength)
(do
(actions/do-dialogue entities :ego "One sec.")
(actions/play-animation entities :ego :grow)
(actions/do-dialogue entities
:warriors "[Todo animation here]"
:warriors "Congratulations young master. Thou art worthy in might."
:warriors "Take my medal of strength.")
(actions/give entities items/medal))
(do
(actions/do-dialogue entities
:warriors "[Todo animation here]"
:warriors "You lost, young master. Go hitherto, unto thy gym."))))}
"Something else." "Something else."
{:choices actions/something-else}] {:choices actions/something-else}]
} }

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

@@ -227,7 +227,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/grass] :inventory [items/grass items/flask-1-strength]
: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 :grass :slobber :flask-with-strength]) (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 :flask-with-strength :medal])
(defn cursor [filename which] (defn cursor [filename which]
(let [scale 2 (let [scale 2