diff --git a/desktop/asset-work/inside-house/safe-screen.png b/desktop/asset-work/inside-house/safe-screen.png deleted file mode 100644 index 301d00b0..00000000 Binary files a/desktop/asset-work/inside-house/safe-screen.png and /dev/null differ diff --git a/desktop/asset-work/intro.wav b/desktop/asset-work/intro.wav deleted file mode 100644 index 91790100..00000000 Binary files a/desktop/asset-work/intro.wav and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-1.png b/desktop/asset-work/safe-song/safe-song-1.png deleted file mode 100644 index b86880b4..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-1.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-10.png b/desktop/asset-work/safe-song/safe-song-10.png deleted file mode 100644 index b143d377..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-10.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-11.png b/desktop/asset-work/safe-song/safe-song-11.png deleted file mode 100644 index eec288c5..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-11.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-12.png b/desktop/asset-work/safe-song/safe-song-12.png deleted file mode 100644 index 55c2da0e..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-12.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-13.png b/desktop/asset-work/safe-song/safe-song-13.png deleted file mode 100644 index dab2cc7a..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-13.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-14.png b/desktop/asset-work/safe-song/safe-song-14.png deleted file mode 100644 index 25add2eb..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-14.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-15.png b/desktop/asset-work/safe-song/safe-song-15.png deleted file mode 100644 index 501f46a7..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-15.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-16.png b/desktop/asset-work/safe-song/safe-song-16.png deleted file mode 100644 index e1cb4d86..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-16.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-17.png b/desktop/asset-work/safe-song/safe-song-17.png deleted file mode 100644 index 66bce194..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-17.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-18.png b/desktop/asset-work/safe-song/safe-song-18.png deleted file mode 100644 index 501ba48e..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-18.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-19.png b/desktop/asset-work/safe-song/safe-song-19.png deleted file mode 100644 index 4c0c40b9..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-19.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-2.png b/desktop/asset-work/safe-song/safe-song-2.png deleted file mode 100644 index 0c231ee7..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-2.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-20.png b/desktop/asset-work/safe-song/safe-song-20.png deleted file mode 100644 index 1aa0b9dd..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-20.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-21.png b/desktop/asset-work/safe-song/safe-song-21.png deleted file mode 100644 index 73c04f77..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-21.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-22.png b/desktop/asset-work/safe-song/safe-song-22.png deleted file mode 100644 index bc84330a..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-22.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-23.png b/desktop/asset-work/safe-song/safe-song-23.png deleted file mode 100644 index d661380f..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-23.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-24.png b/desktop/asset-work/safe-song/safe-song-24.png deleted file mode 100644 index c661a6a2..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-24.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-25.png b/desktop/asset-work/safe-song/safe-song-25.png deleted file mode 100644 index 440b2f2b..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-25.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-26.png b/desktop/asset-work/safe-song/safe-song-26.png deleted file mode 100644 index 9c10056c..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-26.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-27.png b/desktop/asset-work/safe-song/safe-song-27.png deleted file mode 100644 index ffa25150..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-27.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-28.png b/desktop/asset-work/safe-song/safe-song-28.png deleted file mode 100644 index 6ad70e41..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-28.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-29.png b/desktop/asset-work/safe-song/safe-song-29.png deleted file mode 100644 index 1982cfa1..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-29.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-3.png b/desktop/asset-work/safe-song/safe-song-3.png deleted file mode 100644 index 6f0c9e69..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-3.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-4.png b/desktop/asset-work/safe-song/safe-song-4.png deleted file mode 100644 index e38562b7..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-4.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-5.png b/desktop/asset-work/safe-song/safe-song-5.png deleted file mode 100644 index b85db78e..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-5.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-6.png b/desktop/asset-work/safe-song/safe-song-6.png deleted file mode 100644 index a50579b3..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-6.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-7.png b/desktop/asset-work/safe-song/safe-song-7.png deleted file mode 100644 index 84532b49..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-7.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-8.png b/desktop/asset-work/safe-song/safe-song-8.png deleted file mode 100644 index ac7b85bd..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-8.png and /dev/null differ diff --git a/desktop/asset-work/safe-song/safe-song-9.png b/desktop/asset-work/safe-song/safe-song-9.png deleted file mode 100644 index 65d49b04..00000000 Binary files a/desktop/asset-work/safe-song/safe-song-9.png and /dev/null differ diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 953fc694..ea16c009 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -1,12 +1,8 @@ MOBILE -CLOJURE 1.8 direct linking -sometimes arrow takes override -obvious about calculating path? seems to just pause a long time - -Reenable mobile screenshots - Static images for mobile screenshots? - -Lying down at start of jail +Desktop buttons are wrong size Pinching end is wrong, sometimes clicks +background loading of assets? +loading image? +reset inventory text on open up -Improve padding on text so it's more clickable diff --git a/desktop/resources/intro.wav b/desktop/resources/intro.wav deleted file mode 100644 index 91790100..00000000 Binary files a/desktop/resources/intro.wav and /dev/null differ diff --git a/desktop/resources/packed/global.atlas b/desktop/resources/packed/global.atlas index 8f9bc6f7..6e84b66d 100644 --- a/desktop/resources/packed/global.atlas +++ b/desktop/resources/packed/global.atlas @@ -6,35 +6,35 @@ filter: Nearest,Nearest repeat: none bird rotate: false - xy: 144, 74 + xy: 460, 146 size: 2, 2 orig: 2, 2 offset: 0, 0 index: -1 black rotate: false - xy: 2, 4 + xy: 574, 372 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 close rotate: false - xy: 470, 660 + xy: 649, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ego/Untitled rotate: false - xy: 324, 640 + xy: 634, 858 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/talk rotate: false - xy: 324, 640 + xy: 634, 858 size: 144, 36 orig: 144, 36 offset: 0, 0 @@ -55,14 +55,14 @@ ego/axe-wood index: -1 ego/base rotate: false - xy: 956, 922 + xy: 1006, 772 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 956, 922 + xy: 1006, 772 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -90,84 +90,84 @@ ego/climb index: -1 ego/crawl rotate: false - xy: 2, 247 + xy: 634, 896 size: 273, 25 orig: 273, 25 offset: 0, 0 index: -1 ego/crowbar rotate: false - xy: 664, 922 + xy: 780, 858 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/dot rotate: false - xy: 522, 197 + xy: 507, 247 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 wizard/dot rotate: false - xy: 522, 197 + xy: 507, 247 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ego/fire rotate: false - xy: 2, 152 + xy: 2, 114 size: 216, 36 orig: 216, 36 offset: 0, 0 index: -1 ego/flying rotate: false - xy: 988, 902 + xy: 614, 231 size: 34, 44 orig: 34, 44 offset: 0, 0 index: -1 ego/frog rotate: false - xy: 954, 722 + xy: 476, 322 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/frustrated-talk rotate: false - xy: 348, 284 + xy: 926, 885 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 324, 608 + xy: 484, 470 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 364, 360 + xy: 348, 284 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/glad rotate: false - xy: 2, 30 + xy: 416, 668 size: 140, 46 orig: 140, 46 offset: 0, 0 index: -1 ego/grow rotate: false - xy: 626, 808 + xy: 166, 4 size: 90, 36 orig: 90, 36 offset: 0, 0 @@ -188,28 +188,28 @@ ego/hand-hold index: -1 ego/hold-hand rotate: false - xy: 474, 360 + xy: 1005, 734 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/hold-up-to-window rotate: false - xy: 348, 322 + xy: 348, 246 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/ida rotate: false - xy: 292, 316 + xy: 148, 42 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/idea rotate: false - xy: 229, 175 + xy: 292, 316 size: 54, 70 orig: 54, 70 offset: 0, 0 @@ -230,224 +230,224 @@ ego/jump-straight index: -1 ego/love rotate: false - xy: 240, 103 + xy: 254, 239 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 0 ego/love rotate: false - xy: 240, 31 + xy: 458, 250 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 1 ego/love rotate: false - xy: 424, 568 + xy: 510, 294 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 2 ego/love rotate: false - xy: 574, 808 + xy: 510, 222 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 3 ego/love rotate: false - xy: 660, 736 + xy: 204, 42 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 4 ego/love rotate: false - xy: 786, 722 + xy: 254, 167 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 5 ego/love rotate: false - xy: 838, 736 + xy: 408, 137 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 6 ego/love rotate: false - xy: 890, 760 + xy: 574, 808 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 7 ego/love rotate: false - xy: 942, 760 + xy: 562, 294 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 8 ego/love rotate: false - xy: 838, 664 + xy: 562, 222 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 9 ego/love rotate: false - xy: 786, 650 + xy: 562, 671 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 10 ego/love rotate: false - xy: 890, 650 + xy: 256, 42 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 11 ego/love rotate: false - xy: 942, 650 + xy: 308, 63 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 12 ego/love rotate: false - xy: 838, 592 + xy: 360, 63 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 13 ego/love rotate: false - xy: 890, 578 + xy: 412, 65 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 14 ego/love rotate: false - xy: 942, 578 + xy: 574, 398 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 15 ego/love rotate: false - xy: 476, 587 + xy: 464, 78 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 16 ego/love rotate: false - xy: 535, 671 + xy: 507, 150 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 17 ego/love rotate: false - xy: 587, 684 + xy: 559, 150 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 18 ego/love rotate: false - xy: 639, 664 + xy: 516, 78 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 19 ego/love rotate: false - xy: 587, 612 + xy: 568, 78 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 20 ego/love rotate: false - xy: 535, 599 + xy: 493, 6 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 21 ego/love rotate: false - xy: 639, 592 + xy: 545, 6 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 22 ego/love rotate: false - xy: 691, 646 + xy: 597, 6 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 23 ego/love rotate: false - xy: 691, 574 + xy: 611, 150 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 24 ego/love rotate: false - xy: 587, 540 + xy: 620, 78 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 25 ego/pant rotate: false - xy: 890, 722 + xy: 220, 114 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 ego/player rotate: false - xy: 2, 78 + xy: 2, 40 size: 144, 72 orig: 144, 72 offset: 0, 0 index: -1 ego/poke rotate: false - xy: 578, 756 + xy: 492, 418 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 800, 808 + xy: 932, 772 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 712, 756 + xy: 931, 734 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared-walk rotate: false - xy: 890, 832 + xy: 926, 847 size: 96, 36 orig: 96, 36 offset: 0, 0 @@ -468,56 +468,56 @@ ego/shock index: -1 ego/shoot rotate: false - xy: 810, 922 + xy: 416, 630 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/sigh rotate: false - xy: 324, 678 + xy: 2, 2 size: 162, 36 orig: 162, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 148, 50 + xy: 324, 614 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 776, 884 + xy: 424, 554 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/squat-talk rotate: false - xy: 712, 718 + xy: 716, 561 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 634, 846 + xy: 364, 398 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/standup rotate: false - xy: 2, 190 + xy: 2, 152 size: 225, 55 orig: 225, 55 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 634, 884 + xy: 424, 592 size: 140, 36 orig: 140, 36 offset: 0, 0 @@ -538,119 +538,119 @@ ego/swing-shovel index: -1 ego/thorw rotate: false - xy: 762, 846 + xy: 364, 360 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 364, 398 + xy: 348, 322 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 476, 544 + xy: 460, 150 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 988, 722 + xy: 552, 554 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 1 ego/whistle rotate: false - xy: 1006, 864 + xy: 229, 171 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 2 ego/whistle rotate: false - xy: 988, 864 + xy: 1004, 548 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 3 frankie rotate: false - xy: 2, 274 + xy: 664, 923 size: 312, 35 orig: 312, 35 offset: 0, 0 index: -1 frankie-walk rotate: false - xy: 285, 179 + xy: 790, 562 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 0 frankie-walk rotate: false - xy: 311, 179 + xy: 258, 5 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 1 frankie-walk rotate: false - xy: 336, 19 + xy: 790, 525 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 2 frankie-walk rotate: false - xy: 362, 19 + xy: 755, 524 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 3 frankie-walk rotate: false - xy: 388, 19 + xy: 650, 239 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 4 frankie-walk rotate: false - xy: 414, 19 + xy: 676, 239 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 5 frankie-walk rotate: false - xy: 440, 19 + xy: 813, 123 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 6 frankie-walk rotate: false - xy: 994, 685 + xy: 993, 492 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 7 inventory rotate: false - xy: 743, 576 + xy: 449, 7 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory rotate: false - xy: 743, 576 + xy: 449, 7 size: 42, 56 orig: 42, 56 offset: 0, 0 @@ -664,98 +664,308 @@ inventory-overlay index: -1 open-inventory rotate: false - xy: 484, 486 + xy: 570, 613 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 1 open-inventory rotate: false - xy: 505, 314 + xy: 570, 555 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 2 open-inventory rotate: false - xy: 549, 314 + xy: 649, 20 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 3 open-inventory rotate: false - xy: 285, 216 + xy: 720, 446 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 4 open-inventory rotate: false - xy: 470, 245 + xy: 755, 331 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 5 open-inventory rotate: false - xy: 292, 121 + xy: 764, 466 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 6 open-inventory rotate: false - xy: 292, 63 + xy: 767, 408 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 7 open-inventory rotate: false - xy: 292, 63 + xy: 767, 408 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 9 open-inventory rotate: false - xy: 292, 5 + xy: 808, 467 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 8 open-inventory rotate: false - xy: 478, 187 + xy: 811, 409 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 10 open-inventory rotate: false - xy: 571, 28 + xy: 855, 416 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 11 open-inventory rotate: false - xy: 615, 28 + xy: 663, 181 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 12 +safe-song/safe-song + rotate: false + xy: 348, 209 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 0 +safe-song/safe-song + rotate: false + xy: 306, 172 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 1 +safe-song/safe-song + rotate: false + xy: 306, 135 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 2 +safe-song/safe-song + rotate: false + xy: 626, 821 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 3 +safe-song/safe-song + rotate: false + xy: 728, 821 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 4 +safe-song/safe-song + rotate: false + xy: 912, 810 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 5 +safe-song/safe-song + rotate: false + xy: 626, 784 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 6 +safe-song/safe-song + rotate: false + xy: 728, 784 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 7 +safe-song/safe-song + rotate: false + xy: 830, 773 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 8 +safe-song/safe-song + rotate: false + xy: 625, 747 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 9 +safe-song/safe-song + rotate: false + xy: 727, 747 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 10 +safe-song/safe-song + rotate: false + xy: 829, 736 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 11 +safe-song/safe-song + rotate: false + xy: 614, 710 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 12 +safe-song/safe-song + rotate: false + xy: 716, 710 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 13 +safe-song/safe-song + rotate: false + xy: 818, 699 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 14 +safe-song/safe-song + rotate: false + xy: 920, 697 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 15 +safe-song/safe-song + rotate: false + xy: 614, 673 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 16 +safe-song/safe-song + rotate: false + xy: 716, 673 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 17 +safe-song/safe-song + rotate: false + xy: 818, 662 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 18 +safe-song/safe-song + rotate: false + xy: 920, 660 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 19 +safe-song/safe-song + rotate: false + xy: 614, 636 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 20 +safe-song/safe-song + rotate: false + xy: 716, 636 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 21 +safe-song/safe-song + rotate: false + xy: 818, 625 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 22 +safe-song/safe-song + rotate: false + xy: 920, 623 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 23 +safe-song/safe-song + rotate: false + xy: 614, 599 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 24 +safe-song/safe-song + rotate: false + xy: 716, 599 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 25 +safe-song/safe-song + rotate: false + xy: 818, 588 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 26 +safe-song/safe-song + rotate: false + xy: 920, 586 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 27 +safe-song/safe-song + rotate: false + xy: 614, 562 + size: 100, 35 + orig: 100, 35 + offset: 0, 0 + index: 28 safe/inputed-key rotate: false - xy: 466, 43 + xy: 464, 65 size: 9, 11 orig: 9, 11 offset: 0, 0 index: -1 +safe/safe-screen + rotate: false + xy: 2, 209 + size: 250, 100 + orig: 250, 100 + offset: 0, 0 + index: -1 save rotate: false - xy: 691, 718 + xy: 667, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -769,21 +979,21 @@ test/abc index: -1 white rotate: false - xy: 424, 542 + xy: 526, 717 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 wizard/Untitled rotate: false - xy: 904, 870 + xy: 484, 502 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 wizard/cloud rotate: false - xy: 743, 634 + xy: 306, 232 size: 40, 30 orig: 40, 30 offset: 0, 0 @@ -804,308 +1014,308 @@ wizard/experiment index: 0 wizard/experiment rotate: false - xy: 488, 659 + xy: 578, 751 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 1 wizard/experiment rotate: false - xy: 639, 535 + xy: 308, 6 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 2 wizard/experiment rotate: false - xy: 686, 517 + xy: 355, 6 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 3 wizard/experiment rotate: false - xy: 787, 593 + xy: 402, 6 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 4 wizard/experiment rotate: false - xy: 733, 517 + xy: 460, 193 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 5 wizard/experiment rotate: false - xy: 787, 536 + xy: 816, 531 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 6 wizard/experiment rotate: false - xy: 834, 535 + xy: 863, 531 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 7 wizard/experiment rotate: false - xy: 881, 521 + xy: 910, 529 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 8 wizard/experiment rotate: false - xy: 928, 521 + xy: 957, 529 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 9 wizard/experiment rotate: false - xy: 975, 521 + xy: 614, 505 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 10 wizard/experiment rotate: false - xy: 498, 429 + xy: 661, 505 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 11 wizard/experiment rotate: false - xy: 492, 372 + xy: 708, 504 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 12 wizard/experiment rotate: false - xy: 458, 303 + xy: 626, 448 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 13 wizard/experiment rotate: false - xy: 539, 372 + xy: 626, 391 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 14 wizard/experiment rotate: false - xy: 329, 227 + xy: 673, 447 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 15 wizard/experiment rotate: false - xy: 376, 227 + xy: 673, 390 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 16 wizard/experiment rotate: false - xy: 423, 227 + xy: 720, 389 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 17 wizard/experiment rotate: false - xy: 514, 257 + xy: 614, 334 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 18 wizard/experiment rotate: false - xy: 561, 257 + xy: 614, 277 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 19 wizard/experiment rotate: false - xy: 337, 170 + xy: 661, 333 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 20 wizard/experiment rotate: false - xy: 384, 170 + xy: 661, 276 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 21 wizard/experiment rotate: false - xy: 336, 113 + xy: 708, 332 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 22 wizard/experiment rotate: false - xy: 383, 113 + xy: 708, 275 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 23 wizard/experiment rotate: false - xy: 336, 56 + xy: 755, 274 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 24 wizard/experiment rotate: false - xy: 383, 56 + xy: 852, 474 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 25 wizard/experiment rotate: false - xy: 431, 170 + xy: 899, 472 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 26 wizard/experiment rotate: false - xy: 430, 113 + xy: 946, 472 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 27 wizard/experiment rotate: false - xy: 430, 56 + xy: 899, 415 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 28 wizard/experiment rotate: false - xy: 522, 200 + xy: 946, 415 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 29 wizard/experiment rotate: false - xy: 569, 200 + xy: 707, 218 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 30 wizard/experiment rotate: false - xy: 478, 130 + xy: 754, 217 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 31 wizard/experiment rotate: false - xy: 477, 73 + xy: 707, 161 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 32 wizard/experiment rotate: false - xy: 525, 143 + xy: 754, 160 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 33 wizard/experiment rotate: false - xy: 572, 143 + xy: 801, 217 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 34 wizard/experiment rotate: false - xy: 477, 16 + xy: 801, 160 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 35 wizard/experiment rotate: false - xy: 525, 86 + xy: 672, 104 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 36 wizard/experiment rotate: false - xy: 572, 86 + xy: 719, 103 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 37 wizard/experiment rotate: false - xy: 524, 29 + xy: 766, 103 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 38 wizard/flame rotate: false - xy: 528, 647 + xy: 247, 197 size: 5, 10 orig: 5, 10 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 743, 666 + xy: 306, 264 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 wizard/stand rotate: false - xy: 476, 438 + xy: 284, 119 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/wizard rotate: false - xy: 476, 438 + xy: 284, 119 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/talk rotate: false - xy: 144, 2 + xy: 830, 810 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 718, 794 + xy: 492, 366 size: 80, 50 orig: 80, 50 offset: 0, 0 diff --git a/desktop/resources/packed/global.png b/desktop/resources/packed/global.png index 9a085b02..59d6cc28 100644 Binary files a/desktop/resources/packed/global.png and b/desktop/resources/packed/global.png differ diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index e67112d2..8bfebb7c 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -983,7 +983,7 @@ ([entities] (play-safe entities true)) ([entities whistle?] - (let [safe-song-anim (utils/make-anim-seq "safe-song/safe-song" [100 35] 0.05 + (let [safe-song-anim (utils/make-anim-seq (texture-atlas "packed/global.atlas") "safe-song/safe-song" [100 35] 0.05 (flatten [ [1 2 3] @@ -1005,7 +1005,7 @@ (wait entities 400) (add-entity entities :safe-song (rooms/make-entity :safe-song - (assoc (utils/get-texture "safe-song/safe-song-1") + (assoc (utils/atlas->texture (texture-atlas "packed/global.atlas") "safe-song/safe-song" 0) :x 110 :y 120 :baseline 241 diff --git a/desktop/src-common/advent/screens/rooms.clj b/desktop/src-common/advent/screens/rooms.clj index 21d7eef9..b5aa70ee 100644 --- a/desktop/src-common/advent/screens/rooms.clj +++ b/desktop/src-common/advent/screens/rooms.clj @@ -13,8 +13,7 @@ :mouse-in? (fn [entities x y] (let [e (utils/get-entity entities id)] (if-let [[bx1 by1 bx2 by2] (:box e)] - (do (println "checking 1" id) - (zone/within bx1 by1 bx2 by2 x y)) + (zone/within bx1 by1 bx2 by2 x y) (let [{^float entity-x :x ^float entity-y :y width :width scale-x :scale-x scale-y :scale-y origin-x :origin-x origin-y :origin-y height :height region :object} (-> entities :room :entities id) width (or width (if (instance? TextureRegion region ) (.getRegionWidth ^TextureRegion region) 0)) diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index b15c612c..c6b22d4d 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -265,7 +265,7 @@ (actions/talk entities :ladder-guard "Do not toucheth, young sire.")))} :collision "inside-cafeteria/collision.png" :fight (make-fight-entity global-atlas) - :hands-fight (assoc (animation->texture screen hands-fight-win) + :hands-fight (assoc (utils/atlas->texture atlas "fight-new-assets/fight" 0) :origin-x 128 :origin-y 96 :x 150 diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index d90ddf3a..2277b19f 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -474,14 +474,14 @@ #_(actions/in-love entities))}} :layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) (assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97) - (assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5) + (assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5) (assoc (utils/atlas->texture atlas "bookstack") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)] :night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) (assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97) - (assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] + (assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)] :sunrise [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) (assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97) - (assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]} + (assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)]} :blackout (assoc (utils/atlas->texture global-atlas "black") :x -10 :y -10 :width 340 @@ -524,12 +524,12 @@ :sign (assoc (animation->texture screen sign ) :anim sign :anim-start 0 - :x 125 :y 138 :baseline 239) + :x 125 :y 138 :baseline 237) :bird-2 (utils/make-bird screen global-atlas (as-> [[220 225] [195 235] [210 230] [250 225]] p (concat p (reverse p)))) :outside-particles (common/make-outside-particles) - :door (assoc (animation->texture screen door) + :door (assoc (animation->texture (assoc screen :total-time 0) door) :x 160 :y 97 :baseline 99 :open door :door-sound (utils/load-sound "door.ogg") diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 2439634c..06c156d2 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -699,7 +699,6 @@ (get-in ego [:right :talk] ) {2 [:blink 0.15]} (get-in ego [:left :grow] ) {1 [:grow-sound 0.75]} (get-in ego [:right :grow] ) {1 [:grow-sound 0.75]} - (get-in ego [:left :crowbar] ) {3 [:crowbar-sound 0.5]} (get-in ego [:right :crowbar] ) {3 [:crowbar-sound 0.5]} (get-in ego [:right :shoot] ) {14 [:shoot-sound 0.75]} (get-in ego [:left :shoot] ) {14 [:shoot-sound 0.75]} @@ -859,7 +858,6 @@ (get-looped-animation-point anim last-animated-time) last-animated-time))] - (if (and (= current-frame-index (:current-frame-index entity) (:previous-frame-index entity)) (not (:force-rerender entity))) entity @@ -1356,6 +1354,7 @@ :pinch-stop (fn [screen entities options] + (println "stopped pinching") (when (get-in entities [:state :active?]) (-> entities (remove-cam-tweens)))) @@ -1427,15 +1426,37 @@ interacting-entity (get-interacting-entity entities x y)] (-> entities (assoc-in [:cursor :depressed?] true) + (update-in [:cursor :counter] #(inc (or % 0))) + (update-in [:cursor :max-counter] #(inc (or % 0))) (assoc-in [:cursor :down-target] (or (:id interacting-entity ) (:id interaction) nil))))))) :on-touch-up (fn [screen entities options] - (println (input! :is-touched)) - (println "touch up") - (log/info "touch up") - (handle-touch-up screen entities options)) + (let [currently-pressed (dec (get-in entities [:cursor :counter])) + max-pressed (get-in entities [:cursor :max-counter])] + (println "touched up" currently-pressed max-pressed) + (cond + (and (<= currently-pressed 0) + (<= max-pressed 1)) + (handle-touch-up screen + (-> entities + (assoc-in [:cursor :counter] 0) + (assoc-in [:cursor :max-counter] 0)) + options) + + (= currently-pressed 0) + (-> entities + (assoc-in [:cursor :counter] 0) + (assoc-in [:cursor :max-counter] 0)) + + (get-in entities [:state :active?]) + (update-in entities [:cursor :counter] #(max 0 (dec %))) + + :else + entities + ))) :on-tap (fn [screen entities options] + (println "tapping") (when utils/mobile? (handle-touch-up screen entities options))) @@ -1982,6 +2003,8 @@ (assoc-in [:already-saved?] false))) + + :on-reactivate (fn [screen entities {:keys [script-started? item]}] (let [selected-item? (and (:value item) @@ -2031,7 +2054,7 @@ entities)))) - :on-touch-up + :on-tap (fn [screen entities options] (if (= (button-code :left) (:button options)) (let [[x y] (utils/unproject screen options)] diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 48a0be4c..40a3f0d2 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -569,7 +569,7 @@ (utils/remove-save (:id (:selected-save entities))) (as-> entities entities (utils/remove-actor-from-stage entities :confirm-delete) - (assoc entities :saves-list (utils/snapshot-screenshots)) + (assoc entities :saves-list (utils/snapshot-screenshots (-> screen :resources :default second))) (assoc entities :save-menu (->> (saves-menu entities (:renderer screen)) (utils/add-actor-to-stage screen))))) diff --git a/ios/src/java/advent/core/IOSLauncher.java b/ios/src/java/advent/core/IOSLauncher.java index 4418aa20..525bdeca 100644 --- a/ios/src/java/advent/core/IOSLauncher.java +++ b/ios/src/java/advent/core/IOSLauncher.java @@ -21,13 +21,16 @@ public class IOSLauncher extends IOSApplication.Delegate { config.preferredFramesPerSecond = 30; config.useAccelerometer=false; config.useCompass=false; + System.out.println("application created."); RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core")); + System.out.println("clojure loaded"); try { NSDictionary infoDictionary = NSBundle.getMainBundle().getInfoDictionary(); String version = infoDictionary.get(new NSString("CFBundleShortVersionString")).toString(); RT.var("advent.version", "version-override").bindRoot(version); Game game = (Game) RT.var("advent.core", "advent").deref(); + System.out.println("game loaded"); return new IOSApplication(game, config); } catch (Exception e) { e.printStackTrace();