diff --git a/desktop/asset-work/dream/cliff.png b/desktop/asset-work/dream/cliff.png index 1a191229..07b4ba1b 100644 Binary files a/desktop/asset-work/dream/cliff.png and b/desktop/asset-work/dream/cliff.png differ diff --git a/desktop/asset-work/dream/clouds1.png b/desktop/asset-work/dream/clouds1.png index ae190375..782bad7f 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/far.png b/desktop/asset-work/dream/far.png index 586b2627..552f7882 100644 Binary files a/desktop/asset-work/dream/far.png and b/desktop/asset-work/dream/far.png differ diff --git a/desktop/build-osx.json b/desktop/build-osx.json index df306680..37f640bf 100644 --- a/desktop/build-osx.json +++ b/desktop/build-osx.json @@ -1,6 +1,6 @@ { "platform": "mac", - "jdk": "/Users/brycecovert/dev/jvms/jre1.8.0_91.jre/Contents/Home/Archive.zip", + "jdk": "/Users/brycecovert/dev/jvms/jre1.8.0_112.jre/Contents/jre.zip", "executable": "Tick's Tales", "vmargs": [], "appjar": "target/advent-standalone.jar", diff --git a/desktop/build-windows.json b/desktop/build-windows.json index 3e03ed2f..6e7670de 100644 --- a/desktop/build-windows.json +++ b/desktop/build-windows.json @@ -1,6 +1,6 @@ { "platform": "windows", - "jdk": "/Users/brycecovert/dev/jvms/openjdk-1.7.0-u80-unofficial-windows-i586-image.zip", + "jdk": "/Users/brycecovert/dev/jvms/java-1.8.0-openjdk-1.8.0.111-3.b15.ojdkbuild.windows.x86_64.zip", "executable": "TicksTales", "appjar": "target/advent-standalone.jar", "mainclass": "advent/core/desktop_launcher", diff --git a/desktop/build-zip.sh b/desktop/build-zip.sh index 08dd7771..f28def5c 100755 --- a/desktop/build-zip.sh +++ b/desktop/build-zip.sh @@ -6,11 +6,15 @@ cd target # cp -r "/Users/brycecovert/Music/Tick's Tales OST" osx/OST # cp -r "/Users/brycecovert/Music/Tick's Tales OST" windows/OST mv osx "Tick's Tales - OS X" +mv osx-mobilesim "Tick's Tales - OS X - Mobile Sim" mv linux "Tick's Tales - Linux" mv windows "Tick's Tales - Windows" +mv windows-mobilesim "Tick's Tales - Windows - Mobile Sim" zip -r linux-1.2.`cat ../last-release`.zip "Tick's Tales - Linux" zip -r osx-1.2.`cat ../last-release`.zip "Tick's Tales - OS X" +zip -r osx-mobilesim-1.2.`cat ../last-release`.zip "Tick's Tales - OS X - Mobile Sim" zip -r windows-1.2.`cat ../last-release`.zip "Tick's Tales - Windows" +zip -r windows-mobilesim-1.2.`cat ../last-release`.zip "Tick's Tales - Windows - Mobile Sim" popd rm ~/Dropbox/TicksTalesBuilds/*.zip cp target/*.zip ~/Dropbox/TicksTalesBuilds/ diff --git a/desktop/project.clj b/desktop/project.clj index c8a696bf..7e1ec545 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -33,6 +33,16 @@ [slamhound "1.5.5"] [org.clojure/data.csv "0.1.3"]] + #_#_:warn-on-reflection true} + :mobile-dev { + :source-paths ["src" "src-common" "src-dev"] + :jvm-opts ["-Duse-repl=true" "-Dno-steam=true" "-Dui_scale=1.5" #_"-Dclojure.compiler.direct-linking=true"] + :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"] + [org.clojure/tools.nrepl "0.2.12"] + [play-clj-nrepl "0.1.0" :exclusions [play-clj]] + [slamhound "1.5.5"] + [org.clojure/data.csv "0.1.3"]] + #_#_:warn-on-reflection true} :app-store { :source-paths ["src" "src-common" "src-dev"] diff --git a/desktop/release-non-steam.sh b/desktop/release-non-steam.sh index 8b208972..a16005e3 100755 --- a/desktop/release-non-steam.sh +++ b/desktop/release-non-steam.sh @@ -1,7 +1,9 @@ #!/bin/bash -#lein do clean, compile, uberjar -# java -jar packr.jar build-windows.json +lein do clean, compile, uberjar +java -jar packr.jar build-windows.json +java -jar packr.jar build-windows-mobilesim.json java -jar packr.jar build-osx.json +java -jar packr.jar build-osx-mobilesim.json # java -jar packr.jar build-linux-32.json # java -jar packr.jar build-linux-64.json cp icons.icns target/osx/Tick\'s\ Tales.app/Contents/Resources/ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index ad156037..9556df1b 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -48,7 +48,7 @@ castle-gate/background index: -1 castle-gate/coinflip rotate: false - xy: 1978, 876 + xy: 1228, 904 size: 50, 10 orig: 50, 10 offset: 0, 0 @@ -139,7 +139,7 @@ cat-tree/background index: -1 cat-tree/cat rotate: false - xy: 1228, 903 + xy: 1432, 20 size: 22, 11 orig: 22, 11 offset: 0, 0 @@ -263,13 +263,6 @@ cat-tree/grandma-cry-5 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/grandma-cry-6 - rotate: false - xy: 1978, 888 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 cat-tree/monocle rotate: false xy: 1856, 1573 @@ -312,6 +305,13 @@ cloudy orig: 20, 20 offset: 0, 0 index: -1 +cursorr + rotate: false + xy: 461, 4 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 dbh rotate: false xy: 2, 1086 @@ -347,13 +347,6 @@ dream/case orig: 15, 38 offset: 0, 0 index: -1 -dream/cliff - rotate: false - xy: 1952, 1130 - size: 81, 87 - orig: 81, 87 - offset: 0, 0 - index: -1 dream/fairy-godfather rotate: false xy: 1284, 1654 @@ -510,7 +503,7 @@ ego/ida index: -1 ego/idea rotate: false - xy: 1978, 930 + xy: 1978, 942 size: 54, 70 orig: 54, 70 offset: 0, 0 @@ -657,21 +650,21 @@ held/bloodclot-head-1 index: -1 held/dot rotate: false - xy: 1228, 900 + xy: 1978, 876 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 space/dot rotate: false - xy: 1228, 900 + xy: 1978, 876 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 outside-jail/dot rotate: false - xy: 1228, 900 + xy: 1978, 876 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -811,7 +804,7 @@ inside-cafeteria/ladder-guard-2 index: -1 inside-cafeteria/warriors rotate: false - xy: 1978, 1002 + xy: 1978, 1014 size: 66, 126 orig: 66, 126 offset: 0, 0 @@ -888,7 +881,7 @@ inside-castle/trophy index: -1 inside-castle/watch rotate: false - xy: 1952, 1219 + xy: 1475, 392 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -916,7 +909,7 @@ inside-house/flask index: -1 inside-house/frog-legs rotate: false - xy: 468, 4 + xy: 442, 4 size: 17, 16 orig: 17, 16 offset: 0, 0 @@ -944,7 +937,7 @@ inside-jail/background index: -1 inside-jail/ball-n-chain rotate: false - xy: 428, 4 + xy: 402, 4 size: 38, 16 orig: 38, 16 offset: 0, 0 @@ -1005,6 +998,13 @@ outside-castle/flies orig: 45, 15 offset: 0, 0 index: -1 +outside-castle/note + rotate: false + xy: 479, 4 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 outside-castle/peddler rotate: false xy: 2017, 12 @@ -1021,7 +1021,7 @@ outside-jail/Untitled index: -1 outside-jail/alarm-clock rotate: false - xy: 1432, 20 + xy: 1106, 840 size: 16, 11 orig: 16, 11 offset: 0, 0 @@ -1070,7 +1070,7 @@ outside-jail/rope index: -1 outside-jail/spear rotate: false - xy: 2035, 1166 + xy: 1842, 1497 size: 11, 51 orig: 11, 51 offset: 0, 0 @@ -1091,32 +1091,39 @@ outsidehouse/cauldron index: -1 outsidehouse/charcoal-1 rotate: false - xy: 324, 2 + xy: 1952, 1122 size: 24, 18 orig: 24, 18 offset: 0, 0 index: -1 outsidehouse/charcoal-2 rotate: false - xy: 350, 2 + xy: 324, 2 size: 24, 18 orig: 24, 18 offset: 0, 0 index: -1 outsidehouse/charcoal-3 rotate: false - xy: 376, 2 + xy: 350, 2 size: 24, 18 orig: 24, 18 offset: 0, 0 index: -1 outsidehouse/charcoal-4 rotate: false - xy: 402, 2 + xy: 376, 2 size: 24, 18 orig: 24, 18 offset: 0, 0 index: -1 +outsidehouse/fg2 + rotate: false + xy: 1978, 879 + size: 59, 61 + orig: 59, 61 + offset: 0, 0 + index: -1 outsidehouse/lamb rotate: false xy: 2020, 1702 @@ -1229,6 +1236,13 @@ space/bloodclot-explode-2 orig: 106, 165 offset: 0, 0 index: -1 +space/bloodclot-head-talk-1 + rotate: false + xy: 1952, 1142 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 space/bloodclot-talk rotate: false xy: 2, 919 @@ -1238,7 +1252,7 @@ space/bloodclot-talk index: -1 space/broken-jewel rotate: false - xy: 2036, 1844 + xy: 2036, 1203 size: 10, 14 orig: 10, 14 offset: 0, 0 @@ -1301,7 +1315,7 @@ wizard/disappear index: -1 wizard/flame rotate: false - xy: 1952, 1118 + xy: 2034, 1002 size: 5, 10 orig: 5, 10 offset: 0, 0 @@ -1328,483 +1342,658 @@ filter: Nearest,Nearest repeat: none behindhouse/brush rotate: false - xy: 2, 1322 + xy: 2, 1080 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 behindhouse/fg rotate: false - xy: 1290, 1806 + xy: 968, 1564 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fg rotate: false - xy: 1290, 1806 + xy: 968, 1564 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +behindhouse/fgleft + rotate: false + xy: 1870, 748 + size: 161, 50 + orig: 161, 50 + offset: 0, 0 + index: -1 behindhouse/house - rotate: false - xy: 324, 354 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -behindhouse/house-cover - rotate: false - xy: 592, 12 - size: 20, 21 - orig: 20, 21 - offset: 0, 0 - index: -1 -castle-gate/frankie - rotate: false - xy: 2, 29 - size: 312, 35 - orig: 312, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-6 - rotate: false - xy: 2022, 525 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-7 - rotate: false - xy: 2022, 488 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-8 - rotate: false - xy: 2022, 451 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/goon-2 - rotate: false - xy: 2022, 417 - size: 24, 32 - orig: 24, 32 - offset: 0, 0 - index: -1 -castle-gate/goon-2-talk - rotate: false - xy: 2022, 383 - size: 24, 32 - orig: 24, 32 - offset: 0, 0 - index: -1 -cat-tree/inventory - rotate: false - xy: 1870, 460 - size: 42, 42 - orig: 42, 42 - offset: 0, 0 - index: -1 -cat-tree/sillhoute - rotate: false - xy: 1290, 838 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -cat-tree/tree-and-rock - rotate: false - xy: 1290, 596 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -cursorr - rotate: false - xy: 2030, 760 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -dawn - rotate: false - xy: 968, 1806 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/clouds1 - rotate: false - xy: 2, 1080 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/far - rotate: false - xy: 646, 1322 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/fountain - rotate: false - xy: 2, 354 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-jail/fountain - rotate: false - xy: 2, 354 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/pedestals - rotate: false - xy: 968, 596 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/sky - rotate: false - xy: 646, 112 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -ego/get-sick - rotate: false - xy: 1934, 841 - size: 108, 36 - orig: 108, 36 - offset: 0, 0 - index: -1 -ego/love-1 - rotate: false - xy: 1978, 706 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-2 - rotate: false - xy: 1978, 634 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/love-3 - rotate: false - xy: 1978, 562 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/pant - rotate: false - xy: 1548, 558 - size: 62, 36 - orig: 62, 36 - offset: 0, 0 - index: -1 -ego/standup - rotate: false - xy: 614, 12 - size: 225, 55 - orig: 225, 55 - offset: 0, 0 - index: -1 -ego/swing - rotate: false - xy: 324, 35 - size: 288, 75 - orig: 288, 75 - offset: 0, 0 - index: -1 -ending-castle/ending-castle2-assets/collision - rotate: false - xy: 324, 1322 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -held/flesh - rotate: false - xy: 1590, 474 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -held/hand - rotate: false - xy: 1612, 1564 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -held/head - rotate: false - xy: 2, 112 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-antique/closed-blinds - rotate: false - xy: 324, 1564 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-antique/darken - rotate: false - xy: 646, 1564 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-antique/desk - rotate: false - xy: 2, 838 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-antique/fg - rotate: false - xy: 2, 596 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-antique/glow rotate: false xy: 324, 596 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-antique/open-blinds +behindhouse/house-cover rotate: false - xy: 324, 112 + xy: 940, 294 + size: 20, 21 + orig: 20, 21 + offset: 0, 0 + index: -1 +black + rotate: false + xy: 1864, 7 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 +castle-gate/frankie + rotate: false + xy: 648, 317 + size: 312, 35 + orig: 312, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-6 + rotate: false + xy: 2018, 880 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-7 + rotate: false + xy: 2018, 843 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-8 + rotate: false + xy: 2022, 1103 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/goon-2 + rotate: false + xy: 1900, 610 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 +cat-tree/owl + rotate: false + xy: 1872, 1251 + size: 168, 30 + orig: 168, 30 + offset: 0, 0 + index: -1 +cat-tree/sillhoute + rotate: false + xy: 1284, 109 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-antique/portrait +cat-tree/tree-and-rock rotate: false - xy: 2030, 688 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -inside-antique/shopkeep - rotate: false - xy: 284, 6 - size: 18, 21 - orig: 18, 21 - offset: 0, 0 - index: -1 -inside-antique/teddy - rotate: false - xy: 2030, 652 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -inside-cafeteria/fg - rotate: false - xy: 324, 838 + xy: 1606, 351 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/fight +dawn rotate: false - xy: 968, 1322 + xy: 326, 1322 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-1 +dream/cliff rotate: false - xy: 1290, 402 - size: 256, 192 - orig: 256, 192 + xy: 2, 838 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-2 +dream/clouds1 rotate: false - xy: 1612, 644 - size: 256, 192 - orig: 256, 192 + xy: 2, 112 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-3 +dream/corner-l rotate: false - xy: 1290, 208 - size: 256, 192 - orig: 256, 192 + xy: 1934, 1987 + size: 112, 59 + orig: 112, 59 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-4 +dream/corner-r rotate: false - xy: 1290, 14 - size: 256, 192 - orig: 256, 192 + xy: 1934, 1926 + size: 112, 59 + orig: 112, 59 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-5 +dream/far rotate: false - xy: 1612, 450 - size: 256, 192 - orig: 256, 192 + xy: 648, 1322 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-6 +dream/fountain rotate: false - xy: 1548, 256 - size: 256, 192 - orig: 256, 192 + xy: 1614, 1322 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-7 +outside-jail/fountain rotate: false - xy: 1548, 62 - size: 256, 192 - orig: 256, 192 + xy: 1614, 1322 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/glow +dream/pedestals + rotate: false + xy: 962, 109 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/sky + rotate: false + xy: 1292, 1080 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ego/Untitled + rotate: false + xy: 1782, 71 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/talk + rotate: false + xy: 1782, 71 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/crowbar + rotate: false + xy: 1782, 33 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/frustrated-talk + rotate: false + xy: 862, 86 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/get-sick + rotate: false + xy: 1934, 1888 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/hold-up-to-window + rotate: false + xy: 1934, 1850 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/love-1 + rotate: false + xy: 1548, 489 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-2 + rotate: false + xy: 1548, 417 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-3 + rotate: false + xy: 1870, 676 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/pant + rotate: false + xy: 1980, 1178 + size: 62, 36 + orig: 62, 36 + offset: 0, 0 + index: -1 +ego/scared-walk + rotate: false + xy: 862, 48 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/sigh + rotate: false + xy: 1870, 800 + size: 162, 36 + orig: 162, 36 + offset: 0, 0 + index: -1 +ego/swing + rotate: false + xy: 648, 195 + size: 288, 75 + orig: 288, 75 + offset: 0, 0 + index: -1 +ending-castle/crowd-right + rotate: false + xy: 1928, 444 + size: 116, 135 + orig: 116, 135 + offset: 0, 0 + index: -1 +ending-castle/ending-castle2-assets/collision + rotate: false + xy: 324, 1806 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +georgia/kick-1 + rotate: false + xy: 1656, 1083 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-2 + rotate: false + xy: 1698, 1083 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-4 + rotate: false + xy: 1698, 1083 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-3 + rotate: false + xy: 1740, 1083 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-5 + rotate: false + xy: 1782, 1083 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-6 + rotate: false + xy: 862, 3 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-7 + rotate: false + xy: 904, 3 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +goon-2-walk + rotate: false + xy: 1872, 1283 + size: 168, 34 + orig: 168, 34 + offset: 0, 0 + index: -1 +castle-gate/goon-2-walk + rotate: false + xy: 1872, 1283 + size: 168, 34 + orig: 168, 34 + offset: 0, 0 + index: -1 +held/bloodclot-head-2 + rotate: false + xy: 1928, 223 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-3 + rotate: false + xy: 1928, 139 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-4 + rotate: false + xy: 1928, 55 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-5 + rotate: false + xy: 1318, 25 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-6 + rotate: false + xy: 1434, 25 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-7 + rotate: false + xy: 1550, 25 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-8 + rotate: false + xy: 1666, 25 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/flesh + rotate: false + xy: 940, 272 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +held/hand rotate: false xy: 646, 838 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +held/head + rotate: false + xy: 968, 835 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/closed-blinds + rotate: false + xy: 2, 596 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/darken + rotate: false + xy: 324, 1564 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/desk + rotate: false + xy: 646, 1806 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/fg + rotate: false + xy: 970, 1322 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/glow + rotate: false + xy: 326, 1080 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/open-blinds + rotate: false + xy: 968, 351 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/portrait + rotate: false + xy: 1584, 399 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +inside-antique/shopkeep + rotate: false + xy: 842, 5 + size: 18, 21 + orig: 18, 21 + offset: 0, 0 + index: -1 +inside-antique/teddy + rotate: false + xy: 1898, 15 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +inside-cafeteria/fg + rotate: false + xy: 1290, 1806 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/fight + rotate: false + xy: 1292, 1322 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-1 + rotate: false + xy: 1290, 399 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-2 + rotate: false + xy: 1614, 1128 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-3 + rotate: false + xy: 1612, 644 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/glow + rotate: false + xy: 648, 1080 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight-1 + rotate: false + xy: 2, 4 + size: 106, 106 + orig: 106, 106 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight-2 + rotate: false + xy: 110, 4 + size: 106, 106 + orig: 106, 106 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight-3 + rotate: false + xy: 218, 4 + size: 106, 106 + orig: 106, 106 + offset: 0, 0 + index: -1 inside-castle/books rotate: false - xy: 1250, 9 + xy: 1610, 4 size: 34, 19 orig: 34, 19 offset: 0, 0 index: -1 inside-castle/brian-working rotate: false - xy: 2, 66 + xy: 326, 66 size: 320, 44 orig: 320, 44 offset: 0, 0 index: -1 +inside-castle/door + rotate: false + xy: 1814, 593 + size: 84, 49 + orig: 84, 49 + offset: 0, 0 + index: -1 inside-castle/fight-1 rotate: false - xy: 1290, 1564 + xy: 1612, 1806 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/gameplayer rotate: false - xy: 1548, 450 + xy: 1614, 1082 size: 40, 44 orig: 40, 44 offset: 0, 0 index: -1 inside-castle/hands-1 rotate: false - xy: 1808, 10 + xy: 1212, 3 size: 104, 104 orig: 104, 104 offset: 0, 0 index: -1 inside-castle/magic rotate: false - xy: 1590, 452 + xy: 938, 215 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 inside-castle/pedestal-overlay rotate: false - xy: 646, 354 + xy: 326, 112 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/roof - rotate: false - xy: 841, 10 - size: 57, 57 - orig: 57, 57 - offset: 0, 0 - index: -1 inside-castle/sign2 rotate: false - xy: 1158, 8 + xy: 1518, 3 size: 44, 20 orig: 44, 20 offset: 0, 0 index: -1 inside-castle/sign-2 rotate: false - xy: 1158, 8 + xy: 1518, 3 size: 44, 20 orig: 44, 20 offset: 0, 0 index: -1 inside-castle/sign3 rotate: false - xy: 1204, 8 + xy: 1564, 3 size: 44, 20 orig: 44, 20 offset: 0, 0 index: -1 inside-castle/sign-3 rotate: false - xy: 1204, 8 + xy: 1564, 3 size: 44, 20 orig: 44, 20 offset: 0, 0 index: -1 inside-castle/way-back-tree rotate: false - xy: 968, 112 + xy: 1612, 838 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/desk rotate: false - xy: 324, 1080 + xy: 646, 1564 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/glow rotate: false - xy: 968, 1080 + xy: 970, 1077 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/safe-screen rotate: false - xy: 906, 10 + xy: 960, 7 size: 250, 100 orig: 250, 100 offset: 0, 0 index: -1 inside-house/sillhoute rotate: false - xy: 1612, 1080 + xy: 1290, 835 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1818,112 +2007,140 @@ inside-jail/bars index: -1 inside-jail/bars- rotate: false - xy: 324, 1806 + xy: 2, 1322 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/candle rotate: false - xy: 202, 2 + xy: 1782, 6 size: 80, 25 orig: 80, 25 offset: 0, 0 index: -1 +inside-jail/chest-top + rotate: false + xy: 1824, 1094 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 +inside-jail/crowbar + rotate: false + xy: 1980, 1216 + size: 64, 33 + orig: 64, 33 + offset: 0, 0 + index: -1 inside-jail/fg rotate: false - xy: 646, 1080 + xy: 1290, 1564 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/glow rotate: false - xy: 1290, 1322 + xy: 324, 838 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/warden rotate: false - xy: 1548, 2 + xy: 388, 6 size: 258, 58 orig: 258, 58 offset: 0, 0 index: -1 inside-jail/window-bent rotate: false - xy: 2022, 317 + xy: 938, 184 size: 18, 29 orig: 18, 29 offset: 0, 0 index: -1 -inventory - rotate: false - xy: 1978, 504 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: -1 -open-inventory-1 - rotate: false - xy: 1978, 504 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: -1 inventory-overlay rotate: false - xy: 968, 838 + xy: 968, 593 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +outside-castle/Untitled + rotate: false + xy: 1477, 361 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +outside-castle/peddler-talk + rotate: false + xy: 1477, 361 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +outside-castle/balloons + rotate: false + xy: 1980, 1140 + size: 60, 36 + orig: 60, 36 + offset: 0, 0 + index: -1 +outside-castle/blanket + rotate: false + xy: 1290, 351 + size: 103, 46 + orig: 103, 46 + offset: 0, 0 + index: -1 outside-castle/brush-bl rotate: false - xy: 1548, 496 + xy: 326, 4 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -outside-castle/brush-br +outside-castle/crowd-right rotate: false - xy: 1158, 30 - size: 130, 80 - orig: 130, 80 + xy: 1928, 307 + size: 116, 135 + orig: 116, 135 offset: 0, 0 index: -1 -outside-castle/note +outside-castle/steer rotate: false - xy: 2030, 742 - size: 16, 16 - orig: 16, 16 + xy: 1612, 607 + size: 200, 35 + orig: 200, 35 offset: 0, 0 index: -1 outside-castle/walk-behind rotate: false - xy: 1612, 838 + xy: 1606, 109 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/axe rotate: false - xy: 2022, 348 + xy: 938, 237 size: 22, 33 orig: 22, 33 offset: 0, 0 index: -1 -outside-jail/candle +outside-jail/closed-stash rotate: false - xy: 510, 8 - size: 80, 25 - orig: 80, 25 + xy: 1548, 561 + size: 52, 30 + orig: 52, 30 offset: 0, 0 index: -1 outside-jail/open-stash rotate: false - xy: 614, 69 + xy: 648, 274 size: 290, 41 orig: 290, 41 offset: 0, 0 @@ -1935,23 +2152,23 @@ outsidehouse/background-trees orig: 320, 240 offset: 0, 0 index: -1 +outsidehouse/door + rotate: false + xy: 862, 124 + size: 96, 58 + orig: 96, 58 + offset: 0, 0 + index: -1 outsidehouse/fence rotate: false - xy: 968, 1564 + xy: 968, 1806 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outsidehouse/fg2 - rotate: false - xy: 1978, 778 - size: 59, 61 - orig: 59, 61 - offset: 0, 0 - index: -1 outsidehouse/foreground rotate: false - xy: 1612, 1806 + xy: 1612, 1564 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1963,2129 +2180,1912 @@ outsidehouse/house orig: 320, 240 offset: 0, 0 index: -1 +outsidehouse/lamb-walk + rotate: false + xy: 1934, 1820 + size: 108, 28 + orig: 108, 28 + offset: 0, 0 + index: -1 outsidehouse/note rotate: false - xy: 2030, 724 + xy: 1548, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 outsidehouse/sheep-walk rotate: false - xy: 2, 6 + xy: 1318, 2 size: 198, 21 orig: 198, 21 offset: 0, 0 index: -1 pathfind-test rotate: false - xy: 2030, 706 + xy: 1566, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 save rotate: false - xy: 2030, 670 + xy: 2022, 1085 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -space/bloodclot-explode-10 +space/Untitled rotate: false - xy: 1870, 671 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-11 - rotate: false - xy: 1870, 504 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-12 - rotate: false - xy: 1806, 283 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-13 - rotate: false - xy: 1806, 116 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-14 - rotate: false - xy: 1914, 337 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-15 - rotate: false - xy: 1914, 170 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-16 - rotate: false - xy: 1914, 3 - size: 106, 165 - orig: 106, 165 + xy: 2010, 17 + size: 36, 36 + orig: 36, 36 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 1934, 1881 + xy: 1934, 1653 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 1934, 1714 + xy: 1936, 1486 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 1934, 1547 + xy: 1936, 1319 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 1934, 1380 + xy: 1872, 1084 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 1934, 1213 + xy: 1934, 917 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 1934, 1046 + xy: 1928, 581 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-9 +space/bloodclot-head-talk-2 rotate: false - xy: 1934, 879 - size: 106, 165 - orig: 106, 165 + xy: 1934, 840 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-stand + rotate: false + xy: 648, 28 + size: 212, 165 + orig: 212, 165 offset: 0, 0 index: -1 space/bullet rotate: false - xy: 316, 9 + xy: 648, 2 size: 192, 24 orig: 192, 24 offset: 0, 0 index: -1 space/later rotate: false - xy: 1290, 1080 + xy: 324, 354 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 the-end rotate: false - xy: 968, 354 + xy: 1290, 593 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/clouds rotate: false - xy: 646, 1806 + xy: 2, 354 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/logo rotate: false - xy: 1612, 1322 + xy: 646, 354 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +wizard/Untitled + rotate: false + xy: 1928, 3 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 +wizard/cloud + rotate: false + xy: 1870, 644 + size: 40, 30 + orig: 40, 30 + offset: 0, 0 + index: -1 +wizard/magic-hands + rotate: false + xy: 1980, 1088 + size: 40, 50 + orig: 40, 50 + offset: 0, 0 + index: -1 +wizard/talk + rotate: false + xy: 1395, 351 + size: 80, 46 + orig: 80, 46 + offset: 0, 0 + index: -1 pack3.png size: 2048,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -behindhouse/fgleft - rotate: false - xy: 209, 141 - size: 161, 50 - orig: 161, 50 - offset: 0, 0 - index: -1 -black - rotate: false - xy: 1833, 738 - size: 32, 24 - orig: 32, 24 - offset: 0, 0 - index: -1 castle-gate/Untitled rotate: false - xy: 798, 721 + xy: 776, 655 size: 192, 35 orig: 192, 35 offset: 0, 0 index: -1 castle-gate/goon-2-search rotate: false - xy: 798, 687 + xy: 1034, 805 size: 192, 32 orig: 192, 32 offset: 0, 0 index: -1 +castle-gate/goon-2-talk + rotate: false + xy: 1085, 12 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 castle-gate/throw-walkie-1 rotate: false - xy: 518, 692 + xy: 260, 304 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-2 rotate: false - xy: 2, 110 + xy: 518, 498 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 260, 331 + xy: 776, 692 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 1042, 886 + xy: 260, 166 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 1249, 886 + xy: 1300, 886 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-6 rotate: false - xy: 1456, 886 + xy: 1507, 886 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-7 rotate: false - xy: 1663, 886 + xy: 1714, 886 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-8 rotate: false - xy: 260, 193 + xy: 260, 28 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-9 rotate: false - xy: 776, 758 + xy: 518, 360 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 cat-tree/brush-l rotate: false - xy: 798, 615 + xy: 983, 733 size: 152, 70 orig: 152, 70 offset: 0, 0 index: -1 cat-tree/eye-1 rotate: false - xy: 209, 198 + xy: 209, 4 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-6 rotate: false - xy: 209, 198 + xy: 209, 4 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-10 rotate: false - xy: 1630, 200 + xy: 1438, 184 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-11 rotate: false - xy: 1676, 189 + xy: 1438, 134 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-12 rotate: false - xy: 1722, 189 + xy: 1438, 84 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-13 rotate: false - xy: 1820, 411 + xy: 1483, 284 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-2 rotate: false - xy: 1196, 529 + xy: 1460, 510 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-3 rotate: false - xy: 1672, 455 + xy: 1408, 453 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-4 rotate: false - xy: 1402, 236 + xy: 1872, 384 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-5 rotate: false - xy: 1492, 217 + xy: 1437, 284 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-7 rotate: false - xy: 1492, 217 + xy: 1437, 284 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-8 rotate: false - xy: 1538, 217 + xy: 1445, 334 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-9 rotate: false - xy: 1584, 212 + xy: 1438, 234 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 1559, 664 + xy: 1770, 454 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 1935, 677 + xy: 1921, 441 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 886, 2 + xy: 1921, 399 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 946, 2 + xy: 1381, 7 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 1219, 428 + xy: 1710, 413 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 1279, 428 + xy: 1770, 412 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 1339, 424 + xy: 1918, 357 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 1718, 410 + xy: 1978, 327 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 1219, 386 + xy: 1484, 242 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 1279, 386 + xy: 1484, 200 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 1339, 382 + xy: 1484, 158 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 1180, 305 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-7 rotate: false - xy: 1988, 982 + xy: 1304, 391 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-8 rotate: false - xy: 1988, 940 + xy: 1606, 470 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 1988, 898 + xy: 1710, 455 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/owl +cat-tree/inventory rotate: false - xy: 1199, 818 - size: 168, 30 - orig: 168, 30 - offset: 0, 0 - index: -1 -dream/corner-l - rotate: false - xy: 791, 324 - size: 112, 59 - orig: 112, 59 - offset: 0, 0 - index: -1 -dream/corner-r - rotate: false - xy: 693, 100 - size: 112, 59 - orig: 112, 59 + xy: 1041, 2 + size: 42, 42 + orig: 42, 42 offset: 0, 0 index: -1 dream/sign rotate: false - xy: 905, 101 + xy: 1162, 241 size: 41, 58 orig: 41, 58 offset: 0, 0 index: -1 -ego/Untitled - rotate: false - xy: 1199, 780 - size: 144, 36 - orig: 144, 36 - offset: 0, 0 - index: -1 -ego/talk - rotate: false - xy: 1199, 780 - size: 144, 36 - orig: 144, 36 - offset: 0, 0 - index: -1 ego/cat-toy rotate: false - xy: 518, 640 + xy: 2, 2 size: 205, 50 orig: 205, 50 offset: 0, 0 index: -1 -ego/crowbar - rotate: false - xy: 1533, 848 - size: 144, 36 - orig: 144, 36 - offset: 0, 0 - index: -1 -ego/frustrated-talk - rotate: false - xy: 801, 161 - size: 96, 36 - orig: 96, 36 - offset: 0, 0 - index: -1 ego/grow rotate: false - xy: 1344, 466 + xy: 1814, 622 size: 90, 36 orig: 90, 36 offset: 0, 0 index: -1 ego/grow-talk rotate: false - xy: 1473, 772 + xy: 2008, 630 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hand-hold rotate: false - xy: 952, 649 + xy: 1568, 500 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ending-castle/hand-hold rotate: false - xy: 952, 649 + xy: 1568, 500 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 -ego/hold-up-to-window - rotate: false - xy: 1120, 656 - size: 108, 36 - orig: 108, 36 - offset: 0, 0 - index: -1 ego/jump-straight rotate: false - xy: 372, 143 + xy: 1506, 646 size: 90, 48 orig: 90, 48 offset: 0, 0 index: -1 ego/love-10 rotate: false - xy: 1512, 513 + xy: 1049, 367 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-11 rotate: false - xy: 1546, 585 + xy: 1101, 567 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-12 rotate: false - xy: 1564, 513 + xy: 1153, 567 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-13 rotate: false - xy: 907, 397 + xy: 1101, 495 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-14 rotate: false - xy: 1820, 499 + xy: 1205, 567 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-15 rotate: false - xy: 1872, 499 + xy: 1101, 423 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-16 rotate: false - xy: 1620, 433 + xy: 1153, 495 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-17 rotate: false - xy: 885, 204 + xy: 1153, 423 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-18 rotate: false - xy: 1924, 500 + xy: 1205, 495 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-19 rotate: false - xy: 959, 409 + xy: 1205, 423 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-20 rotate: false - xy: 1011, 436 + xy: 1257, 518 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-21 rotate: false - xy: 1063, 433 + xy: 1257, 446 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-22 rotate: false - xy: 1115, 433 + xy: 1921, 483 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-23 rotate: false - xy: 1167, 423 + xy: 1973, 483 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-24 rotate: false - xy: 1011, 364 + xy: 1309, 505 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-25 rotate: false - xy: 1063, 361 + xy: 1361, 505 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-26 rotate: false - xy: 1115, 361 + xy: 1309, 433 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-4 rotate: false - xy: 410, 71 + xy: 1337, 749 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-5 rotate: false - xy: 630, 60 + xy: 1993, 785 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-6 rotate: false - xy: 1989, 826 + xy: 1995, 713 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-7 rotate: false - xy: 1989, 754 + xy: 1049, 583 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-8 rotate: false - xy: 725, 644 + xy: 1049, 511 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-9 rotate: false - xy: 1494, 585 + xy: 1049, 439 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/poke rotate: false - xy: 543, 3 + xy: 1710, 497 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 1926, 639 + xy: 1101, 385 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 1718, 452 + xy: 1175, 385 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 -ego/scared-walk - rotate: false - xy: 1518, 475 - size: 96, 36 - orig: 96, 36 - offset: 0, 0 - index: -1 ego/shoot rotate: false - xy: 1679, 848 + xy: 983, 695 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 -ego/sigh - rotate: false - xy: 1369, 848 - size: 162, 36 - orig: 162, 36 - offset: 0, 0 - index: -1 ego/squat rotate: false - xy: 992, 656 + xy: 1391, 848 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/squat-talk rotate: false - xy: 1820, 461 + xy: 1183, 347 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 1230, 658 + xy: 1519, 848 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 +ego/standup + rotate: false + xy: 1034, 839 + size: 225, 55 + orig: 225, 55 + offset: 0, 0 + index: -1 ego/suspended rotate: false - xy: 1369, 810 + xy: 899, 8 size: 140, 36 orig: 140, 36 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 1340, 734 + xy: 1775, 848 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 1340, 696 + xy: 1391, 810 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 899, 161 + xy: 1253, 2 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 -ending-castle/crowd-right - rotate: false - xy: 1870, 887 - size: 116, 135 - orig: 116, 135 - offset: 0, 0 - index: -1 ending-castle/frankie-fall-1 rotate: false - xy: 959, 372 + xy: 1091, 321 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 1195, 198 + xy: 1533, 353 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 1237, 198 + xy: 1529, 316 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 1195, 161 + xy: 1581, 433 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-2 rotate: false - xy: 989, 327 + xy: 1484, 76 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 947, 290 + xy: 1526, 76 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 989, 290 + xy: 1441, 2 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 1069, 189 + xy: 1497, 427 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 1111, 182 + xy: 1497, 390 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 1153, 182 + xy: 1491, 353 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 1195, 235 + xy: 1539, 427 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 1237, 235 + xy: 1539, 390 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 896, 276 + xy: 1830, 453 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 -georgia/kick-1 - rotate: false - xy: 1995, 677 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 georgia/kick-10 rotate: false - xy: 1027, 200 + xy: 1049, 322 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-11 rotate: false - xy: 1031, 316 + xy: 1297, 2 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-12 rotate: false - xy: 1073, 316 + xy: 1339, 2 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-13 rotate: false - xy: 1115, 316 + xy: 1830, 408 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-14 rotate: false - xy: 1065, 271 + xy: 1484, 113 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 1107, 271 + xy: 1526, 113 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 1149, 264 + xy: 1441, 39 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 1069, 226 + xy: 1483, 31 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 990, 155 + xy: 1525, 31 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 1111, 219 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-2 - rotate: false - xy: 905, 319 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-4 - rotate: false - xy: 905, 319 + xy: 1454, 458 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 1153, 219 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-3 - rotate: false - xy: 948, 121 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-5 - rotate: false - xy: 956, 76 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-6 - rotate: false - xy: 947, 327 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-7 - rotate: false - xy: 981, 245 + xy: 1455, 413 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 985, 200 + xy: 683, 315 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 1023, 245 + xy: 2006, 668 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -goon-2-walk - rotate: false - xy: 1199, 850 - size: 168, 34 - orig: 168, 34 - offset: 0, 0 - index: -1 -castle-gate/goon-2-walk - rotate: false - xy: 1199, 850 - size: 168, 34 - orig: 168, 34 - offset: 0, 0 - index: -1 -held/bloodclot-head-2 - rotate: false - xy: 992, 694 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-3 - rotate: false - xy: 1108, 694 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-4 - rotate: false - xy: 1224, 696 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-5 - rotate: false - xy: 1641, 764 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-6 - rotate: false - xy: 1757, 764 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-7 - rotate: false - xy: 1873, 803 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-8 - rotate: false - xy: 1873, 719 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 held/bloodclot-head-9 rotate: false - xy: 791, 385 + xy: 1137, 721 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-10 rotate: false - xy: 260, 830 + xy: 2, 248 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-11 rotate: false - xy: 2, 442 + xy: 260, 442 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-12 rotate: false - xy: 260, 636 + xy: 518, 636 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-13 rotate: false - xy: 518, 830 + xy: 776, 830 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-14 rotate: false - xy: 2, 248 + xy: 2, 54 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-8 +inside-cafeteria/fight-new-assets/fight-4 rotate: false xy: 2, 830 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-9 +inside-cafeteria/fight-new-assets/fight-5 rotate: false xy: 2, 636 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-1 +inside-cafeteria/fight-new-assets/fight-6 rotate: false - xy: 2, 2 - size: 106, 106 - orig: 106, 106 + xy: 260, 830 + size: 256, 192 + orig: 256, 192 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-2 +inside-cafeteria/fight-new-assets/fight-7 rotate: false - xy: 110, 2 - size: 106, 106 - orig: 106, 106 + xy: 2, 442 + size: 256, 192 + orig: 256, 192 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-3 +inside-cafeteria/fight-new-assets/fight-8 rotate: false - xy: 693, 161 - size: 106, 106 - orig: 106, 106 + xy: 260, 636 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-9 + rotate: false + xy: 518, 830 + size: 256, 192 + orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-4 rotate: false - xy: 798, 507 + xy: 683, 27 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-5 rotate: false - xy: 218, 33 + xy: 791, 27 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 983, 778 + xy: 899, 46 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-7 rotate: false - xy: 1091, 778 + xy: 1007, 46 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/warriors-stand rotate: false - xy: 776, 896 + xy: 1034, 896 size: 264, 126 orig: 264, 126 offset: 0, 0 index: -1 -inside-castle/door +inside-castle/roof rotate: false - xy: 457, 7 - size: 84, 49 - orig: 84, 49 + xy: 1447, 560 + size: 57, 57 + orig: 57, 57 offset: 0, 0 index: -1 inside-castle/walkie-talkie rotate: false - xy: 1460, 659 + xy: 1538, 464 size: 35, 34 orig: 35, 34 offset: 0, 0 index: -1 inside-house/candle rotate: false - xy: 990, 508 + xy: 1506, 612 size: 102, 32 orig: 102, 32 offset: 0, 0 index: -1 -inside-jail/chest-top - rotate: false - xy: 1196, 495 - size: 44, 32 - orig: 44, 32 - offset: 0, 0 - index: -1 inside-jail/chest-top-open rotate: false - xy: 1672, 421 + xy: 1072, 661 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 -inside-jail/crowbar +inventory rotate: false - xy: 1904, 604 - size: 64, 33 - orig: 64, 33 + xy: 1345, 691 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: -1 +open-inventory-1 + rotate: false + xy: 1345, 691 + size: 42, 56 + orig: 42, 56 offset: 0, 0 index: -1 open-inventory-11 rotate: false - xy: 1768, 178 + xy: 1253, 45 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-12 rotate: false - xy: 1812, 178 + xy: 1411, 395 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-13 rotate: false - xy: 937, 218 + xy: 1666, 454 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-2 rotate: false - xy: 630, 2 + xy: 1162, 183 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-3 rotate: false - xy: 1941, 442 + xy: 1162, 125 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-4 rotate: false - xy: 1355, 324 + xy: 1205, 247 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-5 rotate: false - xy: 1449, 285 + xy: 1206, 189 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-6 rotate: false - xy: 1448, 227 + xy: 1206, 131 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-7 rotate: false - xy: 1775, 352 + xy: 1209, 73 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-8 rotate: false - xy: 1775, 294 + xy: 1209, 15 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-10 rotate: false - xy: 1775, 294 + xy: 1209, 15 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-9 rotate: false - xy: 1775, 236 + xy: 1253, 103 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 -outside-castle/Untitled +outside-castle/brush-br rotate: false - xy: 798, 469 - size: 126, 36 - orig: 126, 36 + xy: 1129, 639 + size: 130, 80 + orig: 130, 80 offset: 0, 0 index: -1 -outside-castle/peddler-talk +outside-jail/candle rotate: false - xy: 798, 469 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -outside-castle/balloons - rotate: false - xy: 1497, 657 - size: 60, 36 - orig: 60, 36 - offset: 0, 0 - index: -1 -outside-castle/blanket - rotate: false - xy: 791, 276 - size: 103, 46 - orig: 103, 46 - offset: 0, 0 - index: -1 -outside-castle/crowd-right - rotate: false - xy: 575, 132 - size: 116, 135 - orig: 116, 135 - offset: 0, 0 - index: -1 -outside-castle/steer - rotate: false - xy: 582, 436 - size: 200, 35 - orig: 200, 35 - offset: 0, 0 - index: -1 -outside-jail/closed-stash - rotate: false - xy: 1989, 722 - size: 52, 30 - orig: 52, 30 - offset: 0, 0 - index: -1 -outsidehouse/door - rotate: false - xy: 807, 101 - size: 96, 58 - orig: 96, 58 + xy: 1101, 358 + size: 80, 25 + orig: 80, 25 offset: 0, 0 index: -1 outsidehouse/fg1 rotate: false - xy: 1511, 783 + xy: 1261, 821 size: 128, 63 orig: 128, 63 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 1552, 706 + xy: 1429, 619 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 -outsidehouse/lamb-walk - rotate: false - xy: 218, 3 - size: 108, 28 - orig: 108, 28 - offset: 0, 0 - index: -1 safe-song/safe-song-1 rotate: false - xy: 1358, 659 + xy: 1519, 811 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-10 rotate: false - xy: 1629, 690 + xy: 1797, 697 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-11 rotate: false - xy: 1731, 690 + xy: 1598, 660 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-12 rotate: false - xy: 807, 64 + xy: 1700, 660 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-13 rotate: false - xy: 784, 27 + xy: 1802, 660 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-14 rotate: false - xy: 1242, 507 + xy: 1610, 623 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-15 rotate: false - xy: 1242, 470 + xy: 1712, 623 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-16 rotate: false - xy: 1518, 438 + xy: 1904, 666 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-17 rotate: false - xy: 1620, 653 + xy: 1906, 629 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-18 rotate: false - xy: 1722, 653 + xy: 1610, 586 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-19 rotate: false - xy: 1598, 616 + xy: 1712, 586 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-2 rotate: false - xy: 682, 63 + xy: 1621, 811 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-20 rotate: false - xy: 1700, 616 + xy: 1814, 585 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-21 rotate: false - xy: 1616, 579 + xy: 1916, 592 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-22 rotate: false - xy: 1616, 542 + xy: 1916, 555 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-23 rotate: false - xy: 1616, 505 + xy: 1345, 577 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-24 rotate: false - xy: 1718, 527 + xy: 1506, 575 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-25 rotate: false - xy: 1718, 490 + xy: 1506, 538 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-26 rotate: false - xy: 1833, 682 + xy: 1608, 549 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-27 rotate: false - xy: 1824, 645 + xy: 1710, 549 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-28 rotate: false - xy: 1802, 608 + xy: 1812, 548 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-29 rotate: false - xy: 1800, 571 + xy: 1608, 512 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-3 rotate: false - xy: 990, 542 + xy: 1723, 811 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-4 rotate: false - xy: 1092, 542 + xy: 970, 655 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-5 rotate: false - xy: 1094, 505 + xy: 1809, 734 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-6 rotate: false - xy: 682, 26 + xy: 1389, 696 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-7 rotate: false - xy: 1242, 544 + xy: 1491, 696 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-8 rotate: false - xy: 1629, 727 + xy: 1593, 697 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 safe-song/safe-song-9 rotate: false - xy: 1731, 727 + xy: 1695, 697 size: 100, 35 orig: 100, 35 offset: 0, 0 index: -1 -space/Untitled +space/bloodclot-explode-10 rotate: false - xy: 1825, 848 - size: 36, 36 - orig: 36, 36 + xy: 467, 193 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-11 + rotate: false + xy: 575, 193 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-12 + rotate: false + xy: 467, 26 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-13 + rotate: false + xy: 575, 26 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-14 + rotate: false + xy: 725, 469 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-15 + rotate: false + xy: 833, 488 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-16 + rotate: false + xy: 725, 302 + size: 106, 165 + orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 474, 469 + xy: 833, 321 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 467, 302 + xy: 683, 135 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 582, 473 + xy: 791, 135 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 467, 135 + xy: 941, 488 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 690, 473 + xy: 941, 321 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 575, 269 + xy: 899, 154 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 683, 269 + xy: 1007, 154 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-head-talk-1 +space/bloodclot-explode-9 rotate: false - xy: 801, 199 - size: 82, 75 - orig: 82, 75 + xy: 1921, 857 + size: 106, 165 + orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 1326, 581 + xy: 1825, 771 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 1410, 582 + xy: 1909, 780 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 1344, 504 + xy: 1911, 703 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 1428, 505 + xy: 1261, 590 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 1468, 695 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-2 - rotate: false - xy: 906, 538 + xy: 1345, 614 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-3 rotate: false - xy: 326, 64 + xy: 1253, 744 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-4 rotate: false - xy: 462, 58 + xy: 1261, 667 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 546, 55 + xy: 1389, 733 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 990, 579 + xy: 1473, 733 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 1074, 579 + xy: 1557, 734 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 1158, 579 + xy: 1641, 734 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 1242, 581 + xy: 1725, 734 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 -space/bloodclot-stand - rotate: false - xy: 260, 469 - size: 212, 165 - orig: 212, 165 - offset: 0, 0 - index: -1 space/susp rotate: false - xy: 1345, 772 + xy: 1647, 848 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 1778, 410 + xy: 1496, 464 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 1902, 572 + xy: 1506, 506 size: 60, 30 orig: 60, 30 offset: 0, 0 index: -1 white rotate: false - xy: 952, 623 + xy: 255, 2 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 -wizard/Untitled - rotate: false - xy: 328, 12 - size: 80, 50 - orig: 80, 50 - offset: 0, 0 - index: -1 -wizard/cloud - rotate: false - xy: 956, 44 - size: 40, 30 - orig: 40, 30 - offset: 0, 0 - index: -1 wizard/experiment-1 rotate: false - xy: 725, 773 + xy: 467, 385 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-10 rotate: false - xy: 1446, 400 + xy: 1115, 16 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-11 rotate: false - xy: 1399, 343 + xy: 1162, 11 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-12 rotate: false - xy: 1446, 343 + xy: 1257, 389 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-13 rotate: false - xy: 1493, 381 + xy: 1364, 391 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-14 rotate: false - xy: 1540, 381 + xy: 1257, 332 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-15 rotate: false - xy: 1493, 324 + xy: 1304, 334 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-16 rotate: false - xy: 1540, 324 + xy: 1351, 334 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-17 rotate: false - xy: 1587, 376 + xy: 1398, 334 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-18 rotate: false - xy: 1587, 319 + xy: 1249, 275 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-19 rotate: false - xy: 1634, 364 + xy: 1250, 218 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-2 rotate: false - xy: 725, 716 + xy: 1874, 491 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-20 rotate: false - xy: 1634, 307 + xy: 1250, 161 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-21 rotate: false - xy: 1681, 353 + xy: 1413, 503 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-22 rotate: false - xy: 1728, 353 + xy: 1874, 434 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-23 rotate: false - xy: 1681, 296 + xy: 1981, 426 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 1728, 296 + xy: 1981, 369 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 1214, 329 + xy: 1296, 275 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 1261, 329 + xy: 1297, 218 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 1167, 309 + xy: 1297, 161 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 1308, 325 + xy: 1297, 104 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 1214, 272 + xy: 1297, 47 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-3 rotate: false - xy: 410, 14 + xy: 1361, 448 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-30 rotate: false - xy: 1261, 272 + xy: 1343, 277 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 1308, 268 + xy: 1390, 277 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 1355, 267 + xy: 1344, 220 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 1402, 286 + xy: 1344, 163 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 1493, 267 + xy: 1344, 106 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 1540, 267 + xy: 1344, 49 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 1587, 262 + xy: 1391, 220 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 1634, 250 + xy: 1391, 163 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 1681, 239 + xy: 1391, 106 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 1728, 239 + xy: 1391, 49 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-4 rotate: false - xy: 909, 44 + xy: 1133, 301 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-5 rotate: false - xy: 2000, 620 + xy: 1115, 244 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-6 rotate: false - xy: 926, 481 + xy: 1115, 187 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-7 rotate: false - xy: 1167, 366 + xy: 1115, 130 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-8 rotate: false - xy: 1894, 442 + xy: 1115, 73 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 1399, 400 + xy: 1162, 68 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/magic-hands - rotate: false - xy: 943, 166 - size: 40, 50 - orig: 40, 50 - offset: 0, 0 - index: -1 -wizard/talk - rotate: false - xy: 1436, 457 - size: 80, 46 - orig: 80, 46 - offset: 0, 0 - index: -1 wizard/talk-angry rotate: false - xy: 1718, 564 + xy: 1792, 496 size: 80, 50 orig: 80, 50 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 0fb88bf6..ca8c3488 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index a912bbec..423ff949 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 022b6a5f..0f6c3d5d 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 2df18583..47b2ca54 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -403,8 +403,8 @@ :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/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) + :layers [(assoc (utils/get-texture "dream/sky.png") :x 0 :y 0 :baseline -3 :parallax 0.5) + (assoc (utils/get-texture "dream/far.png") :x -10 :y 0 :baseline -2 :origin-x 160 :parallax 0.5) (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) @@ -412,11 +412,11 @@ (assoc (utils/get-texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) (assoc (utils/get-texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) (assoc (utils/get-texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] - :current-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) + :current-layers [(assoc (utils/get-texture "dream/sky.png") :x 160 :y 120 :origin-y 120 :baseline -3 :origin-x 160 :parallax 0.01) + (assoc (utils/get-texture "dream/far.png") :x 160 :y 120 :baseline -2 :origin-y 120 :origin-x 160 :parallax 0.01) + (assoc (utils/get-texture "dream/clouds1.png") :x 150 :y 120 :baseline -1 :origin-x 160 :origin-y 120 :parallax 0.1 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :origin-x 15 :origin-y 10 :baseline 0 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/get-texture "dream/cliff.png") :x 160 :y 120 :origin-x 160 :origin-y 120 :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) (assoc (utils/get-texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) (assoc (utils/get-texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index d827bc61..8eabf324 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1317,7 +1317,13 @@ void main () (= (key-code :m) (:key options))) (-> entities (remove-cam-tweens) - (assoc-in [:cam :zoom] utils/max-zoom #_(max utils/max-zoom (min utils/min-zoom (* (or start-zoom zoom) (/ initial-distance distance)))))) + (assoc-in [:tweens :cam-zoom] + (tween/tween :cam-zoom screen + [:cam :zoom] + (get-in entities [:cam :zoom] 1.0) + utils/max-zoom + 1.5 + :ease tween/ease-linear))) :else nil)) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index c1094915..d4aefe3c 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -30,7 +30,7 @@ entity) -(def ui-scale (Double/parseDouble (str (or (System/getenv "UI_SCALE") 1.0)))) +(def ui-scale (Double/parseDouble (str (or (System/getProperty "ui_scale") 1.0)))) (def mobile? (= 1.5 ui-scale)) (def max-zoom (if mobile? 0.5 0.75)) (def min-zoom 0.95)