diff --git a/desktop/asset-work/dream/far.png b/desktop/asset-work/dream/far.png new file mode 100644 index 00000000..586b2627 Binary files /dev/null and b/desktop/asset-work/dream/far.png differ diff --git a/desktop/asset-work/dream/sky.png b/desktop/asset-work/dream/sky.png new file mode 100644 index 00000000..91f54eae Binary files /dev/null and b/desktop/asset-work/dream/sky.png differ diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index e27a481a..c0430905 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -15,7 +15,8 @@ [play-clj.math :refer :all] [play-clj.ui :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)) @@ -516,9 +517,8 @@ :default {:origin-x 31}} :facing :left :update-fn (fn [s es e] - (if (:distracted? e) - (assoc-in e [:offset-y] 0) - (assoc-in e [:offset-y] (get-in es [:bounce-surrogate :delta-y] 0)))) + (assoc-in e [:offset-y] (* (:scale-y e) (get-in es [:bounce-surrogate :delta-y] 0)))) + :talk-color (Color/valueOf "ADA6FFFF") :script (actions/get-script entities (if (get-in @entities [:room :entities :fairy-godfather :distracted?]) (actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.")