diff --git a/desktop/asset-work/wizard/talk-angry.pxa/0.pxi b/desktop/asset-work/wizard/talk-angry.pxa/0.pxi index bd729bce..fcd85084 100644 Binary files a/desktop/asset-work/wizard/talk-angry.pxa/0.pxi and b/desktop/asset-work/wizard/talk-angry.pxa/0.pxi differ diff --git a/desktop/asset-work/wizard/talk-angry.pxa/1.pxi b/desktop/asset-work/wizard/talk-angry.pxa/1.pxi index fc1cb84f..023c49c7 100644 Binary files a/desktop/asset-work/wizard/talk-angry.pxa/1.pxi and b/desktop/asset-work/wizard/talk-angry.pxa/1.pxi differ diff --git a/desktop/asset-work/wizard/talk-angry.pxa/2.pxi b/desktop/asset-work/wizard/talk-angry.pxa/2.pxi index fc36e5ef..d84e146c 100644 Binary files a/desktop/asset-work/wizard/talk-angry.pxa/2.pxi and b/desktop/asset-work/wizard/talk-angry.pxa/2.pxi differ diff --git a/desktop/asset-work/wizard/talk-angry.pxa/3.pxi b/desktop/asset-work/wizard/talk-angry.pxa/3.pxi index e86884da..d298e790 100644 Binary files a/desktop/asset-work/wizard/talk-angry.pxa/3.pxi and b/desktop/asset-work/wizard/talk-angry.pxa/3.pxi differ 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" "")