diff --git a/desktop/asset-work/held/title.png b/desktop/asset-work/held/title.png deleted file mode 100644 index f2767d53..00000000 Binary files a/desktop/asset-work/held/title.png and /dev/null differ diff --git a/desktop/asset-work/inside-castle/background-sunrise.png b/desktop/asset-work/inside-castle/background-sunrise.png deleted file mode 100644 index 58fa1a99..00000000 Binary files a/desktop/asset-work/inside-castle/background-sunrise.png and /dev/null differ diff --git a/desktop/asset-work/inside-castle/inside-castle-sunrise.png b/desktop/asset-work/inside-castle/inside-castle-sunrise.png deleted file mode 100644 index 67d75bc3..00000000 Binary files a/desktop/asset-work/inside-castle/inside-castle-sunrise.png and /dev/null differ diff --git a/desktop/asset-work/outside-castle/background-sunrise.png b/desktop/asset-work/outside-castle/background-sunrise.png deleted file mode 100644 index 8342040b..00000000 Binary files a/desktop/asset-work/outside-castle/background-sunrise.png and /dev/null differ diff --git a/desktop/asset-work/pack.json b/desktop/asset-work/pack.json index a2fd2bb5..53d299ac 100644 --- a/desktop/asset-work/pack.json +++ b/desktop/asset-work/pack.json @@ -6,8 +6,8 @@ edgePadding: true, duplicatePadding: false, rotation: false, - minWidth: 16, - minHeight: 16, + minWidth: 1024, + minHeight: 1024, maxWidth: 1024, maxHeight: 1024, square: false, diff --git a/desktop/asset-work/testscreen/subject.png b/desktop/asset-work/testscreen/subject.png deleted file mode 100644 index 306e44dd..00000000 Binary files a/desktop/asset-work/testscreen/subject.png and /dev/null differ diff --git a/desktop/asset-work/testscreen/test.png b/desktop/asset-work/testscreen/test.png deleted file mode 100644 index c030f455..00000000 Binary files a/desktop/asset-work/testscreen/test.png and /dev/null differ diff --git a/desktop/asset-work/title-overlay.png b/desktop/asset-work/title-overlay.png deleted file mode 100644 index 06fa5f59..00000000 Binary files a/desktop/asset-work/title-overlay.png and /dev/null differ diff --git a/desktop/asset-work/title.png b/desktop/asset-work/title.png deleted file mode 100644 index 8a67e24a..00000000 Binary files a/desktop/asset-work/title.png and /dev/null differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 67f8196b..9799483a 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -81,7 +81,7 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -dream/dot +ego/dot rotate: false xy: 1020, 941 size: 1, 1 @@ -95,7 +95,7 @@ inside-house/dot orig: 1, 1 offset: 0, 0 index: -1 -outsidehouse/dot +wizard/dot rotate: false xy: 1020, 941 size: 1, 1 @@ -109,20 +109,6 @@ title/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-antique/dot - rotate: false - xy: 1020, 941 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -ego/dot - rotate: false - xy: 1020, 941 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 inside-jail/dot rotate: false xy: 1020, 941 @@ -130,7 +116,21 @@ inside-jail/dot orig: 1, 1 offset: 0, 0 index: -1 -wizard/dot +dream/dot + rotate: false + xy: 1020, 941 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +outsidehouse/dot + rotate: false + xy: 1020, 941 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-antique/dot rotate: false xy: 1020, 941 size: 1, 1 @@ -347,14 +347,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 1020, 938 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 1020, 938 size: 1, 1 @@ -719,7 +719,7 @@ cat-tree/brush-l index: -1 cat-tree/cat-stand rotate: false - xy: 346, 6 + xy: 329, 6 size: 198, 11 orig: 198, 11 offset: 0, 0 @@ -1200,13 +1200,6 @@ talk-bg-2 orig: 21, 40 offset: 0, 0 index: -1 -testscreen/subject - rotate: false - xy: 329, 2 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 wizard/experiment-2 rotate: false xy: 973, 816 @@ -1669,7 +1662,7 @@ filter: Nearest,Nearest repeat: none behindhouse/brush rotate: false - xy: 646, 250 + xy: 646, 734 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1716,6 +1709,13 @@ castle-gate/throw-walkie-5 orig: 205, 136 offset: 0, 0 index: -1 +dream/clouds1 + rotate: false + xy: 646, 8 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 ego/love-10 rotate: false xy: 968, 684 @@ -1830,7 +1830,7 @@ ego/scoot index: -1 inside-antique/closed-blinds rotate: false - xy: 646, 8 + xy: 646, 492 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1842,20 +1842,6 @@ inside-cafeteria/knights-stand orig: 490, 80 offset: 0, 0 index: -1 -inside-castle/background-sunrise - rotate: false - xy: 324, 700 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-castle/inside-castle-sunrise - rotate: false - xy: 324, 700 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 inside-house/candle rotate: false xy: 494, 942 @@ -1865,21 +1851,14 @@ inside-house/candle index: -1 inside-jail/bars rotate: false - xy: 646, 734 + xy: 324, 458 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/bars- rotate: false - xy: 646, 492 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-castle/background-sunrise - rotate: false - xy: 324, 458 + xy: 324, 216 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1921,7 +1900,7 @@ outsidehouse/background index: -1 outsidehouse/background-trees rotate: false - xy: 324, 216 + xy: 324, 700 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1940,6 +1919,13 @@ title/background orig: 320, 240 offset: 0, 0 index: -1 +title/clouds + rotate: false + xy: 646, 250 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 wizard/disappear rotate: false xy: 494, 976 @@ -1962,35 +1948,28 @@ filter: Nearest,Nearest repeat: none behindhouse/fg rotate: false - xy: 324, 56 + xy: 324, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fg rotate: false - xy: 324, 56 + xy: 324, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dawn rotate: false - xy: 646, 782 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/clouds1 - rotate: false - xy: 2, 540 + xy: 2, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/clouds2 rotate: false - xy: 324, 782 + xy: 2, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2060,7 +2039,7 @@ ego/stand index: -1 ending-castle/ending-castle2-assets/collision rotate: false - xy: 2, 298 + xy: 2, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2081,26 +2060,33 @@ inside-antique/beard index: -1 inside-antique/darken rotate: false - xy: 324, 540 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/desk rotate: false - xy: 2, 56 + xy: 324, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/fg rotate: false - xy: 646, 298 + xy: 646, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/fg + rotate: false + xy: 324, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/fight rotate: false xy: 646, 56 size: 320, 240 @@ -2109,7 +2095,14 @@ inside-cafeteria/fg index: -1 inside-house/desk rotate: false - xy: 324, 298 + xy: 646, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/fg + rotate: false + xy: 646, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2123,7 +2116,7 @@ outside-jail/candle index: -1 outsidehouse/fence rotate: false - xy: 646, 540 + xy: 2, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2156,13 +2149,6 @@ title/banner orig: 171, 42 offset: 0, 0 index: -1 -title/clouds - rotate: false - xy: 2, 782 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 wizard/experiment-10 rotate: false xy: 968, 349 @@ -2227,7 +2213,7 @@ filter: Nearest,Nearest repeat: none behindhouse/house rotate: false - xy: 646, 54 + xy: 324, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2269,14 +2255,14 @@ cat-tree/grandma-cry-9 index: -1 dream/fountain rotate: false - xy: 324, 538 + xy: 324, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/fountain rotate: false - xy: 324, 538 + xy: 324, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2318,70 +2304,70 @@ ego/throw index: -1 held/hand rotate: false - xy: 324, 54 + xy: 324, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/head rotate: false - xy: 646, 296 + xy: 646, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/glow rotate: false - xy: 646, 780 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-cafeteria/fight - rotate: false - xy: 2, 538 + xy: 2, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/glow rotate: false - xy: 2, 54 + xy: 324, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/fight-1 rotate: false - xy: 324, 780 + xy: 2, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/glow rotate: false - xy: 324, 296 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-jail/fg - rotate: false - xy: 2, 780 + xy: 646, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/glow rotate: false - xy: 646, 538 + xy: 2, 54 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inventory-overlay + rotate: false + xy: 646, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/foreground rotate: false - xy: 2, 296 + xy: 2, 538 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/house + rotate: false + xy: 646, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -2525,212 +2511,233 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none +castle-gate/throw-walkie-6 + rotate: false + xy: 646, 157 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-7 + rotate: false + xy: 646, 19 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 2, 2 + xy: 2, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 62, 2 + xy: 62, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 122, 2 + xy: 122, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 182, 2 + xy: 182, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 242, 2 + xy: 242, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 302, 2 + xy: 302, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 362, 2 + xy: 362, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 422, 2 + xy: 422, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 482, 2 + xy: 482, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 542, 2 + xy: 542, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 602, 2 + xy: 853, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/sillhoute rotate: false - xy: 324, 286 + xy: 646, 779 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cat-tree/tree-and-rock + rotate: false + xy: 646, 537 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/pedestals rotate: false - xy: 2, 44 + xy: 324, 537 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +held/bloodclot-head-7 + rotate: false + xy: 853, 44 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 inside-antique/open-blinds rotate: false - xy: 324, 528 + xy: 324, 779 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/pedestal-overlay rotate: false - xy: 646, 770 + xy: 2, 295 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/way-back-tree + rotate: false + xy: 646, 295 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/sillhoute rotate: false - xy: 646, 528 + xy: 2, 53 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inventory-overlay +outside-castle/walk-behind rotate: false - xy: 2, 528 + xy: 324, 53 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outsidehouse/house +space/bloodclot-explode-5 rotate: false - xy: 2, 770 - size: 320, 240 - orig: 320, 240 + xy: 853, 128 + size: 106, 165 + orig: 106, 165 offset: 0, 0 index: -1 space/later rotate: false - xy: 324, 770 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -testscreen/test - rotate: false - xy: 324, 44 + xy: 2, 779 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 the-end rotate: false - xy: 646, 286 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -title - rotate: false - xy: 646, 44 + xy: 324, 295 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/logo rotate: false - xy: 2, 286 + xy: 2, 537 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 968, 955 + xy: 968, 964 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 968, 898 + xy: 968, 907 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 968, 841 + xy: 968, 850 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 968, 784 + xy: 968, 793 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 968, 727 + xy: 968, 736 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 968, 670 + xy: 968, 679 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 968, 613 + xy: 968, 622 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2741,311 +2748,248 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/throw-walkie-6 - rotate: false - xy: 324, 307 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-7 - rotate: false - xy: 381, 2 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 castle-gate/throw-walkie-8 rotate: false - xy: 531, 307 + xy: 2, 885 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-9 rotate: false - xy: 588, 2 + xy: 2, 747 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 -cat-tree/tree-and-rock - rotate: false - xy: 646, 779 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 dream/corner-l rotate: false - xy: 795, 550 + xy: 2, 18 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 dream/corner-r rotate: false - xy: 795, 489 + xy: 628, 795 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 -held/bloodclot-head-7 - rotate: false - xy: 265, 44 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 held/bloodclot-head-8 rotate: false - xy: 795, 695 + xy: 396, 772 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 795, 611 + xy: 512, 772 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 -held/title - rotate: false - xy: 2, 779 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 inside-cafeteria/knights rotate: false - xy: 2, 29 + xy: 218, 669 size: 74, 97 orig: 74, 97 offset: 0, 0 index: -1 -inside-castle/way-back-tree - rotate: false - xy: 2, 295 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-castle/walk-behind - rotate: false - xy: 2, 537 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 outside-jail/rope rotate: false - xy: 78, 40 + xy: 209, 768 size: 185, 86 orig: 185, 86 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 842, 150 + xy: 910, 779 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 space/bloodclot-explode-10 rotate: false - xy: 326, 140 + xy: 425, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-11 rotate: false - xy: 434, 140 + xy: 2, 246 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 432, 612 + xy: 533, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 432, 445 + xy: 2, 79 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 542, 140 + xy: 641, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 650, 140 + xy: 749, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 911, 612 + xy: 857, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 540, 445 + xy: 110, 580 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 540, 612 + xy: 110, 413 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 648, 445 + xy: 110, 246 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 648, 612 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-5 - rotate: false - xy: 2, 128 + xy: 110, 79 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 110, 128 + xy: 209, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 218, 128 + xy: 2, 580 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 324, 612 + xy: 317, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-9 rotate: false - xy: 324, 445 + xy: 2, 413 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 758, 181 + xy: 218, 207 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 842, 304 + xy: 218, 130 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 926, 304 + xy: 116, 2 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 842, 227 + xy: 742, 779 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 926, 227 + xy: 826, 779 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-4 rotate: false - xy: 911, 535 + xy: 294, 691 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 909, 458 + xy: 218, 592 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 795, 412 + xy: 218, 515 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 738, 335 + xy: 218, 438 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 879, 381 + xy: 218, 361 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 758, 258 + xy: 218, 284 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 -title-overlay - rotate: false - xy: 324, 779 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index 000db347..3afb8921 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index 17d63e46..7c10cc67 100644 Binary files a/desktop/resources/packed/pack4.png and b/desktop/resources/packed/pack4.png differ diff --git a/desktop/resources/packed/pack5.png b/desktop/resources/packed/pack5.png index 9262680b..34d50307 100644 Binary files a/desktop/resources/packed/pack5.png and b/desktop/resources/packed/pack5.png differ diff --git a/desktop/resources/packed/pack6.png b/desktop/resources/packed/pack6.png index 463f474e..2a665d48 100644 Binary files a/desktop/resources/packed/pack6.png and b/desktop/resources/packed/pack6.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index 644cb308..1334f1c7 100644 Binary files a/desktop/resources/packed/pack7.png and b/desktop/resources/packed/pack7.png differ diff --git a/desktop/resources/packed/pack8.png b/desktop/resources/packed/pack8.png index 8c77f15d..d1cdfb5e 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/src-common/advent/core.clj b/desktop/src-common/advent/core.clj index 1c36a82d..2d41f0b5 100644 --- a/desktop/src-common/advent/core.clj +++ b/desktop/src-common/advent/core.clj @@ -8,7 +8,6 @@ [advent.screens.title :as title] [advent.screens.credits :as credits] [advent.screens.inventory :as inventory] - [advent.screens.test :as test] [advent.screens.safe :as safe] [clojure.pprint] [advent.pathfind]) diff --git a/desktop/src-common/advent/screens/test.clj b/desktop/src-common/advent/screens/test.clj deleted file mode 100644 index fdb54235..00000000 --- a/desktop/src-common/advent/screens/test.clj +++ /dev/null @@ -1,49 +0,0 @@ -(ns advent.screens.test - (:require [play-clj.core :refer :all] - [play-clj.math :refer :all] - [play-clj.ui :refer :all] - [play-clj.utils :refer :all] - [play-clj.g2d :refer :all] - [advent.utils :as utils] - [advent.tween :as tween] - [advent.screens.scene :as scene] - [advent.screens.dialogue :as dialogue] - [advent.screens.title :as title] - [advent.screens.inventory :as inventory] - [advent.screens.safe :as safe] - [advent.screens.fade :as fade] - ) - (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter] - [com.badlogic.gdx.graphics.g2d TextureRegion] - [com.badlogic.gdx.utils.viewport FitViewport] - [com.badlogic.gdx.scenes.scene2d.ui Slider$SliderStyle] - [com.badlogic.gdx.scenes.scene2d.utils Align] - [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input - InputMultiplexer InputProcessor Net Preferences Screen])) - - - - - - -(defscreen test-screen - :on-show - (fn [screen entities] - - (utils/setup-viewport screen 320 240) - - {: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]] - - (clear!) - (render! screen [(:overlay entities) (:subject entities)]) - entities) - - :show-screen (fn [entities] - entities) - :on-resize (fn [{:keys [viewport width height]} [entities]] - (.update viewport width height) - nil))