From 54c287140789e0f522b96017836623f9bac3c393 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 2 May 2016 09:13:07 -0700 Subject: [PATCH] fixed a couple glitches. --- .../asset-work/wizard/talk-angry.pxa/0.pxi | Bin 264135 -> 264135 bytes .../asset-work/wizard/talk-angry.pxa/1.pxi | Bin 264137 -> 264137 bytes .../asset-work/wizard/talk-angry.pxa/2.pxi | Bin 788928 -> 788928 bytes .../asset-work/wizard/talk-angry.pxa/3.pxi | Bin 788927 -> 788927 bytes desktop/last-release | 2 +- .../advent/screens/rooms/outside_house.clj | 1 + desktop/src-common/advent/screens/splash.clj | 6 +++--- 7 files changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop/asset-work/wizard/talk-angry.pxa/0.pxi b/desktop/asset-work/wizard/talk-angry.pxa/0.pxi index bd729bcea8ff78dba5d912acae88a14ec63af117..fcd850847aa67bb931635a886dba11deeaaed80c 100644 GIT binary patch delta 66 zcmV-I0KNamj}XU?5P*aMgaWh!u1T|i0n7uJepLeyx31*_-~*F@0SuR}NdqXio>2qb Y4+B0BYPWr11N{dB|N26=eQ5(qo^ekaKmY&$ delta 77 zcmX@!FL1nHprM7ag=q`(I?w6z0+~6c*99^wY;Is&!aTh$lv!Z=x~I$!m?t+d@_=Qx e17-j4GynhPw7oWw`7itQx>9DI?QNONj`IMA6&>gR diff --git a/desktop/asset-work/wizard/talk-angry.pxa/1.pxi b/desktop/asset-work/wizard/talk-angry.pxa/1.pxi index fc1cb84fadbae747bb3fb4e86b062ddf0d675b06..023c49c73c7002f5e0e73c1e85b186c4d81369ab 100644 GIT binary patch delta 89 zcmX@vFL1J7prM7ag=q_Ok?r)nP-cPc>z*<{V4mE-=!3-F+`#yUdHXC+W*HVB^8+(n bY6tUnpr${q?nw+2FurgN7Ey7N#xC^L<(V|8n|2eYP*N!uJ1B+&`GxcL#zn3lOscF&hxG12G2> mb8g=q$W`-m^905Z%-i+Dx$iJZqYa2ZaT5Sn@+TYs delta 96 zcmX>w+2FurgN7Ey7N#xC^L-~zU}Tv--O?YjfHYJP72AI1HFdAoi%_Z{Z#>i*mpK>A`p{E3?YQ*tK6 diff --git a/desktop/asset-work/wizard/talk-angry.pxa/3.pxi b/desktop/asset-work/wizard/talk-angry.pxa/3.pxi index e86884daf8648e313fea620e39345f6c5f177a65..d298e7907944f84b39227b270aafddfcb60290e6 100644 GIT binary patch delta 101 zcmdl#*K0A*6oU{v8K`2PPt0}yQAAIf}&87RaueYz*J%H|1-PnfsQ z4rEqg*=`ojeTI2^cO)|l$MpGgnK`!eC3AmaZtqS7VHO}}1!6WJW(Q&pAm#*OuI=5a H+$Ku^%4{lr diff --git a/desktop/last-release b/desktop/last-release index 8c61d23e..04f9fe46 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -58 +59 diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 0bf96dbd..2858837c 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -190,6 +190,7 @@ :wizard "Do you promise?") (actions/play-animation entities :ego :frog-nod :stop? false) (actions/talk entities :wizard "Frustatium DISPOSIUM!!!" :anim :talk-angry :stop? false) + (actions/play-sound entities "ending-castle/georgia-appear.ogg" 0.5 false) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start) (Thread/sleep 1500) diff --git a/desktop/src-common/advent/screens/splash.clj b/desktop/src-common/advent/screens/splash.clj index 6accf860..5fab1ceb 100644 --- a/desktop/src-common/advent/screens/splash.clj +++ b/desktop/src-common/advent/screens/splash.clj @@ -25,15 +25,15 @@ (defn fade-in [screen e thing then] (assoc-in e [:tweens :fade-in] - (tween/tween :fade-in screen [thing :opacity] 0.0 1.0 1.0 + (tween/tween :fade-in screen [thing :opacity] 0.0 1.0 0.5 :finish then :ease tween/ease-in-quadratic))) (defn fade-out [screen e thing then] (assoc-in e [:tweens :fade-out] - (tween/tween :fade-out screen [thing :opacity] 1.0 0.0 1.0 + (tween/tween :fade-out screen [thing :opacity] 1.0 0.0 0.5 :finish then - :ease tween/ease-in-quadratic))) + :ease tween/ease-out-quadratic))) (defn get-texture [path] (let [atlas-name (str/replace path #".png" "")