This commit is contained in:
Bryce Covert
2016-08-01 18:36:05 -07:00
parent 9139a37119
commit 0a3b10b221
11 changed files with 96 additions and 64 deletions

View File

@@ -17,9 +17,9 @@
InputMultiplexer InputProcessor Net Preferences Screen]))
(defn close [screen entities]
(defn close [screen entities script-started?]
(log/info "closing inventory")
(screen! @(resolve 'advent.screens.scene/scene) :on-reactivate)
(screen! @(resolve 'advent.screens.scene/scene) :on-reactivate :script-started? script-started?)
(-> 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)))))
@@ -44,8 +44,8 @@
(screen! @(resolve 'advent.screens.scene/scene) :on-chose-item :item highlighted-item)
(when-let [interaction-script ((or (:scripts highlighted-item) (constantly nil)) (:value current-cursor))]
(interaction-script room-entities)
(close screen entities)))
(close screen entities))))
(close screen entities true)))
(close screen entities false))))
(defn right-click [screen entities]
(let [{:keys [highlighted-item]} entities