improvements to dream sequence.

This commit is contained in:
Bryce Covert
2015-11-14 09:33:58 -08:00
parent 4f37232223
commit 0671ff4673
3 changed files with 4 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -15,7 +15,8 @@
[play-clj.math :refer :all] [play-clj.math :refer :all]
[play-clj.ui :refer :all] [play-clj.ui :refer :all]
[play-clj.utils :refer :all] [play-clj.utils :refer :all]
[play-clj.g2d :refer :all])) [play-clj.g2d :refer :all])
(:import [com.badlogic.gdx.graphics Color]))
(def walk-chan (a/chan)) (def walk-chan (a/chan))
@@ -516,9 +517,8 @@
:default {:origin-x 31}} :default {:origin-x 31}}
:facing :left :facing :left
:update-fn (fn [s es e] :update-fn (fn [s es e]
(if (:distracted? e) (assoc-in e [:offset-y] (* (:scale-y e) (get-in es [:bounce-surrogate :delta-y] 0))))
(assoc-in e [:offset-y] 0) :talk-color (Color/valueOf "ADA6FFFF")
(assoc-in e [:offset-y] (get-in es [:bounce-surrogate :delta-y] 0))))
:script (actions/get-script entities :script (actions/get-script entities
(if (get-in @entities [:room :entities :fairy-godfather :distracted?]) (if (get-in @entities [:room :entities :fairy-godfather :distracted?])
(actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.") (actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.")