diff --git a/desktop/resources/dream-2.mp3 b/desktop/resources/dream-2.mp3 new file mode 100644 index 00000000..8bd196d2 Binary files /dev/null and b/desktop/resources/dream-2.mp3 differ diff --git a/desktop/resources/dream/music.ogg b/desktop/resources/dream/music.ogg new file mode 100644 index 00000000..68f74abb Binary files /dev/null and b/desktop/resources/dream/music.ogg differ diff --git a/desktop/resources/dream/music.wav b/desktop/resources/dream/music.wav new file mode 100644 index 00000000..e7629076 Binary files /dev/null and b/desktop/resources/dream/music.wav differ diff --git a/desktop/resources/secret-hideout.mp3 b/desktop/resources/secret-hideout.mp3 new file mode 100644 index 00000000..51228a7d Binary files /dev/null and b/desktop/resources/secret-hideout.mp3 differ diff --git a/desktop/resources/secret-hideout.ogg b/desktop/resources/secret-hideout.ogg new file mode 100644 index 00000000..fef151d1 Binary files /dev/null and b/desktop/resources/secret-hideout.ogg differ diff --git a/desktop/resources/secret-hideout.wav b/desktop/resources/secret-hideout.wav new file mode 100644 index 00000000..282f5e20 Binary files /dev/null and b/desktop/resources/secret-hideout.wav differ diff --git a/desktop/settings.edn b/desktop/settings.edn index 2a45f7a5..cc4e8079 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 41.0, :music-volume 100.0} \ No newline at end of file +{:sound-volume 86.0, :music-volume 59.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 1b052a94..aa52915c 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -305,7 +305,7 @@ (defn make [screen] (let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1]) fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6])] - (rooms/make :music :town-1 + (rooms/make :music :dream :interactions {:pit {:box [54 0 219 36] :script (actions/get-script entities (actions/walk-to entities :ego [154 41]) diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj index 638f922c..8cabbd17 100644 --- a/desktop/src-common/advent/screens/rooms/inside_stash.clj +++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj @@ -48,7 +48,7 @@ (defn make [screen] - (rooms/make :music {:day :town-2 :night :night} + (rooms/make :music {:day :secret-hideout :night :secret-hideout} :interactions {:left-dir {:box [91 60 125 140] :script (actions/get-script diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 73379eda..b82892b1 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -700,6 +700,7 @@ void main() (when shader (.setUniformf shader "multiply_amount" (float (or multiply-amount 1.0))) (.setUniformf shader "hue_amount" (float (or hue-amount 1.0)))) + (.setColor batch (color (:r e 1.0) (:g e 1.0) (:b e 1.0) (:opacity e 1.0))) @@ -781,7 +782,9 @@ void main() :inside-fangald (utils/make-music "inside-fangald.ogg") :fight (utils/make-music "megaboss.mp3") :pull-sword (utils/make-music "pull-sword.ogg") - :night (utils/make-music "night.ogg")} + :night (utils/make-music "night.ogg") + :dream (utils/make-music "dream/music.ogg") + :secret-hideout (utils/make-music "secret-hideout.ogg")} :state (get-state) :time-profiles {:object nil :default utils/default-night-merge