From e1deb01e0529f6cb005a2d37146279bd5f4a4828 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 28 Jul 2015 18:48:36 -0700 Subject: [PATCH] other tweak. --- desktop/settings.edn | 2 +- .../src-common/advent/screens/rooms/dream.clj | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/desktop/settings.edn b/desktop/settings.edn index 524f31a0..03c7f454 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 39.0, :music-volume 86.0} \ No newline at end of file +{:sound-volume 82.0, :music-volume 86.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index fc0b9b05..03bf194c 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -81,16 +81,19 @@ (defn read-sword-plaque [entities] (actions/walk-to entities :ego [168 76] :face :left) - (actions/talk entities :ego "There's a plaque here.") - (actions/play-animation entities :ego :squat) - (actions/do-dialogue entities - :ego "'A noble choice to be a knight,\nBe a hero, do what's right.'" - :ego "'There's no need to shove,\nTo find your true love,'" - :ego "'Because maidens love guys with might.'" - :ego "Awesome!" - :ego "If I become a knight, maybe Georgia McGorgeous will love me!") - (when-not (get-in @entities [:state :plaques-read :sword]) - (actions/in-love entities)) + + (if-not (get-in @entities [:state :plaques-read :sword]) + (do + (actions/talk entities :ego "There's a plaque here.") + (actions/play-animation entities :ego :squat) + (actions/do-dialogue entities + :ego "'A noble choice to be a knight,\nBe a hero, do what's right.'" + :ego "'There's no need to shove,\nTo find your true love,'" + :ego "'Because maidens love guys with might.'" + :ego "Awesome!" + :ego "If I become a knight, maybe Georgia McGorgeous will love me!") + (actions/in-love entities)) + (actions/talk entities :ego "I can't get through that glass!")) (actions/stop-walking entities :ego :face :right) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) (face-fairy entities) @@ -491,5 +494,5 @@ (if (actions/has-item? entities :shovel) (update-in entities [:room :entities] dissoc :shovel) entities) - (assoc-in entities [:room :wind-sound :id] (sound! (get-in entities [:room :wind-sound :sound]) :loop 0.175)))) + (assoc-in entities [:room :wind-sound :id] (sound! (get-in entities [:room :wind-sound :sound]) :loop 0.2)))) :start-pos [140 55])))