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

prep.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-30 20:02:56 -07:00
parent ca3c04dada
commit de78c56d44
3 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
desktop/src-common/advent/screens/splash.clj
View File

@@ -60,33 +60,51 @@
entities)))) entities))))
(def steps (def steps
[{:can-skip false (-> []
:do (fn [screen entities] (into [{:can-skip false
(fade-in screen entities :dbhlogo identity)) :do (fn [screen entities]
:duration 1.0} (fade-in screen entities :dbhlogo identity))
{:can-skip true :duration 1.0}
:do (fn [screen entities] {:can-skip true
entities) :do (fn [screen entities]
:duration 2.0} entities)
{:can-skip false :duration 2.0}
:do (fn [screen entities] {:can-skip false
(fade-out screen entities :dbhlogo identity)) :do (fn [screen entities]
:duration 2.0} (fade-out screen entities :dbhlogo identity))
{:can-skip true :duration 1.0}])
:do (fn [screen entities]
(utils/play-music (:pop-music entities)) (into (if utils/mobile?
(-> entities [{:can-skip false
(assoc-in [:pop-logo :anim-start] (:total-time screen)) :do (fn [screen entities]
(assoc-in [:pop-logo :anim] (get-in entities [:pop-logo :main-anim])))) (fade-in screen entities :pop-logo identity))
:duration 10.0} :duration 1.0}
{:can-skip false {:can-skip true
:do (fn [screen entities] :do (fn [screen entities]
(utils/stop-music (:pop-music 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) (set-screen! @(resolve 'advent.core/advent) title/title-screen)
entities) entities)
:duration 0.0}]) :duration 0.0})))
(defscreen splash-screen (defscreen splash-screen
@@ -111,7 +129,8 @@
:x 0 :y 0 :x 0 :y 0
:origin-x 0 :origin-y 0 :origin-x 0 :origin-y 0
:scale-x 4 :scale-y 4 :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) :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 :steps steps
:pop-music (utils/make-music "music/POPPixelLogo2Audiomix_mixdown.ogg") :pop-music (utils/make-music "music/POPPixelLogo2Audiomix_mixdown.ogg")

10
desktop/src-common/advent/screens/title.clj
View File

@@ -175,7 +175,6 @@
([msg col] ([msg col]
(make-label msg col utils/title-label-scale)) (make-label msg col utils/title-label-scale))
([msg col scale] ([msg col scale]
(println msg scale)
(let [font (utils/get-font "ego/font.fnt") (let [font (utils/get-font "ego/font.fnt")
p (NinePatchEntity. (skin! (skin "ui/ui.json") :get-patch "ui-bg")) p (NinePatchEntity. (skin! (skin "ui/ui.json") :get-patch "ui-bg"))
@@ -319,7 +318,8 @@
(.addActor (:object (doto (image (.addActor (:object (doto (image
screenshot) screenshot)
(image! :set-size (- cell-w 16) (- cell-h 16))))) (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))) :continue-button continue-button)))
(defn confirm-delete [entities] (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 :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 :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 :row
[(make-button "Keep" :key :dont-delete-button) :width (* utils/ui-scale 120) :height (* utils/button-scale 56)] [(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)]])) [(make-button "Delete" :key :confirm-delete-button) :width (* utils/ui-scale 120) :height (* utils/button-scale 56)]]))

8
desktop/src-common/advent/steam.clj
View File

@@ -45,9 +45,11 @@
(.dispose png))) (.dispose png)))
(defn delete-file [filename] (defn delete-file [filename]
(.delete (if is-app-store? (let [file (if is-app-store?
(files! :external filename) (files! :external filename)
(files! :local filename)))) (files! :local filename))]
(when (.exists file)
(.delete file))))
(defn save-screenshot-file-name [name] (defn save-screenshot-file-name [name]
(str "saves/screenshot-" (clojure.core/name name) ".png" )) (str "saves/screenshot-" (clojure.core/name name) ".png" ))