diff --git a/desktop/asset-work/door.ogg b/desktop/asset-work/door.ogg new file mode 100644 index 00000000..3f870398 Binary files /dev/null and b/desktop/asset-work/door.ogg differ diff --git a/desktop/asset-work/door.wav b/desktop/asset-work/door.wav index 7bcecfe0..bddd2c66 100644 Binary files a/desktop/asset-work/door.wav and b/desktop/asset-work/door.wav differ diff --git a/desktop/asset-work/ego/georgia.png b/desktop/asset-work/ego/georgia.png new file mode 100644 index 00000000..582d7eff Binary files /dev/null and b/desktop/asset-work/ego/georgia.png differ diff --git a/desktop/asset-work/ego/georgia.pxa/0.pxi b/desktop/asset-work/ego/georgia.pxa/0.pxi new file mode 100644 index 00000000..6301ad4f Binary files /dev/null and b/desktop/asset-work/ego/georgia.pxa/0.pxi differ diff --git a/desktop/asset-work/ego/georgia.pxa/1.pxi b/desktop/asset-work/ego/georgia.pxa/1.pxi new file mode 100644 index 00000000..67e47402 Binary files /dev/null and b/desktop/asset-work/ego/georgia.pxa/1.pxi differ diff --git a/desktop/asset-work/ego/georgia.pxa/2.pxi b/desktop/asset-work/ego/georgia.pxa/2.pxi new file mode 100644 index 00000000..ea29616f Binary files /dev/null and b/desktop/asset-work/ego/georgia.pxa/2.pxi differ diff --git a/desktop/asset-work/ego/georgia.pxa/CelData.plist b/desktop/asset-work/ego/georgia.pxa/CelData.plist new file mode 100644 index 00000000..4749afb9 --- /dev/null +++ b/desktop/asset-work/ego/georgia.pxa/CelData.plist @@ -0,0 +1,18 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/asset-work/inside-castle/writing.ogg b/desktop/asset-work/inside-castle/writing.ogg new file mode 100644 index 00000000..2d66c64f Binary files /dev/null and b/desktop/asset-work/inside-castle/writing.ogg differ diff --git a/desktop/asset-work/inside-castle/writing.wav b/desktop/asset-work/inside-castle/writing.wav new file mode 100644 index 00000000..62e84602 Binary files /dev/null and b/desktop/asset-work/inside-castle/writing.wav differ diff --git a/desktop/asset-work/outside-castle/door.wav b/desktop/asset-work/outside-castle/door.wav new file mode 100644 index 00000000..2a1b679c Binary files /dev/null and b/desktop/asset-work/outside-castle/door.wav differ diff --git a/desktop/asset-work/outside-castle/moo.ogg b/desktop/asset-work/outside-castle/moo.ogg new file mode 100644 index 00000000..ed3db796 Binary files /dev/null and b/desktop/asset-work/outside-castle/moo.ogg differ diff --git a/desktop/asset-work/outside-castle/moo.wav b/desktop/asset-work/outside-castle/moo.wav new file mode 100644 index 00000000..98401915 Binary files /dev/null and b/desktop/asset-work/outside-castle/moo.wav differ diff --git a/desktop/asset-work/outsidehouse/sheep-bleet.ogg b/desktop/asset-work/outsidehouse/sheep-bleet.ogg new file mode 100644 index 00000000..cc8fc915 Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-bleet.ogg differ diff --git a/desktop/asset-work/outsidehouse/sheep-bleet.wav b/desktop/asset-work/outsidehouse/sheep-bleet.wav new file mode 100644 index 00000000..2c016c27 Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-bleet.wav differ diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 960e7d39..fb0d257e 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -16,8 +16,6 @@ IOS AUDIO + blink + scratch - + peddler scratch - + sheep + candles + magic hands + gandarf explosion @@ -33,8 +31,6 @@ AUDIO + ladder break + eavesdrop + milking - + angus - + writing + antique sigh + bloodclot grunt + bloodclot explode diff --git a/desktop/resources/door.ogg b/desktop/resources/door.ogg index 846fbcbf..3f870398 100644 Binary files a/desktop/resources/door.ogg and b/desktop/resources/door.ogg differ diff --git a/desktop/resources/inside-castle/writing.ogg b/desktop/resources/inside-castle/writing.ogg new file mode 100644 index 00000000..2d66c64f Binary files /dev/null and b/desktop/resources/inside-castle/writing.ogg differ diff --git a/desktop/resources/outside-castle/moo.ogg b/desktop/resources/outside-castle/moo.ogg new file mode 100644 index 00000000..ed3db796 Binary files /dev/null and b/desktop/resources/outside-castle/moo.ogg differ diff --git a/desktop/resources/outsidehouse/sheep-bleet.ogg b/desktop/resources/outsidehouse/sheep-bleet.ogg new file mode 100644 index 00000000..cc8fc915 Binary files /dev/null and b/desktop/resources/outsidehouse/sheep-bleet.ogg differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 36b9a2ec..c0668ce5 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -633,20 +633,6 @@ cat-tree/owl orig: 152, 28 offset: 0, 0 index: -1 -cloud - rotate: false - xy: 968, 195 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 -space/cloud - rotate: false - xy: 968, 195 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 cloudy rotate: false xy: 994, 453 @@ -717,6 +703,13 @@ ego/axe-wood orig: 660, 70 offset: 0, 0 index: -1 +ego/base + rotate: false + xy: 835, 151 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 ego/crawl rotate: false xy: 348, 416 @@ -745,6 +738,13 @@ ego/frustrated-talk orig: 96, 36 offset: 0, 0 index: -1 +ego/georgia + rotate: false + xy: 669, 150 + size: 90, 30 + orig: 90, 30 + offset: 0, 0 + index: -1 ego/grow rotate: false xy: 446, 182 @@ -894,7 +894,7 @@ held/bloodclot-head-2 index: -1 held/flesh rotate: false - xy: 946, 190 + xy: 896, 190 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -908,14 +908,14 @@ inside-antique/antique-sigh index: -1 inside-antique/shopkeep rotate: false - xy: 926, 189 + xy: 876, 189 size: 18, 21 orig: 18, 21 offset: 0, 0 index: -1 inside-antique/shopkeep-talk rotate: false - xy: 852, 189 + xy: 802, 189 size: 72, 21 orig: 72, 21 offset: 0, 0 @@ -983,6 +983,13 @@ inside-castle/roof orig: 57, 57 offset: 0, 0 index: -1 +inside-castle/trophy + rotate: false + xy: 918, 194 + size: 64, 16 + orig: 64, 16 + offset: 0, 0 + index: -1 inside-house/candle-aura rotate: false xy: 538, 182 @@ -1004,20 +1011,6 @@ inside-jail/warden orig: 258, 58 offset: 0, 0 index: -1 -inside-jail/window - rotate: false - xy: 765, 151 - size: 18, 29 - orig: 18, 29 - offset: 0, 0 - index: -1 -inside-jail/window-bent - rotate: false - xy: 785, 151 - size: 18, 29 - orig: 18, 29 - offset: 0, 0 - index: -1 inventory rotate: false xy: 526, 684 @@ -1060,6 +1053,13 @@ outside-castle/note orig: 16, 16 offset: 0, 0 index: -1 +outside-castle/peddler + rotate: false + xy: 815, 151 + size: 18, 36 + orig: 18, 36 + offset: 0, 0 + index: -1 outside-jail/Untitled rotate: false xy: 2, 807 @@ -1097,7 +1097,7 @@ outside-jail/candle index: -1 outside-jail/closed-stash rotate: false - xy: 669, 150 + xy: 761, 150 size: 52, 30 orig: 52, 30 offset: 0, 0 @@ -1207,13 +1207,6 @@ white orig: 32, 24 offset: 0, 0 index: -1 -wizard/cloud - rotate: false - xy: 723, 150 - size: 40, 30 - orig: 40, 30 - offset: 0, 0 - index: -1 wizard/disappear rotate: false xy: 632, 670 @@ -1222,13 +1215,6 @@ wizard/disappear offset: 0, 0 index: -1 wizard/experiment-1 - rotate: false - xy: 805, 155 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-2 rotate: false xy: 871, 93 size: 45, 55 @@ -1257,631 +1243,596 @@ filter: Nearest,Nearest repeat: none bg4 rotate: false - xy: 2, 820 + xy: 324, 653 size: 360, 202 orig: 360, 202 offset: 0, 0 index: -1 +castle-gate/stash-closed + rotate: false + xy: 952, 739 + size: 70, 41 + orig: 70, 41 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-1 + rotate: false + xy: 324, 31 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 cat-tree/background rotate: false - xy: 2, 578 + xy: 2, 650 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +cat-tree/grandma-cry-1 + rotate: false + xy: 963, 127 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-2 + rotate: false + xy: 963, 85 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-3 + rotate: false + xy: 963, 43 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-4 + rotate: false + xy: 952, 697 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/inventory + rotate: false + xy: 952, 653 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 +cloud + rotate: false + xy: 502, 14 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +space/cloud + rotate: false + xy: 502, 14 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 dream/background rotate: false - xy: 2, 336 + xy: 324, 411 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -dream/shovel - rotate: false - xy: 324, 754 - size: 19, 64 - orig: 19, 64 - offset: 0, 0 - index: -1 -ego/base - rotate: false - xy: 345, 782 - size: 16, 36 - orig: 16, 36 - offset: 0, 0 - index: -1 ego/burnt rotate: false - xy: 364, 976 + xy: 2, 976 size: 480, 46 orig: 480, 46 offset: 0, 0 index: -1 -ego/glad - rotate: false - xy: 846, 976 - size: 140, 46 - orig: 140, 46 - offset: 0, 0 - index: -1 ego/idea rotate: false - xy: 968, 662 + xy: 968, 581 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 -ego/love-10 - rotate: false - xy: 968, 158 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-11 - rotate: false - xy: 968, 86 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-12 - rotate: false - xy: 968, 14 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 ego/love-4 rotate: false - xy: 968, 590 + xy: 968, 509 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-5 rotate: false - xy: 968, 518 + xy: 968, 437 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-6 rotate: false - xy: 968, 446 + xy: 968, 365 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-7 rotate: false - xy: 968, 374 + xy: 968, 293 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-8 rotate: false - xy: 968, 302 + xy: 968, 221 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-9 - rotate: false - xy: 968, 230 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/shoot - rotate: false - xy: 164, 10 - size: 144, 36 - orig: 144, 36 - offset: 0, 0 - index: -1 ending-castle/ending-castle2-assets/background rotate: false - xy: 2, 94 + xy: 2, 408 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/background rotate: false - xy: 364, 734 + xy: 324, 169 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +held/bloodclot-head-3 + rotate: false + xy: 2, 892 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-4 + rotate: false + xy: 118, 892 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-5 + rotate: false + xy: 234, 892 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-6 + rotate: false + xy: 350, 892 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-7 + rotate: false + xy: 2, 36 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 inside-antique/background rotate: false - xy: 324, 492 + xy: 2, 166 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/portrait rotate: false - xy: 345, 746 + xy: 466, 922 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +inside-antique/teddy + rotate: false + xy: 466, 904 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 inside-cafeteria/background rotate: false - xy: 324, 250 + xy: 646, 411 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/Untitled +inside-cafeteria/warriors-stand rotate: false - xy: 2, 2 - size: 160, 44 - orig: 160, 44 + xy: 686, 654 + size: 264, 126 + orig: 264, 126 offset: 0, 0 index: -1 inside-castle/background rotate: false - xy: 324, 8 + xy: 646, 169 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/brian-working rotate: false - xy: 2, 48 + xy: 2, 120 size: 320, 44 orig: 320, 44 offset: 0, 0 index: -1 +inside-castle/magic + rotate: false + xy: 433, 9 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 inside-house/background rotate: false - xy: 686, 734 + xy: 700, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-jail/background +inside-house/candle rotate: false - xy: 646, 492 - size: 320, 240 - orig: 320, 240 + xy: 324, 858 + size: 102, 32 + orig: 102, 32 offset: 0, 0 index: -1 -inside-stash/background +inside-house/safe-screen rotate: false - xy: 646, 250 - size: 320, 240 - orig: 320, 240 + xy: 118, 43 + size: 200, 75 + orig: 200, 75 offset: 0, 0 index: -1 -outside-castle/background +inside-jail/chest-top rotate: false - xy: 646, 8 - size: 320, 240 - orig: 320, 240 + xy: 428, 858 + size: 44, 32 + orig: 44, 32 offset: 0, 0 index: -1 -outside-castle/peddler +inside-jail/chest-top-open rotate: false - xy: 988, 986 - size: 18, 36 - orig: 18, 36 + xy: 963, 9 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 +inside-jail/window + rotate: false + xy: 996, 666 + size: 18, 29 + orig: 18, 29 + offset: 0, 0 + index: -1 +outside-castle/flies + rotate: false + xy: 455, 14 + size: 45, 15 + orig: 45, 15 offset: 0, 0 index: -1 outsidehouse/note rotate: false - xy: 324, 736 + xy: 466, 958 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +outsidehouse/sheep-anim + rotate: false + xy: 2, 8 + size: 429, 21 + orig: 429, 21 + offset: 0, 0 + index: -1 pathfind-test rotate: false - xy: 345, 764 + xy: 466, 940 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +space/bloodclot-explode-1 + rotate: false + xy: 484, 857 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-2 + rotate: false + xy: 592, 857 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-3 + rotate: false + xy: 531, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-4 + rotate: false + xy: 639, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-5 + rotate: false + xy: 747, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-6 + rotate: false + xy: 855, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +wizard/magic-hands + rotate: false + xy: 968, 169 + size: 40, 50 + orig: 40, 50 + offset: 0, 0 + index: -1 pack4.png size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -behindhouse/fgleft +castle-gate/frankie rotate: false - xy: 611, 4 - size: 161, 50 - orig: 161, 50 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-1 - rotate: false - xy: 755, 758 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-2 - rotate: false - xy: 754, 620 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-3 - rotate: false - xy: 754, 482 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-4 - rotate: false - xy: 754, 344 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-5 - rotate: false - xy: 754, 206 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-6 - rotate: false - xy: 754, 68 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-1 - rotate: false - xy: 962, 854 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-10 - rotate: false - xy: 961, 476 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-11 - rotate: false - xy: 961, 434 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-12 - rotate: false - xy: 961, 392 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-13 - rotate: false - xy: 961, 350 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-14 - rotate: false - xy: 961, 308 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-15 - rotate: false - xy: 961, 266 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-16 - rotate: false - xy: 961, 224 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-17 - rotate: false - xy: 961, 182 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-18 - rotate: false - xy: 961, 140 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-19 - rotate: false - xy: 961, 98 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-2 - rotate: false - xy: 962, 812 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-20 - rotate: false - xy: 961, 56 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-3 - rotate: false - xy: 962, 770 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-4 - rotate: false - xy: 962, 728 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-5 - rotate: false - xy: 961, 686 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-6 - rotate: false - xy: 961, 644 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 961, 602 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-8 - rotate: false - xy: 961, 560 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-9 - rotate: false - xy: 961, 518 - size: 58, 40 - orig: 58, 40 + xy: 2, 19 + size: 312, 35 + orig: 312, 35 offset: 0, 0 index: -1 ego/cat-toy rotate: false - xy: 404, 4 + xy: 608, 4 size: 205, 50 orig: 205, 50 offset: 0, 0 index: -1 +ego/love-10 + rotate: false + xy: 968, 880 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-11 + rotate: false + xy: 968, 808 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-12 + rotate: false + xy: 968, 736 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-13 + rotate: false + xy: 968, 664 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-14 + rotate: false + xy: 968, 592 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-15 + rotate: false + xy: 968, 520 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-16 + rotate: false + xy: 968, 448 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-17 + rotate: false + xy: 968, 376 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-18 + rotate: false + xy: 968, 304 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-19 + rotate: false + xy: 968, 232 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-20 + rotate: false + xy: 968, 160 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-21 + rotate: false + xy: 968, 88 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-9 + rotate: false + xy: 968, 952 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 inside-antique/beard rotate: false - xy: 324, 2 + xy: 815, 2 size: 78, 52 orig: 78, 52 offset: 0, 0 index: -1 -inside-antique/teddy - rotate: false - xy: 1002, 16 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -inside-cafeteria/warriors-stand - rotate: false - xy: 755, 896 - size: 264, 126 - orig: 264, 126 - offset: 0, 0 - index: -1 inside-castle/background-sunrise rotate: false - xy: 2, 275 + xy: 324, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/inside-castle-sunrise rotate: false - xy: 2, 275 + xy: 324, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/magic +inside-jail/background rotate: false - xy: 1002, 34 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -inside-castle/trophy - rotate: false - xy: 856, 16 - size: 64, 16 - orig: 64, 16 - offset: 0, 0 - index: -1 -inside-house/candle - rotate: false - xy: 856, 34 - size: 102, 32 - orig: 102, 32 + xy: 2, 782 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 inside-jail/bars rotate: false - xy: 432, 56 + xy: 646, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/bars- + rotate: false + xy: 646, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-stash/background + rotate: false + xy: 2, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/background + rotate: false + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/background-sunrise rotate: false - xy: 432, 298 + xy: 646, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/flies - rotate: false - xy: 324, 72 - size: 45, 15 - orig: 45, 15 - offset: 0, 0 - index: -1 outside-jail/background rotate: false - xy: 433, 782 + xy: 2, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +outside-jail/open-stash + rotate: false + xy: 316, 13 + size: 290, 41 + orig: 290, 41 + offset: 0, 0 + index: -1 outsidehouse/background rotate: false - xy: 2, 759 + xy: 324, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/background-trees rotate: false - xy: 2, 33 + xy: 324, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outsidehouse/lamb-walk - rotate: false - xy: 2, 3 - size: 108, 28 - orig: 108, 28 - offset: 0, 0 - index: -1 -outsidehouse/sheep-anim - rotate: false - xy: 2, 1001 - size: 429, 21 - orig: 429, 21 - offset: 0, 0 - index: -1 -outsidehouse/sheep-walk - rotate: false - xy: 112, 10 - size: 198, 21 - orig: 198, 21 - offset: 0, 0 - index: -1 space/background rotate: false - xy: 2, 517 + xy: 646, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -space/bloodclot-explode-1 - rotate: false - xy: 324, 834 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-2 - rotate: false - xy: 324, 667 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-3 - rotate: false - xy: 324, 500 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-4 - rotate: false - xy: 324, 333 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-5 - rotate: false - xy: 324, 166 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-3 - rotate: false - xy: 324, 89 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 testscreen/subject rotate: false - xy: 922, 17 + xy: 2, 2 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 title/background rotate: false - xy: 432, 540 + xy: 2, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 wizard/Untitled rotate: false - xy: 774, 4 + xy: 895, 4 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 -wizard/magic-hands +wizard/experiment-2 rotate: false - xy: 960, 4 - size: 40, 50 - orig: 40, 50 + xy: 977, 31 + size: 45, 55 + orig: 45, 55 offset: 0, 0 index: -1 @@ -1892,247 +1843,261 @@ filter: Nearest,Nearest repeat: none behindhouse/brush rotate: false - xy: 646, 780 + xy: 2, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +behindhouse/fgleft + rotate: false + xy: 396, 4 + size: 161, 50 + orig: 161, 50 + offset: 0, 0 + index: -1 bg5 rotate: false - xy: 324, 780 + xy: 2, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 castle-gate/Untitled rotate: false - xy: 774, 743 + xy: 2, 19 size: 192, 35 orig: 192, 35 offset: 0, 0 index: -1 -castle-gate/stash-closed - rotate: false - xy: 702, 737 - size: 70, 41 - orig: 70, 41 - offset: 0, 0 - index: -1 -cat-tree/inventory - rotate: false - xy: 44, 736 - size: 42, 42 - orig: 42, 42 - offset: 0, 0 - index: -1 dawn rotate: false - xy: 376, 54 + xy: 324, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/clouds1 rotate: false - xy: 380, 538 + xy: 646, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/clouds2 rotate: false - xy: 702, 492 + xy: 2, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 584, 16 + xy: 863, 18 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 -ego/love-13 +ego/glad rotate: false - xy: 968, 950 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-14 - rotate: false - xy: 968, 878 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-15 - rotate: false - xy: 968, 806 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-16 - rotate: false - xy: 968, 734 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-17 - rotate: false - xy: 324, 665 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-18 - rotate: false - xy: 324, 593 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-19 - rotate: false - xy: 324, 521 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-20 - rotate: false - xy: 324, 449 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-21 - rotate: false - xy: 324, 377 - size: 50, 70 - orig: 50, 70 + xy: 721, 8 + size: 140, 46 + orig: 140, 46 offset: 0, 0 index: -1 ego/love-22 rotate: false - xy: 324, 305 + xy: 968, 952 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-23 rotate: false - xy: 324, 233 + xy: 968, 880 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-24 rotate: false - xy: 324, 161 + xy: 968, 808 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-25 rotate: false - xy: 324, 89 + xy: 968, 736 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-26 rotate: false - xy: 324, 17 + xy: 968, 664 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/warden - rotate: false - xy: 540, 11 - size: 42, 41 - orig: 42, 41 - offset: 0, 0 - index: -1 ending-castle/ending-castle2-assets/collision rotate: false - xy: 376, 296 + xy: 324, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/closed-blinds rotate: false - xy: 2, 250 + xy: 2, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/darken rotate: false - xy: 698, 250 + xy: 646, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/desk rotate: false - xy: 698, 8 + xy: 646, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/gameplayer +inside-castle/Untitled rotate: false - xy: 2, 734 - size: 40, 44 - orig: 40, 44 + xy: 559, 10 + size: 160, 44 + orig: 160, 44 offset: 0, 0 index: -1 -inside-jail/bars- +inside-house/desk rotate: false - xy: 2, 780 + xy: 646, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +inside-jail/window-bent + rotate: false + xy: 306, 2 + size: 18, 29 + orig: 18, 29 + offset: 0, 0 + index: -1 outside-castle/brush rotate: false - xy: 2, 492 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outside-jail/open-stash +outsidehouse/lamb-walk rotate: false - xy: 88, 737 - size: 290, 41 - orig: 290, 41 + xy: 196, 3 + size: 108, 28 + orig: 108, 28 + offset: 0, 0 + index: -1 +outsidehouse/sheep-walk + rotate: false + xy: 196, 33 + size: 198, 21 + orig: 198, 21 offset: 0, 0 index: -1 title/clouds rotate: false - xy: 2, 8 + xy: 324, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -wizard/talk +wizard/cloud rotate: false - xy: 458, 6 - size: 80, 46 - orig: 80, 46 + xy: 968, 62 + size: 40, 30 + orig: 40, 30 offset: 0, 0 index: -1 -wizard/talk-angry +wizard/experiment-10 rotate: false - xy: 376, 2 - size: 80, 50 - orig: 80, 50 + xy: 968, 208 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-11 + rotate: false + xy: 968, 151 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-12 + rotate: false + xy: 968, 94 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-13 + rotate: false + xy: 973, 5 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-3 + rotate: false + xy: 968, 607 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-4 + rotate: false + xy: 968, 550 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-5 + rotate: false + xy: 968, 493 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-6 + rotate: false + xy: 968, 436 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-7 + rotate: false + xy: 968, 379 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-8 + rotate: false + xy: 968, 322 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-9 + rotate: false + xy: 968, 265 + size: 45, 55 + orig: 45, 55 offset: 0, 0 index: -1 @@ -2143,273 +2108,287 @@ filter: Nearest,Nearest repeat: none behindhouse/fg rotate: false - xy: 324, 772 + xy: 2, 529 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fg rotate: false - xy: 324, 772 + xy: 2, 529 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -castle-gate/frankie +cat-tree/grandma-cry-5 rotate: false - xy: 2, 9 - size: 312, 35 - orig: 312, 35 + xy: 960, 2 + size: 58, 40 + orig: 58, 40 offset: 0, 0 index: -1 dream/fountain rotate: false - xy: 324, 46 + xy: 646, 529 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/fountain rotate: false - xy: 324, 46 + xy: 646, 529 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +ego/hold-up-to-window + rotate: false + xy: 806, 7 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/shoot + rotate: false + xy: 2, 7 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 ego/stand rotate: false - xy: 462, 8 + xy: 294, 7 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/talk rotate: false - xy: 316, 8 + xy: 148, 7 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 718, 8 + xy: 550, 7 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 846, 8 + xy: 678, 7 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 -ending-castle/warden-2 +ego/warden rotate: false - xy: 968, 59 + xy: 916, 2 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 inside-antique/fg rotate: false - xy: 2, 288 + xy: 324, 771 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/glow rotate: false - xy: 646, 288 + xy: 324, 45 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/fg rotate: false - xy: 324, 530 + xy: 2, 287 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/fight rotate: false - xy: 2, 46 + xy: 646, 771 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/glow rotate: false - xy: 646, 46 + xy: 646, 287 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/fight-1 rotate: false - xy: 324, 288 + xy: 2, 45 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-house/desk +inside-house/glow rotate: false - xy: 2, 772 + xy: 646, 45 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/fg rotate: false - xy: 646, 772 + xy: 324, 529 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fence rotate: false - xy: 2, 530 + xy: 2, 771 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/foreground rotate: false - xy: 646, 530 + xy: 324, 287 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/susp rotate: false - xy: 590, 8 + xy: 422, 7 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 590, 8 + xy: 422, 7 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 -wizard/experiment-10 - rotate: false - xy: 968, 558 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-11 - rotate: false - xy: 968, 501 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-12 - rotate: false - xy: 968, 444 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-13 - rotate: false - xy: 968, 387 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-14 rotate: false - xy: 968, 330 + xy: 968, 956 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-15 rotate: false - xy: 968, 273 + xy: 968, 899 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-16 rotate: false - xy: 968, 216 + xy: 968, 842 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-17 rotate: false - xy: 968, 159 + xy: 968, 785 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-18 rotate: false - xy: 968, 102 + xy: 968, 728 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-19 rotate: false - xy: 974, 2 + xy: 968, 671 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-3 +wizard/experiment-20 rotate: false - xy: 968, 957 + xy: 968, 614 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-4 +wizard/experiment-21 rotate: false - xy: 968, 900 + xy: 968, 557 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-5 +wizard/experiment-22 rotate: false - xy: 968, 843 + xy: 968, 500 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-6 +wizard/experiment-23 rotate: false - xy: 968, 786 + xy: 968, 443 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-7 +wizard/experiment-24 rotate: false - xy: 968, 729 + xy: 968, 386 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-8 +wizard/experiment-25 rotate: false - xy: 968, 672 + xy: 968, 329 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-9 +wizard/experiment-26 rotate: false - xy: 968, 615 + xy: 968, 272 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-27 + rotate: false + xy: 968, 215 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-28 + rotate: false + xy: 968, 158 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-29 + rotate: false + xy: 968, 101 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-30 + rotate: false + xy: 968, 44 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2422,414 +2401,505 @@ filter: Nearest,Nearest repeat: none behindhouse/house rotate: false - xy: 324, 528 + xy: 2, 296 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-10 + rotate: false + xy: 480, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-11 + rotate: false + xy: 540, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-12 + rotate: false + xy: 600, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-13 + rotate: false + xy: 660, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-14 + rotate: false + xy: 720, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-15 + rotate: false + xy: 780, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-16 + rotate: false + xy: 840, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-17 + rotate: false + xy: 900, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-18 + rotate: false + xy: 960, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 240, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 300, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-8 + rotate: false + xy: 360, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 420, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/sillhoute + rotate: false + xy: 646, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/pedestals rotate: false - xy: 646, 44 + xy: 646, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -ego/hold-up-to-window +dream/shovel rotate: false - xy: 2, 6 - size: 108, 36 - orig: 108, 36 + xy: 968, 397 + size: 19, 64 + orig: 19, 64 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 112, 6 + xy: 166, 16 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 +ending-castle/warden-2 + rotate: false + xy: 968, 354 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 held/hand rotate: false - xy: 324, 770 + xy: 2, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/head rotate: false - xy: 2, 286 + xy: 324, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/open-blinds rotate: false - xy: 324, 44 + xy: 646, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +inside-castle/gameplayer + rotate: false + xy: 968, 463 + size: 40, 44 + orig: 40, 44 + offset: 0, 0 + index: -1 inside-castle/pedestal-overlay rotate: false - xy: 646, 286 + xy: 324, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-house/glow - rotate: false - xy: 2, 770 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-jail/chest-top - rotate: false - xy: 186, 10 - size: 44, 32 - orig: 44, 32 - offset: 0, 0 - index: -1 -inside-jail/chest-top-open - rotate: false - xy: 232, 10 - size: 44, 32 - orig: 44, 32 - offset: 0, 0 - index: -1 inside-jail/glow rotate: false - xy: 2, 528 + xy: 2, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inventory-overlay rotate: false - xy: 2, 44 + xy: 646, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/house rotate: false - xy: 646, 770 + xy: 324, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/later rotate: false - xy: 324, 286 + xy: 2, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 278, 2 + xy: 968, 312 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 title/logo rotate: false - xy: 646, 528 + xy: 324, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-20 - rotate: false - xy: 968, 955 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-21 - rotate: false - xy: 968, 898 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-22 - rotate: false - xy: 968, 841 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-23 - rotate: false - xy: 968, 784 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-24 - rotate: false - xy: 968, 727 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-25 - rotate: false - xy: 968, 670 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-26 - rotate: false - xy: 968, 613 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-27 - rotate: false - xy: 968, 556 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-28 - rotate: false - xy: 968, 499 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-29 - rotate: false - xy: 968, 442 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-30 - rotate: false - xy: 968, 385 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-31 rotate: false - xy: 968, 328 + xy: 968, 965 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 968, 271 + xy: 968, 908 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 968, 214 + xy: 968, 851 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 968, 157 + xy: 968, 794 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 968, 100 + xy: 968, 737 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 968, 43 + xy: 968, 680 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 +wizard/experiment-37 + rotate: false + xy: 968, 623 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-38 + rotate: false + xy: 968, 566 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-39 + rotate: false + xy: 968, 509 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/talk + rotate: false + xy: 84, 6 + size: 80, 46 + orig: 80, 46 + offset: 0, 0 + index: -1 +wizard/talk-angry + rotate: false + xy: 2, 2 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 pack8.png size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/throw-walkie-7 +castle-gate/throw-walkie-2 rotate: false - xy: 324, 156 + xy: 646, 321 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 -castle-gate/throw-walkie-8 +castle-gate/throw-walkie-3 rotate: false - xy: 324, 18 + xy: 724, 16 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 -castle-gate/throw-walkie-9 +cat-tree/brush-l rotate: false - xy: 531, 156 - size: 205, 136 - orig: 205, 136 + xy: 853, 387 + size: 152, 70 + orig: 152, 70 offset: 0, 0 index: -1 -cat-tree/sillhoute +cat-tree/grandma-cry-19 rotate: false - xy: 2, 778 - size: 320, 240 - orig: 320, 240 + xy: 2, 10 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-20 + rotate: false + xy: 62, 10 + size: 58, 40 + orig: 58, 40 offset: 0, 0 index: -1 cat-tree/tree-and-rock - rotate: false - xy: 2, 52 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -ego/swing - rotate: false - xy: 531, 79 - size: 288, 75 - orig: 288, 75 - offset: 0, 0 - index: -1 -held/title - rotate: false - xy: 646, 536 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-castle/way-back-tree - rotate: false - xy: 646, 294 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-house/safe-screen - rotate: false - xy: 738, 217 - size: 200, 75 - orig: 200, 75 - offset: 0, 0 - index: -1 -inside-house/sillhoute - rotate: false - xy: 324, 778 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-castle/walk-behind - rotate: false - xy: 324, 294 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-jail/guard-sleep - rotate: false - xy: 531, 10 - size: 172, 67 - orig: 172, 67 - offset: 0, 0 - index: -1 -space/bloodclot-explode-6 - rotate: false - xy: 821, 50 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-4 - rotate: false - xy: 940, 217 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-5 - rotate: false - xy: 705, 2 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-6 - rotate: false - xy: 929, 140 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-7 - rotate: false - xy: 929, 63 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -testscreen/test - rotate: false - xy: 646, 778 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -the-end - rotate: false - xy: 2, 536 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -title rotate: false xy: 324, 536 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -title-overlay +ego/swing + rotate: false + xy: 646, 459 + size: 288, 75 + orig: 288, 75 + offset: 0, 0 + index: -1 +held/bloodclot-head-8 + rotate: false + xy: 324, 43 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-9 + rotate: false + xy: 440, 43 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/title rotate: false xy: 2, 294 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-37 +inside-castle/way-back-tree rotate: false - xy: 968, 963 - size: 45, 55 - orig: 45, 55 + xy: 324, 294 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-38 +inside-house/sillhoute rotate: false - xy: 968, 906 - size: 45, 55 - orig: 45, 55 + xy: 2, 778 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-39 +outside-castle/walk-behind rotate: false - xy: 968, 849 - size: 45, 55 - orig: 45, 55 + xy: 646, 536 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +space/bloodclot-explode-10 + rotate: false + xy: 648, 154 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-11 + rotate: false + xy: 756, 154 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-7 + rotate: false + xy: 324, 127 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-8 + rotate: false + xy: 432, 127 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-9 + rotate: false + xy: 540, 127 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-10 + rotate: false + xy: 931, 2 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-3 + rotate: false + xy: 936, 459 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-4 + rotate: false + xy: 556, 50 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-5 + rotate: false + xy: 640, 50 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-6 + rotate: false + xy: 931, 310 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-7 + rotate: false + xy: 931, 233 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-8 + rotate: false + xy: 864, 156 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-9 + rotate: false + xy: 931, 79 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +testscreen/test + rotate: false + xy: 324, 778 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +the-end + rotate: false + xy: 646, 778 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title + rotate: false + xy: 2, 536 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title-overlay + rotate: false + xy: 2, 52 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 @@ -2838,212 +2908,149 @@ size: 1024,512 format: RGBA8888 filter: Nearest,Nearest repeat: none -cat-tree/brush-l +castle-gate/throw-walkie-4 rotate: false - xy: 542, 432 - size: 152, 70 - orig: 152, 70 + xy: 2, 347 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -held/bloodclot-head-3 +castle-gate/throw-walkie-5 rotate: false - xy: 542, 348 - size: 114, 82 - orig: 114, 82 + xy: 2, 209 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -held/bloodclot-head-4 +castle-gate/throw-walkie-6 rotate: false - xy: 542, 264 - size: 114, 82 - orig: 114, 82 + xy: 209, 347 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -held/bloodclot-head-5 +castle-gate/throw-walkie-7 rotate: false - xy: 542, 180 - size: 114, 82 - orig: 114, 82 + xy: 2, 71 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -held/bloodclot-head-6 +castle-gate/throw-walkie-8 rotate: false - xy: 434, 86 - size: 114, 82 - orig: 114, 82 + xy: 209, 209 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -held/bloodclot-head-7 +castle-gate/throw-walkie-9 rotate: false - xy: 434, 2 - size: 114, 82 - orig: 114, 82 + xy: 416, 347 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -held/bloodclot-head-8 +outside-jail/guard-sleep rotate: false - xy: 696, 420 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-9 - rotate: false - xy: 812, 420 - size: 114, 82 - orig: 114, 82 + xy: 2, 2 + size: 172, 67 + orig: 172, 67 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 742, 266 + xy: 947, 408 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 -space/bloodclot-explode-10 - rotate: false - xy: 2, 3 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-11 - rotate: false - xy: 110, 170 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 space/bloodclot-explode-12 rotate: false - xy: 218, 337 + xy: 209, 42 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 110, 3 + xy: 317, 42 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 218, 170 + xy: 623, 318 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 326, 337 + xy: 731, 318 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 218, 3 + xy: 839, 318 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 326, 170 + xy: 500, 180 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 434, 337 + xy: 608, 151 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 326, 3 + xy: 716, 151 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 434, 170 + xy: 824, 151 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-7 - rotate: false - xy: 2, 337 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-8 - rotate: false - xy: 2, 170 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-9 - rotate: false - xy: 110, 337 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-10 - rotate: false - xy: 550, 26 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 658, 343 + xy: 416, 270 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 658, 266 + xy: 932, 241 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 742, 343 + xy: 932, 164 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 658, 189 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-8 - rotate: false - xy: 928, 427 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-9 - rotate: false - xy: 550, 103 + xy: 932, 87 size: 82, 75 orig: 82, 75 offset: 0, 0 diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index 1571b2d6..f9896baf 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 e465f418..077720a1 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 612b0bcc..d5ea4b65 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 ba4b9ef0..c9c90f8c 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 4fab88f2..a91922e9 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 2e9105ee..ca6afea2 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 7d0d4de4..c3c34feb 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/resources/packed/pack9.png b/desktop/resources/packed/pack9.png index 0ad8cd19..c4375ef2 100644 Binary files a/desktop/resources/packed/pack9.png and b/desktop/resources/packed/pack9.png differ diff --git a/desktop/resources/particles/cloud-georgia b/desktop/resources/particles/cloud-georgia new file mode 100644 index 00000000..97cc7e94 --- /dev/null +++ b/desktop/resources/particles/cloud-georgia @@ -0,0 +1,304 @@ +base +- Delay - +active: false +- Duration - +lowMin: 2000.0 +lowMax: 2000.0 +- Count - +min: 0 +max: 10 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1000.0 +highMax: 1000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 30.0 +lowMax: 30.0 +highMin: 40.0 +highMax: 40.0 +relative: false +scalingCount: 7 +scaling0: 0.6122449 +scaling1: 0.7755102 +scaling2: 0.877551 +scaling3: 0.7755102 +scaling4: 0.9183673 +scaling5: 0.877551 +scaling6: 1.0 +timelineCount: 7 +timeline0: 0.0 +timeline1: 0.10273973 +timeline2: 0.28767124 +timeline3: 0.46575344 +timeline4: 0.67808217 +timeline5: 0.8287671 +timeline6: 1.0 +- Velocity - +active: false +- Angle - +active: false +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 40.0 +highMax: -40.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 6 +scaling0: 0.12280702 +scaling1: 0.57894737 +scaling2: 0.5263158 +scaling3: 0.61403507 +scaling4: 0.64912283 +scaling5: 0.24561404 +timelineCount: 6 +timeline0: 0.0 +timeline1: 0.09589041 +timeline2: 0.3561644 +timeline3: 0.60958904 +timeline4: 0.8835617 +timeline5: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +cloud-georgia.png + + +top +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 15 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 2000.0 +highMax: 2000.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.3 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: -15.0 +lowMax: 15.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: -15.0 +lowMax: 15.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 15.0 +lowMax: 10.0 +highMin: 0.0 +highMax: 10.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 4.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: -20.0 +highMax: 20.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 0.9647059 +colors2: 0.9647059 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.5614035 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.5479452 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +cloud-georgia.png diff --git a/desktop/resources/particles/cloud-georgia.png b/desktop/resources/particles/cloud-georgia.png new file mode 100644 index 00000000..0e7ae358 Binary files /dev/null and b/desktop/resources/particles/cloud-georgia.png differ diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 8b5dceff..6be4d538 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -796,3 +796,66 @@ (play-animation entities :ego :love) (actions/update-state entities (fn [s] (assoc s :has-seen-love? true))) (transition-music entities nil :duration 1.0)))) + + +(defn fade-in-georgia [entities] + (actions/run-action entities + (begin [this screen entities] + (particle-effect! (get-in entities [:room :entities :georgia-cloud]) :reset) + (particle-effect! (get-in entities [:room :entities :georgia-cloud]) :start) + (-> entities + (assoc-in [:room :entities :georgia-face :x] (- (get-in entities [:room :entities :ego :x]) 30)) + (assoc-in [:room :entities :georgia-face :y] (+ (get-in entities [:room :entities :ego :y]) 30)) + + (assoc-in [:room :entities :georgia-cloud :x] (- (get-in entities [:room :entities :ego :x]) 30)) + (assoc-in [:room :entities :georgia-cloud :y] (+ (get-in entities [:room :entities :ego :y]) 30)) + (assoc-in [:tweens :fade-georgia] + (tween/tween :fade-georgia screen [:room :entities :georgia-face :opacity] 0.0 1.0 1.0 :ease tween/ease-in-cubic)))) + + (continue [this screen entities] + (assoc-in entities [:room :entities :georgia-cloud :opacity] (get-in entities [:room :entities :georgia-face :opacity]))) + + (done? [this screen entities] + (nil? (get-in entities [:tweens :fade-georgia]))) + + (terminate [this screen entities] + entities) + (skip-type [this screen entities] + :none))) + +(defn fade-out-georgia [entities] + (actions/run-action entities + (begin [this screen entities] + (particle-effect! (get-in entities [:room :entities :georgia-cloud]) :allow-completion) + (-> entities + (assoc-in [:tweens :fade-georgia] + (tween/tween :fade-georgia screen [:room :entities :georgia-face :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic)))) + + (continue [this screen entities] + entities) + + (done? [this screen entities] + (nil? (get-in entities [:tweens :fade-georgia]))) + + (terminate [this screen entities] + entities) + (skip-type [this screen entities] + :none))) + +(defn georgia-say [entities msg] + (fade-in-georgia entities) + (actions/talk entities :georgia-face msg) + (fade-out-georgia entities) + (transition-music entities nil :duration 1.0)) + +(defn in-love [entities] + (let [seen-love (get-in @entities [:state :has-seen-love?])] + (when (or (not seen-love) + (< (rand-int 10) 3)) + + (transition-music entities :love :duration 1.0) + (fade-in-georgia entities) + (play-animation entities :ego :love) + (actions/update-state entities (fn [s] (assoc s :has-seen-love? true))) + (fade-out-georgia entities) + (transition-music entities nil :duration 1.0)))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index c913d9b1..761b6e29 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -46,7 +46,7 @@ (actions/has-obtained? entities :sword) 0.0 :else - (max 0.0 (- 1.0 (/ (utils/dist 45 97 (:x ego) (:y ego)) 50.0)))))) + (* 0.2 (max 0.0 (- 1.0 (/ (utils/dist 45 97 (:x ego) (:y ego)) 50.0))))))) (defn bloodclot-appear [entities] (actions/run-action entities @@ -341,7 +341,7 @@ game-player-stand-up (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]] (aget game-player-talk-sheet 0 i))) - game-player-stand-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.1 [0 1 1 2 0 2 2 1 0 2 2 2 2 2 1 1 ]) + game-player-stand-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.1 (flatten (repeat 4 [0 1 1 2 0 2 2 1 0 2 2 2 2 2 1 1 ]))) game-player-talk-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.2 [2 3 2 2 3 2 3 2]) game-player-pause-from-work (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.15 [2 3 4 5 6 7]) game-player-get-to-work (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.15 (reverse [2 3 4 5 6 7])) @@ -426,8 +426,8 @@ :script (actions/get-script entities (actions/do-dialogue entities :ego "That's Georgia McGorgeous' house." - :ego "One day, when I'm a knight, I'll ask her to be my girlfriend.") - (actions/in-love entities))}} + :ego "One day, when I'm a knight, she'll say...") + (actions/georgia-say entities "Kiss me, brave Sir Tick!"))}} :layers {:day [(assoc (utils/get-texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) (assoc (utils/get-texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) (assoc (utils/get-texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5) @@ -485,7 +485,7 @@ :x 160 :y 97 :baseline 99 :open door :door-sound (utils/load-sound "door.ogg") - :anim-sound-frames {door {1 [:door-sound 1.0]}} + :anim-sound-frames {door {1 [:door-sound 0.1]}} ) :sword (assoc (utils/get-texture "inside-castle/sword.png") :x 22 @@ -526,6 +526,7 @@ :game-player (assoc (utils/get-texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 :talk-color (color 1.0 0.3 0.2 1.0) :script (actions/get-script entities (do-game-player-dialogue entities)) + :writing-sound (utils/load-sound "inside-castle/writing.ogg") :facing :left :scripts #(condp = % :wool (actions/get-script entities @@ -602,7 +603,8 @@ :talk game-player-talk-up} :get-to-work game-player-get-to-work :pause-from-work game-player-pause-from-work - :anim-sound-frames {game-player-stand-up {11 [:blink 0.3] }} + :anim-sound-frames {game-player-stand-up {11 [:blink 0.3] } + game-player-stand-down {1 [:writing-sound 0.07]}} :flex game-player-flex)} :monocle (rooms/make-entity :monocle (assoc (animation->texture screen monocle) :x 209 :y 160 :baseline 240 diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 2bf6e7a3..46e9514e 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -14,7 +14,7 @@ (defn flies-vol [entities] - (utils/proximity-volume entities [201 175] :scale 0.5)) + (utils/proximity-volume entities [201 175] :scale 0.20)) (defn do-initial-peddler-conversation [entities] (actions/do-dialogue entities @@ -361,6 +361,8 @@ :steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 155 :baseline 80 :stand steer-stand :night-profile :sprite + :moo (utils/load-sound "outside-castle/moo.ogg") + :anim-sound-frames {steer-stand {10 [:moo 0.2]}} :script (actions/get-script entities (actions/walk-to entities :ego [168 150] :face :right) (actions/do-dialogue entities diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index c2d24966..e4b9e740 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -705,7 +705,9 @@ nil) :eat-sound (utils/load-sound "outsidehouse/sheep-eat.ogg") - :anim-sound-frames {sheep-stand {11 [:eat-sound 1.0]}} + :bleet-sound (utils/load-sound "outsidehouse/sheep-bleet.ogg") + :anim-sound-frames {sheep-stand {11 [:eat-sound 0.3] + 35 [:bleet-sound 0.5]}} :left {:walk (utils/flip sheep-walk) :stand (utils/flip sheep-stand)} :right {:walk sheep-walk @@ -722,7 +724,7 @@ :x 253 :y 88 :baseline 122 :open door :door-sound (utils/load-sound "door.ogg") - :anim-sound-frames {door {1 [:door-sound 1.0]}} + :anim-sound-frames {door {1 [:door-sound 0.1]}} ) :lamb (assoc (utils/get-texture "outsidehouse/lamb.png") :x 10 :y 163 :baseline 77 diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 70a1cb13..a56626fc 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -283,7 +283,7 @@ (as-> entities entities (utils/play-sound! screen entities (get-in entities [:room :fountain-sound :sound]) - (utils/sourced-volume-fn :fountain 0.25 [172 120]) + (utils/sourced-volume-fn :fountain 0.15 [172 120]) (utils/get-sound-pan 172) :loop) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 010defd9..fb14875f 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -657,10 +657,10 @@ void main() :x (first start-pos) :y (last start-pos) :id "ego"} - ego (assoc ego :anim-sound-frames {(get-in ego [:left :walk]) {2 [choose-step-sound 0.6] - 6 [choose-step-sound 0.6]} - (get-in ego [:right :walk]) {2 [choose-step-sound 0.6] - 6 [choose-step-sound 0.6]} + ego (assoc ego :anim-sound-frames {(get-in ego [:left :walk]) {2 [choose-step-sound 0.3] + 6 [choose-step-sound 0.3]} + (get-in ego [:right :walk]) {2 [choose-step-sound 0.3] + 6 [choose-step-sound 0.3]} (get-in ego [:left :talk] ) {2 [:blink 0.15]} (get-in ego [:right :talk] ) {2 [:blink 0.15]} @@ -841,7 +841,7 @@ void main() [{:keys [id sound volume-fn]} & rest] (get-in entities [:current-sounds :value])] (if id (do - (sound! sound :set-volume id (volume-fn entities)) + (sound! sound :set-volume id (utils/scale-vol-from-fade entities (volume-fn entities))) (recur entities rest)) entities))) @@ -926,6 +926,30 @@ void main() (defn mouse-moved [{:keys [input-x input-y viewport] :as screen} [entities]] (utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y]))) +(defn add-georgia-to-all-rooms [screen rooms] + (let [georgia-talk (utils/make-anim "ego/georgia.png" [30 30] 0.2 [0 1 0 1 0 0 1 0 1 2]) + georgia-stand (utils/make-anim "ego/georgia.png" [30 30] 0.3 [0 0 0 0 0 0 0 2 0 0 0 0 2]) + + georgia-face (rooms/make-entity :georgia-face + (assoc (animation->texture screen georgia-stand) + :talk georgia-talk + :anim georgia-stand + :stand georgia-stand + :talk-color (Color/valueOf "ffabe0ff") + :anim-start 0 + :x 100 :y 100 :baseline 242 :origin-x 15 :origin-y 15 + :opacity 0.0)) + georgia-cloud (assoc (particle-effect "particles/cloud-georgia") :x 100 :y 100 :baseline 241 :opacity 0.0)] + (reduce (fn [rooms room-key] + (update-in rooms [room-key :entities] + assoc + :georgia-face georgia-face + :georgia-cloud georgia-cloud)) + rooms + (keys rooms)))) + + + (defscreen scene :on-timer (fn [screen [entities]] @@ -958,11 +982,13 @@ void main() :castle-gate (rooms.castle-gate/make screen) :outside-jail (rooms.outside-jail/make screen) :outside-castle (rooms.outside-castle/make screen)} + rooms (add-georgia-to-all-rooms screen rooms) entities {:rooms rooms :step-particles (assoc (particle-effect "particles/step") :x 100 :y 100 :baseline 241) :cam {:zoom 0.95 :paused? false :object nil} + :current-sounds {:object nil :value []} :musics {:object nil @@ -1061,6 +1087,7 @@ void main() entities (update-from-room screen entities) entities (update-from-hotspots screen entities) entities (assoc-in entities [:room :entities :ego :last-frame] (get-in entities [:room :entities :ego :object])) + entities (update-in entities [:room :entities] (fn [entities] (into entities (for [[id entity] entities] diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 4be1398d..3d38bd7c 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -68,7 +68,10 @@ (defn snapshot-state [entities name] (doto (.getPreferences (Gdx/app) "ticks-tales-saves") (.putString (saves/saves name) (pr-str (entities :state))) - (.putString "snapshot-list" (pr-str (filter (complement #{"Autosave"} ) (cons (saves/saves name) (snapshot-list))))) + (.putString "snapshot-list" (pr-str (filter (complement #{"Autosave"}) + (cons (saves/saves name) + (filter (complement #{(saves/saves name)}) + (snapshot-list)))))) .flush)) (defn save [entities] @@ -257,7 +260,8 @@ (defn load-sound [f] (try (sound f) - (catch Exception _ + (catch Exception e + (println e) (sound (str f ".mp3"))))) @@ -405,13 +409,16 @@ (defn sourced-volume-fn [target vol-scale [x y]] (fn [entities] - (* (if (= target :ego) - (-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.75) - (* (or vol-scale 1.0)) - (clamp-volume)) - (proximity-volume entities [x y] :scale vol-scale)) - (- 1.0 (get-in entities [:fade :opacity]))))) + (if (= target :ego) + (-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.75) + (* (or vol-scale 1.0)) + (clamp-volume)) + (proximity-volume entities [x y] :scale vol-scale)) + )) +(defn scale-vol-from-fade [entities vol] + (* vol + (- 1.0 (get-in entities [:fade :opacity])))) (defn play-sound! ([screen entities snd volume-fn] @@ -423,8 +430,8 @@ ([screen entities snd volume-fn pan type] (let [vol (volume-fn entities) sound-id (if (= :once type) - (sound! snd :play (current-sound-volume vol) 1.0 pan) - (sound! snd :loop (current-sound-volume vol) 1.0 pan)) ] + (sound! snd :play (scale-vol-from-fade entities (current-sound-volume vol)) 1.0 pan) + (sound! snd :loop (scale-vol-from-fade entities (current-sound-volume vol)) 1.0 pan)) ] (update-in entities [:current-sounds :value] conj {:id sound-id :sound snd