diff --git a/desktop/asset-work/dream/background.psd b/desktop/asset-work/dream/background.psd index cb88c39d..59bd5554 100644 Binary files a/desktop/asset-work/dream/background.psd and b/desktop/asset-work/dream/background.psd differ diff --git a/desktop/asset-work/dream/clouds1.png b/desktop/asset-work/dream/clouds1.png index 63bbbfd8..ae190375 100644 Binary files a/desktop/asset-work/dream/clouds1.png and b/desktop/asset-work/dream/clouds1.png differ diff --git a/desktop/asset-work/dream/clouds2.png b/desktop/asset-work/dream/clouds2.png deleted file mode 100644 index 0e7dd9cc..00000000 Binary files a/desktop/asset-work/dream/clouds2.png and /dev/null differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index e03007e7..e68f0a7a 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -123,27 +123,6 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -ego/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -outsidehouse/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -dream/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 inside-antique/dot rotate: false xy: 846, 784 @@ -158,7 +137,7 @@ title/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-house/dot +outsidehouse/dot rotate: false xy: 846, 784 size: 1, 1 @@ -172,6 +151,27 @@ inside-jail/dot orig: 1, 1 offset: 0, 0 index: -1 +inside-house/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +dream/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +ego/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 wizard/dot rotate: false xy: 846, 784 @@ -354,14 +354,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 849, 784 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 849, 784 size: 1, 1 @@ -1431,7 +1431,7 @@ cursorr index: -1 dawn rotate: false - xy: 646, 538 + xy: 646, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1443,9 +1443,9 @@ dream/clouds1 orig: 320, 240 offset: 0, 0 index: -1 -dream/clouds2 +dream/far rotate: false - xy: 324, 538 + xy: 333, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1515,7 +1515,7 @@ ego/pant index: -1 ending-castle/ending-castle2-assets/collision rotate: false - xy: 333, 296 + xy: 324, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1543,14 +1543,14 @@ inside-antique/closed-blinds index: -1 inside-antique/darken rotate: false - xy: 646, 780 + xy: 333, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/desk rotate: false - xy: 655, 296 + xy: 646, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1571,7 +1571,7 @@ inside-castle/door index: -1 inside-house/desk rotate: false - xy: 333, 54 + xy: 655, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2296,476 +2296,560 @@ filter: Nearest,Nearest repeat: none castle-gate/goon-2-talk rotate: false - xy: 738, 337 + xy: 500, 443 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 castle-gate/stash-closed rotate: false - xy: 2, 10 + xy: 2, 13 size: 70, 41 orig: 70, 41 offset: 0, 0 index: -1 castle-gate/throw-walkie-1 rotate: false - xy: 324, 716 + xy: 324, 477 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-2 rotate: false - xy: 324, 494 + xy: 531, 402 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 531, 474 + xy: 500, 264 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 598, 716 + xy: 707, 239 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 324, 356 + xy: 500, 126 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-6 rotate: false - xy: 531, 336 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-7 - rotate: false - xy: 324, 218 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-8 - rotate: false - xy: 324, 80 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-9 - rotate: false - xy: 738, 479 + xy: 707, 101 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 cat-tree/grandma-cry-1 rotate: false - xy: 954, 427 + xy: 440, 307 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-10 + rotate: false + xy: 851, 59 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-11 + rotate: false + xy: 851, 17 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-2 rotate: false - xy: 954, 385 + xy: 440, 265 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-3 rotate: false - xy: 963, 240 + xy: 440, 223 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-4 rotate: false - xy: 963, 198 + xy: 964, 648 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-5 rotate: false - xy: 963, 156 + xy: 440, 181 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-6 rotate: false - xy: 963, 114 + xy: 954, 510 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 954, 468 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-8 + rotate: false + xy: 954, 426 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 438, 62 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 2, 537 + xy: 2, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-r rotate: false - xy: 531, 612 + xy: 538, 540 size: 65, 240 orig: 65, 240 offset: 0, 0 index: -1 dream/broom rotate: false - xy: 990, 721 + xy: 820, 789 size: 15, 66 orig: 15, 66 offset: 0, 0 index: -1 dream/cliff rotate: false - xy: 921, 282 + xy: 768, 12 size: 81, 87 orig: 81, 87 offset: 0, 0 index: -1 +dream/corner-l + rotate: false + xy: 324, 81 + size: 112, 59 + orig: 112, 59 + offset: 0, 0 + index: -1 +dream/sky + rotate: false + xy: 2, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 dream/sword rotate: false - xy: 970, 855 + xy: 693, 543 size: 15, 38 orig: 15, 38 offset: 0, 0 index: -1 ego/frog rotate: false - xy: 987, 857 + xy: 440, 143 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 764, 339 + xy: 605, 583 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 945, 507 + xy: 911, 5 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 598, 614 + xy: 929, 690 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 970, 938 + xy: 605, 540 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 970, 895 + xy: 649, 540 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 +georgia/kick-10 + rotate: false + xy: 880, 636 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-11 + rotate: false + xy: 922, 636 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-12 + rotate: false + xy: 970, 979 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-13 + rotate: false + xy: 970, 934 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-14 + rotate: false + xy: 970, 889 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-15 + rotate: false + xy: 954, 381 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-16 + rotate: false + xy: 608, 4 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-17 + rotate: false + xy: 650, 4 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-18 + rotate: false + xy: 410, 17 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-19 + rotate: false + xy: 452, 17 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 georgia/kick-3 rotate: false - xy: 74, 8 + xy: 74, 11 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-5 rotate: false - xy: 116, 8 + xy: 116, 11 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-6 rotate: false - xy: 158, 8 + xy: 158, 11 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-7 rotate: false - xy: 200, 8 + xy: 200, 11 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 242, 8 + xy: 242, 11 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 284, 8 + xy: 284, 11 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 held/bloodclot-head-1 rotate: false - xy: 324, 632 + xy: 324, 226 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-2 rotate: false - xy: 766, 632 + xy: 324, 142 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-3 rotate: false - xy: 823, 17 + xy: 881, 552 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-2 rotate: false - xy: 738, 371 + xy: 821, 681 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-3 rotate: false - xy: 846, 371 + xy: 500, 18 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/knights rotate: false - xy: 690, 617 + xy: 692, 2 size: 74, 97 orig: 74, 97 offset: 0, 0 index: -1 -inside-cafeteria/ladder-guard - rotate: false - xy: 747, 12 - size: 74, 87 - orig: 74, 87 - offset: 0, 0 - index: -1 inside-cafeteria/warriors rotate: false - xy: 805, 726 + xy: 432, 349 size: 66, 126 orig: 66, 126 offset: 0, 0 index: -1 +inside-castle/roof + rotate: false + xy: 821, 622 + size: 57, 57 + orig: 57, 57 + offset: 0, 0 + index: -1 inside-castle/way-back-tree rotate: false - xy: 2, 53 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/balloons rotate: false - xy: 954, 469 + xy: 438, 104 size: 60, 36 orig: 60, 36 offset: 0, 0 index: -1 outside-castle/walk-behind rotate: false - xy: 2, 295 + xy: 2, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/guard-sleep rotate: false - xy: 747, 268 + xy: 646, 788 size: 172, 67 orig: 172, 67 offset: 0, 0 index: -1 outsidehouse/fg1 rotate: false - xy: 873, 789 + xy: 837, 792 size: 128, 63 orig: 128, 63 offset: 0, 0 index: -1 -outsidehouse/fgtest - rotate: false - xy: 945, 545 - size: 75, 75 - orig: 75, 75 - offset: 0, 0 - index: -1 space/Blergh rotate: false - xy: 538, 854 + xy: 324, 310 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-flex rotate: false - xy: 646, 854 + xy: 605, 615 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 646, 854 + xy: 605, 615 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-talk rotate: false - xy: 754, 854 + xy: 646, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-1 rotate: false - xy: 531, 169 + xy: 754, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 639, 169 + xy: 713, 621 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 862, 854 + xy: 738, 377 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 882, 622 + xy: 862, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 747, 101 + xy: 846, 377 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 855, 101 + xy: 914, 210 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 531, 2 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-8 - rotate: false - xy: 639, 2 + xy: 914, 43 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-1 rotate: false - xy: 440, 639 + xy: 713, 544 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-2 rotate: false - xy: 326, 3 + xy: 797, 544 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-3 rotate: false - xy: 410, 3 + xy: 326, 4 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-4 rotate: false - xy: 939, 24 + xy: 608, 49 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-stand rotate: false - xy: 324, 854 + xy: 324, 615 size: 212, 165 orig: 212, 165 offset: 0, 0 index: -1 the-end rotate: false - xy: 2, 779 + xy: 2, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/screenshot-backdrop-active rotate: false - xy: 970, 981 + xy: 967, 817 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 wizard/cloud rotate: false - xy: 856, 339 + xy: 970, 857 size: 40, 30 orig: 40, 30 offset: 0, 0 @@ -2776,548 +2860,471 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -cat-tree/grandma-cry-10 +castle-gate/throw-walkie-7 rotate: false - xy: 894, 835 - size: 58, 40 - orig: 58, 40 + xy: 2, 886 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -cat-tree/grandma-cry-11 +castle-gate/throw-walkie-8 rotate: false - xy: 954, 835 - size: 58, 40 - orig: 58, 40 + xy: 2, 748 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-9 + rotate: false + xy: 209, 886 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 683, 774 + xy: 956, 982 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 518, 693 + xy: 956, 940 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 518, 651 + xy: 956, 898 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 518, 609 + xy: 956, 856 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 434, 553 + xy: 770, 777 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 410, 511 + xy: 844, 815 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 410, 469 + xy: 763, 735 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 410, 427 + xy: 763, 693 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 518, 567 + xy: 200, 19 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 540, 735 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-8 - rotate: false - xy: 774, 835 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-9 - rotate: false - xy: 834, 835 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -dream/corner-l - rotate: false - xy: 774, 877 - size: 112, 59 - orig: 112, 59 - offset: 0, 0 - index: -1 dream/corner-r rotate: false - xy: 888, 877 + xy: 2, 19 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 683, 816 + xy: 770, 819 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ending-castle/frankie-fall-1 rotate: false - xy: 344, 347 + xy: 946, 819 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 170, 55 + xy: 432, 629 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 386, 389 + xy: 432, 592 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 386, 352 + xy: 474, 629 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-2 rotate: false - xy: 344, 310 + xy: 830, 778 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 344, 273 + xy: 434, 666 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 302, 241 + xy: 476, 666 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 344, 236 + xy: 518, 666 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 600, 740 + xy: 560, 666 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 470, 516 + xy: 602, 666 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 470, 479 + xy: 644, 666 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 470, 442 + xy: 686, 666 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-10 - rotate: false - xy: 86, 34 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-11 - rotate: false - xy: 128, 47 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-12 - rotate: false - xy: 194, 201 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-13 - rotate: false - xy: 194, 156 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-14 - rotate: false - xy: 194, 111 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-15 - rotate: false - xy: 236, 214 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-16 - rotate: false - xy: 236, 169 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-17 - rotate: false - xy: 236, 124 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-18 - rotate: false - xy: 302, 368 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-19 - rotate: false - xy: 302, 323 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 georgia/kick-20 rotate: false - xy: 302, 278 + xy: 904, 812 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 held/bloodclot-head-4 rotate: false - xy: 542, 938 + xy: 326, 499 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-5 rotate: false - xy: 658, 938 + xy: 326, 415 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-6 rotate: false - xy: 774, 938 + xy: 326, 331 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-7 rotate: false - xy: 890, 938 + xy: 326, 247 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-8 rotate: false - xy: 542, 854 + xy: 326, 163 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 658, 854 + xy: 326, 79 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-4 rotate: false - xy: 2, 79 + xy: 209, 778 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-5 rotate: false - xy: 110, 246 + xy: 218, 169 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 218, 413 + xy: 218, 61 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-7 rotate: false - xy: 326, 580 + xy: 326, 689 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 +inside-cafeteria/ladder-guard + rotate: false + xy: 317, 797 + size: 74, 87 + orig: 74, 87 + offset: 0, 0 + index: -1 inside-castle/hands-1 rotate: false - xy: 434, 749 + xy: 326, 583 size: 104, 104 orig: 104, 104 offset: 0, 0 index: -1 -inside-castle/roof +outsidehouse/fgtest rotate: false - xy: 624, 795 - size: 57, 57 - orig: 57, 57 + xy: 686, 703 + size: 75, 75 + orig: 75, 75 offset: 0, 0 index: -1 space/bloodclot-explode-10 rotate: false - xy: 2, 688 + xy: 2, 247 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-11 rotate: false - xy: 110, 855 + xy: 2, 80 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 2, 521 + xy: 110, 581 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 110, 688 + xy: 110, 414 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 218, 855 + xy: 110, 247 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 2, 354 + xy: 110, 80 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 110, 521 + xy: 416, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 218, 688 + xy: 524, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 326, 855 + xy: 632, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 2, 187 + xy: 740, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 110, 354 + xy: 848, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 218, 521 + xy: 218, 611 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 326, 688 + xy: 218, 444 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 434, 855 + xy: 218, 277 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-8 + rotate: false + xy: 2, 581 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-9 rotate: false - xy: 2, 855 + xy: 2, 414 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 110, 92 + xy: 518, 780 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 218, 259 + xy: 518, 703 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 326, 426 + xy: 602, 780 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 434, 595 + xy: 602, 703 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 540, 777 + xy: 686, 780 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 2, 2 + xy: 326, 2 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 110, 169 + xy: 410, 2 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 218, 336 + xy: 116, 3 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 326, 503 + xy: 434, 780 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 434, 672 + xy: 434, 703 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 344, 384 + xy: 260, 19 size: 40, 40 orig: 40, 40 offset: 0, 0 diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index cb9f8358..6a4a4667 100644 Binary files a/desktop/resources/packed/pack4.png and b/desktop/resources/packed/pack4.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index a541a029..456f9a19 100644 Binary files a/desktop/resources/packed/pack7.png and b/desktop/resources/packed/pack7.png differ diff --git a/desktop/resources/packed/pack8.png b/desktop/resources/packed/pack8.png index 634b4545..17e0920e 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/resources/particles/cloudy2 b/desktop/resources/particles/cloudy2 index 27601b2a..a0969754 100644 --- a/desktop/resources/particles/cloudy2 +++ b/desktop/resources/particles/cloudy2 @@ -8,12 +8,12 @@ lowMin: 3000.0 lowMax: 3000.0 - Count - min: 0 -max: 50 +max: 100 - Emission - lowMin: 0.0 lowMax: 0.0 -highMin: 70.0 -highMax: 70.0 +highMin: 25.0 +highMax: 25.0 relative: false scalingCount: 1 scaling0: 1.0 @@ -140,9 +140,9 @@ active: false active: false - Tint - colorsCount: 3 -colors0: 0.92156863 -colors1: 0.9372549 -colors2: 0.94509804 +colors0: 0.9411765 +colors1: 0.98039216 +colors2: 1.0 timelineCount: 1 timeline0: 0.0 - Transparency - @@ -151,14 +151,18 @@ lowMax: 0.0 highMin: 1.0 highMax: 1.0 relative: false -scalingCount: 3 +scalingCount: 5 scaling0: 0.0 -scaling1: 0.21052632 -scaling2: 0.05263158 -timelineCount: 3 +scaling1: 0.36842105 +scaling2: 0.49122807 +scaling3: 0.36842105 +scaling4: 0.0 +timelineCount: 5 timeline0: 0.0 -timeline1: 0.48630136 -timeline2: 1.0 +timeline1: 0.10273973 +timeline2: 0.5068493 +timeline3: 0.8630137 +timeline4: 1.0 - Options - attached: false continuous: true diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 08c8e822..2f3b3848 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -28,6 +28,8 @@ (assoc-in [:room :layers 4 :opacity] opacity) (assoc-in [:room :layers 5 :opacity] opacity) (assoc-in [:room :layers 6 :opacity] opacity) + (assoc-in [:room :layers 7 :opacity] opacity) + (assoc-in [:room :layers 8 :opacity] opacity) (assoc-in [:room :entities :sword :opacity] tool-opacity) (assoc-in [:room :entities :case :opacity] tool-opacity) (assoc-in [:room :entities :broom :opacity] tool-opacity) @@ -379,7 +381,9 @@ :ego "It seems like misery!" :ego "Plus, how can I ever win the heart of my true love, Georgia McGorgeous?"))}}} :timers {:return [1.0 1.0 return-from-island]} - :layers [(assoc (utils/get-texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) + :layers [(assoc (utils/get-texture "dream/sky.png") :x 0 :y 0 :baseline -3 :parallax 0.01) + (assoc (utils/get-texture "dream/far.png") :x -10 :y 0 :baseline -2 :parallax 0.01) + (assoc (utils/get-texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) (assoc (utils/get-texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) (assoc (utils/get-texture "dream/background.png") :x 0 :y 0 :baseline 2) @@ -514,7 +518,7 @@ (utils/fast-forward-particle (get-in entities [:room :entities :outside-particles])) (as-> entities entities - (if (get-in entities [:state :seen-intro?]) + (if (doto (get-in entities [:state :seen-intro?]) println) (set-opacity entities 1.0 1.0) (set-opacity entities 0.0 0.0)) (if (actions/has-item? entities :broom)