From 0671ff467364e423c0f70c79508ab968a1dc5e84 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@liffft.com>
Date: Sat, 14 Nov 2015 09:33:58 -0800
Subject: [PATCH] improvements to dream sequence.

---
 desktop/asset-work/dream/far.png                 | Bin 0 -> 3005 bytes
 desktop/asset-work/dream/sky.png                 | Bin 0 -> 1742 bytes
 .../src-common/advent/screens/rooms/dream.clj    |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 desktop/asset-work/dream/far.png
 create mode 100644 desktop/asset-work/dream/sky.png

diff --git a/desktop/asset-work/dream/far.png b/desktop/asset-work/dream/far.png
new file mode 100644
index 0000000000000000000000000000000000000000..586b26270214fdb0485b5907bc1899cfcc4e0b2b
GIT binary patch
literal 3005
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
Wr++rY=+-R!P<y%gGt0K@%=kBipJ!$O

literal 0
HcmV?d00001

diff --git a/desktop/asset-work/dream/sky.png b/desktop/asset-work/dream/sky.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f54eaeded10b898b853397d3da79de761476af
GIT binary patch
literal 1742
zcmb_dPiPcZ7=K2iF=!S4K&_X@1gV0vGqW?3*%`CC>rOUVvYUi;!KFRa`SUhAB=g6a
zm+mBb2vM;TO0krlTD`O$#hw}?+7f6*EP-5lh{b~~UKA9fIce#e&2H);3L59|=6mmb
z-|zc<|9BS$`+K&wf7A{D*qZBAivX-k5&3D`MzWryZw`~+9^75V$J`38X+8pJ)725o
z+1d~)BF!8-c?Wd?us*a(Wn3=g6~nb-TBH*TZI4(3&~+sAG-DWHsG}jvNm5U4{6ay?
zOj5_i0$cDhsA~0&`{>wsf5{jhHe{1Jau{}n3IVVY)?jFlIDrx-sXDGg<mi~8U|j_d
zC#hvp<-#D$xIThnOr#Aq&Ou3zaiS<m@q;kVastD049C-)tO$a_vas<{#G7wcl%kq#
z_#(R`RmIp-7^YUM#cF)a^@kWvmSu*GGx0c0H0WT=!CFW=K}QooMS<a49=2QuMu?j3
zj^ZRmm@bE4dxgRZuoE;AMN-Cun#XW4ma*+9uDW)Bi|BtEt7-?OF%L0C6u6_lLF!TI
zXd08;z1dNuNZ2R?zD0_nji|0MY9j~d)Fef2Vy0y(yd;PwC!2IaGz3~ma1t$}3XvpJ
zH#j3<u)Ng7S<ODpXZVboNF;bx<+yH9W;1EB=T%n7cJuLc(>CV>SaS^2^lcH}4O{7r
zwo1lF8g~7X>y9+LV6f_9H>kQE%w+0Shx-efVL8#^fv8Z+ajVF;K1XKOcWqeDv|_Eo
z!juF<)>)1gSly%rT^4A)B6QMxLO}6OgBNv8pc?k(yJnCfq?o8(UTL4^5$VZDTp0$k
zSs5qfkQwsHu-uvdVF7@a$2m1!3Kt&Vo8LUk?n=$8GZ&|(CqH=Du6!}~?8Wn*{rd`w
zf5@Mm`+9Kle&@MAAN{?%^~BMS`#>9<04-}?){d}DVa-J904>$cVBLo8sWmUJMSy31
z+wtqb^GAt;=fUijpFTZxxO0xV($aQd_UGGWZg;A8@2!hhd-AQ@i`jwv&P~_GUtC$d
zEGz271%2k5r6;LR{_XAg?(Wiq>FSSD3orfqT}w-+r>uK(>Q}V)a`Ae0y5n0l7~63O
zUeafr{Fm3JS|9$?_Z|X@GV-2aQm;+U+g`j)sV2TZz2QT!?e~3uoy}8y(F>F7?pLoK
HJu&$oVEDWL

literal 0
HcmV?d00001

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.")