From 8fe72959d277783b43575190c972536bea3d68f2 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 1 May 2015 17:59:57 -0700 Subject: [PATCH] can only do one at a time. --- .../advent/screens/rooms/inside_castle.clj | 4 +++- desktop/src-common/advent/screens/scene.clj | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index ae45088f..139b60f5 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -76,7 +76,9 @@ "Deal." {:run #(do (actions/update-state entities (fn [state] (assoc state :current-riddle :wool))) (actions/respond entities % - :game-player "Very well. I am studying for next year's derby, and there are a few puzzles that have me stumped." + :game-player "Very well. " + :game-player "I'm studying for next year's derby..." + :game-player "... and there are a few puzzles that have ME stumped." :game-player "If you can bring me the answers to three riddles, I'll give you my trophy." :game-player "Here's the first riddle:" :game-player "'White as snow, but not as cold,\nKeeps you warm, or so I'm told.'" diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index ee567019..866cff7a 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -761,16 +761,17 @@ :on-show-inventory (fn [screen [entities]] (click-inventory screen entities)) :on-menu (fn [screen [entities]] - (-> entities - (assoc-in [:cursor :override] nil) - (assoc-in [:tweens :fade-out-music] - (tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 1.0)) - (assoc-in [:tweens :fade-out] - (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 - :finish #(do (.clear @(resolve 'advent.core/am)) - (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) - (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)) - %))))) + (when-not (get-in entities [:tweens :fade-out]) + (-> entities + (assoc-in [:cursor :override] nil) + (assoc-in [:tweens :fade-out-music] + (tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 1.0)) + (assoc-in [:tweens :fade-out] + (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 + :finish #(do (.clear @(resolve 'advent.core/am)) + (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) + (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)) + %)))))) :on-start-script (fn [{:keys [script]} [entities]] (script entities)