diff --git a/desktop/asset-work/inventory.png b/desktop/asset-work/inventory.png index 081412eb..b9dfbb9a 100644 Binary files a/desktop/asset-work/inventory.png and b/desktop/asset-work/inventory.png differ diff --git a/desktop/asset-work/open-inventory-1.png b/desktop/asset-work/open-inventory-1.png new file mode 100644 index 00000000..b9dfbb9a Binary files /dev/null and b/desktop/asset-work/open-inventory-1.png differ diff --git a/desktop/asset-work/open-inventory-10.png b/desktop/asset-work/open-inventory-10.png new file mode 100644 index 00000000..2d13df04 Binary files /dev/null and b/desktop/asset-work/open-inventory-10.png differ diff --git a/desktop/asset-work/open-inventory-11.png b/desktop/asset-work/open-inventory-11.png new file mode 100644 index 00000000..e413c4ab Binary files /dev/null and b/desktop/asset-work/open-inventory-11.png differ diff --git a/desktop/asset-work/open-inventory-12.png b/desktop/asset-work/open-inventory-12.png new file mode 100644 index 00000000..d8f0669f Binary files /dev/null and b/desktop/asset-work/open-inventory-12.png differ diff --git a/desktop/asset-work/open-inventory-13.png b/desktop/asset-work/open-inventory-13.png new file mode 100644 index 00000000..3fc9a8aa Binary files /dev/null and b/desktop/asset-work/open-inventory-13.png differ diff --git a/desktop/asset-work/open-inventory-2.png b/desktop/asset-work/open-inventory-2.png new file mode 100644 index 00000000..a0881d0e Binary files /dev/null and b/desktop/asset-work/open-inventory-2.png differ diff --git a/desktop/asset-work/open-inventory-3.png b/desktop/asset-work/open-inventory-3.png new file mode 100644 index 00000000..1b80bcd9 Binary files /dev/null and b/desktop/asset-work/open-inventory-3.png differ diff --git a/desktop/asset-work/open-inventory-4.png b/desktop/asset-work/open-inventory-4.png new file mode 100644 index 00000000..bf4ff418 Binary files /dev/null and b/desktop/asset-work/open-inventory-4.png differ diff --git a/desktop/asset-work/open-inventory-5.png b/desktop/asset-work/open-inventory-5.png new file mode 100644 index 00000000..35cbefd0 Binary files /dev/null and b/desktop/asset-work/open-inventory-5.png differ diff --git a/desktop/asset-work/open-inventory-6.png b/desktop/asset-work/open-inventory-6.png new file mode 100644 index 00000000..2d958227 Binary files /dev/null and b/desktop/asset-work/open-inventory-6.png differ diff --git a/desktop/asset-work/open-inventory-7.png b/desktop/asset-work/open-inventory-7.png new file mode 100644 index 00000000..b5dbb9e5 Binary files /dev/null and b/desktop/asset-work/open-inventory-7.png differ diff --git a/desktop/asset-work/open-inventory-8.png b/desktop/asset-work/open-inventory-8.png new file mode 100644 index 00000000..2d13df04 Binary files /dev/null and b/desktop/asset-work/open-inventory-8.png differ diff --git a/desktop/asset-work/open-inventory-9.png b/desktop/asset-work/open-inventory-9.png new file mode 100644 index 00000000..9dd75049 Binary files /dev/null and b/desktop/asset-work/open-inventory-9.png differ diff --git a/desktop/asset-work/open-inventory.pxa/0.pxi b/desktop/asset-work/open-inventory.pxa/0.pxi new file mode 100644 index 00000000..0688f874 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/0.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/1.pxi b/desktop/asset-work/open-inventory.pxa/1.pxi new file mode 100644 index 00000000..c20383b6 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/1.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/10.pxi b/desktop/asset-work/open-inventory.pxa/10.pxi new file mode 100644 index 00000000..13a047f9 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/10.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/11.pxi b/desktop/asset-work/open-inventory.pxa/11.pxi new file mode 100644 index 00000000..9ccae017 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/11.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/12.pxi b/desktop/asset-work/open-inventory.pxa/12.pxi new file mode 100644 index 00000000..eff129ad Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/12.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/2.pxi b/desktop/asset-work/open-inventory.pxa/2.pxi new file mode 100644 index 00000000..bcc71d0d Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/2.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/3.pxi b/desktop/asset-work/open-inventory.pxa/3.pxi new file mode 100644 index 00000000..6e232bb8 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/3.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/4.pxi b/desktop/asset-work/open-inventory.pxa/4.pxi new file mode 100644 index 00000000..069ff60b Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/4.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/5.pxi b/desktop/asset-work/open-inventory.pxa/5.pxi new file mode 100644 index 00000000..bc83ad3c Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/5.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/6.pxi b/desktop/asset-work/open-inventory.pxa/6.pxi new file mode 100644 index 00000000..2064cbdd Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/6.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/7.pxi b/desktop/asset-work/open-inventory.pxa/7.pxi new file mode 100644 index 00000000..47ebb639 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/7.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/8.pxi b/desktop/asset-work/open-inventory.pxa/8.pxi new file mode 100644 index 00000000..3ab206c8 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/8.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/9.pxi b/desktop/asset-work/open-inventory.pxa/9.pxi new file mode 100644 index 00000000..47ebb639 Binary files /dev/null and b/desktop/asset-work/open-inventory.pxa/9.pxi differ diff --git a/desktop/asset-work/open-inventory.pxa/CelData.plist b/desktop/asset-work/open-inventory.pxa/CelData.plist new file mode 100644 index 00000000..0aa530db --- /dev/null +++ b/desktop/asset-work/open-inventory.pxa/CelData.plist @@ -0,0 +1,58 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index c37c0dd7..0c528023 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -32,16 +32,9 @@ behindhouse/stick orig: 24, 42 offset: 0, 0 index: -1 -black - rotate: false - xy: 2013, 134 - size: 32, 24 - orig: 32, 24 - offset: 0, 0 - index: -1 butterfly rotate: false - xy: 1867, 1471 + xy: 1952, 1121 size: 14, 7 orig: 14, 7 offset: 0, 0 @@ -62,42 +55,42 @@ castle-gate/coinflip index: -1 castle-gate/frankie-walk-1 rotate: false - xy: 2013, 234 + xy: 2013, 263 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-2 rotate: false - xy: 2013, 197 + xy: 2013, 226 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-3 rotate: false - xy: 2013, 160 + xy: 2013, 189 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-4 rotate: false - xy: 2021, 97 + xy: 2013, 152 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-5 rotate: false - xy: 2021, 60 + xy: 2020, 1665 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-6 rotate: false - xy: 2020, 1665 + xy: 2021, 59 size: 24, 35 orig: 24, 35 offset: 0, 0 @@ -111,7 +104,7 @@ castle-gate/goon-1 index: -1 castle-gate/goon-2-flip rotate: false - xy: 1606, 1044 + xy: 494, 545 size: 48, 32 orig: 48, 32 offset: 0, 0 @@ -179,7 +172,7 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-antique/dot +title/dot rotate: false xy: 704, 916 size: 1, 1 @@ -193,20 +186,6 @@ wizard/dot orig: 1, 1 offset: 0, 0 index: -1 -ego/dot - rotate: false - xy: 704, 916 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -title/dot - rotate: false - xy: 704, 916 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 inside-jail/dot rotate: false xy: 704, 916 @@ -235,6 +214,20 @@ dream/dot orig: 1, 1 offset: 0, 0 index: -1 +inside-antique/dot + rotate: false + xy: 704, 916 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +ego/dot + rotate: false + xy: 704, 916 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 cat-tree/grandma rotate: false xy: 1228, 839 @@ -300,7 +293,7 @@ cat-tree/tree-r index: -1 close rotate: false - xy: 463, 4 + xy: 1638, 1024 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -319,6 +312,13 @@ space/cloud orig: 15, 15 offset: 0, 0 index: -1 +cursorr + rotate: false + xy: 444, 4 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 dbh rotate: false xy: 2, 1086 @@ -375,6 +375,13 @@ dream/fairy-godfather-magic orig: 500, 77 offset: 0, 0 index: -1 +dream/island + rotate: false + xy: 1606, 1021 + size: 30, 20 + orig: 30, 20 + offset: 0, 0 + index: -1 dream/plaque1 rotate: false xy: 1787, 76 @@ -405,7 +412,7 @@ dream/shovel index: -1 dream/sword rotate: false - xy: 2031, 20 + xy: 1491, 442 size: 15, 38 orig: 15, 38 offset: 0, 0 @@ -426,14 +433,14 @@ ego/axe-wood index: -1 ego/base rotate: false - xy: 1491, 444 + xy: 1638, 1080 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/whistle-1 rotate: false - xy: 1491, 444 + xy: 1638, 1080 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -461,7 +468,7 @@ ego/crawl index: -1 ego/flying rotate: false - xy: 1995, 4 + xy: 2007, 483 size: 34, 44 orig: 34, 44 offset: 0, 0 @@ -489,7 +496,7 @@ ego/glad index: -1 ego/hold-hand rotate: false - xy: 1491, 406 + xy: 1638, 1042 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -543,6 +550,13 @@ ego/swing-shovel orig: 630, 70 offset: 0, 0 index: -1 +ego/whistle-2 + rotate: false + xy: 1491, 404 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 ending-castle/Untitled rotate: false xy: 1767, 109 @@ -587,14 +601,14 @@ ending-castle/ending-castle2-assets/foreground index: -1 ending-castle/guard-1 rotate: false - xy: 2007, 512 + xy: 2007, 587 size: 27, 56 orig: 27, 56 offset: 0, 0 index: -1 ending-castle/guard-2 rotate: false - xy: 2013, 413 + xy: 2007, 529 size: 27, 56 orig: 27, 56 offset: 0, 0 @@ -629,21 +643,21 @@ held/bloodclot-head-1 index: -1 held/dot rotate: false - xy: 2007, 468 + xy: 1228, 900 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 outside-jail/dot rotate: false - xy: 2007, 468 + xy: 1228, 900 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 space/dot rotate: false - xy: 2007, 468 + xy: 1228, 900 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -671,14 +685,14 @@ inside-antique/beard index: -1 inside-antique/bowl rotate: false - xy: 481, 7 + xy: 2032, 137 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/bowl-0 rotate: false - xy: 481, 7 + xy: 2032, 137 size: 14, 13 orig: 14, 13 offset: 0, 0 @@ -692,14 +706,14 @@ inside-antique/bowl-1 index: -1 inside-antique/bowl-2 rotate: false - xy: 2031, 5 + xy: 1696, 4 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/bowl-3 rotate: false - xy: 1696, 4 + xy: 480, 7 size: 14, 13 orig: 14, 13 offset: 0, 0 @@ -762,7 +776,7 @@ inside-cafeteria/knights-stand index: -1 inside-cafeteria/ladder rotate: false - xy: 2013, 350 + xy: 2013, 379 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -776,7 +790,7 @@ inside-cafeteria/ladder-guard index: -1 inside-cafeteria/ladder-guard-2 rotate: false - xy: 2007, 570 + xy: 1606, 1043 size: 30, 73 orig: 30, 73 offset: 0, 0 @@ -804,7 +818,7 @@ inside-castle/background index: -1 inside-castle/bookstack rotate: false - xy: 2013, 313 + xy: 2013, 342 size: 27, 35 orig: 27, 35 offset: 0, 0 @@ -816,6 +830,13 @@ inside-castle/game-player-talk orig: 400, 44 offset: 0, 0 index: -1 +inside-castle/gameplayer + rotate: false + xy: 1995, 4 + size: 40, 44 + orig: 40, 44 + offset: 0, 0 + index: -1 inside-castle/hands-fight rotate: false xy: 1284, 1942 @@ -839,28 +860,14 @@ inside-castle/pull-sword index: -1 inside-castle/sign1 rotate: false - xy: 494, 517 + xy: 494, 523 size: 44, 20 orig: 44, 20 offset: 0, 0 index: -1 inside-castle/sign-1 rotate: false - xy: 494, 517 - size: 44, 20 - orig: 44, 20 - offset: 0, 0 - index: -1 -inside-castle/sign2 - rotate: false - xy: 1606, 1022 - size: 44, 20 - orig: 44, 20 - offset: 0, 0 - index: -1 -inside-castle/sign-2 - rotate: false - xy: 1606, 1022 + xy: 494, 523 size: 44, 20 orig: 44, 20 offset: 0, 0 @@ -874,7 +881,7 @@ inside-castle/trophy index: -1 inside-castle/watch rotate: false - xy: 2021, 50 + xy: 1952, 1219 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -902,7 +909,7 @@ inside-house/flask index: -1 inside-house/frog-legs rotate: false - xy: 444, 4 + xy: 2013, 134 size: 17, 16 orig: 17, 16 offset: 0, 0 @@ -965,14 +972,14 @@ inside-stash/background index: -1 inside-stash/candle rotate: false - xy: 1606, 1231 + xy: 494, 517 size: 16, 4 orig: 16, 4 offset: 0, 0 index: -1 inside-stash/lid rotate: false - xy: 1842, 1471 + xy: 2021, 50 size: 23, 7 orig: 23, 7 offset: 0, 0 @@ -986,7 +993,7 @@ outside-castle/background index: -1 outside-castle/bird rotate: false - xy: 540, 535 + xy: 1282, 759 size: 2, 2 orig: 2, 2 offset: 0, 0 @@ -998,6 +1005,20 @@ outside-castle/flies orig: 45, 15 offset: 0, 0 index: -1 +outside-castle/note + rotate: false + xy: 462, 4 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +outside-castle/peddler + rotate: false + xy: 2021, 96 + size: 18, 36 + orig: 18, 36 + offset: 0, 0 + index: -1 outside-jail/Untitled rotate: false xy: 1284, 1582 @@ -1105,7 +1126,7 @@ outsidehouse/lamb index: -1 outsidehouse/sheep rotate: false - xy: 2013, 390 + xy: 2013, 419 size: 33, 21 orig: 33, 21 offset: 0, 0 @@ -1224,7 +1245,7 @@ space/broken-jewel index: -1 talk-bg-2 rotate: false - xy: 2013, 271 + xy: 2013, 300 size: 21, 40 orig: 21, 40 offset: 0, 0 @@ -1252,39 +1273,25 @@ title/banner-back index: -1 title/quill rotate: false - xy: 2007, 471 + xy: 2013, 442 size: 33, 39 orig: 33, 39 offset: 0, 0 index: -1 title/save-indicator rotate: false - xy: 1883, 1471 + xy: 1475, 393 size: 7, 7 orig: 7, 7 offset: 0, 0 index: -1 title/save-indicator-active rotate: false - xy: 1892, 1471 + xy: 1842, 1541 size: 7, 7 orig: 7, 7 offset: 0, 0 index: -1 -title/screenshot-backdrop - rotate: false - xy: 494, 539 - size: 48, 38 - orig: 48, 38 - offset: 0, 0 - index: -1 -title/screenshot-backdrop-active - rotate: false - xy: 1606, 1078 - size: 48, 38 - orig: 48, 38 - offset: 0, 0 - index: -1 wizard/disappear rotate: false xy: 634, 759 @@ -1294,7 +1301,7 @@ wizard/disappear index: -1 wizard/flame rotate: false - xy: 1952, 1118 + xy: 2041, 125 size: 5, 10 orig: 5, 10 offset: 0, 0 @@ -1349,11 +1356,18 @@ behindhouse/house index: -1 behindhouse/house-cover rotate: false - xy: 1590, 473 + xy: 592, 12 size: 20, 21 orig: 20, 21 offset: 0, 0 index: -1 +black + rotate: false + xy: 696, 5 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 castle-gate/frankie rotate: false xy: 2, 29 @@ -1363,28 +1377,28 @@ castle-gate/frankie index: -1 castle-gate/frankie-walk-7 rotate: false - xy: 2022, 468 + xy: 2022, 525 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-8 rotate: false - xy: 2022, 431 + xy: 2022, 488 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/goon-2 rotate: false - xy: 2022, 397 + xy: 2022, 454 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 castle-gate/goon-2-talk rotate: false - xy: 2022, 363 + xy: 2022, 420 size: 24, 32 orig: 24, 32 offset: 0, 0 @@ -1396,6 +1410,20 @@ cat-tree/brush-l orig: 152, 70 offset: 0, 0 index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 1548, 454 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/inventory + rotate: false + xy: 1870, 460 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 cat-tree/sillhoute rotate: false xy: 1290, 838 @@ -1412,18 +1440,11 @@ cat-tree/tree-and-rock index: -1 cloudy rotate: false - xy: 1590, 451 + xy: 284, 7 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -cursorr - rotate: false - xy: 2030, 646 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 dawn rotate: false xy: 968, 1806 @@ -1459,13 +1480,6 @@ outside-jail/fountain orig: 320, 240 offset: 0, 0 index: -1 -dream/island - rotate: false - xy: 284, 7 - size: 30, 20 - orig: 30, 20 - offset: 0, 0 - index: -1 dream/pedestals rotate: false xy: 968, 596 @@ -1564,23 +1578,16 @@ ego/swing orig: 288, 75 offset: 0, 0 index: -1 -ego/whistle-2 +ego/whistle-3 rotate: false xy: 2030, 740 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 -ego/whistle-3 - rotate: false - xy: 2030, 702 - size: 16, 36 - orig: 16, 36 - offset: 0, 0 - index: -1 ego/whistle-4 rotate: false - xy: 2030, 664 + xy: 2030, 702 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -1594,7 +1601,7 @@ ending-castle/ending-castle2-assets/collision index: -1 held/flesh rotate: false - xy: 592, 13 + xy: 878, 47 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1657,21 +1664,21 @@ inside-antique/open-blinds index: -1 inside-antique/portrait rotate: false - xy: 2030, 574 + xy: 2030, 648 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 inside-antique/shopkeep rotate: false - xy: 2022, 236 + xy: 2022, 331 size: 18, 21 orig: 18, 21 offset: 0, 0 index: -1 inside-antique/teddy rotate: false - xy: 684, 13 + xy: 2030, 612 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1748,7 +1755,7 @@ inside-cafeteria/glow index: -1 inside-castle/books rotate: false - xy: 614, 10 + xy: 660, 10 size: 34, 19 orig: 34, 19 offset: 0, 0 @@ -1767,13 +1774,6 @@ inside-castle/fight-1 orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/gameplayer - rotate: false - xy: 1548, 450 - size: 40, 44 - orig: 40, 44 - offset: 0, 0 - index: -1 inside-castle/hands-1 rotate: false xy: 1808, 10 @@ -1783,7 +1783,7 @@ inside-castle/hands-1 index: -1 inside-castle/magic rotate: false - xy: 878, 47 + xy: 764, 9 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1795,20 +1795,34 @@ inside-castle/pedestal-overlay orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/sign3 +inside-castle/sign2 rotate: false xy: 832, 47 size: 44, 20 orig: 44, 20 offset: 0, 0 index: -1 -inside-castle/sign-3 +inside-castle/sign-2 rotate: false xy: 832, 47 size: 44, 20 orig: 44, 20 offset: 0, 0 index: -1 +inside-castle/sign3 + rotate: false + xy: 614, 9 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 +inside-castle/sign-3 + rotate: false + xy: 614, 9 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 inside-castle/way-back-tree rotate: false xy: 968, 112 @@ -1881,16 +1895,23 @@ inside-jail/warden index: -1 inside-jail/window-bent rotate: false - xy: 2022, 259 + xy: 2022, 354 size: 18, 29 orig: 18, 29 offset: 0, 0 index: -1 inventory rotate: false - xy: 1870, 460 - size: 42, 42 - orig: 42, 42 + xy: 1978, 504 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-1 + rotate: false + xy: 1978, 504 + size: 42, 56 + orig: 42, 56 offset: 0, 0 index: -1 inventory-overlay @@ -1907,20 +1928,6 @@ outside-castle/brush-bl orig: 60, 60 offset: 0, 0 index: -1 -outside-castle/note - rotate: false - xy: 2030, 628 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -outside-castle/peddler - rotate: false - xy: 2022, 290 - size: 18, 36 - orig: 18, 36 - offset: 0, 0 - index: -1 outside-castle/walk-behind rotate: false xy: 1612, 838 @@ -1930,7 +1937,7 @@ outside-castle/walk-behind index: -1 outside-jail/axe rotate: false - xy: 2022, 328 + xy: 2022, 385 size: 22, 33 orig: 22, 33 offset: 0, 0 @@ -1986,7 +1993,7 @@ outsidehouse/house index: -1 outsidehouse/note rotate: false - xy: 2030, 610 + xy: 2030, 684 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2000,14 +2007,14 @@ outsidehouse/sheep-walk index: -1 pathfind-test rotate: false - xy: 2030, 592 + xy: 2030, 666 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 save rotate: false - xy: 2030, 556 + xy: 2030, 630 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2147,18 +2154,11 @@ title/logo index: -1 white rotate: false - xy: 650, 5 + xy: 730, 5 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 -wizard/experiment-1 - rotate: false - xy: 1978, 505 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 pack3.png size: 2048,1024 @@ -2265,28 +2265,28 @@ cat-tree/eye-6 index: -1 cat-tree/eye-10 rotate: false - xy: 1130, 281 + xy: 1626, 288 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-11 rotate: false - xy: 1144, 231 + xy: 1100, 238 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-12 rotate: false - xy: 1176, 281 + xy: 1146, 238 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-13 rotate: false - xy: 1190, 231 + xy: 1177, 151 size: 44, 48 orig: 44, 48 offset: 0, 0 @@ -2307,144 +2307,130 @@ cat-tree/eye-3 index: -1 cat-tree/eye-4 rotate: false - xy: 1572, 502 + xy: 1169, 42 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-5 rotate: false - xy: 1618, 502 + xy: 857, 34 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-7 rotate: false - xy: 1618, 502 + xy: 857, 34 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-8 rotate: false - xy: 1815, 315 + xy: 903, 34 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-9 rotate: false - xy: 1084, 281 + xy: 1580, 288 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 412, 79 + xy: 1988, 898 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 1374, 449 + xy: 412, 79 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 571, 15 + xy: 1374, 449 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 1374, 407 + xy: 571, 15 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 1374, 365 + xy: 1374, 407 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 1986, 600 + xy: 1374, 365 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 1986, 558 + xy: 737, 55 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 381, 37 + xy: 724, 13 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 729, 55 + xy: 797, 43 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 724, 13 + xy: 381, 37 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 789, 43 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 1988, 982 + xy: 1572, 510 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-8 rotate: false - xy: 1988, 940 + xy: 1988, 982 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 1988, 898 + xy: 1988, 940 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/inventory - rotate: false - xy: 1664, 507 - size: 42, 42 - orig: 42, 42 - offset: 0, 0 - index: -1 cat-tree/owl rotate: false xy: 1415, 854 @@ -2496,21 +2482,21 @@ ego/grow index: -1 ego/grow-talk rotate: false - xy: 830, 2 + xy: 1855, 536 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hand-hold rotate: false - xy: 1855, 536 + xy: 1128, 389 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ending-castle/hand-hold rotate: false - xy: 1855, 536 + xy: 1128, 389 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2769,7 +2755,7 @@ ego/throw index: -1 ego/warden rotate: false - xy: 1708, 508 + xy: 1718, 245 size: 42, 41 orig: 42, 41 offset: 0, 0 @@ -2790,224 +2776,224 @@ ending-castle/frankie-fall-1 index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 1299, 163 + xy: 1846, 214 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 1256, 126 + xy: 1888, 214 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 1298, 126 + xy: 1166, 380 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-2 rotate: false - xy: 1173, 194 + xy: 1169, 5 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 1215, 194 + xy: 1131, 201 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 1674, 299 + xy: 1173, 201 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 1165, 380 + xy: 1935, 540 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 1207, 380 + xy: 1993, 476 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 1249, 380 + xy: 1215, 24 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 1081, 344 + xy: 1762, 214 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 1257, 163 + xy: 1804, 214 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 1100, 238 + xy: 1084, 288 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 georgia/kick-1 rotate: false - xy: 849, 40 + xy: 1893, 540 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 1165, 335 + xy: 1250, 372 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-11 rotate: false - xy: 1207, 335 + xy: 1909, 450 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-12 rotate: false - xy: 1249, 335 + xy: 1951, 450 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-13 rotate: false - xy: 1222, 290 + xy: 1993, 431 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-14 rotate: false - xy: 1264, 290 + xy: 1903, 405 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 1236, 245 + xy: 1903, 360 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 1278, 245 + xy: 1945, 405 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 1257, 200 + xy: 1903, 315 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 1299, 200 + xy: 1945, 360 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 1986, 513 + xy: 1903, 270 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-2 rotate: false - xy: 1172, 149 + xy: 1867, 491 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-4 rotate: false - xy: 1172, 149 + xy: 1867, 491 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 1122, 81 + xy: 1945, 315 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-3 rotate: false - xy: 1214, 149 + xy: 1909, 495 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-5 rotate: false - xy: 1861, 320 + xy: 1951, 495 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-6 rotate: false - xy: 1861, 275 + xy: 1993, 513 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-7 rotate: false - xy: 1081, 381 + xy: 1211, 106 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 1123, 382 + xy: 1215, 61 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 1123, 337 + xy: 1208, 372 size: 40, 43 orig: 40, 43 offset: 0, 0 @@ -3217,14 +3203,14 @@ inside-house/candle index: -1 inside-jail/chest-top rotate: false - xy: 784, 9 + xy: 1939, 577 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 inside-jail/chest-top-open rotate: false - xy: 1815, 281 + xy: 1664, 460 size: 44, 32 orig: 44, 32 offset: 0, 0 @@ -3236,6 +3222,90 @@ inside-jail/crowbar orig: 64, 33 offset: 0, 0 index: -1 +open-inventory-11 + rotate: false + xy: 1718, 346 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-12 + rotate: false + xy: 1718, 288 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-13 + rotate: false + xy: 1674, 286 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-2 + rotate: false + xy: 1939, 611 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-3 + rotate: false + xy: 1982, 673 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-4 + rotate: false + xy: 1983, 615 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-5 + rotate: false + xy: 1580, 395 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-6 + rotate: false + xy: 1624, 395 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-7 + rotate: false + xy: 1668, 402 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-8 + rotate: false + xy: 1674, 344 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-10 + rotate: false + xy: 1674, 344 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-9 + rotate: false + xy: 1712, 404 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 outside-castle/Untitled rotate: false xy: 983, 740 @@ -3287,7 +3357,7 @@ outside-castle/steer index: -1 outside-jail/closed-stash rotate: false - xy: 675, 65 + xy: 784, 11 size: 52, 30 orig: 52, 30 offset: 0, 0 @@ -3700,14 +3770,14 @@ space/susp index: -1 talk-bg rotate: false - xy: 1122, 39 + xy: 1622, 453 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 1986, 642 + xy: 675, 65 size: 60, 30 orig: 60, 30 offset: 0, 0 @@ -3721,280 +3791,287 @@ wizard/Untitled index: -1 wizard/cloud rotate: false - xy: 1131, 199 + xy: 1710, 462 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 -wizard/experiment-10 - rotate: false - xy: 677, 8 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-11 - rotate: false - xy: 891, 27 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-12 - rotate: false - xy: 1478, 502 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-13 - rotate: false - xy: 1525, 502 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-14 - rotate: false - xy: 1481, 445 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-15 - rotate: false - xy: 1528, 445 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-16 - rotate: false - xy: 1575, 445 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-17 - rotate: false - xy: 1622, 445 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-18 - rotate: false - xy: 1486, 388 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-19 - rotate: false - xy: 1533, 388 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-2 +wizard/experiment-1 rotate: false xy: 725, 773 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-20 +wizard/experiment-10 rotate: false - xy: 1580, 388 + xy: 1481, 445 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-21 +wizard/experiment-11 rotate: false - xy: 1627, 388 + xy: 1528, 445 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-22 +wizard/experiment-12 rotate: false - xy: 1486, 331 + xy: 1575, 453 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-23 +wizard/experiment-13 rotate: false - xy: 1533, 331 + xy: 1486, 388 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-24 +wizard/experiment-14 rotate: false - xy: 1580, 331 + xy: 1533, 388 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-25 +wizard/experiment-15 rotate: false - xy: 1627, 331 + xy: 1632, 495 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-26 +wizard/experiment-16 rotate: false - xy: 1669, 450 + xy: 1679, 494 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-27 +wizard/experiment-17 rotate: false - xy: 1674, 393 + xy: 1726, 494 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-28 +wizard/experiment-18 rotate: false - xy: 1674, 336 + xy: 1773, 479 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-29 +wizard/experiment-19 rotate: false - xy: 1716, 451 + xy: 1820, 479 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-3 +wizard/experiment-2 rotate: false xy: 524, 78 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-30 +wizard/experiment-20 rotate: false - xy: 1721, 394 + xy: 1486, 331 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-31 +wizard/experiment-21 rotate: false - xy: 1721, 337 + xy: 1533, 331 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-32 +wizard/experiment-22 rotate: false - xy: 1083, 144 + xy: 1580, 338 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-33 +wizard/experiment-23 rotate: false - xy: 1763, 479 + xy: 1627, 338 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-34 +wizard/experiment-24 rotate: false - xy: 1810, 479 + xy: 1756, 422 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-35 +wizard/experiment-25 rotate: false - xy: 1768, 422 + xy: 1803, 422 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-36 +wizard/experiment-26 rotate: false - xy: 1768, 365 + xy: 1762, 365 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-37 +wizard/experiment-27 rotate: false - xy: 1815, 422 + xy: 1809, 365 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-38 +wizard/experiment-28 rotate: false - xy: 1815, 365 + xy: 1850, 422 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-39 +wizard/experiment-29 rotate: false - xy: 1768, 308 + xy: 1856, 365 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-4 +wizard/experiment-3 rotate: false xy: 1178, 561 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-5 +wizard/experiment-30 + rotate: false + xy: 1762, 308 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-31 + rotate: false + xy: 1809, 308 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-32 + rotate: false + xy: 1856, 308 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-33 + rotate: false + xy: 1762, 251 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-34 + rotate: false + xy: 1809, 251 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-35 + rotate: false + xy: 1856, 251 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-36 + rotate: false + xy: 1083, 144 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-37 + rotate: false + xy: 1130, 144 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-38 + rotate: false + xy: 1122, 87 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-39 + rotate: false + xy: 1122, 30 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-4 rotate: false xy: 1434, 434 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-6 +wizard/experiment-5 rotate: false xy: 524, 21 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 +wizard/experiment-6 + rotate: false + xy: 677, 8 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 wizard/experiment-7 rotate: false - xy: 1939, 612 + xy: 1985, 558 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-8 rotate: false - xy: 1982, 674 + xy: 1478, 502 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 1939, 555 + xy: 1525, 502 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 1130, 147 + xy: 1169, 92 size: 40, 50 orig: 40, 50 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index fb4e4cb5..802ebd1c 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 43a0c7d1..b2d0be24 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 6a09af78..d17ee185 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index df56f96a..f447f569 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1354,6 +1354,7 @@ void main () :on-reactivate (fn [screen [entities]] + (screen! hud :on-reactivate) (-> entities (assoc-in [:state :active?] true) (assoc-in [:cursor :override] nil))) @@ -1366,6 +1367,7 @@ void main () (assoc-in [:cursor :override] nil))) :on-chose-item (fn [{:keys [item]} [entities]] + (screen! hud :on-chose-item :item item) (assoc-in entities [:cursor :current] item)) :on-show-inventory (fn [screen [entities]] @@ -1453,6 +1455,7 @@ void main () (utils/setup-viewport screen 320 240) {:already-saved? false + :opening-inventory? false :close (assoc (utils/get-texture "close.png") :x 304 :y 224 :width 16 :height 16 @@ -1464,14 +1467,22 @@ void main () :baseline 9000 :opacity 0.8) :inventory (assoc (utils/get-texture "inventory.png") :x 278 :y 0 :baseline 9000 + :open (utils/make-anim-seq "open-inventory" [42 56] 0.055 (flatten [(range 6) 6 7 8 7 ])) + :anim (utils/make-anim "inventory.png" [42 56] 0.1 [0]) + :default (utils/make-anim "inventory.png" [42 56] 0.1 [0]) + :opened (utils/make-anim-seq "open-inventory" [42 56] 0.1 [7]) + :closing (utils/make-anim-seq "open-inventory" [42 56] 0.055 [9 10 11 12 0]) + :anim-start 0 :mouse-in? (zone/box 278 0 320 42) :opacity 0.8) + :all-items (texture! (texture (pixmap "cursor.png")) :split 18 16) #_#_:fps (assoc (label "" (color :white) ) :x 5 :baseline 0 :opacity 0.1)})) :on-render (fn [{:keys [^FitViewport viewport] :as screen} [entities]] (.apply viewport) (let [entities (utils/apply-tweens screen entities (:tweens entities)) + entities (update-in entities [:inventory] animate screen ) hud-interactable? (hud-interactable?) entities (if hud-interactable? (as-> entities entities @@ -1484,14 +1495,35 @@ void main () (update-in entities [:save] assoc :r 1.0 :g 1.0 :b 1.0 )) (as-> entities entities (update-in entities [:save] assoc :r 0.75 :g 0.75 :b 0.75) - (grow-hud screen entities :save false)))] + (grow-hud screen entities :save false))) + entities (if (and (= (get-in entities [:inventory :anim]) + (get-in entities [:inventory :closing])) + (animation! (get-in entities [:inventory :closing]) + :is-animation-finished + (- (+ (:delta-time screen) (:total-time screen)) (get-in entities [:inventory :anim-start])))) + (-> entities + (update-in [:inventory] #(actions/start-animation screen % :default))) + entities) + entities (if (and (:opening-inventory? entities) + (animation! (get-in entities [:inventory :open]) + :is-animation-finished + (- (+ (:delta-time screen) (:total-time screen)) (get-in entities [:inventory :anim-start])))) + (do + (screen! scene :on-show-inventory) + (-> entities + (assoc :opening-inventory? false) + (assoc-in [:inventory :anim] (get-in entities [:inventory :opened])))) + entities)] #_(label! (:fps entities) :set-text (str (game :fps))) + + (render! screen [ (if (and hud-interactable? (not (:already-saved? entities))) (:save entities) (assoc (:save entities) :opacity 0.5)) (if hud-interactable? (:inventory entities) (assoc (:inventory entities) :opacity 0.5)) + (:selected-item entities) (:close entities)]) entities)) @@ -1503,6 +1535,18 @@ void main () (fn [_ [entities]] (assoc-in entities [:already-saved?] false)) + :on-chose-item + (fn [{:keys [item]} [entities]] + (println utils/+all-cursors+ (.indexOf utils/+all-cursors+ :ball-n-chain) (.indexOf utils/+all-cursors+ (:cursor item) ) (:all-items entities)) + (assoc entities :selected-item + (doto (assoc (texture (aget (get-in entities [:all-items ]) 0 (.indexOf utils/+all-cursors+ (:cursor item)))) + :x 295 :y 40 :baseline 9000 :opacity 1.0) println) + )) + + :on-reactivate + (fn [screen [entities]] + (update-in entities [:inventory] #(actions/start-animation screen % :closing))) + :on-mouse-moved (fn [screen [entities]] (let [[x y] (utils/unproject screen) @@ -1532,16 +1576,23 @@ void main () (fn [screen [entities]] (if (= (button-code :left) (:button screen)) (let [[x y] (utils/unproject screen)] - (cond ((:mouse-in? (:inventory entities)) x y) - (screen! scene :on-show-inventory) + (cond + (not (hud-interactable?)) + nil - (utils/intersects? (:close entities) [x y]) - (screen! scene :on-menu) + ((:mouse-in? (:inventory entities)) x y) + (-> entities + (update-in [:inventory] #(actions/start-animation screen % :open)) + (assoc :opening-inventory? true)) + - (and (not (:already-saved? entities)) (utils/intersects? (:save entities) [x y]) (hud-interactable?)) - (do - (screen! scene :on-save) - (assoc entities :already-saved? true)) + (utils/intersects? (:close entities) [x y]) + (screen! scene :on-menu) - :else - nil))))) + (and (not (:already-saved? entities)) (utils/intersects? (:save entities) [x y]) (hud-interactable?)) + (do + (screen! scene :on-save) + (assoc entities :already-saved? true)) + + :else + nil))))) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 1ae288d5..43b69dbc 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -451,29 +451,26 @@ (do (log/info "Making windowed 800x600 decorated window") (System/setProperty "org.lwjgl.opengl.Window.undecorated", "false") - (.setDisplayMode Gdx/graphics 800 600 false))) + (.setFullscreenMode Gdx/graphics 800 600))) (defmethod make-fullscreen :linux [] - (let [width (-> Gdx/graphics .getDesktopDisplayMode .width) - height (-> Gdx/graphics .getDesktopDisplayMode .height)] + (let [width (-> Gdx/graphics .getDisplayMode .width) + height (-> Gdx/graphics .getDisplayMode .height)] (log/info "Making fullscreen " width "x" height " as undecorated window") (System/setProperty "org.lwjgl.opengl.Window.undecorated", "true") - (.setDisplayMode Gdx/graphics + (.setFullscreenMode Gdx/graphics width - height - false))) + height))) (defmethod is-fullscreen? :linux [] (= "true" (System/getProperty "org.lwjgl.opengl.Window.undecorated"))) (defn make-fullscreen-normal [] - (let [width (-> Gdx/graphics .getDesktopDisplayMode .width) - height (-> Gdx/graphics .getDesktopDisplayMode .height)] + (let [width (-> Gdx/graphics .getDisplayMode .width) + height (-> Gdx/graphics .getDisplayMode .height)] (log/info "Making fullscreen " width "x" height " as true fullscreen") - (.setDisplayMode Gdx/graphics - width - height - true) + (.setFullscreenMode Gdx/graphics + (.getDisplayMode Gdx/graphics)) (set! (.foregroundFPS (-> (class Gdx/graphics) (.getDeclaredField (name "config")) (doto (.setAccessible true))