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

bug fixes

Browse Source
This commit is contained in:
Bryce Covert
2015-10-28 09:40:12 -07:00
parent e39e0c65db
commit d081ee271c
6 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -250,6 +250,7 @@
(actions/walk-straight-to entities :ego [35 45] :override-dir :right :speed 3.0))
(actions/do-dialogue entities :ego "I don't want to get too close while he still has his lightning gem!"))
(do
(actions/update-entity entities :ego #(assoc % :get-script (:original-get-script %)))
(swing-at-blergh entities)
(actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?"
:bloodclot-head "Take this!")
@@ -261,6 +262,7 @@
(actions/play-animation entities :ego :shock :stop? false)
(actions/begin-animation entities :bloodclot-head :stand)
(actions/update-entity entities :lightning #(assoc % :opacity 0.0))
(actions/play-animation entities :ego :burnt :stop? false)
(actions/play-animation entities :ego :passed-out :continue? true)
(actions/do-dialogue entities :bloodclot-head "Oh shucks. I overcooked him."
@@ -304,7 +306,7 @@
:collision "space/collision.png"
:scale-fn (constantly 1.5)
:start-pos [35 45]
:apply-state (fn [_ e]
:apply-state (fn [screen e]
(as-> e e
(if (get-in e [:state :broke-jewel?])
(assoc-in e [:room :entities :broken-jewel] (get-in e [:room :broken-jewel]))
@@ -315,4 +317,19 @@
(if (get-in e [:state :seen-bloodclot?])
(assoc-in e [:room :entities :bloodclot-head :opacity ] 1.0)
e)
(assoc-in e [:state :seen-bloodclot?] true))))))
(if (and (not (actions/has-obtained? e :slingshot))
(get-in e [:state :seen-bloodclot?]))
(update-in e [:room :entities :ego] #(actions/start-animation screen % :scared))
e)
(assoc-in e [:state :seen-bloodclot?] true)
(assoc-in e [:room :entities :ego :original-get-script]
(get-in e [:room :entities :ego :get-script]))
(assoc-in e [:room :entities :ego :get-script]
(fn [cursor [x y]]
(actions/get-script entities
(if (actions/has-obtained? entities :slingshot)
(actions/talk entities :ego "No time for that!")
(do
(actions/talk entities :ego "No time for that!" :anim :scared-talk :stop? false)
(actions/begin-animation entities :ego :scared)))))))))))