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

Stage one of new puzzle complete.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-28 16:25:48 -08:00
parent 2fcace279c
commit 3ef0a4e157
3 changed files with 68 additions and 56 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: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

11
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -101,12 +101,19 @@
(defn talk-to-owl [entities] (defn talk-to-owl [entities]
(actions/walk-to entities :ego [141 54] :face :right) (actions/walk-to entities :ego [141 54] :face :right)
(if (get-in @entities [:state :talked-to-owl?]) (cond (actions/has-obtained? entities :feather)
(do (actions/do-dialogue entities :ego "Hello again."
:owl "Oh! Hello again! Thanks you again for all your help."
:owl "My nausea has nearly worn off.")
(actions/play-animation entities :owl :puke))
(get-in @entities [:state :talked-to-owl?])
(do (actions/do-dialogue entities :ego "Hello again." (do (actions/do-dialogue entities :ego "Hello again."
:owl "Have you found my glass monocle!?" :owl "Have you found my glass monocle!?"
:owl "I'll have no relief of this nausea until you do.") :owl "I'll have no relief of this nausea until you do.")
(actions/play-animation entities :owl :puke)) (actions/play-animation entities :owl :puke))
:else
(do (actions/do-dialogue entities :ego "Hello there little owl." (do (actions/do-dialogue entities :ego "Hello there little owl."
:owl "Who you calling little?" :owl "Who you calling little?"
:ego "Wow! You can talk?" :ego "Wow! You can talk?"
@@ -162,7 +169,7 @@
(actions/walk-to entities :ego [141 54] :face :right) (actions/walk-to entities :ego [141 54] :face :right)
(actions/talk entities :ego "Is this your monocle?") (actions/talk entities :ego "Is this your monocle?")
(actions/play-animation entities :owl :puke) (actions/play-animation entities :owl :puke)
(actions/remove-entity entities :monocle) (actions/remove-item entities :monocle)
(actions/do-dialogue entities (actions/do-dialogue entities
:owl "It is!" :owl "It is!"
:owl "Thank you!" :owl "Thank you!"

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

@@ -290,7 +290,12 @@
(actions/play-animation entities :ego :squat) (actions/play-animation entities :ego :squat)
(actions/remove-item entities :recipe) (actions/remove-item entities :recipe)
(actions/give entities :ash) (actions/give entities :ash)
(actions/talk entities :ego "It burned up into ash."))})) (actions/talk entities :ego "It burned up into ash."))
:spell-component (actions/get-script entities
(actions/walk-to entities :ego [141 90] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :spell-component)
(actions/talk entities :ego "I poured it in. Now what?"))}))
:wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2 :wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2
:script (actions/get-script entities (talk-to-gandarf-outside entities))})) :script (actions/get-script entities (talk-to-gandarf-outside entities))}))
:note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png") :note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png")