From cf0a83ff023da096c6c0ed868f2edec809b45cfe Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Wed, 22 Apr 2015 17:49:40 -0700
Subject: [PATCH] tweask.

---
 desktop/settings.edn                              | 2 +-
 desktop/src-common/advent/actions.clj             | 2 +-
 desktop/src-common/advent/screens/rooms/dream.clj | 1 +
 desktop/src-common/advent/screens/scene.clj       | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/desktop/settings.edn b/desktop/settings.edn
index fd0b39bf..e82fda4d 100644
--- a/desktop/settings.edn
+++ b/desktop/settings.edn
@@ -1 +1 @@
-{:sound-volume 44.0, :music-volume 70.0}
\ No newline at end of file
+{:sound-volume 44.0, :music-volume 0.0}
\ No newline at end of file
diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj
index 9dc8286e..5dafcda1 100644
--- a/desktop/src-common/advent/actions.clj
+++ b/desktop/src-common/advent/actions.clj
@@ -335,7 +335,7 @@
       (do-stop entities :ego :face face))))
 
 (defn get-text-duration [text]
-  (* (count (s/split text #" ")) 0.5))
+  (max 1.5 (* (count (s/split text #" ")) 0.5)))
 
 (defn talk [entities target-id text & {:keys [stop? animate? anim]}]
   (let [initial-time (atom nil)
diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj
index 64cb8769..e4cb7c30 100644
--- a/desktop/src-common/advent/screens/rooms/dream.clj
+++ b/desktop/src-common/advent/screens/rooms/dream.clj
@@ -328,6 +328,7 @@
                                                                                      (actions/remove-item entities :dream-sword)
                                                                                      (actions/remove-item entities :broom)
                                                                                      (actions/remove-item entities :shovel)
+                                                                                     (actions/resume-camera entities)
                                                                                      (actions/transition-background entities  :inside-castle [79 145] :time 5.0)
                                                                                      (actions/walk-to entities :ego [159 74])
                                                                                      (actions/do-dialogue entities
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 3f97d88b..10034c29 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -367,6 +367,7 @@
                    :anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
                                  (get-in ego [:left :swing-shovel]) {:origin-x 26}
                                  (get-in ego [:right :swing-shovel]) {:origin-x 26}
+                                 (get-in ego [:left :love]) {:origin-x 36}
                                  :default {:origin-x 9}})]
     (actions/start-animation screen
                              (merge (animation->texture screen (:stand (:right ego))) ego)