diff --git a/desktop/asset-work/wizard/drip.ogg b/desktop/asset-work/wizard/drip.ogg new file mode 100644 index 00000000..7c198c10 Binary files /dev/null and b/desktop/asset-work/wizard/drip.ogg differ diff --git a/desktop/asset-work/wizard/drip.wav b/desktop/asset-work/wizard/drip.wav new file mode 100644 index 00000000..8246091f Binary files /dev/null and b/desktop/asset-work/wizard/drip.wav differ diff --git a/desktop/asset-work/wizard/explode.ogg b/desktop/asset-work/wizard/explode.ogg new file mode 100644 index 00000000..949f0cd6 Binary files /dev/null and b/desktop/asset-work/wizard/explode.ogg differ diff --git a/desktop/asset-work/wizard/explode.wav b/desktop/asset-work/wizard/explode.wav new file mode 100644 index 00000000..769c0178 Binary files /dev/null and b/desktop/asset-work/wizard/explode.wav differ diff --git a/desktop/resources/wizard/drip.ogg b/desktop/resources/wizard/drip.ogg new file mode 100644 index 00000000..7c198c10 Binary files /dev/null and b/desktop/resources/wizard/drip.ogg differ diff --git a/desktop/resources/wizard/explode.ogg b/desktop/resources/wizard/explode.ogg new file mode 100644 index 00000000..88448cf4 Binary files /dev/null and b/desktop/resources/wizard/explode.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 94cc1d42..2084565b 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -230,6 +230,13 @@ :experiment (rooms/make-entity :experiment (assoc (animation->texture screen experiment-left) :x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 13 :origin-y 0 :experiment experiment-left + :drip-sound (utils/load-sound "wizard/drip.ogg") + :explode-sound (utils/load-sound "wizard/explode.ogg") + :anim-sound-frames {experiment-left {31 [:drip-sound 0.5] + 67 [:drip-sound 0.5] + 73 [:explode-sound (constantly 0.8)] + }} + :baseline 225)) :collision "inside-house/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 7f2087fa..7c0fa18a 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -633,7 +633,7 @@ (actions/talk entities :ego "It's locked.") (do (actions/play-animation entities :door :open) (actions/transition-background entities :inside-house [237 0] :between (fn [s e] - (if (= 1 (rand-int 4)) + (if (= 1 (rand-int 2)) (assoc-in e [:room :entities :experiment] (get-in e [:room :experiment])) e))) (when (get-in @entities [:room :entities :experiment])