diff --git a/desktop/asset-work/title/quill.png b/desktop/asset-work/title/quill.png new file mode 100644 index 00000000..8bdbb5a4 Binary files /dev/null and b/desktop/asset-work/title/quill.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index c7b9539a..8d5b33f7 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -41,14 +41,14 @@ behindhouse/stick index: -1 black rotate: false - xy: 2013, 138 + xy: 2013, 134 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 butterfly rotate: false - xy: 1106, 844 + xy: 1475, 393 size: 14, 7 orig: 14, 7 offset: 0, 0 @@ -69,42 +69,35 @@ castle-gate/coinflip index: -1 castle-gate/frankie-walk-1 rotate: false - xy: 2013, 275 + xy: 2013, 234 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-2 rotate: false - xy: 2013, 238 + xy: 2013, 197 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-3 rotate: false - xy: 2013, 201 + xy: 2013, 160 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-4 rotate: false - xy: 2013, 164 + xy: 2021, 97 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-5 rotate: false - xy: 2021, 101 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-6 - rotate: false - xy: 2021, 64 + xy: 2021, 60 size: 24, 35 orig: 24, 35 offset: 0, 0 @@ -179,14 +172,7 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -dream/dot - rotate: false - xy: 704, 916 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -outsidehouse/dot +title/dot rotate: false xy: 704, 916 size: 1, 1 @@ -200,14 +186,14 @@ inside-antique/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-jail/dot +outsidehouse/dot rotate: false xy: 704, 916 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -title/dot +inside-house/dot rotate: false xy: 704, 916 size: 1, 1 @@ -221,14 +207,21 @@ ego/dot orig: 1, 1 offset: 0, 0 index: -1 -wizard/dot +dream/dot rotate: false xy: 704, 916 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -inside-house/dot +inside-jail/dot + rotate: false + xy: 704, 916 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +wizard/dot rotate: false xy: 704, 916 size: 1, 1 @@ -405,7 +398,7 @@ dream/sign index: -1 dream/sword rotate: false - xy: 1491, 442 + xy: 2031, 20 size: 15, 38 orig: 15, 38 offset: 0, 0 @@ -426,7 +419,7 @@ ego/axe-wood index: -1 ego/base rotate: false - xy: 1491, 404 + xy: 1491, 444 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -480,6 +473,13 @@ ego/glad orig: 140, 46 offset: 0, 0 index: -1 +ego/hold-hand + rotate: false + xy: 1491, 406 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 ego/ida rotate: false xy: 1786, 1478 @@ -580,7 +580,7 @@ ending-castle/guard-1 index: -1 ending-castle/guard-2 rotate: false - xy: 2013, 414 + xy: 2013, 413 size: 27, 56 orig: 27, 56 offset: 0, 0 @@ -615,21 +615,21 @@ held/bloodclot-head-1 index: -1 held/dot rotate: false - xy: 1992, 1733 + xy: 2007, 468 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 space/dot rotate: false - xy: 1992, 1733 + xy: 2007, 468 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 outside-jail/dot rotate: false - xy: 1992, 1733 + xy: 2007, 468 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -755,7 +755,7 @@ inside-cafeteria/knights-stand index: -1 inside-cafeteria/ladder rotate: false - xy: 2007, 472 + xy: 2013, 350 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -797,7 +797,7 @@ inside-castle/background index: -1 inside-castle/bookstack rotate: false - xy: 2013, 354 + xy: 2013, 313 size: 27, 35 orig: 27, 35 offset: 0, 0 @@ -881,7 +881,7 @@ inside-castle/trophy index: -1 inside-castle/watch rotate: false - xy: 1475, 392 + xy: 2021, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1119,7 +1119,7 @@ outsidehouse/door index: -1 outsidehouse/sheep rotate: false - xy: 2013, 391 + xy: 2013, 390 size: 33, 21 orig: 33, 21 offset: 0, 0 @@ -1224,14 +1224,14 @@ space/bloodclot-talk index: -1 space/broken-jewel rotate: false - xy: 2036, 338 + xy: 2036, 297 size: 10, 14 orig: 10, 14 offset: 0, 0 index: -1 talk-bg-2 rotate: false - xy: 2013, 312 + xy: 2013, 271 size: 21, 40 orig: 21, 40 offset: 0, 0 @@ -1257,6 +1257,13 @@ title/banner-back orig: 540, 42 offset: 0, 0 index: -1 +title/quill + rotate: false + xy: 2007, 471 + size: 33, 39 + orig: 33, 39 + offset: 0, 0 + index: -1 title/save-indicator rotate: false xy: 2039, 636 @@ -1354,30 +1361,37 @@ castle-gate/frankie orig: 312, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-7 +castle-gate/frankie-walk-6 rotate: false xy: 2022, 468 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-8 +castle-gate/frankie-walk-7 rotate: false xy: 2022, 431 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 +castle-gate/frankie-walk-8 + rotate: false + xy: 2022, 394 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 castle-gate/goon-2 rotate: false - xy: 2022, 397 + xy: 2022, 360 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 castle-gate/goon-2-talk rotate: false - xy: 2022, 363 + xy: 2022, 326 size: 24, 32 orig: 24, 32 offset: 0, 0 @@ -1412,7 +1426,7 @@ cloudy index: -1 cursorr rotate: false - xy: 2030, 699 + xy: 2030, 737 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1508,13 +1522,6 @@ ego/get-sick orig: 108, 36 offset: 0, 0 index: -1 -ego/hold-hand - rotate: false - xy: 2030, 740 - size: 16, 36 - orig: 16, 36 - offset: 0, 0 - index: -1 ego/love-1 rotate: false xy: 1978, 706 @@ -1636,14 +1643,14 @@ inside-antique/open-blinds index: -1 inside-antique/portrait rotate: false - xy: 2030, 627 + xy: 2030, 665 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 inside-antique/teddy rotate: false - xy: 2030, 591 + xy: 2030, 629 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1783,7 +1790,7 @@ inside-house/desk index: -1 inside-house/flask rotate: false - xy: 2030, 717 + xy: 2030, 755 size: 16, 21 orig: 16, 21 offset: 0, 0 @@ -1846,7 +1853,7 @@ inside-jail/warden index: -1 inside-jail/window-bent rotate: false - xy: 2022, 259 + xy: 2022, 222 size: 18, 29 orig: 18, 29 offset: 0, 0 @@ -1874,14 +1881,14 @@ outside-castle/brush-bl index: -1 outside-castle/note rotate: false - xy: 2030, 681 + xy: 2030, 719 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 outside-castle/peddler rotate: false - xy: 2022, 290 + xy: 2022, 253 size: 18, 36 orig: 18, 36 offset: 0, 0 @@ -1895,7 +1902,7 @@ outside-castle/walk-behind index: -1 outside-jail/axe rotate: false - xy: 2022, 328 + xy: 2022, 291 size: 22, 33 orig: 22, 33 offset: 0, 0 @@ -1958,7 +1965,7 @@ outsidehouse/lamb index: -1 outsidehouse/note rotate: false - xy: 2030, 663 + xy: 2030, 701 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1972,14 +1979,14 @@ outsidehouse/sheep-walk index: -1 pathfind-test rotate: false - xy: 2030, 645 + xy: 2030, 683 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 save rotate: false - xy: 2030, 609 + xy: 2030, 647 size: 16, 16 orig: 16, 16 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index b65a06c9..ca61b493 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index ed023066..d3ac7b2a 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 0bd435bc..fa1dae6c 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -353,6 +353,7 @@ :banner-back (assoc (animation->texture (assoc screen :total-time 0.0) banner-back) :x 580 :y 400 :scale-x 4 :scale-y 4 :anim banner-back :z 3) + :quill (assoc (utils/get-texture "title/quill.png") :x 1150 :y 4 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 10) :logo (assoc (utils/get-texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 6) :fade (assoc (utils/get-texture "black.png") :scale-x 80