diff --git a/desktop/resources/overdirt.png b/desktop/resources/overdirt.png deleted file mode 100644 index abdb8e67..00000000 Binary files a/desktop/resources/overdirt.png and /dev/null differ diff --git a/desktop/resources/pack.json b/desktop/resources/pack.json new file mode 100644 index 00000000..7a44520b --- /dev/null +++ b/desktop/resources/pack.json @@ -0,0 +1,36 @@ +{ + pot: true, + paddingX: 2, + paddingY: 2, + bleed: true, + edgePadding: true, + duplicatePadding: false, + rotation: false, + minWidth: 16, + minHeight: 16, + maxWidth: 4096, + maxHeight: 4096, + square: false, + stripWhitespaceX: false, + stripWhitespaceY: false, + alphaThreshold: 0, + filterMin: Nearest, + filterMag: Nearest, + wrapX: ClampToEdge, + wrapY: ClampToEdge, + format: RGBA8888, + alias: true, + outputFormat: png, + jpegQuality: 0.9, + ignoreBlankImages: true, + fast: false, + debug: false, + combineSubdirectories: true, + flattenPaths: false, + premultiplyAlpha: false, + useIndexes: true, + limitMemory: true, + grid: false, + scale: [ 1 ], + scaleSuffix: [ "" ] +} diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas new file mode 100644 index 00000000..111a39db --- /dev/null +++ b/desktop/resources/packed/pack.atlas @@ -0,0 +1,2464 @@ + +pack.png +size: 4096,4096 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +behindhouse/abc + rotate: false + xy: 516, 902 + size: 320, 62 + orig: 320, 62 + offset: 0, 0 + index: -1 +behindhouse/background + rotate: false + xy: 516, 1450 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +behindhouse/brush + rotate: false + xy: 3498, 3175 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +behindhouse/collision + rotate: false + xy: 1626, 2438 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +behindhouse/fg + rotate: false + xy: 1989, 1990 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/fg + rotate: false + xy: 1989, 1990 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +behindhouse/fg2 + rotate: false + xy: 838, 1330 + size: 183, 360 + orig: 183, 360 + offset: 0, 0 + index: -1 +behindhouse/fgleft + rotate: false + xy: 1132, 708 + size: 161, 50 + orig: 161, 50 + offset: 0, 0 + index: -1 +behindhouse/house + rotate: false + xy: 1989, 1748 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +behindhouse/house-cover + rotate: false + xy: 2034, 3756 + size: 20, 21 + orig: 20, 21 + offset: 0, 0 + index: -1 +behindhouse/house-cover copy + rotate: false + xy: 1860, 3128 + size: 20, 21 + orig: 20, 21 + offset: 0, 0 + index: -1 +behindhouse/stick + rotate: false + xy: 690, 414 + size: 24, 42 + orig: 24, 42 + offset: 0, 0 + index: -1 +bg + rotate: false + xy: 516, 2088 + size: 480, 270 + orig: 480, 270 + offset: 0, 0 + index: -1 +bg2 + rotate: false + xy: 2, 182 + size: 360, 202 + orig: 360, 202 + offset: 0, 0 + index: -1 +bg3 + rotate: false + xy: 1542, 3541 + size: 360, 202 + orig: 360, 202 + offset: 0, 0 + index: -1 +bg4 + rotate: false + xy: 516, 1692 + size: 360, 202 + orig: 360, 202 + offset: 0, 0 + index: -1 +bg5 + rotate: false + xy: 3176, 3205 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +black + rotate: false + xy: 3277, 2207 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 +butterfly + rotate: false + xy: 1888, 3532 + size: 14, 7 + orig: 14, 7 + offset: 0, 0 + index: -1 +castle-gate/Untitled + rotate: false + xy: 1132, 587 + size: 192, 35 + orig: 192, 35 + offset: 0, 0 + index: -1 +castle-gate/background + rotate: false + xy: 516, 1208 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +castle-gate/coinflip + rotate: false + xy: 758, 673 + size: 50, 10 + orig: 50, 10 + offset: 0, 0 + index: -1 +castle-gate/collision + rotate: false + xy: 1704, 2680 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +castle-gate/frankie + rotate: false + xy: 1560, 3151 + size: 312, 35 + orig: 312, 35 + offset: 0, 0 + index: -1 +castle-gate/goon-1 + rotate: false + xy: 1948, 2458 + size: 24, 33 + orig: 24, 33 + offset: 0, 0 + index: -1 +castle-gate/goon-2 + rotate: false + xy: 666, 72 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 +castle-gate/goon-2-flip + rotate: false + xy: 3912, 3184 + size: 48, 32 + orig: 48, 32 + offset: 0, 0 + index: -1 +castle-gate/goon-2-search + rotate: false + xy: 758, 570 + size: 192, 32 + orig: 192, 32 + offset: 0, 0 + index: -1 +castle-gate/goon-2-talk + rotate: false + xy: 3132, 2848 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 +castle-gate/overlay + rotate: false + xy: 2992, 2717 + size: 138, 239 + orig: 138, 239 + offset: 0, 0 + index: -1 +castle-gate/stash-closed + rotate: false + xy: 1912, 1350 + size: 70, 41 + orig: 70, 41 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie + rotate: false + xy: 2124, 3958 + size: 1845, 136 + orig: 1845, 136 + offset: 0, 0 + index: -1 +cat-tree/Untitled + rotate: false + xy: 1948, 2438 + size: 28, 18 + orig: 28, 18 + offset: 0, 0 + index: -1 +cat-tree/pounce + rotate: false + xy: 1948, 2438 + size: 28, 18 + orig: 28, 18 + offset: 0, 0 + index: -1 +cat-tree/background + rotate: false + xy: 516, 966 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cat-tree/brush-l + rotate: false + xy: 604, 530 + size: 152, 70 + orig: 152, 70 + offset: 0, 0 + index: -1 +cat-tree/cat + rotate: false + xy: 1962, 2922 + size: 22, 11 + orig: 22, 11 + offset: 0, 0 + index: -1 +cat-tree/cat-stand + rotate: false + xy: 1028, 2909 + size: 198, 11 + orig: 198, 11 + offset: 0, 0 + index: -1 +cat-tree/collision + rotate: false + xy: 2026, 2716 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cat-tree/destroy-ladder + rotate: false + xy: 1904, 3694 + size: 522, 38 + orig: 522, 38 + offset: 0, 0 + index: -1 +cat-tree/grandma + rotate: false + xy: 878, 1748 + size: 275, 36 + orig: 275, 36 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry + rotate: false + xy: 2, 2378 + size: 1160, 40 + orig: 1160, 40 + offset: 0, 0 + index: -1 +cat-tree/inventory + rotate: false + xy: 3928, 3327 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 +cat-tree/monocle + rotate: false + xy: 1912, 1303 + size: 28, 7 + orig: 28, 7 + offset: 0, 0 + index: -1 +cat-tree/owl + rotate: false + xy: 3332, 2691 + size: 152, 28 + orig: 152, 28 + offset: 0, 0 + index: -1 +cat-tree/sillhoute + rotate: false + xy: 2633, 1264 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cat-tree/tree-and-rock + rotate: false + xy: 1160, 1103 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cat-tree/tree-r + rotate: false + xy: 3814, 2691 + size: 65, 240 + orig: 65, 240 + offset: 0, 0 + index: -1 +close + rotate: false + xy: 1542, 3374 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +cloud + rotate: false + xy: 1132, 829 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +space/cloud + rotate: false + xy: 1132, 829 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +cloudy + rotate: false + xy: 2034, 3734 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +dream/cloudy + rotate: false + xy: 2034, 3734 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +cursor + rotate: false + xy: 2, 2360 + size: 1024, 16 + orig: 1024, 16 + offset: 0, 0 + index: -1 +cursor_light + rotate: false + xy: 1028, 3827 + size: 1024, 16 + orig: 1024, 16 + offset: 0, 0 + index: -1 +cursorr + rotate: false + xy: 1542, 3356 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +dawn + rotate: false + xy: 1667, 2196 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +dream/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +cat-tree/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +wizard/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-antique/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +title/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-jail/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +ego/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +outsidehouse/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-house/dot + rotate: false + xy: 1020, 1745 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +dream/background + rotate: false + xy: 1382, 2680 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/broom + rotate: false + xy: 4079, 4028 + size: 15, 66 + orig: 15, 66 + offset: 0, 0 + index: -1 +dream/case + rotate: false + xy: 1972, 2156 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 +dream/cliff + rotate: false + xy: 3820, 3059 + size: 81, 87 + orig: 81, 87 + offset: 0, 0 + index: -1 +dream/clouds1 + rotate: false + xy: 3492, 2691 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/clouds2 + rotate: false + xy: 1304, 2438 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/collision + rotate: false + xy: 2348, 2716 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/corner-l + rotate: false + xy: 1864, 1968 + size: 112, 59 + orig: 112, 59 + offset: 0, 0 + index: -1 +dream/corner-r + rotate: false + xy: 1804, 1242 + size: 112, 59 + orig: 112, 59 + offset: 0, 0 + index: -1 +dream/fairy-godfather + rotate: false + xy: 2, 602 + size: 567, 77 + orig: 567, 77 + offset: 0, 0 + index: -1 +dream/fountain + rotate: false + xy: 3599, 1723 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/fountain + rotate: false + xy: 3599, 1723 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/island + rotate: false + xy: 1570, 3009 + size: 30, 20 + orig: 30, 20 + offset: 0, 0 + index: -1 +dream/pedestals + rotate: false + xy: 3277, 1481 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/plaque1 + rotate: false + xy: 1122, 591 + size: 8, 11 + orig: 8, 11 + offset: 0, 0 + index: -1 +dream/plaque2 + rotate: false + xy: 878, 1692 + size: 10, 6 + orig: 10, 6 + offset: 0, 0 + index: -1 +dream/plaque3 + rotate: false + xy: 2016, 2620 + size: 8, 11 + orig: 8, 11 + offset: 0, 0 + index: -1 +dream/scale + rotate: false + xy: 3599, 1481 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/shovel + rotate: false + xy: 1225, 1356 + size: 19, 64 + orig: 19, 64 + offset: 0, 0 + index: -1 +dream/sign + rotate: false + xy: 1306, 769 + size: 41, 58 + orig: 41, 58 + offset: 0, 0 + index: -1 +dream/sword + rotate: false + xy: 4079, 3988 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 +ego/Untitled + rotate: false + xy: 634, 386 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/axe + rotate: false + xy: 1904, 3574 + size: 420, 70 + orig: 420, 70 + offset: 0, 0 + index: -1 +ego/axe-wood + rotate: false + xy: 2, 458 + size: 660, 70 + orig: 660, 70 + offset: 0, 0 + index: -1 +ego/base + rotate: false + xy: 1542, 3392 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 +ego/burnt + rotate: false + xy: 1904, 3646 + size: 480, 46 + orig: 480, 46 + offset: 0, 0 + index: -1 +ego/cat-toy + rotate: false + xy: 3352, 3470 + size: 205, 50 + orig: 205, 50 + offset: 0, 0 + index: -1 +ego/crawl + rotate: false + xy: 1023, 1479 + size: 273, 25 + orig: 273, 25 + offset: 0, 0 + index: -1 +ego/crowbar + rotate: false + xy: 1164, 2385 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/fire + rotate: false + xy: 544, 690 + size: 216, 36 + orig: 216, 36 + offset: 0, 0 + index: -1 +ego/flying + rotate: false + xy: 2870, 3688 + size: 34, 44 + orig: 34, 44 + offset: 0, 0 + index: -1 +ego/font + rotate: false + xy: 2, 1846 + size: 512, 512 + orig: 512, 512 + offset: 0, 0 + index: -1 +ego/font1 + rotate: false + xy: 1028, 3313 + size: 512, 512 + orig: 512, 512 + offset: 0, 0 + index: -1 +ego/font2 + rotate: false + xy: 2, 1332 + size: 512, 512 + orig: 512, 512 + offset: 0, 0 + index: -1 +ego/frog + rotate: false + xy: 720, 492 + size: 32, 36 + orig: 32, 36 + offset: 0, 0 + index: -1 +ego/frustrated-talk + rotate: false + xy: 464, 69 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/get-sick + rotate: false + xy: 1362, 823 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/glad + rotate: false + xy: 878, 1700 + size: 140, 46 + orig: 140, 46 + offset: 0, 0 + index: -1 +ego/grow + rotate: false + xy: 1600, 816 + size: 90, 36 + orig: 90, 36 + offset: 0, 0 + index: -1 +ego/grow-talk + rotate: false + xy: 3132, 2882 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +ego/hold-up-to-window + rotate: false + xy: 336, 31 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/ida + rotate: false + xy: 664, 458 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/idea + rotate: false + xy: 2326, 3574 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/love + rotate: false + xy: 2, 2497 + size: 1300, 70 + orig: 1300, 70 + offset: 0, 0 + index: -1 +ego/pant + rotate: false + xy: 1962, 2935 + size: 62, 36 + orig: 62, 36 + offset: 0, 0 + index: -1 +ego/reach + rotate: false + xy: 1806, 1050 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/scared + rotate: false + xy: 1806, 1012 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/scared-walk + rotate: false + xy: 1228, 1810 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/scoot + rotate: false + xy: 1160, 829 + size: 200, 30 + orig: 200, 30 + offset: 0, 0 + index: -1 +ego/shock + rotate: false + xy: 2, 132 + size: 360, 48 + orig: 360, 48 + offset: 0, 0 + index: -1 +ego/shoot + rotate: false + xy: 1730, 2928 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/sigh + rotate: false + xy: 1132, 624 + size: 162, 36 + orig: 162, 36 + offset: 0, 0 + index: -1 +ego/spear + rotate: false + xy: 3820, 3148 + size: 90, 100 + orig: 90, 100 + offset: 0, 0 + index: -1 +ego/squat + rotate: false + xy: 1155, 1748 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/stand + rotate: false + xy: 566, 106 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/standup + rotate: false + xy: 1023, 1422 + size: 225, 55 + orig: 225, 55 + offset: 0, 0 + index: -1 +ego/swing + rotate: false + xy: 1570, 3074 + size: 288, 75 + orig: 288, 75 + offset: 0, 0 + index: -1 +ego/swing-shovel + rotate: false + xy: 2, 386 + size: 630, 70 + orig: 630, 70 + offset: 0, 0 + index: -1 +ego/talk + rotate: false + xy: 958, 530 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/thorw + rotate: false + xy: 1472, 816 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/throw + rotate: false + xy: 336, 69 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/warden + rotate: false + xy: 3928, 3284 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +ending-castle/Untitled + rotate: false + xy: 998, 2319 + size: 28, 39 + orig: 28, 39 + offset: 0, 0 + index: -1 +ending-castle/game-player + rotate: false + xy: 998, 2319 + size: 28, 39 + orig: 28, 39 + offset: 0, 0 + index: -1 +ending-castle/duke + rotate: false + xy: 2428, 3684 + size: 440, 48 + orig: 440, 48 + offset: 0, 0 + index: -1 +ending-castle/ending-castle2-assets/background + rotate: false + xy: 364, 144 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ending-castle/ending-castle2-assets/collision + rotate: false + xy: 2670, 2716 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +space/collision + rotate: false + xy: 2670, 2716 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +held/collision + rotate: false + xy: 2670, 2716 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ending-castle/ending-castle2-assets/foreground + rotate: false + xy: 1542, 3430 + size: 344, 109 + orig: 344, 109 + offset: 0, 0 + index: -1 +ending-castle/warden-2 + rotate: false + xy: 762, 685 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +goon-2-walk + rotate: false + xy: 952, 568 + size: 168, 34 + orig: 168, 34 + offset: 0, 0 + index: -1 +castle-gate/goon-2-walk + rotate: false + xy: 952, 568 + size: 168, 34 + orig: 168, 34 + offset: 0, 0 + index: -1 +held/background + rotate: false + xy: 3636, 3659 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +held/bloodclot-head + rotate: false + xy: 1028, 3845 + size: 1026, 82 + orig: 1026, 82 + offset: 0, 0 + index: -1 +held/dot + rotate: false + xy: 1152, 2420 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +space/dot + rotate: false + xy: 1152, 2420 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +outside-jail/dot + rotate: false + xy: 1152, 2420 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +held/flesh + rotate: false + xy: 1602, 3009 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +space/flesh + rotate: false + xy: 1602, 3009 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +held/hand + rotate: false + xy: 1667, 1712 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +held/head + rotate: false + xy: 1667, 1470 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +held/title + rotate: false + xy: 3277, 997 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/antique-sigh + rotate: false + xy: 3352, 3447 + size: 198, 21 + orig: 198, 21 + offset: 0, 0 + index: -1 +inside-antique/background + rotate: false + xy: 1560, 3188 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/beard + rotate: false + xy: 1806, 1188 + size: 78, 52 + orig: 78, 52 + offset: 0, 0 + index: -1 +inside-antique/bowl + rotate: false + xy: 3552, 3461 + size: 12, 7 + orig: 12, 7 + offset: 0, 0 + index: -1 +inside-antique/closed-blinds + rotate: false + xy: 3498, 2933 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/collision + rotate: false + xy: 2026, 2474 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/darken + rotate: false + xy: 1345, 2196 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/desk + rotate: false + xy: 1989, 2232 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/fg + rotate: false + xy: 2311, 1990 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/fire-particle + rotate: false + xy: 1882, 3424 + size: 4, 4 + orig: 4, 4 + offset: 0, 0 + index: -1 +inside-antique/glow + rotate: false + xy: 1220, 1954 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/open-blinds + rotate: false + xy: 2633, 1506 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/portrait + rotate: false + xy: 1774, 838 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +inside-antique/shopkeep + rotate: false + xy: 336, 109 + size: 18, 21 + orig: 18, 21 + offset: 0, 0 + index: -1 +inside-antique/shopkeep-talk + rotate: false + xy: 370, 8 + size: 72, 21 + orig: 72, 21 + offset: 0, 0 + index: -1 +inside-antique/sword + rotate: false + xy: 2016, 2633 + size: 8, 16 + orig: 8, 16 + offset: 0, 0 + index: -1 +inside-castle/sword + rotate: false + xy: 2016, 2633 + size: 8, 16 + orig: 8, 16 + offset: 0, 0 + index: -1 +inside-antique/teddy + rotate: false + xy: 1028, 2322 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +inside-cafeteria/background + rotate: false + xy: 838, 1088 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/collision + rotate: false + xy: 2348, 2474 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/doorway + rotate: false + xy: 1276, 2569 + size: 14, 113 + orig: 14, 113 + offset: 0, 0 + index: -1 +inside-cafeteria/fg + rotate: false + xy: 2633, 1990 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/fight + rotate: false + xy: 3277, 1965 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/fight copy + rotate: false + xy: 3599, 1965 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/glow + rotate: false + xy: 1542, 1954 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight + rotate: false + xy: 2906, 3795 + size: 728, 104 + orig: 728, 104 + offset: 0, 0 + index: -1 +inside-cafeteria/knight-a + rotate: false + xy: 1028, 2922 + size: 700, 85 + orig: 700, 85 + offset: 0, 0 + index: -1 +inside-cafeteria/knights + rotate: false + xy: 260, 33 + size: 74, 97 + orig: 74, 97 + offset: 0, 0 + index: -1 +inside-cafeteria/knights-stand + rotate: false + xy: 1542, 3745 + size: 490, 80 + orig: 490, 80 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder + rotate: false + xy: 1886, 1202 + size: 29, 38 + orig: 29, 38 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder-guard + rotate: false + xy: 3820, 2970 + size: 74, 87 + orig: 74, 87 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder-guard-2 + rotate: false + xy: 3921, 2132 + size: 30, 73 + orig: 30, 73 + offset: 0, 0 + index: -1 +inside-cafeteria/warriors + rotate: false + xy: 1948, 2552 + size: 66, 126 + orig: 66, 126 + offset: 0, 0 + index: -1 +inside-cafeteria/warriors-stand + rotate: false + xy: 544, 728 + size: 264, 126 + orig: 264, 126 + offset: 0, 0 + index: -1 +inside-castle/Untitled + rotate: false + xy: 1132, 662 + size: 160, 44 + orig: 160, 44 + offset: 0, 0 + index: -1 +inside-castle/background + rotate: false + xy: 838, 846 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/background-sunrise + rotate: false + xy: 2532, 3200 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/inside-castle-sunrise + rotate: false + xy: 2532, 3200 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/books + rotate: false + xy: 1228, 1789 + size: 34, 19 + orig: 34, 19 + offset: 0, 0 + index: -1 +inside-castle/bookstack + rotate: false + xy: 446, 2 + size: 27, 35 + orig: 27, 35 + offset: 0, 0 + index: -1 +inside-castle/brian-working + rotate: false + xy: 516, 856 + size: 320, 44 + orig: 320, 44 + offset: 0, 0 + index: -1 +inside-castle/collision + rotate: false + xy: 2670, 2474 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/door + rotate: false + xy: 1876, 2922 + size: 84, 49 + orig: 84, 49 + offset: 0, 0 + index: -1 +inside-castle/fight-1 + rotate: false + xy: 2955, 1749 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/game-player-talk + rotate: false + xy: 1904, 3505 + size: 400, 44 + orig: 400, 44 + offset: 0, 0 + index: -1 +inside-castle/gameplayer + rotate: false + xy: 3928, 3371 + size: 40, 44 + orig: 40, 44 + offset: 0, 0 + index: -1 +inside-castle/hands-1 + rotate: false + xy: 1220, 1848 + size: 104, 104 + orig: 104, 104 + offset: 0, 0 + index: -1 +inside-castle/hands-fight + rotate: false + xy: 2906, 3689 + size: 728, 104 + orig: 728, 104 + offset: 0, 0 + index: -1 +inside-castle/magic + rotate: false + xy: 1624, 3009 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +inside-castle/monocle + rotate: false + xy: 2386, 3685 + size: 28, 7 + orig: 28, 7 + offset: 0, 0 + index: -1 +inside-castle/pedestal-overlay + rotate: false + xy: 2955, 1507 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/pull-sword + rotate: false + xy: 516, 1896 + size: 380, 190 + orig: 380, 190 + offset: 0, 0 + index: -1 +inside-castle/roof + rotate: false + xy: 1948, 2493 + size: 57, 57 + orig: 57, 57 + offset: 0, 0 + index: -1 +inside-castle/scale + rotate: false + xy: 1989, 1264 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/trophy + rotate: false + xy: 2056, 3911 + size: 64, 16 + orig: 64, 16 + offset: 0, 0 + index: -1 +inside-castle/walkie-talkie + rotate: false + xy: 2955, 2438 + size: 35, 34 + orig: 35, 34 + offset: 0, 0 + index: -1 +inside-castle/watch + rotate: false + xy: 810, 846 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +inside-castle/way-back-tree + rotate: false + xy: 1482, 1228 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/background + rotate: false + xy: 810, 604 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/candle + rotate: false + xy: 562, 72 + size: 102, 32 + orig: 102, 32 + offset: 0, 0 + index: -1 +inside-house/candle-aura + rotate: false + xy: 260, 2 + size: 108, 27 + orig: 108, 27 + offset: 0, 0 + index: -1 +inside-house/collision + rotate: false + xy: 2992, 2475 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/desk + rotate: false + xy: 2311, 2232 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/flask + rotate: false + xy: 3314, 2694 + size: 16, 21 + orig: 16, 21 + offset: 0, 0 + index: -1 +inside-house/frog-legs + rotate: false + xy: 1326, 1901 + size: 17, 16 + orig: 17, 16 + offset: 0, 0 + index: -1 +inside-house/glow + rotate: false + xy: 1345, 1712 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/inputed-key + rotate: false + xy: 1149, 833 + size: 9, 11 + orig: 9, 11 + offset: 0, 0 + index: -1 +inside-house/safe-lock + rotate: false + xy: 3132, 2717 + size: 198, 2 + orig: 198, 2 + offset: 0, 0 + index: -1 +inside-house/safe-screen + rotate: false + xy: 1023, 1345 + size: 200, 75 + orig: 200, 75 + offset: 0, 0 + index: -1 +inside-house/sillhoute + rotate: false + xy: 2955, 1265 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/background + rotate: false + xy: 1888, 3215 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/ball-n-chain + rotate: false + xy: 3596, 3671 + size: 38, 16 + orig: 38, 16 + offset: 0, 0 + index: -1 +inside-jail/bars + rotate: false + xy: 2854, 3200 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/bars- + rotate: false + xy: 2848, 2958 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/candle + rotate: false + xy: 3888, 3417 + size: 80, 25 + orig: 80, 25 + offset: 0, 0 + index: -1 +inside-jail/chest-top + rotate: false + xy: 3928, 3250 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 +inside-jail/chest-top-open + rotate: false + xy: 3912, 3150 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 +inside-jail/collision + rotate: false + xy: 3314, 2449 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/collision-free + rotate: false + xy: 898, 1846 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/collision-locked + rotate: false + xy: 1023, 1506 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/crowbar + rotate: false + xy: 2016, 2651 + size: 8, 27 + orig: 8, 27 + offset: 0, 0 + index: -1 +inside-jail/fg + rotate: false + xy: 2955, 1991 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/glow + rotate: false + xy: 1345, 1470 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/moveable-bars + rotate: false + xy: 2331, 3458 + size: 53, 91 + orig: 53, 91 + offset: 0, 0 + index: -1 +inside-jail/warden + rotate: false + xy: 878, 1786 + size: 258, 58 + orig: 258, 58 + offset: 0, 0 + index: -1 +inside-jail/window + rotate: false + xy: 3921, 2101 + size: 18, 29 + orig: 18, 29 + offset: 0, 0 + index: -1 +inside-jail/window-bent + rotate: false + xy: 998, 2288 + size: 18, 29 + orig: 18, 29 + offset: 0, 0 + index: -1 +inside-stash/background + rotate: false + xy: 1882, 2973 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-stash/candle + rotate: false + xy: 1028, 2903 + size: 16, 4 + orig: 16, 4 + offset: 0, 0 + index: -1 +inside-stash/collision + rotate: false + xy: 3636, 2449 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-stash/lid + rotate: false + xy: 544, 681 + size: 23, 7 + orig: 23, 7 + offset: 0, 0 + index: -1 +inventory + rotate: false + xy: 1806, 936 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 +inventory-overlay + rotate: false + xy: 2633, 1748 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +mainfont + rotate: false + xy: 2, 818 + size: 512, 512 + orig: 512, 512 + offset: 0, 0 + index: -1 +outside-castle/Untitled + rotate: false + xy: 1684, 856 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +outside-castle/peddler-talk + rotate: false + xy: 1684, 856 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +outside-castle/background + rotate: false + xy: 2386, 3442 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/background-sunrise + rotate: false + xy: 2204, 2958 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/balloons + rotate: false + xy: 1912, 1312 + size: 60, 36 + orig: 60, 36 + offset: 0, 0 + index: -1 +outside-castle/bird + rotate: false + xy: 1378, 2732 + size: 2, 2 + orig: 2, 2 + offset: 0, 0 + index: -1 +outside-castle/blanket + rotate: false + xy: 3888, 3444 + size: 103, 46 + orig: 103, 46 + offset: 0, 0 + index: -1 +outside-castle/brush + rotate: false + xy: 3176, 2963 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/collision + rotate: false + xy: 2992, 2233 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/flies + rotate: false + xy: 1298, 1489 + size: 45, 15 + orig: 45, 15 + offset: 0, 0 + index: -1 +outside-castle/note + rotate: false + xy: 1542, 3338 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +outside-castle/peddler + rotate: false + xy: 878, 1858 + size: 18, 36 + orig: 18, 36 + offset: 0, 0 + index: -1 +outside-castle/scale-map + rotate: false + xy: 2311, 1264 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/steer + rotate: false + xy: 364, 107 + size: 200, 35 + orig: 200, 35 + offset: 0, 0 + index: -1 +outside-castle/walk-behind + rotate: false + xy: 1160, 861 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/Untitled + rotate: false + xy: 2, 530 + size: 600, 70 + orig: 600, 70 + offset: 0, 0 + index: -1 +outside-jail/alarm-clock + rotate: false + xy: 1986, 2922 + size: 16, 11 + orig: 16, 11 + offset: 0, 0 + index: -1 +outside-jail/axe + rotate: false + xy: 2955, 2403 + size: 22, 33 + orig: 22, 33 + offset: 0, 0 + index: -1 +outside-jail/background + rotate: false + xy: 2708, 3442 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/bent-bar-window + rotate: false + xy: 1326, 1919 + size: 17, 33 + orig: 17, 33 + offset: 0, 0 + index: -1 +outside-jail/candle + rotate: false + xy: 1692, 829 + size: 80, 25 + orig: 80, 25 + offset: 0, 0 + index: -1 +outside-jail/candle-aura + rotate: false + xy: 1028, 3009 + size: 540, 135 + orig: 540, 135 + offset: 0, 0 + index: -1 +outside-jail/candle-aura2 + rotate: false + xy: 2, 681 + size: 540, 135 + orig: 540, 135 + offset: 0, 0 + index: -1 +outside-jail/closed-stash + rotate: false + xy: 3912, 3218 + size: 52, 30 + orig: 52, 30 + offset: 0, 0 + index: -1 +outside-jail/collision + rotate: false + xy: 3314, 2207 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/dither + rotate: false + xy: 1560, 3146 + size: 3, 3 + orig: 3, 3 + offset: 0, 0 + index: -1 +outside-jail/guard-sleep + rotate: false + xy: 1132, 760 + size: 172, 67 + orig: 172, 67 + offset: 0, 0 + index: -1 +outside-jail/magic + rotate: false + xy: 1646, 3009 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +outside-jail/open-stash + rotate: false + xy: 1570, 3031 + size: 290, 41 + orig: 290, 41 + offset: 0, 0 + index: -1 +outside-jail/rope + rotate: false + xy: 571, 602 + size: 185, 86 + orig: 185, 86 + offset: 0, 0 + index: -1 +outside-jail/spear + rotate: false + xy: 1349, 776 + size: 11, 51 + orig: 11, 51 + offset: 0, 0 + index: -1 +outsidehouse/background + rotate: false + xy: 3030, 3447 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/background-trees + rotate: false + xy: 2526, 2958 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/cauldron + rotate: false + xy: 1482, 854 + size: 200, 38 + orig: 200, 38 + offset: 0, 0 + index: -1 +outsidehouse/collision + rotate: false + xy: 3636, 2207 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/door + rotate: false + xy: 1138, 1786 + size: 88, 58 + orig: 88, 58 + offset: 0, 0 + index: -1 +outsidehouse/fence + rotate: false + xy: 2633, 2232 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/fg1 + rotate: false + xy: 1730, 2966 + size: 128, 63 + orig: 128, 63 + offset: 0, 0 + index: -1 +outsidehouse/fg2 + rotate: false + xy: 2270, 3442 + size: 59, 61 + orig: 59, 61 + offset: 0, 0 + index: -1 +outsidehouse/fgtest + rotate: false + xy: 1912, 1393 + size: 75, 75 + orig: 75, 75 + offset: 0, 0 + index: -1 +outsidehouse/foreground + rotate: false + xy: 3277, 1723 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/house + rotate: false + xy: 2311, 1748 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/lamb + rotate: false + xy: 516, 835 + size: 26, 19 + orig: 26, 19 + offset: 0, 0 + index: -1 +outsidehouse/lamb-walk + rotate: false + xy: 446, 39 + size: 108, 28 + orig: 108, 28 + offset: 0, 0 + index: -1 +outsidehouse/note + rotate: false + xy: 1542, 3320 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +outsidehouse/outsidehouse + rotate: false + xy: 2, 2903 + size: 1024, 1024 + orig: 1024, 1024 + offset: 0, 0 + index: -1 +outsidehouse/sheep + rotate: false + xy: 2335, 3551 + size: 33, 21 + orig: 33, 21 + offset: 0, 0 + index: -1 +outsidehouse/sheep-anim + rotate: false + xy: 1904, 3551 + size: 429, 21 + orig: 429, 21 + offset: 0, 0 + index: -1 +outsidehouse/sheep-walk + rotate: false + xy: 758, 521 + size: 198, 21 + orig: 198, 21 + offset: 0, 0 + index: -1 +pathfind-test + rotate: false + xy: 1104, 550 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +player + rotate: false + xy: 1152, 2423 + size: 144, 72 + orig: 144, 72 + offset: 0, 0 + index: -1 +space/Blergh + rotate: false + xy: 1864, 2029 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/Untitled + rotate: false + xy: 3132, 2920 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +space/background + rotate: false + xy: 3566, 3417 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +space/beam + rotate: false + xy: 1542, 3313 + size: 12, 5 + orig: 12, 5 + offset: 0, 0 + index: -1 +space/blergh-appear + rotate: false + xy: 2, 2736 + size: 1378, 165 + orig: 1378, 165 + offset: 0, 0 + index: -1 +space/blergh-flex + rotate: false + xy: 1482, 1061 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-stand + rotate: false + xy: 1482, 1061 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-grow + rotate: false + xy: 2, 2569 + size: 1272, 165 + orig: 1272, 165 + offset: 0, 0 + index: -1 +space/blergh-grow2 + rotate: false + xy: 1804, 1303 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-grow3 + rotate: false + xy: 1482, 894 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-grow4 + rotate: false + xy: 1590, 1061 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-grow5 + rotate: false + xy: 1590, 894 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-grow6 + rotate: false + xy: 1698, 1061 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-grow7 + rotate: false + xy: 1698, 894 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-grow8 + rotate: false + xy: 3971, 3929 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-stand copy + rotate: false + xy: 3888, 3492 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-swing + rotate: false + xy: 1028, 3146 + size: 530, 165 + orig: 530, 165 + offset: 0, 0 + index: -1 +space/blergh-talk + rotate: false + xy: 3820, 3250 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode + rotate: false + xy: 2, 3929 + size: 2120, 165 + orig: 2120, 165 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk + rotate: false + xy: 2, 2420 + size: 1148, 75 + orig: 1148, 75 + offset: 0, 0 + index: -1 +space/bloodclot-stand + rotate: false + xy: 3352, 3522 + size: 212, 165 + orig: 212, 165 + offset: 0, 0 + index: -1 +space/bloodclot-talk + rotate: false + xy: 2056, 3734 + size: 848, 165 + orig: 848, 165 + offset: 0, 0 + index: -1 +space/broken-jewel + rotate: false + xy: 3158, 2866 + size: 10, 14 + orig: 10, 14 + offset: 0, 0 + index: -1 +space/bullet + rotate: false + xy: 758, 544 + size: 192, 24 + orig: 192, 24 + offset: 0, 0 + index: -1 +space/later + rotate: false + xy: 1989, 1506 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +space/susp + rotate: false + xy: 1028, 2340 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/suspended + rotate: false + xy: 1028, 2340 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +talk-bg + rotate: false + xy: 1806, 894 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +talk-bg-2 + rotate: false + xy: 2306, 3509 + size: 21, 40 + orig: 21, 40 + offset: 0, 0 + index: -1 +testscreen/subject + rotate: false + xy: 1972, 2139 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +testscreen/test + rotate: false + xy: 3277, 1239 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +the-end + rotate: false + xy: 3599, 1239 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title + rotate: false + xy: 2955, 1023 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title-overlay + rotate: false + xy: 3599, 997 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title/background + rotate: false + xy: 2210, 3200 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title/balloon + rotate: false + xy: 1806, 980 + size: 60, 30 + orig: 60, 30 + offset: 0, 0 + index: -1 +title/cloud1 + rotate: false + xy: 1276, 2684 + size: 100, 50 + orig: 100, 50 + offset: 0, 0 + index: -1 +title/cloud2 + rotate: false + xy: 1276, 2684 + size: 100, 50 + orig: 100, 50 + offset: 0, 0 + index: -1 +title/clouds + rotate: false + xy: 3170, 2721 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title/logo + rotate: false + xy: 2311, 1506 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ui/slider + rotate: false + xy: 1668, 3009 + size: 20, 20 + split: 8, 8, 8, 8 + orig: 20, 20 + offset: 0, 0 + index: -1 +ui/slider-bar + rotate: false + xy: 3566, 3659 + size: 28, 28 + orig: 28, 28 + offset: 0, 0 + index: -1 +ui/slider-bar-hover + rotate: false + xy: 3566, 3659 + size: 28, 28 + orig: 28, 28 + offset: 0, 0 + index: -1 +ui/ui + rotate: false + xy: 3820, 2936 + size: 64, 32 + orig: 64, 32 + offset: 0, 0 + index: -1 +uiskin + rotate: false + xy: 2, 2 + size: 256, 128 + orig: 256, 128 + offset: 0, 0 + index: -1 +white + rotate: false + xy: 3498, 3421 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 +wizard/Untitled + rotate: false + xy: 3881, 3906 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 +wizard/cloud + rotate: false + xy: 1362, 791 + size: 40, 30 + orig: 40, 30 + offset: 0, 0 + index: -1 +wizard/disappear + rotate: false + xy: 1888, 3457 + size: 380, 46 + orig: 380, 46 + offset: 0, 0 + index: -1 +wizard/experiment + rotate: false + xy: 2124, 3901 + size: 1755, 55 + orig: 1755, 55 + offset: 0, 0 + index: -1 +wizard/flame + rotate: false + xy: 3559, 3510 + size: 5, 10 + orig: 5, 10 + offset: 0, 0 + index: -1 +wizard/magic-hands + rotate: false + xy: 1250, 1427 + size: 40, 50 + orig: 40, 50 + offset: 0, 0 + index: -1 +wizard/stand + rotate: false + xy: 2034, 3779 + size: 20, 46 + orig: 20, 46 + offset: 0, 0 + index: -1 +wizard + rotate: false + xy: 2034, 3779 + size: 20, 46 + orig: 20, 46 + offset: 0, 0 + index: -1 +wizard/talk + rotate: false + xy: 1806, 1088 + size: 80, 46 + orig: 80, 46 + offset: 0, 0 + index: -1 +wizard/talk-angry + rotate: false + xy: 1806, 1136 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png new file mode 100644 index 00000000..67661f76 Binary files /dev/null and b/desktop/resources/packed/pack.png differ diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 641b3418..512490cb 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -725,7 +725,7 @@ :y (get-in entities [:room :entities :ego :y]) :baseline (get-in entities [:room :entities :ego :baseline])) (particle-effect! :reset) (particle-effect! :start))) - (assoc-in [:room :entities :cloud] (assoc (texture "space/cloud.png") + (assoc-in [:room :entities :cloud] (assoc (utils/get-texture "space/cloud.png") :x (get-in entities [:room :entities :ego :x]) :y (get-in entities [:room :entities :ego :y]) :origin-x 7 diff --git a/desktop/src-common/advent/screens/credits.clj b/desktop/src-common/advent/screens/credits.clj index f83ba5c7..f8ad15ed 100644 --- a/desktop/src-common/advent/screens/credits.clj +++ b/desktop/src-common/advent/screens/credits.clj @@ -94,14 +94,14 @@ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) (let [font (bitmap-font "ego/font.fnt" )] {:font font - :fade (assoc (texture "black.png") + :fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 0.0 :origin-x 0 :origin-y 0) :remaining-messages credit-messages - :the-end (assoc (texture "the-end.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + :the-end (assoc (utils/get-texture "the-end.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 5.0 :ease tween/ease-out-cubic)}})) diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index 02d8c56c..548efae1 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -50,7 +50,7 @@ :on-talk (fn [{:keys [create-talk target-id color text x y scale scene-viewport] :as screen} [entities]] (let [font (bitmap-font "ego/font.fnt" ) - p (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + p (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) _ (nine-patch! p :set-padding 25 25 5 15) bg (drawable :nine-patch (:object p)) @@ -122,7 +122,7 @@ :choices [] :last-pos [0 0] :font font - :np (assoc (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + :np (assoc (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) :x 5 :y 5 :width 1270)}})) :on-render diff --git a/desktop/src-common/advent/screens/fade.clj b/desktop/src-common/advent/screens/fade.clj index ed5c0c8d..fa31530e 100644 --- a/desktop/src-common/advent/screens/fade.clj +++ b/desktop/src-common/advent/screens/fade.clj @@ -19,7 +19,7 @@ (fn [screen entities] (utils/setup-viewport screen 320 240) - {:fade (assoc (texture "black.png") + {:fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 0.0 diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index 5b98a46c..f997c353 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -36,8 +36,8 @@ (let [highlighted-text (assoc (label "Hello" (style :label (utils/get-font "ego/font.fnt") (color :white))) :x 0 :y 850 :width 1280 )] (label! highlighted-text :set-alignment Align/center) - {:overlay (assoc (texture "inventory-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) - :fade (assoc (texture "black.png") + {:overlay (assoc (utils/get-texture "inventory-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) + :fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 0.7 @@ -93,7 +93,7 @@ offset-y (+ y (/ item-width 2)) padding (/ item-width 2) padding (* 4 padding)]] - (assoc (texture (aget (:all-items entities) 0 (.indexOf utils/+all-cursors+ (:cursor item)))) + (assoc (utils/get-texture (aget (:all-items entities) 0 (.indexOf utils/+all-cursors+ (:cursor item)))) :x x :y y :scale-x 4 :scale-y 4 diff --git a/desktop/src-common/advent/screens/rooms/behind_house.clj b/desktop/src-common/advent/screens/rooms/behind_house.clj index fe8665d2..c3b9d1ad 100644 --- a/desktop/src-common/advent/screens/rooms/behind_house.clj +++ b/desktop/src-common/advent/screens/rooms/behind_house.clj @@ -46,17 +46,17 @@ (actions/do-dialogue entities :ego "I can see Gandarf moving around in the corner of the room." :ego "It's hard to make out from this angle.")))}} - :layers {:day [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) - (assoc (texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) - (assoc (texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)] - :night [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) - (assoc (texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) - (assoc (texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]} - :entities {:stick (assoc (texture "behindhouse/stick.png") + :layers {:day [(assoc (utils/get-texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) + (assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) + (assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)] + :night [(assoc (utils/get-texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) + (assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) + (assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]} + :entities {:stick (assoc (utils/get-texture "behindhouse/stick.png") :x 26 :y 80 :baseline 160 :script (actions/get-script entities (actions/walk-to entities :ego [50 80]) @@ -64,7 +64,7 @@ (actions/remove-entity entities :stick) (actions/give entities :stick) (actions/talk entities :ego "This stick might be useful."))) - :peeling (assoc (texture "behindhouse/house-cover.png") + :peeling (assoc (utils/get-texture "behindhouse/house-cover.png") :x 60 :y 92 :baseline 148 :script (actions/get-script entities (cond (= :night (get-in @entities [:state :time])) diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index a5d970ee..84463f8b 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -271,10 +271,10 @@ (Thread/sleep 2000) (actions/walk-straight-to entities :ego [285 71]))}}} - :layers {:day [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)] - :night [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]} + :layers {:day [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)] + :night [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]} :entities {:frankie (make-frankie screen) :goon-1 (make-goon-1 screen) :goon-2 (make-goon-2 screen) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index f717155b..4ac34d26 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -208,12 +208,12 @@ (actions/give entities :feather)) (defn make [screen] - (let [cat-stand-sheet (texture! (texture "cat-tree/cat-stand.png") :split 22 10) + (let [cat-stand-sheet (texture! (utils/get-texture "cat-tree/cat-stand.png") :split 22 10) cat-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])] (aget cat-stand-sheet 0 i))) - cat-walk (animation 0.2 [(texture "cat-tree/pounce.png")]) + cat-walk (animation 0.2 [(utils/get-texture "cat-tree/pounce.png")]) destroy-ladder (utils/make-anim "cat-tree/destroy-ladder.png" [29 38] 0.1 (range 18)) - ladder-entity (assoc (texture "inside-cafeteria/ladder.png") :x 130 :y 60 :baseline 162 + ladder-entity (assoc (utils/get-texture "inside-cafeteria/ladder.png") :x 130 :y 60 :baseline 162 :origin-x 0 :destroy-ladder destroy-ladder) grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) @@ -290,14 +290,14 @@ (actions/walk-to entities :ego [165 45] :face :left) (actions/do-dialogue entities :grandma "No thank you, handsome."))) }} - :layers {:day [(assoc (texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) - (assoc (texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) - (assoc (texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)] - :night [(assoc (texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) - (assoc (texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) - (assoc (texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)]} + :layers {:day [(assoc (utils/get-texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) + (assoc (utils/get-texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) + (assoc (utils/get-texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)] + :night [(assoc (utils/get-texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) + (assoc (utils/get-texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) + (assoc (utils/get-texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)]} :entities { :outside-particles (common/make-outside-particles) :cat (actions/start-animation screen diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 353df08a..050d216a 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -26,7 +26,7 @@ (actions/play-animation entities :ego :standup)) (defn make-wizard [screen wizard-spec] - (let [wizard-sheet (texture! (texture "wizard/talk.png") :split 20 46) + (let [wizard-sheet (texture! (utils/get-texture "wizard/talk.png") :split 20 46) wizard-stand (animation 0.2 (for [i (flatten [(repeat 10 0) 1])] (aget wizard-sheet 0 i))) wizard-talk-angry (utils/make-anim "wizard/talk-angry.png" [20 50] 0.2 [0 2 0 2 1 2 0 3 0 2 0 1 0 2]) diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 9d700f35..c527f895 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -367,19 +367,19 @@ :ego "It seems like misery!" :ego "Plus, how can I ever win the heart of my true love, Georgia McGorgeous?"))}}} :timers {:return [15.0 15.0 return-from-island]} - :layers [(assoc (texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) - (assoc (texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) - (assoc (texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) - (assoc (texture "dream/background.png") :x 0 :y 0 :baseline 2) - (assoc (texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) - (assoc (texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) - (assoc (texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] + :layers [(assoc (utils/get-texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/get-texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) + (assoc (utils/get-texture "dream/background.png") :x 0 :y 0 :baseline 2) + (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)] :wind-sound {:sound (sound "dream/wind.ogg") :id nil} :entities {:magic (assoc (particle-effect "dream/magic") :x 160 :y 80 :baseline 240) :clouds (assoc (particle-effect "dream/cloudy2") :x 160 :y 120 :baseline 241) - :case (assoc (texture "dream/case.png") + :case (assoc (utils/get-texture "dream/case.png") :x 144 :y 122 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities)) @@ -416,11 +416,11 @@ (do (actions/walk-to entities :ego [148 76] :face :right) (actions/do-dialogue entities :fairy-godfather "What are you doing?" :ego "Erm... Nothing."))))}) - :sword (assoc (texture "dream/sword.png") + :sword (assoc (utils/get-texture "dream/sword.png") :x 144 :y 122 :baseline 139) :explode (assoc (particle-effect "dream/explode") :x 150 :y 138 :baseline 240) - :broom (assoc (texture "dream/broom.png") :x 286 :y 122 + :broom (assoc (utils/get-texture "dream/broom.png") :x 286 :y 122 :path (catmull-rom-spline (map #(apply vector-2* %) [[286 122] [286 128]]) true) :update-fn (partial utils/update-path-location 0.30) @@ -435,7 +435,7 @@ (actions/give entities :broom)) (read-broom-plaque entities)))) - :shovel (assoc (texture "dream/shovel.png") :x 33 :y 122 + :shovel (assoc (utils/get-texture "dream/shovel.png") :x 33 :y 122 :path (catmull-rom-spline (map #(apply vector-2* %) [[22 122] [22 128]]) true) :update-fn (partial utils/update-path-location 0.33) @@ -450,10 +450,10 @@ (actions/give entities :shovel)) (read-shovel-plaque entities)))) - :sign (assoc (texture "dream/sign.png") :x 229 :y 33 :baseline 207) - :plaque-1 (assoc (texture "dream/plaque1.png") :x 39 :y 99 :baseline 139 :script (actions/get-script entities (read-shovel-plaque entities))) - :plaque-2 (assoc (texture "dream/plaque2.png") :x 147 :y 104 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities))) - :plaque-3 (assoc (texture "dream/plaque3.png") :x 283 :y 98 :baseline 139 :script (actions/get-script entities (read-broom-plaque entities))) + :sign (assoc (utils/get-texture "dream/sign.png") :x 229 :y 33 :baseline 207) + :plaque-1 (assoc (utils/get-texture "dream/plaque1.png") :x 39 :y 99 :baseline 139 :script (actions/get-script entities (read-shovel-plaque entities))) + :plaque-2 (assoc (utils/get-texture "dream/plaque2.png") :x 147 :y 104 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities))) + :plaque-3 (assoc (utils/get-texture "dream/plaque3.png") :x 283 :y 98 :baseline 139 :script (actions/get-script entities (read-broom-plaque entities))) :outside-particles (common/make-outside-particles) :fairy-godfather (assoc (animation->texture screen fairy-godfather-anim) :x 200 :y 130 diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index b583ec6d..832021ae 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -18,15 +18,15 @@ (defn make [screen] (let [ - peddler-sheet (texture! (texture "outside-castle/peddler-talk.png" ) :split 18 36) + peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36) peddler-stand (utils/flip (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])] (aget peddler-sheet 0 i)))) warden-stand (utils/make-anim "ending-castle/warden-2.png" [21 41] 0.21 (flatten [(repeat 7 0) 1])) game-player-stand (utils/make-anim "ending-castle/game-player.png" [14 39] 0.2 (flatten [(repeat 5 0) 1] )) - ladder-guard-stand-1 (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")]) - ladder-guard-stand-2 (utils/flip (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")])) + ladder-guard-stand-1 (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) + ladder-guard-stand-2 (utils/flip (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")])) grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) cat-stand (utils/make-anim "cat-tree/cat-stand.png" [22 10] 0.15 (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])) duke-stand (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 (flatten [(repeat 4 0) 1])) @@ -37,8 +37,8 @@ scaler (utils/scaler-fn-with-baseline 20 0.01 1.20)] (rooms/make :music :dream :interactions {} - :layers [(assoc (texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) - (assoc (texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] + :layers [(assoc (utils/get-texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) + (assoc (utils/get-texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] :apply-state (fn [screen e] (update-in e [:room :entities :ego] dissoc :talk-override )) :entities {:peddler (assoc (animation->texture screen peddler-stand) diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index a6500df6..df99c903 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -78,8 +78,8 @@ (actions/talk entities :bloodclot-head "Don't make me laugh kid!"))) }} :timers {:taunt [5.0 1.0 add-second]} - :layers [(assoc (texture "held/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "held/hand.png") :x 0 :y 0 :baseline 240)] + :layers [(assoc (utils/get-texture "held/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "held/hand.png") :x 0 :y 0 :baseline 240)] :entities {:bloodclot-head (assoc (animation->texture screen bloodclot-stand) :x 211 :y 115 :baseline 240 :origin-x 57 :origin-y 0 diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 534e958b..69984e62 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -163,7 +163,7 @@ (assoc-in [:room :entities :glow :opacity] 0.0)))) (defn make [screen] - (let [shopkeep-sheet (texture! (texture "inside-antique/shopkeep-talk.png") :split 18 21) + (let [shopkeep-sheet (texture! (utils/get-texture "inside-antique/shopkeep-talk.png") :split 18 21) shopkeep-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 1 (repeat 50 0) 1 0 1 0 1])] (aget shopkeep-sheet 0 i))) shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]] @@ -171,7 +171,7 @@ shopkeep-sigh (utils/make-anim "inside-antique/antique-sigh.png" [22 21] 0.12 (flatten [ (range 9) 0 0 ])) beard (utils/make-anim "inside-antique/beard.png" [26 52] 0.5 [0 1 0 2]) - teddy (assoc (texture "inside-antique/teddy.png") + teddy (assoc (utils/get-texture "inside-antique/teddy.png") :x 255 :y 95 :baseline 160 @@ -268,10 +268,10 @@ :ego "It's a tapestry of Rupert the Lion!" :ego "He's the town of Remington's mascot."))} } - :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-antique/desk.png") :x 0 :y 0 :baseline 113) + :layers [(assoc (utils/get-texture "inside-antique/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-antique/desk.png") :x 0 :y 0 :baseline 113) - (assoc (texture "inside-antique/fg.png") :x 0 :y 0 :baseline 320 :parallax 1.5) + (assoc (utils/get-texture "inside-antique/fg.png") :x 0 :y 0 :baseline 320 :parallax 1.5) ] :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 148 :y 122 :baseline 112 :stand shopkeep-stand @@ -299,10 +299,10 @@ (actions/get-script entities (actions/talk entities :shopkeep "No thanks, sonny.")))) :stand) - :glow (assoc (texture "inside-antique/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.3) - :closed-blinds (assoc (texture "inside-antique/closed-blinds.png") :x 0 :y 0 :baseline 0 :opacity 1.0) - :open-blinds (assoc (texture "inside-antique/open-blinds.png") :x 0 :y 0 :baseline 0 :opacity 0.0) - :darken (assoc (texture "inside-antique/darken.png") :x 0 :y 0 :baseline 321 :opacity 0.4 ) + :glow (assoc (utils/get-texture "inside-antique/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.3) + :closed-blinds (assoc (utils/get-texture "inside-antique/closed-blinds.png") :x 0 :y 0 :baseline 0 :opacity 1.0) + :open-blinds (assoc (utils/get-texture "inside-antique/open-blinds.png") :x 0 :y 0 :baseline 0 :opacity 0.0) + :darken (assoc (utils/get-texture "inside-antique/darken.png") :x 0 :y 0 :baseline 321 :opacity 0.4 ) :beard (assoc (animation->texture screen beard) :anim beard :anim-start 0 @@ -315,7 +315,7 @@ :fire-particle (doto (assoc (particle-effect "inside-antique/fire-particle") :x 162 :y 108 :baseline 240) (particle-effect! :set-position 162 108)) - :bowl (assoc (texture "inside-antique/bowl.png") + :bowl (assoc (utils/get-texture "inside-antique/bowl.png") :x 165 :y 110 :baseline 125 @@ -352,7 +352,7 @@ :shopkeep "Pronto!")))))) :teddy teddy} :portrait (rooms/make-entity :portrait - (assoc (texture "inside-antique/portrait.png") + (assoc (utils/get-texture "inside-antique/portrait.png") :x 112 :y 114 :baseline 120 diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 38c61ab1..637558e4 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -10,7 +10,7 @@ [play-clj.g2d :refer :all])) (defn make-fight-entity [] - (assoc (texture "inside-cafeteria/fight.png") + (assoc (utils/get-texture "inside-cafeteria/fight.png") :x 0 :y 0 :baseline 1000)) @@ -165,13 +165,13 @@ {:run #(actions/respond entities % "Goodbye.")}]})) (defn make [screen] - (let [#_#_warriors-stand-sheet (texture! (texture "inside-cafeteria/warriors-stand.png") :split 66 126) + (let [#_#_warriors-stand-sheet (texture! (utils/get-texture "inside-cafeteria/warriors-stand.png") :split 66 126) #_#_warriors-stand (animation 0.2 (for [i [0 0 0 0 0 0 1 1 0 0 1 1 1 0 0 2 2 2 2 3 3 3 0 0 0 2 2 2 ]] (aget warriors-stand-sheet 0 i))) - #_#_ladder-guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) + #_#_ladder-guard-sheet (texture! (utils/get-texture "inside-cafeteria/ladder-guard.png") :split 37 87) #_#_ladder-guard-stand (animation 0.1 [(aget ladder-guard-sheet 0 0)]) - ladder-guard-stand (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")]) - ladder-guard-talk (animation 0.1 [ (texture "inside-cafeteria/ladder-guard-2.png")]) + ladder-guard-stand (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) + ladder-guard-talk (animation 0.1 [ (utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) warriors-stand (utils/make-anim "inside-cafeteria/knights-stand.png" [49 80] 0.6 (take 100 (repeatedly #(rand-int 10)))) knight-a-stand (utils/make-anim "inside-cafeteria/knight-a.png" [70 85] 0.2 (flatten [(repeat 3 [(repeat 7 0) (repeat 7 1) (repeat 7 0) (repeat 7 2)]) [3 4 5 6 7 8 9]])) @@ -194,10 +194,10 @@ (actions/walk-to entities :ego [126 80] :skip-type :end)) :cursor :right} } - :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-cafeteria/doorway.png") :x 306 :y 34 :baseline 202) - (assoc (texture "inside-cafeteria/glow.png") :y 0 :baseline 240 :additive? true :opacity 0.3) - (assoc (texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5) + :layers [(assoc (utils/get-texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-cafeteria/doorway.png") :x 306 :y 34 :baseline 202) + (assoc (utils/get-texture "inside-cafeteria/glow.png") :y 0 :baseline 240 :additive? true :opacity 0.3) + (assoc (utils/get-texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5) ] :entities {:warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 31 :y 36 :baseline 180 @@ -232,7 +232,7 @@ "Do not durst telleth a soul about that ladder!" "No thank you, young sire.")))) :stand) - :ladder (assoc (texture "inside-cafeteria/ladder.png") :x 205 :y 70 :baseline 170 + :ladder (assoc (utils/get-texture "inside-cafeteria/ladder.png") :x 205 :y 70 :baseline 170 :script (actions/get-script entities (actions/talk entities :ladder-guard "Do not toucheth, young sire.")))} :collision "inside-cafeteria/collision.png" diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index ed256d9e..f812a947 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -336,7 +336,7 @@ add-monocle-if-necessary)) (defn make [screen] - (let [game-player-talk-sheet (texture! (texture "inside-castle/game-player-talk.png") :split 40 44) + (let [game-player-talk-sheet (texture! (utils/get-texture "inside-castle/game-player-talk.png") :split 40 44) game-player-talk-up (animation 0.15 (for [i [0 2 0 2 0 2 0 3 0 2 0 1 0 0 0 0 2 0 2 0 3 0 1 0 1 0 0 1 0 2 0 3 0]] (aget game-player-talk-sheet 0 i))) @@ -429,17 +429,17 @@ :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))}} - :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5) - (assoc (texture "inside-castle/bookstack.png") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)] - :night [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] - :sunrise [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]} - :blackout (assoc (texture "black.png") + :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) + (assoc (utils/get-texture "inside-castle/bookstack.png") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)] + :night [(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)] + :sunrise [(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)]} + :blackout (assoc (utils/get-texture "black.png") :x 0 :y 0 :width 320 :height 240 :opacity 0.8 @@ -488,11 +488,11 @@ :door-sound (sound "door.ogg") :anim-sound-frames {door {1 [:door-sound 1.0]}} ) - :sword (assoc (texture "inside-castle/sword.png") + :sword (assoc (utils/get-texture "inside-castle/sword.png") :x 22 :y 110 :baseline 95) - :walkie-talkie (assoc (texture "inside-castle/walkie-talkie.png") + :walkie-talkie (assoc (utils/get-texture "inside-castle/walkie-talkie.png") :x 257 :y 135 :baseline 0 @@ -519,12 +519,12 @@ (brian-get-to-work entities)) (actions/do-dialogue entities :ego "Can't you give me your trophy of wisdom?" :game-player "If you want my trophy, you'll have to help me with my riddles.")))) - :books (assoc (texture "inside-castle/books.png") + :books (assoc (utils/get-texture "inside-castle/books.png") :x 230 :y 30 :baseline 191 :script (actions/get-script entities (walk-to-player entities) (actions/talk entities :game-player "Don't touch my books!"))) - :game-player (assoc (texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 + :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)) :facing :left diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 73a2fc54..a54f1b78 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -130,12 +130,12 @@ {:run #(actions/do-dialogue entities :ego %)}]})) (defn make [screen] - (let [safelock-sheet (texture! (texture "inside-house/safe-lock.png") :split 9 2) + (let [safelock-sheet (texture! (utils/get-texture "inside-house/safe-lock.png") :split 9 2) safe-lock (animation 0.1 (for [i (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])] (aget safelock-sheet 0 i))) - candle (utils/make-anim (texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2]) - candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) - experiment-left (utils/flip (utils/make-anim (texture "wizard/experiment.png" ) [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] + candle (utils/make-anim (utils/get-texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2]) + candle-aura (utils/make-anim (utils/get-texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) + experiment-left (utils/flip (utils/make-anim (utils/get-texture "wizard/experiment.png" ) [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] (rooms/make :music :inside-fangald :interactions {:down-dir {:box [151 0 320 40] :script (actions/get-script entities @@ -159,10 +159,10 @@ :window {:box [119 120 203 190] :script (actions/get-script entities (actions/talk entities :ego "It's a really big window!"))}} - :layers [(assoc (texture "inside-house/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) - (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0) - (assoc (texture "inside-house/glow.png") :x 0 :y 0 :baseline 199 :additive? true)] + :layers [(assoc (utils/get-texture "inside-house/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) + (assoc (utils/get-texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0) + (assoc (utils/get-texture "inside-house/glow.png") :x 0 :y 0 :baseline 199 :additive? true)] :entities { :wizard (common/make-wizard screen {:x 228 :y 60 :baseline 160 :scale-x 1.75 :scale-y 1.75 :origin-x 0 :origin-y 0 :script (actions/get-script entities (do-wizard-dialogue entities)) @@ -211,7 +211,7 @@ :magic-frog-particle (doto (assoc (particle-effect "inside-house/magic-frog") :x 230 :y 0 :baseline 241) (particle-effect! :set-position 237 0)) - :flask (assoc (texture "inside-house/flask.png") + :flask (assoc (utils/get-texture "inside-house/flask.png") :x 265 :y 80 :baseline 240 :script (actions/get-script entities (actions/remove-entity entities :flask) @@ -219,7 +219,7 @@ (when (get-in @entities [:room :entities :wizard]) (actions/do-dialogue entities :ego "Hey you think I could have this flask?" :wizard "Sure.")))) - :frog-legs (assoc (texture "inside-house/frog-legs.png") + :frog-legs (assoc (utils/get-texture "inside-house/frog-legs.png") :x 180 :y 77 :baseline 240 :script (actions/get-script entities (if (get-in @entities [:room :entities :wizard]) diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 0258f240..2f8285bc 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -209,7 +209,7 @@ (defn make [screen] - (let [warden-sheet (texture! (texture "inside-jail/warden.png") :split 43 58) + (let [warden-sheet (texture! (utils/get-texture "inside-jail/warden.png") :split 43 58) warden-talk (animation 0.2 (for [i [1 0 1 0 1 0 1 0 0 0 2 0]] (aget warden-sheet 0 i))) warden-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 2 (repeat 20 0) 2])] @@ -219,7 +219,7 @@ warden-sleep (animation 0.25 (for [i (flatten [ 3 4 3 4 3 4 3 4 3 4 5 5 2 2 2 2 2 2])] (aget warden-sheet 0 i))) candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4)) - candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1])] + candle-aura (utils/make-anim (utils/get-texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1])] (rooms/make :music :inside-antique :interactions { :lock {:box [172 102 190 124] @@ -305,10 +305,10 @@ :door {:box [257 62 301 152] :cursor :down :script (actions/get-script entities (leave entities))}} - :layers [(assoc (texture "inside-jail/background.png") :x 0 :y 0 :baseline 0 :night-profile :none) - (assoc (texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165 :night-profile :none) - (assoc (texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.35 :night-profile :none) - (assoc (texture "inside-jail/fg.png") :x 0 :y 5 :baseline 241 :parallax 1.5 :night-profile :none)] + :layers [(assoc (utils/get-texture "inside-jail/background.png") :x 0 :y 0 :baseline 0 :night-profile :none) + (assoc (utils/get-texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165 :night-profile :none) + (assoc (utils/get-texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.35 :night-profile :none) + (assoc (utils/get-texture "inside-jail/fg.png") :x 0 :y 5 :baseline 241 :parallax 1.5 :night-profile :none)] :hotspots [{:box [121 40 258 44] :fn (fn [screen entities] @@ -331,7 +331,7 @@ (actions/begin-animation entities :warden :sleep)) entities) entities) entities)))}] - :entities {:warden (assoc (texture "inside-jail/warden.png" ) + :entities {:warden (assoc (utils/get-texture "inside-jail/warden.png" ) :x 40 :y 60 :baseline 166 :stand warden-stand :talk warden-talk @@ -367,13 +367,13 @@ :ego "I can't kill him just for doing his job.")) :rope (actions/get-script entities (tie-up-warden entities "I'll tie him up.")) :ball-n-chain (actions/get-script entities (tie-up-warden entities "I'll lock him up."))}) - :chest-top (assoc (texture "inside-jail/chest-top.png") + :chest-top (assoc (utils/get-texture "inside-jail/chest-top.png") :x 193 :y (- 240 165) :baseline 166 :origin-x 0 :origin-y 0 :night-profile :none - :open (animation 0.8 [(texture "inside-jail/chest-top-open.png")]) - :close (animation 0.8 [(texture "inside-jail/chest-top.png")])) - :ball-n-chain (assoc (texture "inside-jail/ball-n-chain.png") + :open (animation 0.8 [(utils/get-texture "inside-jail/chest-top-open.png")]) + :close (animation 0.8 [(utils/get-texture "inside-jail/chest-top.png")])) + :ball-n-chain (assoc (utils/get-texture "inside-jail/ball-n-chain.png") :x 80 :y 80 :baseline 160 :night-profile :none :script (actions/get-script entities @@ -381,7 +381,7 @@ (actions/play-animation entities :ego :squat) (actions/remove-entity entities :ball-n-chain) (actions/give entities :ball-n-chain))) - :moveable-bars (assoc (texture "inside-jail/moveable-bars.png") + :moveable-bars (assoc (utils/get-texture "inside-jail/moveable-bars.png") :night-profile :none :x 132 :y 77 :baseline 163) :candle (assoc (animation->texture screen candle) @@ -396,7 +396,7 @@ :candle-smoke (doto (assoc (particle-effect "inside-jail/candle") :x 215 :y 130 :baseline 200) (particle-effect! :set-position 215 130)) - :crowbar (assoc (texture "inside-jail/crowbar.png") + :crowbar (assoc (utils/get-texture "inside-jail/crowbar.png") :x 304 :y 65 :baseline 175 :night-profile :none :script (actions/get-script entities @@ -407,7 +407,7 @@ (actions/give entities :crowbar) (actions/talk entities :ego "It's a crowbar.")) (actions/talk entities :ego "I can't reach it.")))) - :closed-window (assoc (texture "inside-jail/window.png") + :closed-window (assoc (utils/get-texture "inside-jail/window.png") :night-profile :none :x 99 :y 111 :baseline 128)} :collision "inside-jail/collision-locked.png" diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj index a9125147..3f1daef3 100644 --- a/desktop/src-common/advent/screens/rooms/inside_stash.clj +++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj @@ -49,7 +49,7 @@ (defn make [screen] (let [candle-flame (utils/make-anim "inside-stash/candle.png" [4 4] 0.1 (range 4)) - candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) + candle-aura (utils/make-anim (utils/get-texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) ] (rooms/make :music {:day :secret-hideout :night :secret-hideout} :interactions @@ -81,8 +81,8 @@ :scripts {:sword (actions/get-script entities (actions/talk entities :ego "There's not enough room to swing my sword here.")) :crowbar (actions/get-script entities (bust-chest entities))}}} - :layers [(assoc (texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] - :entities {:lid (assoc (texture "inside-stash/lid.png") + :layers [(assoc (utils/get-texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] + :entities {:lid (assoc (utils/get-texture "inside-stash/lid.png") :x 156 :y 116 :baseline 125 :night-profile :none) :candle-flame (assoc (animation->texture screen candle-flame) :x 165 :y 135 :baseline 1 diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 78e6eea2..eb0b714f 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -275,16 +275,16 @@ add-note-if-necessary)) (defn make [screen] - (let [peddler-sheet (texture! (texture "outside-castle/peddler-talk.png" ) :split 18 36) + (let [peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36) peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])] (aget peddler-sheet 0 i))) peddler-stand (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])] (aget peddler-sheet 0 i))) - balloon-sheet (texture! (texture "outside-castle/balloons.png") :split 20 36) + balloon-sheet (texture! (utils/get-texture "outside-castle/balloons.png") :split 20 36) balloon-stand (animation 0.25 (for [i [1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 1 0 1 2 1 0 1 2 1 0 1 2 1 0 1 2]] (aget balloon-sheet 0 i))) - steer-sheet (texture! (texture "outside-castle/steer.png") :split 50 35) + steer-sheet (texture! (utils/get-texture "outside-castle/steer.png") :split 50 35) steer-stand (animation 0.2 (for [i [0 0 0 0 0 0 0 0 0 1 0 2 0 1 0 2 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 3 3 3 3 3 3 0 0 0 0]] (aget steer-sheet 0 i))) flies-stand (utils/make-anim "outside-castle/flies.png" [15 15] 0.075 (flatten (repeat 2 [0 1 2 1])))] @@ -322,18 +322,18 @@ (actions/give entities :carrot))))}} :flies-sound {:sound (sound "outside-castle/flies2.ogg") :id nil} - :layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1) - (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) - (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] - :night [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) - (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] - :sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) - (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]} + :layers {:day [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1) + (assoc (utils/get-texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) + (assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] + :night [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) + (assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] + :sunrise [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) + (assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]} :entities {:peddler (actions/start-animation screen - (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil + (assoc (utils/get-texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil :anim-sound-frames {peddler-stand {23 [:scratch 1.0]} peddler-talk {23 [:scratch 1.0]}} :scratch (sound "outside-castle/scratch.ogg") @@ -419,7 +419,7 @@ (actions/give entities :flies) (actions/talk entities :ego "Hopefully they won't fly out of my backpack."))} )} - :note (rooms/make-entity :note (assoc (texture "outside-castle/note.png") + :note (rooms/make-entity :note (assoc (utils/get-texture "outside-castle/note.png") :x 198 :y 66 :baseline 174 :script (actions/get-script entities (actions/walk-to entities :ego [210 79] :face :left) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index fb437c47..a6c82eee 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -564,9 +564,9 @@ (defn make [screen] - (let [sheep-stand-sheet (texture! (texture "outsidehouse/sheep-anim.png") :split 33 21) - sheep-walk-sheet (texture! (texture "outsidehouse/sheep-walk.png") :split 33 21) - lamb-walk-sheet (texture! (texture "outsidehouse/lamb-walk.png") :split 27 28) + (let [sheep-stand-sheet (texture! (utils/get-texture "outsidehouse/sheep-anim.png") :split 33 21) + sheep-walk-sheet (texture! (utils/get-texture "outsidehouse/sheep-walk.png") :split 33 21) + lamb-walk-sheet (texture! (utils/get-texture "outsidehouse/lamb-walk.png") :split 27 28) sheep-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 9 10 (repeat 25 11) (repeat 15 12)])] (aget sheep-stand-sheet 0 i))) door (utils/make-anim "outsidehouse/door.png" [22 58] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3])) @@ -624,20 +624,20 @@ entities (walk-to-castle entities)) :cursor :left}} - :layers {:day [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) + :layers {:day [(assoc (utils/get-texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) - (assoc (texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) - (assoc (texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) - (assoc (texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)] - :night [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) + (assoc (utils/get-texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) + (assoc (utils/get-texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) + (assoc (utils/get-texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)] + :night [(assoc (utils/get-texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) - (assoc (texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) - (assoc (texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) - (assoc (texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)]} + (assoc (utils/get-texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) + (assoc (utils/get-texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) + (assoc (utils/get-texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)]} :entities {:sheep (actions/start-animation screen (assoc (animation->texture screen sheep-stand) :x 38 :y 160 :baseline 80 :scale-x (scaler [38 160]) @@ -719,7 +719,7 @@ :door-sound (sound "door.ogg") :anim-sound-frames {door {1 [:door-sound 1.0]}} ) - :lamb (assoc (texture "outsidehouse/lamb.png") + :lamb (assoc (utils/get-texture "outsidehouse/lamb.png") :x 10 :y 163 :baseline 77 :right {:stand (animation 0.1 [lamb-stand]) :walk lamb-walk} @@ -761,7 +761,7 @@ :sword (actions/get-script entities (actions/do-dialogue entities :wizard "The Sword of Blergh!" :wizard "Good job, Tick."))}})) - :note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png") + :note (rooms/make-entity :note (assoc (utils/get-texture "outsidehouse/note.png") :x 277 :y 74 :baseline 160 :night-profile :none :script (actions/get-script entities diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 07373c5b..6fb81f99 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -97,14 +97,14 @@ (utils/proximity-volume entities [172 120] :scale 0.5)) (defn make [screen] - (let [guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) + (let [guard-sheet (texture! (utils/get-texture "inside-cafeteria/ladder-guard.png") :split 37 87) guard-stand (animation 0.1 [(aget guard-sheet 0 0)]) guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] (aget guard-sheet 0 i))) guard-sleep (utils/make-anim "outside-jail/guard-sleep.png" [43 67] 0.1 (range 4)) open-stash (utils/make-anim "outside-jail/open-stash.png" [58 41] 0.075 (reverse (range 5))) close-stash (utils/make-anim "outside-jail/open-stash.png" [58 41] 0.075 (range 5)) candle-flame (utils/make-anim "outside-jail/candle.png" [20 25] 0.075 (range 4)) - candle-aura (utils/make-anim (texture "outside-jail/candle-aura2.png") [135 135] 0.3 [0 1 2 1] )] + candle-aura (utils/make-anim (utils/get-texture "outside-jail/candle-aura2.png") [135 135] 0.3 [0 1 2 1] )] (rooms/make :music {:day :town-1 :night :night} :interactions {:down-dir {:box [30 0 227 40] :script (actions/get-script entities @@ -215,10 +215,10 @@ (actions/remove-item entities :flask-2) (actions/give entities :flask-water) (actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}} - :layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)] - :night [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)]} + :layers {:day [(assoc (utils/get-texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)] + :night [(assoc (utils/get-texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)]} :entities {:warden {:object nil :x 36 :y 86 @@ -240,8 +240,8 @@ :x 172 :y 140 :baseline 114) - :axe (assoc (texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite) - :bent-bar-window (assoc (texture "outside-jail/bent-bar-window.png") + :axe (assoc (utils/get-texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite) + :bent-bar-window (assoc (utils/get-texture "outside-jail/bent-bar-window.png") :x 69 :y (- 240 63) :baseline 2) :outside-particles (common/make-outside-particles)} :fountain-sound {:sound (sound "outside-jail/fountain-2.ogg") @@ -258,13 +258,13 @@ :sleep guard-sleep :script (actions/get-script entities (search-guard entities)) :night-profile :sprite)) - :rope (rooms/make-entity :rope (assoc (texture "outside-jail/rope.png") + :rope (rooms/make-entity :rope (assoc (utils/get-texture "outside-jail/rope.png") :x 14 :y 20 :baseline 1 :night-profile :sprite)) - :spear (rooms/make-entity :spear (assoc (texture "outside-jail/spear.png") + :spear (rooms/make-entity :spear (assoc (utils/get-texture "outside-jail/spear.png") :night-profile :none :x 60 :y 65 :baseline 180 :script (actions/get-script entities (grab-spear entities)))) - :alarm-clock (rooms/make-entity :alarm-clock (assoc (texture "outside-jail/alarm-clock.png") + :alarm-clock (rooms/make-entity :alarm-clock (assoc (utils/get-texture "outside-jail/alarm-clock.png") :x 217 :y 83 :baseline 160 :script (actions/get-script entities (actions/walk-to entities :ego [189 65] :face :right) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index fd784e4d..797d8535 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -89,7 +89,7 @@ (sound! (sound "space/jump.ogg") :play (utils/current-sound-volume)) (-> entities - (assoc-in [:room :entities :cloud] (assoc (texture "space/cloud.png") + (assoc-in [:room :entities :cloud] (assoc (utils/get-texture "space/cloud.png") :x (- (get-in entities [:room :entities :ego :x]) 10) :y (get-in entities [:room :entities :ego :y]) :origin-x 7 @@ -188,13 +188,13 @@ (rooms/make :music :fight :interactions {} - :layers [(assoc (texture "space/background.png") :x 0 :y 0 :baseline 0)] + :layers [(assoc (utils/get-texture "space/background.png") :x 0 :y 0 :baseline 0)] :timers {:taunt [10.0 8.0 taunt] :shock [5.0 15.0 shock]} :entities {:appear (assoc effect :x 240 :y 50 :baseline 200) - :later (assoc (texture "space/later.png") + :later (assoc (utils/get-texture "space/later.png") :x 0 :y 0 :baseline 240 :opacity 0.0) @@ -285,7 +285,7 @@ :bullet (assoc (animation->texture screen bullet) :x 37 :y 85 :baseline 241 :walk bullet) - :broken-jewel (assoc (texture "space/broken-jewel.png") + :broken-jewel (assoc (utils/get-texture "space/broken-jewel.png") :x 225 :y 170 :baseline 240) :collision "space/collision.png" :scale-fn (constantly 1.5) diff --git a/desktop/src-common/advent/screens/safe.clj b/desktop/src-common/advent/screens/safe.clj index 6aa13657..41e716b7 100644 --- a/desktop/src-common/advent/screens/safe.clj +++ b/desktop/src-common/advent/screens/safe.clj @@ -43,14 +43,14 @@ (fn [screen entities] (utils/setup-viewport screen 320 240) - (let [inputed-key (texture "inside-house/inputed-key.png")] - {:fade (assoc (texture "black.png") + (let [inputed-key (utils/get-texture "inside-house/inputed-key.png")] + {:fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 0.7 :origin-x 0 :origin-y 0) - :safe (assoc (texture "inside-house/safe-screen.png") :x start-x :y start-y) + :safe (assoc (utils/get-texture "inside-house/safe-screen.png") :x start-x :y start-y) :entered-keys (doall (for [i (range 5)] (assoc inputed-key :x (+ start-x 10 (* i 12)) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index b5c2ab62..e464efa4 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -493,14 +493,14 @@ void main() nil)) (defn get-ego [screen start-pos start-scale] - (let [player-sheet (texture! (texture "player.png") :split 18 36) - talk-sheet (texture! (texture "ego/talk.png") :split 18 36) - stand-sheet (texture! (texture "ego/stand.png") :split 18 36) - squat-sheet (texture! (texture "ego/squat.png") :split 18 36) - reach-sheet (texture! (texture "ego/reach.png") :split 18 36) - grow-sheet (texture! (texture "ego/grow.png") :split 18 36) - cat-toy-sheet (texture! (texture "ego/cat-toy.png") :split 41 50) - fire-sheet (texture! (texture "ego/fire.png") :split 18 36) + (let [player-sheet (texture! (utils/get-texture "player.png") :split 18 36) + talk-sheet (texture! (utils/get-texture "ego/talk.png") :split 18 36) + stand-sheet (texture! (utils/get-texture "ego/stand.png") :split 18 36) + squat-sheet (texture! (utils/get-texture "ego/squat.png") :split 18 36) + reach-sheet (texture! (utils/get-texture "ego/reach.png") :split 18 36) + grow-sheet (texture! (utils/get-texture "ego/grow.png") :split 18 36) + cat-toy-sheet (texture! (utils/get-texture "ego/cat-toy.png") :split 41 50) + fire-sheet (texture! (utils/get-texture "ego/fire.png") :split 18 36) walk-right (animation 0.075 (for [i (range 8)] (texture (aget player-sheet 0 i)))) @@ -1002,7 +1002,7 @@ void main() :object nil} :fade {:object nil :opacity 0.0} - :white-fade (assoc (texture "white.png") + :white-fade (assoc (utils/get-texture "white.png") :scale-x 20 :scale-y 20 :baseline 9500 @@ -1250,12 +1250,12 @@ void main() (let [screen (assoc screen :total-time 0)] (utils/setup-viewport screen 320 240) - {:close (assoc (texture "close.png") + {:close (assoc (utils/get-texture "close.png") :x 304 :y 224 :width 16 :height 16 :baseline 9000 :opacity 0.8) - :inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000 + :inventory (assoc (utils/get-texture "inventory.png") :x 278 :y 0 :baseline 9000 :mouse-in? (zone/box 278 0 320 42) :opacity 0.8) :fps (assoc (label "" (color :white) ) :x 5 :baseline 0 :opacity 0.1)})) diff --git a/desktop/src-common/advent/screens/test.clj b/desktop/src-common/advent/screens/test.clj index 5fd16515..fdb54235 100644 --- a/desktop/src-common/advent/screens/test.clj +++ b/desktop/src-common/advent/screens/test.clj @@ -32,8 +32,8 @@ (utils/setup-viewport screen 320 240) - {:overlay (assoc (texture "testscreen/test.png" ) :x 0 :y 0 :origin-x 0 :origin-y 0) - :subject (assoc (texture "testscreen/subject.png" ) :x 160 :y 120 :origin-x 7 :origin-y 7 :scale-x 5 :scale-y 5 )}) + {:overlay (assoc (utils/get-texture "testscreen/test.png" ) :x 0 :y 0 :origin-x 0 :origin-y 0) + :subject (assoc (utils/get-texture "testscreen/subject.png" ) :x 160 :y 120 :origin-x 7 :origin-y 7 :scale-x 5 :scale-y 5 )}) :on-render (fn [screen [entities]] diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 91638f73..448d3b7d 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -106,18 +106,18 @@ (label! fullscreen :set-alignment Align/center) (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) - {:background (assoc (texture "title/background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) - :cloud-background (assoc (texture "title/clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) - :logo (assoc (texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) - :fade (assoc (texture "black.png") + {:background (assoc (utils/get-texture "title/background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + :cloud-background (assoc (utils/get-texture "title/clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + :logo (assoc (utils/get-texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + :fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 1.0 :origin-x 0 :origin-y 0) - :flying-ego (assoc (texture "ego/flying.png") - :left (flip (texture "ego/flying.png")) - :right (texture "ego/flying.png") + :flying-ego (assoc (utils/get-texture "ego/flying.png") + :left (flip (utils/get-texture "ego/flying.png")) + :right (utils/get-texture "ego/flying.png") :scale-x 5 :scale-y 5 :origin-x 2 @@ -130,7 +130,7 @@ :path (catmull-rom-spline (map #(apply vector-2* %) [[50 50] [70 100] [100 200] [151 206] [300 225] [480 300] [560 400] [650 440] [700 550] [750 600] [860 650] [950 700] [1030 800] [1280 960] [1300 1000] [-50 1000] [-50 -50]]) true)) :particle-clouds (assoc (particle-effect "title/particle-clouds" :reset :start) :x 640 :y 480 ) :ego-jet (assoc (particle-effect "ego/jet" :reset :start) :x 450 :y 650 ) - :toolbox (center (assoc (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + :toolbox (center (assoc (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) :y 58 :width 500 :height 282)) :music-label (-> (label "Music" (style :label font (color 1.0 1.0 1.0 1.0))) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index a25ee0e3..05d3419b 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -53,6 +53,11 @@ (.putString "save-1" (pr-str (entities :state))) .flush)) +(defn get-texture [path] + (let [atlas-name (str/replace path #".png" "") + atlas (texture-atlas "packed/pack.atlas")] + (texture (texture-atlas! atlas :find-region atlas-name)))) + (defn has-save? [] (-> (.getPreferences (Gdx/app) "ticks-tales-saves") (.contains "save-1"))) @@ -140,7 +145,7 @@ (defn make-bird [screen p] - (let [bird-sheet (texture! (texture "outside-castle/bird.png") :split 1 2) + (let [bird-sheet (texture! (get-texture "outside-castle/bird.png") :split 1 2) bird-stand (animation 0.15 (for [i [0 1]] (aget bird-sheet 0 i)))] (assoc (animation->texture screen bird-stand)