diff --git a/desktop/src-common/advent/saves.clj b/desktop/src-common/advent/saves.clj index 08a6c366..887e3674 100644 --- a/desktop/src-common/advent/saves.clj +++ b/desktop/src-common/advent/saves.clj @@ -9,10 +9,10 @@ (def chapter-name - {:chapter-1 "Chapter 1: Our tale's beginning" - :chapter-2 "Chapter 2: To be a knight" - :chapter-3 "Chapter 3: In the slammer" - :chapter-4 "Chapter 4: Prisoner on the loose" - :chapter-5 "Chapter 5: Slingshot stew"}) + {:chapter-1 "Part 1: Our tale's beginning" + :chapter-2 "Part 2: To be a knight" + :chapter-3 "Part 3: In the slammer" + :chapter-4 "Part 4: Tick the ex-con" + :chapter-5 "Part 5: Slingshot stew"}) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 517c3e3b..0006b32b 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -206,18 +206,22 @@ ]))) (defn chapters-menu [] - (let [chapters (utils/get-chapters)] - (make-table - (concat (mapcat identity - (for [chapter [:chapter-1 :chapter-2 :chapter-3 :chapter-4 :chapter-5]] - [[(doto (make-button (if (chapter chapters) - (saves/chapter-name chapter) - "---") - :chapter (chapter chapters)) - (text-button! :set-disabled (nil? (chapter chapters)))) :height 56 :pad-bottom 4] - :row])) - [ - [ (make-button "Back" :key :back) :height 56]])))) + (let [chapters (utils/get-chapters) + chapter-table (table + (mapcat identity + (for [chapter [:chapter-1 :chapter-2 :chapter-3 :chapter-4 :chapter-5]] + [[(doto (make-button (if (chapter chapters) + (saves/chapter-name chapter) + "---") + :chapter (chapter chapters)) + (text-button! :set-disabled (nil? (chapter chapters)))) :height 56 :pad-bottom 4 :width 400] + :row])))] + + (make-table [[(doto (scroll-pane chapter-table + (skin "ui/ui.json")) + (scroll-pane! :set-fade-scroll-bars false)) :height 240 :width 476] + :row + [ (make-button "Back" :key :back) :height 56]]))) (defn get-selected-save [entities [x y]] (first (filter @@ -253,11 +257,11 @@ (mapcat (fn [group] (conj (map make-cell group) :row)))) scroll-pane (doto (scroll-pane (table grouped-screenshots) - (skin "ui/ui.json")) - (scroll-pane! :set-fade-scroll-bars false))] + (skin "ui/ui.json")) + (scroll-pane! :set-fade-scroll-bars false))] (.setScrollFocus stage (:object scroll-pane)) [scroll-pane - :colspan 3 :height 224 :width 476])) + :colspan 3 :height 212 :pad-bottom 4 :width 476])) (defn saves-menu [entities stage] (let [save-label (make-label "" label-color) @@ -269,9 +273,9 @@ :row (saves-table entities stage) :row - [delete-button :width 100 :height 56] - [(make-button "Back" :key :back) :width 100 :height 56] - [continue-button :width 100 :height 56]]) + [delete-button :width 150 :height 56] + [(make-button "Back" :key :back) :width 150 :height 56] + [continue-button :width 150 :height 56]]) :save-label save-label :delete-button delete-button :continue-button continue-button))) @@ -281,10 +285,10 @@ :row [(make-label "to delete the save" label-color) :height 32 :colspan 2] :row - [(make-label (str "\"" (-> entities :selected-save :name) "\"?") label-color) :height 32 :colspan 2] + [(make-label (str "\"" (-> entities :selected-save :name) "\"?") label-color) :height 32 :colspan 2 :pad-bottom 4] :row - [(make-button "Keep" :key :dont-delete-button) :width 100] - [(make-button "Delete" :key :confirm-delete-button) :width 100]])) + [(make-button "Keep" :key :dont-delete-button) :width 120 :height 56] + [(make-button "Delete" :key :confirm-delete-button) :width 120 :height 56]])) (defscreen title-screen :on-show