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

Bug fixes from Wayne's feedback. typos, tune outside jail, and coin flip hidden.

Browse Source
This commit is contained in:
Bryce Covert
2016-06-24 17:30:38 -07:00
parent 361d92f85f
commit 68021b05e2
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,9 +82,13 @@
:script (actions/get-script entities
(if (get-in @entities [:tweens :coin-y])
(do
(actions/talk entities :ego "Hey, Bubba!" :wait false)
(actions/update-entities entities (fn [entities]
(update-in entities [:tweens] dissoc :coin-y)))
(assoc-in entities [:room :entities :coin-flip :opacity] 1.0)))
(actions/talk entities :ego "Hey, Bubba!" :wait false)
(actions/update-entities entities (fn [entities]
(-> entities
(update-in [:tweens] dissoc :coin-y)
(assoc-in [:room :entities :coin-flip :opacity] 1.0))))
(actions/walk-straight-to entities :coin-flip [212 90] :update-baseline? false :speed 3.0)
(screen! dialogue/talking-screen :stop-talk)

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

@@ -43,7 +43,7 @@
(actions/play-animation entities :ego :reach)
(actions/do-dialogue entities
:ego "Yes! I got my stuff back!"
:ego "Including the Slinger's shot!")
:ego "Including the Slinger's Shot!")
(actions/update-state entities #(-> % (assoc :inventory (concat (:inventory %) [:flask-1-strength :medal :trophy :slingshot])))))
:else
(do

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

@@ -324,7 +324,14 @@ void main ()
(actions/talk entities :ego "Better not hum it with Gandarf around!")
(actions/talk entities :wizard "What's that, boy?")
(actions/talk entities :ego "Oh... Erm... Nothing."))
(get-in @entities [:room :entities :warden])
(= :space
(get-in @entities [:state :last-room]))
(actions/talk entities :ego "No time for that!")
(= :inside-jail
(get-in @entities [:state :last-room]))
(do
(actions/talk entities :ego "I'll whistle it really quietly.")
(actions/play-safe entities)