diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index 5ccd1cb3..4e9886c2 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -51,7 +51,7 @@ opacity (get-in entities [:opacity]) entities (-> entities (assoc-in [:overlay :opacity] opacity) - (assoc-in [:fade :opacity] (* 0.3 opacity)) + (assoc-in [:fade :opacity] (* 0.6 opacity)) (assoc-in [:highlighted-text :opacity] opacity) (update-in [:items] (fn [i] (map #(assoc % :opacity opacity) i))))] diff --git a/desktop/src-common/advent/screens/safe.clj b/desktop/src-common/advent/screens/safe.clj index 19291d5e..05649fac 100644 --- a/desktop/src-common/advent/screens/safe.clj +++ b/desktop/src-common/advent/screens/safe.clj @@ -54,27 +54,20 @@ (assoc inputed-key :x (+ start-x 10 (* i 12)) :y (+ start-y 56)))) - :start-showing? false :shown? false})) :on-render (fn [screen [entities]] - (let [entities (if (:start-showing? entities) - (-> entities - (assoc :start-showing? false) - (assoc :shown? true)) - entities)] - - (when (:shown? entities) - (render! screen [(:fade entities) (:safe entities)]) - (render! screen (take (count (:button-choices entities)) (:entered-keys entities)))) - entities)) + (when (:shown? entities) + (render! screen [(:fade entities) (:safe entities)]) + (render! screen (take (count (:button-choices entities)) (:entered-keys entities)))) + entities) :show-screen (fn [{:keys [success failure]} [entities]] (sound! (sound "inside-house/open-safe.ogg") :play (utils/current-sound-volume)) (assoc entities - :start-showing? true + :shown? true :button-choices [] :success success :failure failure)) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 160b6b74..73a53320 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -68,7 +68,6 @@ :font font :music music :volume 1.0 - :start-showing? false :start-playing start-playing :quit quit :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0