diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index f9b2ba59..260aa864 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -82,7 +82,7 @@ (fade-in entities) (Thread/sleep 100) (actions/talk entities :fairy-godfather "-daaaaaaaaaaaaa!") - (Thread/sleep 1500) + (Thread/sleep 2500) (actions/do-dialogue entities :ego "Umm... What was that all about?" :fairy-godfather "Welcome, young Tick, to the pit of fate." :ego "Err, who are you?" @@ -96,6 +96,7 @@ (particle-effect! (get-in @entities [:room :entities :magic]) :start) (fade-in-tools entities) + (Thread/sleep 2500) (actions/do-dialogue entities :ego "What are these things?" :fairy-godfather "These, young Tick, represent the potential destinies for your life." :fairy-godfather "They have been selected since the dawn of time." @@ -146,7 +147,7 @@ (assoc (texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) (assoc (texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) (assoc (texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] - :entities {:magic (assoc (particle-effect "dream/magic") :x 160 :y 0 :baseline 240) + :entities {:magic (assoc (particle-effect "dream/magic") :x 160 :y 80 :baseline 240) :clouds (assoc (particle-effect "dream/cloudy2") :x 160 :y 120 :baseline 241) :sword (assoc (texture "dream/sword.png") :x 144 :y 122 :baseline 139 diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 09cb22be..da833b38 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -681,7 +681,8 @@ (:button screen)) (assoc-in entities [:cursor :current] :main) (when (and (get-in entities [:state :active?]) - (not (get-in entities [:state :hud-active?]))) + (not (get-in entities [:state :hud-active?])) + (= 0.0 (get-in entities [:fade :opacity]))) (left-click screen entities))))) :on-deactivate (fn [screen [entities]]