diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 823c76cb..3f089e56 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -16,7 +16,6 @@ IOS AUDIO + blink + scratch - + candles + magic hands + gandarf explosion + crying diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index aaf12417..32c8c0ca 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -540,7 +540,7 @@ (defn give [entities item] (run-action entities (begin [this screen entities] - (sound! (utils/load-sound "pickup.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "pickup.ogg") :play (utils/current-sound-volume 0.3)) (-> entities (update-in [:state :inventory] #(conj % item)) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index 7eeffcc2..199543af 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -355,6 +355,8 @@ :stand grandma-stand :squat-1 grandma-squat-1 :squat-2 grandma-squat-2 + :anim-sound-frames {grandma-stand {15 [:blink 0.2 1.6]} + grandma-talk {11 [:blink 0.2 1.6]}} :talk-color (color 1.0 0.4 0.9 1.0) :origin-x 13 diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index cbfd6865..f12e14f2 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -34,14 +34,16 @@ wizard-magic-hands (utils/make-anim "wizard/magic-hands.png" [20 50] 0.2 (range 2)) wizard-disappear (utils/make-anim "wizard/disappear.png" [20 46] 0.075 (range 19)) wizard-talk (animation 0.2 (for [i [0 2 0 2 1 2 0 3 0 2 0 1 0 2]] - (aget wizard-sheet 0 i)))] + (aget wizard-sheet 0 i))) + wizard-talk-left (utils/flip wizard-talk) + wizard-stand-left (utils/flip wizard-stand) + wizard-talk-angry-left (utils/flip wizard-talk-angry)] (actions/start-animation screen (merge (assoc (animation->texture screen wizard-stand) - :left {:talk (utils/flip wizard-talk) - :stand (utils/flip wizard-stand) + :left {:talk wizard-talk-left + :stand wizard-stand-left :disappear (utils/flip wizard-disappear) - :magic-hands (utils/flip wizard-magic-hands) - :talk-angry (utils/flip wizard-talk-angry) + :talk-angry wizard-talk-angry-left } :right {:talk wizard-talk :stand wizard-stand @@ -49,6 +51,16 @@ :talk-angry wizard-talk-angry :magic-hands wizard-magic-hands } + :anim-sound-frames {wizard-stand {11 [:blink 0.15 0.7]} + wizard-talk {11 [:blink 0.15 0.7] + 4 [:blink 0.15 0.7]} + wizard-talk-angry {11 [:blink 0.15 0.7] + 4 [:blink 0.15 0.7]} + wizard-stand-left {11 [:blink 0.15 0.7]} + wizard-talk-left {11 [:blink 0.15 0.7] + 4 [:blink 0.15 0.7]} + wizard-talk-angry-left {11 [:blink 0.15 0.7] + 4 [:blink 0.15 0.7]}} :night-profile :sprite :origin-x 0 :origin-y 0