diff --git a/desktop/asset-work/tongue-fight/big-swoosh.aif b/desktop/asset-work/tongue-fight/big-swoosh.aif new file mode 100644 index 00000000..28cc995c Binary files /dev/null and b/desktop/asset-work/tongue-fight/big-swoosh.aif differ diff --git a/desktop/asset-work/tongue-fight/big-swoosh.ogg b/desktop/asset-work/tongue-fight/big-swoosh.ogg new file mode 100644 index 00000000..815f45ae Binary files /dev/null and b/desktop/asset-work/tongue-fight/big-swoosh.ogg differ diff --git a/desktop/asset-work/tongue-fight/faling-ego.aif b/desktop/asset-work/tongue-fight/faling-ego.aif new file mode 100644 index 00000000..c70c3711 Binary files /dev/null and b/desktop/asset-work/tongue-fight/faling-ego.aif differ diff --git a/desktop/asset-work/tongue-fight/faling-ego.ogg b/desktop/asset-work/tongue-fight/faling-ego.ogg new file mode 100644 index 00000000..52ffe6c7 Binary files /dev/null and b/desktop/asset-work/tongue-fight/faling-ego.ogg differ diff --git a/desktop/asset-work/tongue-fight/falling-ego.aif b/desktop/asset-work/tongue-fight/falling-ego.aif new file mode 100644 index 00000000..00c1197a Binary files /dev/null and b/desktop/asset-work/tongue-fight/falling-ego.aif differ diff --git a/desktop/asset-work/tongue-fight/falling-ego.ogg b/desktop/asset-work/tongue-fight/falling-ego.ogg new file mode 100644 index 00000000..baaaf0f0 Binary files /dev/null and b/desktop/asset-work/tongue-fight/falling-ego.ogg differ diff --git a/desktop/asset-work/tongue-fight/impact.aif b/desktop/asset-work/tongue-fight/impact.aif new file mode 100644 index 00000000..091b05b3 Binary files /dev/null and b/desktop/asset-work/tongue-fight/impact.aif differ diff --git a/desktop/asset-work/tongue-fight/impact.ogg b/desktop/asset-work/tongue-fight/impact.ogg new file mode 100644 index 00000000..12524a8e Binary files /dev/null and b/desktop/asset-work/tongue-fight/impact.ogg differ diff --git a/desktop/asset-work/tongue-fight/swallow.aif b/desktop/asset-work/tongue-fight/swallow.aif new file mode 100644 index 00000000..b0e4cf1a Binary files /dev/null and b/desktop/asset-work/tongue-fight/swallow.aif differ diff --git a/desktop/asset-work/tongue-fight/swallow.ogg b/desktop/asset-work/tongue-fight/swallow.ogg new file mode 100644 index 00000000..e4dc6c30 Binary files /dev/null and b/desktop/asset-work/tongue-fight/swallow.ogg differ diff --git a/desktop/asset-work/tongue-fight/swoosh.aif b/desktop/asset-work/tongue-fight/swoosh.aif new file mode 100644 index 00000000..8292a5e4 Binary files /dev/null and b/desktop/asset-work/tongue-fight/swoosh.aif differ diff --git a/desktop/asset-work/tongue-fight/swoosh.ogg b/desktop/asset-work/tongue-fight/swoosh.ogg new file mode 100644 index 00000000..0834d10a Binary files /dev/null and b/desktop/asset-work/tongue-fight/swoosh.ogg differ diff --git a/desktop/resources/tongue-fight/big-swoosh.ogg b/desktop/resources/tongue-fight/big-swoosh.ogg new file mode 100644 index 00000000..815f45ae Binary files /dev/null and b/desktop/resources/tongue-fight/big-swoosh.ogg differ diff --git a/desktop/resources/tongue-fight/falling-ego.ogg b/desktop/resources/tongue-fight/falling-ego.ogg new file mode 100644 index 00000000..baaaf0f0 Binary files /dev/null and b/desktop/resources/tongue-fight/falling-ego.ogg differ diff --git a/desktop/resources/tongue-fight/impact.ogg b/desktop/resources/tongue-fight/impact.ogg new file mode 100644 index 00000000..12524a8e Binary files /dev/null and b/desktop/resources/tongue-fight/impact.ogg differ diff --git a/desktop/resources/tongue-fight/swallow.ogg b/desktop/resources/tongue-fight/swallow.ogg new file mode 100644 index 00000000..e4dc6c30 Binary files /dev/null and b/desktop/resources/tongue-fight/swallow.ogg differ diff --git a/desktop/resources/tongue-fight/swoosh.ogg b/desktop/resources/tongue-fight/swoosh.ogg new file mode 100644 index 00000000..0834d10a Binary files /dev/null and b/desktop/resources/tongue-fight/swoosh.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 97a3bdab..dd148e9e 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -459,20 +459,26 @@ entities) (skip-type [this screen entities] :none)) + + (actions/play-sound entities :swallow 0.5) (Thread/sleep 1500) (actions/update-entities entities (fn [e] (-> e (assoc-in [:room :entities :falling-bg :opacity] 1) (assoc-in [:room :entities :falling-ego :opacity] 1)))) + (actions/play-sound entities :falling-ego 0.2) (Thread/sleep 4000) (show-big-bloodclot entities 1000) + + (actions/update-entities entities (fn [e] (-> e (assoc-in [:room :entities :falling-bg :opacity] 1) (assoc-in [:room :entities :falling-ego :opacity] 0) (assoc-in [:room :entities :sword-spin :opacity] 1)))) + (actions/play-sound entities :swoosh 0.5) (Thread/sleep 2000)) (defn do-win [entities won?] @@ -493,6 +499,7 @@ (fall-in entities)) (show-big-bloodclot entities 1000) + (actions/play-sound entities :big-swoosh 0.5) (actions/update-entities entities (fn [e] (-> e @@ -513,12 +520,14 @@ (assoc-in [:room :entities :belly-bottom :opacity] 0)))) (show-big-bloodclot entities 0) (Thread/sleep 1000) + (actions/play-sound entities :impact 0.5) (actions/update-entities entities (fn [e] (-> e (update-in [:room :entities :bloodclot-swallow-top] #(actions/start-animation % :uhoh)) (update-in [:room :entities :bloodclot-swallow-bottom] #(actions/start-animation % :uhoh))))) (Thread/sleep 2000) + (actions/play-sound entities :explode-sound 0.5) (actions/update-entities entities (fn [e] (-> e diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 2623de16..cc7487a8 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -242,13 +242,11 @@ :stand blergh-stand-anim :inhale-sound (utils/load-sound "space/bloodclot-inhale.ogg") :exhale-sound (utils/load-sound "space/bloodclot-exhale.ogg") - :explode-sound (utils/load-sound "space/bloodclot-explode.ogg") + :anim-sound-frames {blergh-stand-anim {0 [:inhale-sound grunt-vol] 1 [:exhale-sound grunt-vol]} - bloodclot-grow {35 [:grow-sound (constantly 0.5)] - 181 [:explode-sound (constantly 0.5)]} - bloodclot-big {35 [:grow-sound (constantly 0.5)] - 181 [:explode-sound (constantly 0.5)]}} + bloodclot-grow {35 [:grow-sound (constantly 0.5)]} + bloodclot-big {35 [:grow-sound (constantly 0.5)]}} :opacity 0.0 :anim blergh-stand-anim :anim-start 0 diff --git a/desktop/src-common/advent/screens/rooms/tongue_fight.clj b/desktop/src-common/advent/screens/rooms/tongue_fight.clj index dc968f27..276369c3 100644 --- a/desktop/src-common/advent/screens/rooms/tongue_fight.clj +++ b/desktop/src-common/advent/screens/rooms/tongue_fight.clj @@ -180,6 +180,12 @@ :update-fn trigger-tongue :ego-hearts 1 :tongue-hearts 5 + :sounds {:swoosh (utils/load-sound "tongue-fight/swoosh.ogg") + :big-swoosh (utils/load-sound "tongue-fight/big-swoosh.ogg") + :impact (utils/load-sound "tongue-fight/impact.ogg") + :explode-sound (utils/load-sound "space/bloodclot-explode.ogg") + :swallow (utils/load-sound "tongue-fight/swallow.ogg") + :falling-ego (utils/load-sound "tongue-fight/falling-ego.ogg")} :entities (into {:penultimate (assoc (utils/atlas->texture atlas "penultimate") :x 0 :y 0 :baseline 2 :scale-x 1 :scale-y 1 :opacity 0) :penultimate-wall (assoc (utils/atlas->texture atlas "penultimate-wall") :x 0 :y 0 :baseline 5 :scale-x 1 :scale-y 1 :opacity 0)