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

intro music will start as wind again.

Browse Source
This commit is contained in:
Bryce Covert
2017-07-22 08:23:06 -07:00
parent 7857c8cf09
commit 009f1d920a
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src-common/advent/screens/inventory.clj
View File

@@ -28,7 +28,7 @@
(screen! @(resolve 'advent.screens.scene/hud) :on-reactivate { :script-started? script-started? :item selected-item}) (screen! @(resolve 'advent.screens.scene/hud) :on-reactivate { :script-started? script-started? :item selected-item})
(-> entities (-> entities
(assoc-in [:tweens :fade-out] (tween/tween :fade-out screen [:opacity] 1.0 0.0 0.2 :ease tween/ease-out-cubic (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] (defn mouse-down [screen entities options]
(when (interactable? entities) (when (interactable? entities)
@@ -80,7 +80,7 @@
(> (- (:total-time screen) (:down-time entities)) 0.5) (> (- (:total-time screen) (:down-time entities)) 0.5)
(= selected-item hovered-item) (= selected-item hovered-item)
dragged?) dragged?)
(dissoc entities :selected-item :dragged?) (dissoc entities :selected-item :hovered-item :dragged?)
(and (or (not hovered-item) (= selected-item hovered-item))) (and (or (not hovered-item) (= selected-item hovered-item)))
(do (screen! @(resolve 'advent.screens.scene/scene) :on-chose-item { :item selected-item}) (do (screen! @(resolve 'advent.screens.scene/scene) :on-chose-item { :item selected-item})
@@ -138,6 +138,7 @@
:on-render :on-render
(fn [{:keys [^FitViewport viewport] :as screen} {:keys [shown? tweens] :as entities} options] (fn [{:keys [^FitViewport viewport] :as screen} {:keys [shown? tweens] :as entities} options]
(.apply viewport) (.apply viewport)
(let [entities (utils/apply-tweens screen entities tweens) (let [entities (utils/apply-tweens screen entities tweens)
opacity (get-in entities [:opacity]) opacity (get-in entities [:opacity])
@@ -165,6 +166,7 @@
:show-screen (fn [screen entities {:keys [items]}] :show-screen (fn [screen entities {:keys [items]}]
(log/info "showing inventory") (log/info "showing inventory")
(when-not (:shown? entities) (when-not (:shown? entities)
(label! (entities :hovered-text) :set-text "") (label! (entities :hovered-text) :set-text "")
(-> entities (-> entities
(assoc-in [:hovered-text :text] "") (assoc-in [:hovered-text :text] "")

2
desktop/src-common/advent/screens/rooms/outside_jail.clj
View File

@@ -299,7 +299,7 @@
(actions/remove-entity entities :alarm-clock) (actions/remove-entity entities :alarm-clock)
(actions/give 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 :x 197 :y 94 :baseline 146
:open open-stash :open open-stash
:close close-stash)) :close close-stash))

2
desktop/src-common/advent/screens/scene.clj
View File

@@ -886,7 +886,7 @@
{:object nil {:object nil
:active? true :active? true
:last-room :dream :last-room :dream
:time :day :time :intro
:obtained-items #{} :obtained-items #{}
:inventory [] :inventory []
:plaques-read #{} :plaques-read #{}

2
ios/Info.plist.xml
View File

@@ -21,7 +21,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>123</string> <string>124</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>8.0</string> <string>8.0</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>