diff --git a/desktop/asset-work/dream/appear.ogg b/desktop/asset-work/dream/appear.ogg new file mode 100644 index 00000000..de2dd420 Binary files /dev/null and b/desktop/asset-work/dream/appear.ogg differ diff --git a/desktop/asset-work/dream/appear.wav b/desktop/asset-work/dream/appear.wav old mode 100755 new mode 100644 index 1342bae5..6cc81a83 Binary files a/desktop/asset-work/dream/appear.wav and b/desktop/asset-work/dream/appear.wav differ diff --git a/desktop/resources/dream/appear.ogg b/desktop/resources/dream/appear.ogg index 88ad886c..de2dd420 100644 Binary files a/desktop/resources/dream/appear.ogg and b/desktop/resources/dream/appear.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index a901d898..ea0e8171 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -504,7 +504,7 @@ :path-start-time 0 :scaled true :magic-sound (utils/load-sound "dream/appear.ogg") - :anim-sound-frames {fairy-godfather-magic-anim {1 [:magic-sound 0.8]}} + :anim-sound-frames {fairy-godfather-magic-anim {1 [:magic-sound (constantly 0.5)]}} :left {:walk fairy-godfather-anim :talk fairy-godfather-talk-anim :stand fairy-godfather-anim diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index ce257a23..203dc8a7 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -242,7 +242,7 @@ void main () (when (and (not (get-in entities [:fg-actions :script-running?])) (= (get-in entities [:cursor :down-target]) (or (:id interacting-entity) (:id interaction) nil))) - ((or (when interacting-entity + ((or (when (and interacting-entity (not (:cursor interaction))) (do (screen! hud :on-start-script) ((:get-script interacting-entity) (get-in entities [:cursor :current]) [x y]))) (when interaction