fighting bloodclot coming along

This commit is contained in:
2015-02-15 01:20:52 -08:00
parent 63a4ba065a
commit 8d93158af0
29 changed files with 122 additions and 14 deletions

View File

@@ -159,12 +159,11 @@
#_(actions/play-animation entities :ego :swing)
(actions/do-dialogue entities :blergh "Ha ha ha! Is that the best you can do?"
:blergh "Take this!")
(actions/play-animation entities :blergh :swing)
(actions/walk-straight-to entities :ego [35 45] :anim :squat :override-dir :right :speed 3.0)
(actions/do-dialogue entities :ego "Ouch!"
:blergh "My turn.")
(actions/play-animation entities :ego :shock :stop? false)
(actions/play-animation entities :ego :burnt :stop? false)
(actions/play-animation entities :ego :passed-out :continue? true)
#_(common/go-to-jail entities)
(common/go-to-jail entities)
#_(actions/do-dialogue entities :ego "Hey!"
:ego "What's going on? I was just about to teach Blergh a lesson!"))
:magic-slingshot (actions/get-script entities
@@ -189,7 +188,7 @@
:x 222 :y 172 :baseline 240)
:collision "space/collision.png"
:scale-fn (constantly 1.5)
:start-pos [140 55]
:start-pos [35 45]
:apply-state (fn [e]
(as-> e e
(if (get-in e [:state :broke-jewel?])