diff --git a/desktop/resources/inside-antique/fire-1.ogg b/desktop/resources/inside-antique/fire-1.ogg new file mode 100644 index 00000000..4809cc08 Binary files /dev/null and b/desktop/resources/inside-antique/fire-1.ogg differ diff --git a/desktop/resources/inside-antique/fire-1.wav b/desktop/resources/inside-antique/fire-1.wav new file mode 100644 index 00000000..d75fe9ef Binary files /dev/null and b/desktop/resources/inside-antique/fire-1.wav differ diff --git a/desktop/resources/inside-antique/fire-2.ogg b/desktop/resources/inside-antique/fire-2.ogg new file mode 100644 index 00000000..1265a3b0 Binary files /dev/null and b/desktop/resources/inside-antique/fire-2.ogg differ diff --git a/desktop/resources/inside-antique/fire-2.wav b/desktop/resources/inside-antique/fire-2.wav new file mode 100644 index 00000000..fb71bf8e Binary files /dev/null and b/desktop/resources/inside-antique/fire-2.wav differ diff --git a/desktop/resources/inside-antique/fire-3.ogg b/desktop/resources/inside-antique/fire-3.ogg new file mode 100644 index 00000000..a5ee025d Binary files /dev/null and b/desktop/resources/inside-antique/fire-3.ogg differ diff --git a/desktop/resources/inside-antique/fire-3.wav b/desktop/resources/inside-antique/fire-3.wav new file mode 100644 index 00000000..9f68bc8a Binary files /dev/null and b/desktop/resources/inside-antique/fire-3.wav differ diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 1a854290..a62f7294 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -156,6 +156,7 @@ (actions/talk entities :ego "All of these trinkets seem too bulky to fit in my pack."))} :flowers {:box [171 125 181 155] :script (actions/get-script entities + (actions/update-state entities (fn [s] (assoc s :mints-eaten 0))) (actions/talk entities :ego "I've never been a fan of flowers."))} :lian {:box [272 100 313 160] :script (actions/get-script entities @@ -196,6 +197,7 @@ (actions/talk entities :ego "I'll just try one of these mints.") (actions/play-animation entities :ego :reach) (actions/update-state entities (fn [s] (assoc s :mints-eaten (inc (s :mints-eaten))))) + (sound! (sound (str "inside-antique/fire-" (get-in @entities [:state :mints-eaten]) ".ogg")) :play) (actions/play-animation entities :ego [:fire (get-in @entities [:state :mints-eaten])]) (actions/talk entities :ego "WOWZA! Those are hot.") (when (= 3 (get-in @entities [:state :mints-eaten])) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index c2460ca0..33b3a03b 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -115,11 +115,11 @@ (texture (aget cat-toy-sheet 0 i)))) cat-toy-last-half (animation 0.1 (for [i [3 3 3 2 1 1 0 0]] (texture (aget cat-toy-sheet 0 i)))) - fire-1-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 1 0]] + fire-1-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 2 2 2 2 2 2 2 1 0]] (texture (aget fire-sheet 0 i)))) - fire-2-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 2 2 2 2 2 1 0]] + fire-2-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 2 2 2 2 4 4 4 5 6 7 4 4 4 2 2 2 2 2 2 2 2 1 0]] (texture (aget fire-sheet 0 i)))) - fire-3-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 8 9 10 11 2 2 2 2 2 2 2 2 0]] + fire-3-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 2 2 2 4 4 4 4 4 4 5 6 7 4 4 4 4 4 8 9 10 11 4 4 4 2 2 2 2 2 2 2 2 0]] (texture (aget fire-sheet 0 i)))) grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0 0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]] (texture (aget grow-sheet 0 i))))