refinement on closing.
This commit is contained in:
@@ -94,20 +94,28 @@
|
||||
:blergh "You're still no match for me."
|
||||
:blergh "Give it to me, or I'll make you regret it!")
|
||||
(actions/present-choices entities {:choices ["Ok."
|
||||
{:run #(do (actions/respond entities %
|
||||
:ego "Here you go."
|
||||
:blergh "Yes! Now I can drink this whole thing and can become powerful enough to rule the world!"
|
||||
:blergh "[GREEN]*gulp*[]"
|
||||
:blergh "What's this? What's happening?")
|
||||
(actions/walk-straight-to entities :ego [100 45] :face :right)
|
||||
(actions/do-dialogue entities :ego "TODO: explosion"
|
||||
:ego "You win!"))}
|
||||
{:run (fn [_]
|
||||
(actions/talk entities :ego "Ok." :anim :grow-talk :stop? false)
|
||||
(actions/talk entities :ego "Here you go." :anim :grow-talk)
|
||||
(actions/do-dialogue entities
|
||||
:blergh "Yes! Now I can drink this whole thing and can become powerful enough to rule the world!"
|
||||
:blergh "[#AAFFAAFF]*gulp*[]"
|
||||
:blergh "What's this? What's happening?")
|
||||
(actions/talk entities :ego "Uh oh." :anim :grow-talk :stop? false)
|
||||
(actions/walk-straight-to entities :ego [100 45] :face :right)
|
||||
(actions/play-animation entities :blergh :grow :stop? false)
|
||||
(actions/do-dialogue entities :ego "'Not more than that do drink,\nOr you'll push your body to the brink.'"
|
||||
:ego "Brilliant! I win!")
|
||||
(actions/walk-straight-to entities :ego [800 75] :face :right)
|
||||
(actions/update-state entities (fn [s] (assoc s :blergh-dead? true))))}
|
||||
"No way!"
|
||||
{:run #(do (actions/respond entities % :blergh "Then take this!")
|
||||
(actions/play-animation entities :blergh :swing)
|
||||
(actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0)
|
||||
(actions/do-dialogue entities :ego "Yeow!!"
|
||||
:ego "Even with that potion, I'm not strong enough."))}]}))
|
||||
{:run (fn [_]
|
||||
(actions/talk entities :ego "No way!" :anim :grow-talk)
|
||||
(actions/talk entities :blergh "Then take this!")
|
||||
(actions/play-animation entities :blergh :swing)
|
||||
(actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0)
|
||||
(actions/do-dialogue entities :ego "Yeow!!"
|
||||
:ego "Even with that potion, I'm not strong enough."))}]}))
|
||||
|
||||
|
||||
(defn get-ego [screen start-pos start-scale]
|
||||
@@ -149,6 +157,7 @@
|
||||
(texture (aget grow-sheet 0 i))))
|
||||
hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0])
|
||||
swing (utils/make-anim "ego/swing.png" [36 36] 0.05 (flatten [[0 0 0 1 2 3 3 3 3 ]]))
|
||||
grow-talk (utils/make-anim "ego/grow-talk.png" [18 36] 0.2 (range 2))
|
||||
get-sick (animation 0.3 (map (partial get [(aget talk-sheet 0 0 ) (texture "ego/get-sick.png")]) [0 1 1 1 1 1 1 1 1 1 1 1]) )
|
||||
ego {:right {:walk walk-right
|
||||
:stand stand-anim
|
||||
@@ -164,6 +173,7 @@
|
||||
:get-sick get-sick
|
||||
:hold-up-to-window hold-up-to-window
|
||||
:swing swing
|
||||
:grow-talk grow-talk
|
||||
[:fire 1] fire-1-anim
|
||||
[:fire 2] fire-2-anim
|
||||
[:fire 3] fire-3-anim}
|
||||
@@ -180,6 +190,7 @@
|
||||
:cat-toy-last-half (utils/flip cat-toy-last-half)
|
||||
:grow (utils/flip grow)
|
||||
:hold-up-to-window (utils/flip hold-up-to-window)
|
||||
:grow-talk (utils/flip grow-talk)
|
||||
[:fire 1] (utils/flip fire-1-anim)
|
||||
[:fire 2] (utils/flip fire-2-anim)
|
||||
[:fire 3] (utils/flip fire-3-anim)}
|
||||
|
||||
Reference in New Issue
Block a user