From 009f1d920a120f2286cb4852d3bdac0a5ea4261f Mon Sep 17 00:00:00 2001
From: Bryce Covert <git@brycecovertoperations.com>
Date: Sat, 22 Jul 2017 08:23:06 -0700
Subject: [PATCH] intro music will start as wind again.

---
 desktop/src-common/advent/screens/inventory.clj          | 6 ++++--
 desktop/src-common/advent/screens/rooms/outside_jail.clj | 2 +-
 desktop/src-common/advent/screens/scene.clj              | 2 +-
 ios/Info.plist.xml                                       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj
index ee53523d..f70a51a1 100644
--- a/desktop/src-common/advent/screens/inventory.clj
+++ b/desktop/src-common/advent/screens/inventory.clj
@@ -28,7 +28,7 @@
   (screen! @(resolve 'advent.screens.scene/hud) :on-reactivate { :script-started? script-started? :item selected-item})
   (-> entities
       (assoc-in [:tweens :fade-out] (tween/tween :fade-out screen [:opacity] 1.0 0.0 0.2 :ease tween/ease-out-cubic
-                                                 :finish #(assoc % :shown? false)))))
+                                                 :finish #(assoc % :shown? false :hovered-item nil :selected-item nil)))))
 
 (defn mouse-down [screen entities options]
   (when (interactable? entities)
@@ -80,7 +80,7 @@
            (> (- (:total-time screen) (:down-time entities)) 0.5)
            (= selected-item hovered-item)
                dragged?)
-          (dissoc entities :selected-item :dragged?)
+          (dissoc entities :selected-item :hovered-item :dragged?)
 
           (and (or (not hovered-item) (= selected-item hovered-item)))
           (do (screen! @(resolve 'advent.screens.scene/scene) :on-chose-item { :item selected-item})
@@ -138,6 +138,7 @@
 
   :on-render
   (fn [{:keys [^FitViewport viewport] :as screen} {:keys [shown? tweens] :as entities} options]
+    
     (.apply viewport)
     (let [entities (utils/apply-tweens screen entities tweens)
           opacity (get-in entities [:opacity])
@@ -165,6 +166,7 @@
   :show-screen (fn [screen entities {:keys [items]}]
                  (log/info "showing inventory")
                  (when-not (:shown? entities)
+                   
                    (label! (entities :hovered-text) :set-text "")
                    (-> entities
                        (assoc-in [:hovered-text :text] "")
diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj
index eaf3475a..e7bd5424 100644
--- a/desktop/src-common/advent/screens/rooms/outside_jail.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj
@@ -299,7 +299,7 @@
                                                                                      (actions/remove-entity entities :alarm-clock)
                                                                                      (actions/give entities :alarm-clock)))) 
 
-                :stash (rooms/make-entity :stash (assoc (animation->texture screen open-stash)
+                :stash (rooms/make-entity :stash (assoc (animation->texture (assoc  screen :total-time 0) open-stash)
                                                    :x 197 :y 94 :baseline 146
                                                    :open open-stash
                                                    :close close-stash))
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index fd8f3ff9..71812786 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -886,7 +886,7 @@
     {:object nil
      :active? true
      :last-room :dream
-     :time :day
+     :time :intro
      :obtained-items #{}
      :inventory []
      :plaques-read #{}
diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml
index ddd93d95..a56931eb 100644
--- a/ios/Info.plist.xml
+++ b/ios/Info.plist.xml
@@ -21,7 +21,7 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>123</string>
+    <string>124</string>
     <key>MinimumOSVersion</key>
     <string>8.0</string>
     <key>LSRequiresIPhoneOS</key>