diff --git a/desktop/resources/held/title.png b/desktop/resources/held/title.png new file mode 100644 index 00000000..f2767d53 Binary files /dev/null and b/desktop/resources/held/title.png differ diff --git a/desktop/resources/title.png b/desktop/resources/title.png new file mode 100644 index 00000000..253cf251 Binary files /dev/null and b/desktop/resources/title.png differ diff --git a/desktop/resources/title.psd b/desktop/resources/title.psd new file mode 100644 index 00000000..47883dcc Binary files /dev/null and b/desktop/resources/title.psd differ diff --git a/desktop/resources/ui/slider-bar.png b/desktop/resources/ui/slider-bar.png index 3b41f6b2..aefa98c8 100644 Binary files a/desktop/resources/ui/slider-bar.png and b/desktop/resources/ui/slider-bar.png differ diff --git a/desktop/resources/ui/ui.atlas b/desktop/resources/ui/ui.atlas index 89331bba..5ffd095c 100644 --- a/desktop/resources/ui/ui.atlas +++ b/desktop/resources/ui/ui.atlas @@ -1,12 +1,12 @@ ui.png -size: 128,64 +size: 32,128 format: RGBA8888 filter: Nearest,Nearest repeat: none slider rotate: false - xy: 46, 42 + xy: 2, 2 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -14,14 +14,14 @@ slider index: -1 slider-bar rotate: false - xy: 2, 2 - size: 20, 60 - orig: 20, 60 + xy: 2, 24 + size: 28, 28 + orig: 28, 28 offset: 0, 0 index: -1 slider-bar-hover rotate: false - xy: 24, 2 + xy: 2, 54 size: 20, 60 orig: 20, 60 offset: 0, 0 diff --git a/desktop/resources/ui/ui.png b/desktop/resources/ui/ui.png index 2e479721..ea940363 100644 Binary files a/desktop/resources/ui/ui.png and b/desktop/resources/ui/ui.png differ diff --git a/desktop/settings.edn b/desktop/settings.edn index cc4e8079..08b64432 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 86.0, :music-volume 59.0} \ No newline at end of file +{:sound-volume 64.0, :music-volume 55.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 48732ecd..235be60b 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -37,7 +37,7 @@ s) (defn center [e] - (assoc e :x (- (/ 1280 2) (/ (.getWidth (:object e)) 2)))) + (assoc e :x (- (/ 1280 2) (/ (or (:width e) (.getWidth (:object e))) 2)))) (defscreen title-screen :on-show @@ -46,36 +46,39 @@ (utils/setup-viewport screen 1280 960) (utils/load-settings!) (let [font (utils/get-font "ego/font.fnt") - start-playing (assoc (label "Begin quest" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 300 :height 64 :origin-x 0 :origin-y 0) + start-playing (assoc (label "Begin quest" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 280 :height 64 :origin-x 0 :origin-y 0) start-playing (center start-playing) - quit (assoc (label "End quest" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 65 :height 32 :origin-x 0 :origin-y 0) + quit (assoc (label "End quest" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y (- 280 (* 32 5)) :height 32 :origin-x 0 :origin-y 0) quit (center quit) music (utils/make-music "intro.ogg") - ui-skin (skin "ui/ui.json")] + ui-skin (skin "ui/ui.json") + ] (label! start-playing :set-alignment Align/center) (label! quit :set-alignment Align/center) - {:overlay (assoc (texture "title-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + {:overlay (assoc (texture "title.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) :fade (assoc (texture "black.png") :scale-x 80 :scale-y 80 :opacity 1.0 :origin-x 0 :origin-y 0) + :toolbox (center (assoc (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + :y 90 :width 500 :height 250)) :music-label (-> (label "Music" (style :label font (color 1.0 1.0 1.0 1.0))) - (assoc :x 0 :y 240 :height 32 :origin-x 0 :origin-y 0) + (assoc :x 0 :y (- 280 (* 32 1)) :height 32 :origin-x 0 :origin-y 0) center) :music-volume-slider (-> (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings)) (assoc :x (- (/ 1280 2) 150) :width 300 - :y 195 + :y (- 280 (* 32 2)) :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle))) :sound-label (-> (label "FX" (style :label font (color 1.0 1.0 1.0 1.0))) - (assoc :x 0 :y 150 :height 32 :origin-x 0 :origin-y 0) + (assoc :x 0 :y (- 280 (* 32 3)) :height 32 :origin-x 0 :origin-y 0) center) @@ -83,7 +86,7 @@ :width 300 :x ( - (/ 1280 2) 150) - :y 105 + :y (- 280 (* 32 4)) :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle)) :font font @@ -102,7 +105,7 @@ (let [entities (utils/apply-tweens screen entities (:tweens entities))] (music! (:music entities) :set-volume (utils/current-music-volume (:volume entities))) () - (render! screen [(:overlay entities) (:start-playing entities) (:quit entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:fade entities) ]) + (render! screen [(:overlay entities) (:toolbox entities) (:start-playing entities) (:quit entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:fade entities) ]) entities)) :show-screen (fn [entities]