notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

source of truth comes from inventory for which item is selected.

Browse Source
This commit is contained in:
Bryce Covert
2016-08-03 19:35:17 -07:00
parent 62c9ceb5f9
commit 197165b663
5 changed files with 35 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/src-common/advent/actions.clj
View File

@@ -472,10 +472,7 @@
(run-action entities
(begin [this screen entities]
(screen! dialogue/choice-screen :on-present-choices :choices dialogue-choices :callback #(reset! selected-index %))
(screen! @(resolve 'advent.screens.scene/scene) :on-deactivate)
(-> entities
(assoc-in [:cursor :override] nil)
(assoc-in [:cursor :current] :main)))
(assoc-in entities [:state :active?] false))
(continue [this screen entities] entities)
@@ -483,9 +480,7 @@
(not (nil? @selected-index)))
(terminate [this screen entities]
(-> entities
(assoc-in [:state :active?] true)
(assoc-in [:cursor :override] nil)))
(assoc-in entities [:state :active?] true))
(skip-type [this screen entities]
:none))
@@ -677,8 +672,7 @@
(assoc-in e [:tweens :fade-out] (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 time))
(if music-changed?
(assoc-in e [:tweens :fade-out-music] (tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 time))
e)
(assoc-in e [:cursor :current] :main)))
e)))
(continue [this screen entities]
entities)