diff --git a/desktop/asset-work/ending-castle/cloud.ogg b/desktop/asset-work/ending-castle/cloud.ogg new file mode 100644 index 00000000..a6b1e964 Binary files /dev/null and b/desktop/asset-work/ending-castle/cloud.ogg differ diff --git a/desktop/asset-work/ending-castle/cloud.wav b/desktop/asset-work/ending-castle/cloud.wav new file mode 100644 index 00000000..b66f3cb6 Binary files /dev/null and b/desktop/asset-work/ending-castle/cloud.wav differ diff --git a/desktop/last-release b/desktop/last-release index 3c032078..d6b24041 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -18 +19 diff --git a/desktop/resources/ending-castle/cloud.ogg b/desktop/resources/ending-castle/cloud.ogg new file mode 100644 index 00000000..d71a6d01 Binary files /dev/null and b/desktop/resources/ending-castle/cloud.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index d1868fcd..7b64aff2 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -445,6 +445,7 @@ :none))) (defn do-win [entities] + (actions/do-dialogue entities :ego "Hey, Bloodclot!" :ego "I have this potion which will make me as strong as you!" @@ -468,6 +469,7 @@ (actions/do-dialogue entities :ego "Hey!" :ego "I won!") + (steam/set-achievement "BLOODCLOT") (actions/glad entities) (actions/walk-straight-to entities :ego [340 55]) diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index 56ab3181..03fa762e 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -46,12 +46,19 @@ frankie-down (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 [0]) scaler (utils/scaler-fn-with-baseline 20 1.3 1.30)] (rooms/make :music :dream + :sounds {:cloud (utils/load-sound "ending-castle/cloud.ogg")} :name "Ending" :interactions {} :layers [(assoc (utils/get-texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) (assoc (utils/get-texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] :apply-state (fn [screen e] - (update-in e [:room :entities :ego] dissoc :talk-override )) + (as-> e e + (utils/play-sound! screen e :cloud (fn [e] + (* 0.5 (/ (- 400 (get-in e [:room :entities :gandarf :y])) + 300))) + 0.5 :loop ) + + (update-in e [:room :entities :ego] dissoc :talk-override ))) :georgia (rooms/make-entity :georgia (assoc (animation->texture screen georgia-stand) :x 111 :y 22 :baseline 218 :scale-x 1.3