diff --git a/desktop/asset-work/close.png b/desktop/asset-work/close.png index 8eba4216..7a50590e 100644 Binary files a/desktop/asset-work/close.png and b/desktop/asset-work/close.png differ diff --git a/desktop/asset-work/save.png b/desktop/asset-work/save.png new file mode 100644 index 00000000..289371b1 Binary files /dev/null and b/desktop/asset-work/save.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 9c953665..7c86d51d 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -81,13 +81,6 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -ego/dot - rotate: false - xy: 1020, 941 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 inside-house/dot rotate: false xy: 1020, 941 @@ -95,13 +88,6 @@ inside-house/dot orig: 1, 1 offset: 0, 0 index: -1 -wizard/dot - rotate: false - xy: 1020, 941 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 title/dot rotate: false xy: 1020, 941 @@ -123,7 +109,7 @@ dream/dot orig: 1, 1 offset: 0, 0 index: -1 -outsidehouse/dot +ego/dot rotate: false xy: 1020, 941 size: 1, 1 @@ -137,6 +123,20 @@ inside-antique/dot orig: 1, 1 offset: 0, 0 index: -1 +outsidehouse/dot + rotate: false + xy: 1020, 941 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +wizard/dot + rotate: false + xy: 1020, 941 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 cat-tree/grandma rotate: false xy: 732, 661 @@ -347,14 +347,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 1020, 938 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 1020, 938 size: 1, 1 @@ -703,16 +703,9 @@ castle-gate/coinflip orig: 50, 10 offset: 0, 0 index: -1 -castle-gate/goon-2 - rotate: false - xy: 997, 742 - size: 24, 32 - orig: 24, 32 - offset: 0, 0 - index: -1 castle-gate/goon-2-flip rotate: false - xy: 973, 833 + xy: 973, 793 size: 48, 32 orig: 48, 32 offset: 0, 0 @@ -740,7 +733,7 @@ cat-tree/brush-l index: -1 cat-tree/cat-stand rotate: false - xy: 329, 6 + xy: 312, 6 size: 198, 11 orig: 198, 11 offset: 0, 0 @@ -761,14 +754,14 @@ close index: -1 cloud rotate: false - xy: 312, 2 + xy: 1006, 10 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 space/cloud rotate: false - xy: 312, 2 + xy: 1006, 10 size: 15, 15 orig: 15, 15 offset: 0, 0 @@ -794,13 +787,6 @@ dream/background orig: 320, 240 offset: 0, 0 index: -1 -dream/case - rotate: false - xy: 729, 4 - size: 15, 38 - orig: 15, 38 - offset: 0, 0 - index: -1 dream/fairy-godfather rotate: false xy: 2, 913 @@ -815,13 +801,6 @@ dream/shovel orig: 19, 64 offset: 0, 0 index: -1 -dream/sword - rotate: false - xy: 1006, 5 - size: 15, 38 - orig: 15, 38 - offset: 0, 0 - index: -1 ego/Untitled rotate: false xy: 900, 591 @@ -964,7 +943,7 @@ inside-antique/shopkeep index: -1 inside-antique/teddy rotate: false - xy: 816, 264 + xy: 1006, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1083,7 +1062,7 @@ outside-castle/note index: -1 outside-jail/axe rotate: false - xy: 973, 741 + xy: 729, 9 size: 22, 33 orig: 22, 33 offset: 0, 0 @@ -1130,6 +1109,13 @@ pathfind-test orig: 16, 16 offset: 0, 0 index: -1 +save + rotate: false + xy: 816, 264 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 space/Blergh rotate: false xy: 464, 687 @@ -1214,20 +1200,27 @@ title/screenshot-backdrop orig: 48, 38 offset: 0, 0 index: -1 -wizard/experiment-2 +title/screenshot-backdrop-active rotate: false - xy: 973, 776 - size: 45, 55 - orig: 45, 55 + xy: 973, 827 + size: 48, 38 + orig: 48, 38 offset: 0, 0 index: -1 -wizard/experiment-3 +wizard/experiment-2 rotate: false xy: 265, 5 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 +wizard/magic-hands + rotate: false + xy: 973, 741 + size: 40, 50 + orig: 40, 50 + offset: 0, 0 + index: -1 pack3.png size: 1024,1024 @@ -1626,28 +1619,28 @@ wizard/cloud orig: 40, 30 offset: 0, 0 index: -1 -wizard/experiment-4 +wizard/experiment-3 rotate: false xy: 968, 628 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-5 +wizard/experiment-4 rotate: false xy: 277, 117 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-6 +wizard/experiment-5 rotate: false xy: 973, 571 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-7 +wizard/experiment-6 rotate: false xy: 973, 514 size: 45, 55 @@ -1674,6 +1667,13 @@ castle-gate/Untitled orig: 192, 35 offset: 0, 0 index: -1 +castle-gate/goon-2 + rotate: false + xy: 988, 6 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 castle-gate/goon-2-search rotate: false xy: 378, 7 @@ -1681,13 +1681,6 @@ castle-gate/goon-2-search orig: 192, 32 offset: 0, 0 index: -1 -castle-gate/goon-2-talk - rotate: false - xy: 968, 2 - size: 24, 32 - orig: 24, 32 - offset: 0, 0 - index: -1 castle-gate/throw-walkie-3 rotate: false xy: 2, 78 @@ -1709,6 +1702,13 @@ castle-gate/throw-walkie-5 orig: 205, 136 offset: 0, 0 index: -1 +dream/case + rotate: false + xy: 623, 176 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 dream/clouds1 rotate: false xy: 646, 8 @@ -1716,93 +1716,100 @@ dream/clouds1 orig: 320, 240 offset: 0, 0 index: -1 +dream/sword + rotate: false + xy: 1003, 984 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 ego/love-10 rotate: false - xy: 968, 684 + xy: 968, 688 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-11 rotate: false - xy: 968, 612 + xy: 968, 616 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-12 rotate: false - xy: 968, 540 + xy: 968, 544 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-13 rotate: false - xy: 968, 468 + xy: 968, 472 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-14 rotate: false - xy: 968, 396 + xy: 968, 400 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-15 rotate: false - xy: 968, 324 + xy: 968, 328 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-16 rotate: false - xy: 968, 252 + xy: 968, 256 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-17 rotate: false - xy: 968, 180 + xy: 968, 184 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-18 rotate: false - xy: 968, 108 + xy: 968, 112 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-19 rotate: false - xy: 968, 36 + xy: 968, 40 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-7 rotate: false - xy: 968, 900 + xy: 968, 904 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-8 rotate: false - xy: 968, 828 + xy: 968, 832 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-9 rotate: false - xy: 968, 756 + xy: 968, 760 size: 50, 70 orig: 50, 70 offset: 0, 0 @@ -1844,7 +1851,7 @@ inside-cafeteria/knights-stand index: -1 inside-castle/magic rotate: false - xy: 994, 14 + xy: 623, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1886,7 +1893,7 @@ outside-castle/blanket index: -1 outside-castle/peddler rotate: false - xy: 623, 130 + xy: 968, 2 size: 18, 36 orig: 18, 36 offset: 0, 0 @@ -1947,23 +1954,16 @@ wizard/disappear orig: 380, 46 offset: 0, 0 index: -1 -wizard/magic-hands - rotate: false - xy: 981, 972 - size: 40, 50 - orig: 40, 50 - offset: 0, 0 - index: -1 wizard/stand rotate: false - xy: 623, 168 + xy: 981, 976 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard rotate: false - xy: 623, 168 + xy: 981, 976 size: 20, 46 orig: 20, 46 offset: 0, 0 @@ -2172,60 +2172,60 @@ title/banner index: -1 wizard/experiment-10 rotate: false - xy: 968, 349 + xy: 968, 292 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-11 rotate: false - xy: 968, 292 + xy: 968, 235 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-12 rotate: false - xy: 968, 235 + xy: 968, 178 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-13 rotate: false - xy: 968, 178 + xy: 968, 121 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-14 - rotate: false - xy: 968, 121 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-15 rotate: false xy: 968, 64 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-8 +wizard/experiment-7 rotate: false xy: 968, 463 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-9 +wizard/experiment-8 rotate: false xy: 968, 406 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 +wizard/experiment-9 + rotate: false + xy: 968, 349 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 pack6.png size: 1024,1024 @@ -2393,119 +2393,119 @@ outsidehouse/house orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-16 +wizard/experiment-15 rotate: false xy: 968, 965 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-17 +wizard/experiment-16 rotate: false xy: 968, 908 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-18 +wizard/experiment-17 rotate: false xy: 968, 851 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-19 +wizard/experiment-18 rotate: false xy: 968, 794 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-20 +wizard/experiment-19 rotate: false xy: 968, 737 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-21 +wizard/experiment-20 rotate: false xy: 968, 680 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-22 +wizard/experiment-21 rotate: false xy: 968, 623 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-23 +wizard/experiment-22 rotate: false xy: 968, 566 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-24 +wizard/experiment-23 rotate: false xy: 968, 509 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-25 +wizard/experiment-24 rotate: false xy: 968, 452 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-26 +wizard/experiment-25 rotate: false xy: 968, 395 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-27 +wizard/experiment-26 rotate: false xy: 968, 338 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-28 +wizard/experiment-27 rotate: false xy: 968, 281 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-29 +wizard/experiment-28 rotate: false xy: 968, 224 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-30 +wizard/experiment-29 rotate: false xy: 968, 167 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-31 +wizard/experiment-30 rotate: false xy: 968, 110 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-32 +wizard/experiment-31 rotate: false xy: 968, 53 size: 45, 55 @@ -2532,6 +2532,13 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none +castle-gate/goon-2-talk + rotate: false + xy: 968, 531 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 castle-gate/throw-walkie-6 rotate: false xy: 646, 157 @@ -2714,55 +2721,62 @@ title/logo orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-33 +wizard/experiment-32 rotate: false xy: 968, 964 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-34 +wizard/experiment-33 rotate: false xy: 968, 907 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-35 +wizard/experiment-34 rotate: false xy: 968, 850 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-36 +wizard/experiment-35 rotate: false xy: 968, 793 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-37 +wizard/experiment-36 rotate: false xy: 968, 736 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-38 +wizard/experiment-37 rotate: false xy: 968, 679 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-39 +wizard/experiment-38 rotate: false xy: 968, 622 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 +wizard/experiment-39 + rotate: false + xy: 968, 565 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 pack8.png size: 1024,1024 diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index ea9a7070..09bdcc56 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index a5c7e40d..2a76491c 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index fbb35609..3e641496 100644 Binary files a/desktop/resources/packed/pack4.png and b/desktop/resources/packed/pack4.png differ diff --git a/desktop/resources/packed/pack5.png b/desktop/resources/packed/pack5.png index 3b7c245a..44a8ac72 100644 Binary files a/desktop/resources/packed/pack5.png and b/desktop/resources/packed/pack5.png differ diff --git a/desktop/resources/packed/pack6.png b/desktop/resources/packed/pack6.png index 2a665d48..66e51c14 100644 Binary files a/desktop/resources/packed/pack6.png and b/desktop/resources/packed/pack6.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index 1334f1c7..511b1746 100644 Binary files a/desktop/resources/packed/pack7.png and b/desktop/resources/packed/pack7.png differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index c56304e9..30598ad1 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1316,6 +1316,11 @@ void main () :width 16 :height 16 :baseline 9000 :opacity 0.8) + :save (assoc (utils/get-texture "save.png") + :x 286 :y 224 + :width 16 :height 16 + :baseline 9000 + :opacity 0.8) :inventory (assoc (utils/get-texture "inventory.png") :x 278 :y 0 :baseline 9000 :mouse-in? (zone/box 278 0 320 42) :opacity 0.8) @@ -1326,7 +1331,7 @@ void main () (.apply viewport) (let [entities (utils/apply-tweens screen entities (:tweens entities))] (label! (:fps entities) :set-text (str (game :fps))) - (render! screen [ #_(:fps entities) (:inventory entities) (:close entities)]) + (render! screen [ (:save entities) (:inventory entities) (:close entities)]) entities)) :on-resize @@ -1337,18 +1342,23 @@ void main () (fn [screen [entities]] (let [[x y] (utils/unproject screen) hovered-inventory? ((:mouse-in? (:inventory entities)) x y) - hovered-close? (utils/intersects? (:close entities) [x y])] - (screen! scene :hud-active? :hud-active? (or hovered-close? hovered-inventory?)) + hovered-close? (utils/intersects? (:close entities) [x y]) + hovered-save? (utils/intersects? (:save entities) [x y])] + (screen! scene :hud-active? :hud-active? (or hovered-close? hovered-inventory? hovered-save?)) (cond hovered-inventory? (grow-hud screen entities :inventory true) hovered-close? (grow-hud screen entities :close true) + hovered-save? + (grow-hud screen entities :save true) + :else (let [entities (update-in entities [:tweens] dissoc :inventory-grow-x :inventory-grow-y) entities (grow-hud screen entities :inventory false) - entities (grow-hud screen entities :close false)] + entities (grow-hud screen entities :close false) + entities (grow-hud screen entities :save false)] entities )))) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 92e84988..bfc20c99 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -213,8 +213,11 @@ :save save-name) (image-button! :set-size 142 104) (image-button! :add (doto (Group. ) - (.setSive 142 104) - (.addActor (:object (image (texture save-screenshot)))) + (.setSize 126 88) + (.setOrigin (/ 126 2) (/ 88 2)) + + (.addActor (:object (doto (image (texture save-screenshot)) + (image! :set-size 126 88)))) (.addActor (:object (make-label "content"))) ) )