From de78c56d44dd898323534bbd169062695a3f269f Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 30 May 2017 20:02:56 -0700 Subject: [PATCH] prep. --- desktop/src-common/advent/screens/splash.clj | 73 ++++++++++++-------- desktop/src-common/advent/screens/title.clj | 10 +-- desktop/src-common/advent/steam.clj | 8 ++- 3 files changed, 56 insertions(+), 35 deletions(-) diff --git a/desktop/src-common/advent/screens/splash.clj b/desktop/src-common/advent/screens/splash.clj index dda21bb9..513effe7 100644 --- a/desktop/src-common/advent/screens/splash.clj +++ b/desktop/src-common/advent/screens/splash.clj @@ -60,33 +60,51 @@ entities)))) (def steps - [{:can-skip false - :do (fn [screen entities] - (fade-in screen entities :dbhlogo identity)) - :duration 1.0} - {:can-skip true - :do (fn [screen entities] - entities) - :duration 2.0} - {:can-skip false - :do (fn [screen entities] - (fade-out screen entities :dbhlogo identity)) - :duration 2.0} - {:can-skip true - :do (fn [screen entities] - (utils/play-music (:pop-music entities)) - (-> entities - (assoc-in [:pop-logo :anim-start] (:total-time screen)) - (assoc-in [:pop-logo :anim] (get-in entities [:pop-logo :main-anim])))) - :duration 10.0} - {:can-skip false - :do (fn [screen entities] - (utils/stop-music (:pop-music entities)) + (-> [] + (into [{:can-skip false + :do (fn [screen entities] + (fade-in screen entities :dbhlogo identity)) + :duration 1.0} + {:can-skip true + :do (fn [screen entities] + entities) + :duration 2.0} + {:can-skip false + :do (fn [screen entities] + (fade-out screen entities :dbhlogo identity)) + :duration 1.0}]) - - (set-screen! @(resolve 'advent.core/advent) title/title-screen) - entities) - :duration 0.0}]) + (into (if utils/mobile? + [{:can-skip false + :do (fn [screen entities] + (fade-in screen entities :pop-logo identity)) + :duration 1.0} + {:can-skip true + :do (fn [screen entities] + entities) + :duration 2.0} + {:can-skip false + :do (fn [screen entities] + (fade-out screen entities :pop-logo identity)) + :duration 1.0}] + + [{:can-skip true + :do (fn [screen entities] + (utils/play-music (:pop-music entities)) + (-> entities + (assoc-in [:pop-logo :anim-start] (:total-time screen)) + (assoc-in [:pop-logo :anim] (get-in entities [:pop-logo :main-anim])))) + :duration 10.0}])) + + (conj {:can-skip false + :do (fn [screen entities] + (when-not utils/mobile? + (utils/stop-music (:pop-music entities))) + + + (set-screen! @(resolve 'advent.core/advent) title/title-screen) + entities) + :duration 0.0}))) (defscreen splash-screen @@ -111,7 +129,8 @@ :x 0 :y 0 :origin-x 0 :origin-y 0 :scale-x 4 :scale-y 4 - :z 1) + :z 1 + :opacity (if utils/mobile? 0.0 1.0)) :dbhlogo (assoc (utils/atlas->texture splash-atlas "dbh.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :scale-x 4 :scale-y 4 :z 1 :opacity 0.0) :steps steps :pop-music (utils/make-music "music/POPPixelLogo2Audiomix_mixdown.ogg") diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 9eb23c03..48a0be4c 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -175,7 +175,6 @@ ([msg col] (make-label msg col utils/title-label-scale)) ([msg col scale] - (println msg scale) (let [font (utils/get-font "ego/font.fnt") p (NinePatchEntity. (skin! (skin "ui/ui.json") :get-patch "ui-bg")) @@ -319,7 +318,8 @@ (.addActor (:object (doto (image screenshot) (image! :set-size (- cell-w 16) (- cell-h 16))))) - (.addActor (:object (make-label (str "" (or blurb name)) label-color ))) + (.addActor (:object (doto (make-label (str "" (or blurb name)) label-color 0.25) + (label! :set-alignment Align/bottomLeft)))) )) @@ -355,11 +355,11 @@ :continue-button continue-button))) (defn confirm-delete [entities] - (make-table [[(make-label "Are you sure you want" label-color) :height (* utils/ui-scale 32) :colspan 2] + (make-table [[(make-label "Are you sure you want" label-color 0.25) :height (* utils/ui-scale 32) :colspan 2] :row - [(make-label "to delete the save" label-color) :height (* utils/ui-scale 32) :colspan 2] + [(make-label "to delete the save" label-color 0.25) :height (* utils/ui-scale 32) :colspan 2] :row - [(make-label (str "\"" (-> entities :selected-save :name) "\"?") label-color) :height (* utils/ui-scale 32) :colspan 2 :pad-bottom 4] + [(make-label (str "\"" (-> entities :selected-save :name) "\"?") label-color 0.25) :height (* utils/ui-scale 32) :colspan 2 :pad-bottom 4] :row [(make-button "Keep" :key :dont-delete-button) :width (* utils/ui-scale 120) :height (* utils/button-scale 56)] [(make-button "Delete" :key :confirm-delete-button) :width (* utils/ui-scale 120) :height (* utils/button-scale 56)]])) diff --git a/desktop/src-common/advent/steam.clj b/desktop/src-common/advent/steam.clj index a29a4da0..63418993 100644 --- a/desktop/src-common/advent/steam.clj +++ b/desktop/src-common/advent/steam.clj @@ -45,9 +45,11 @@ (.dispose png))) (defn delete-file [filename] - (.delete (if is-app-store? - (files! :external filename) - (files! :local filename)))) + (let [file (if is-app-store? + (files! :external filename) + (files! :local filename))] + (when (.exists file) + (.delete file)))) (defn save-screenshot-file-name [name] (str "saves/screenshot-" (clojure.core/name name) ".png" ))