diff --git a/desktop/asset-work/georgia/kick-1.png b/desktop/asset-work/georgia/kick-1.png new file mode 100644 index 00000000..cdfbe072 Binary files /dev/null and b/desktop/asset-work/georgia/kick-1.png differ diff --git a/desktop/asset-work/georgia/kick-10.png b/desktop/asset-work/georgia/kick-10.png new file mode 100644 index 00000000..117b863c Binary files /dev/null and b/desktop/asset-work/georgia/kick-10.png differ diff --git a/desktop/asset-work/georgia/kick-11.png b/desktop/asset-work/georgia/kick-11.png new file mode 100644 index 00000000..cd1f6e2f Binary files /dev/null and b/desktop/asset-work/georgia/kick-11.png differ diff --git a/desktop/asset-work/georgia/kick-12.png b/desktop/asset-work/georgia/kick-12.png new file mode 100644 index 00000000..28ee05ae Binary files /dev/null and b/desktop/asset-work/georgia/kick-12.png differ diff --git a/desktop/asset-work/georgia/kick-13.png b/desktop/asset-work/georgia/kick-13.png new file mode 100644 index 00000000..3c7dd3c9 Binary files /dev/null and b/desktop/asset-work/georgia/kick-13.png differ diff --git a/desktop/asset-work/georgia/kick-14.png b/desktop/asset-work/georgia/kick-14.png new file mode 100644 index 00000000..46da36be Binary files /dev/null and b/desktop/asset-work/georgia/kick-14.png differ diff --git a/desktop/asset-work/georgia/kick-15.png b/desktop/asset-work/georgia/kick-15.png new file mode 100644 index 00000000..99c0ca96 Binary files /dev/null and b/desktop/asset-work/georgia/kick-15.png differ diff --git a/desktop/asset-work/georgia/kick-16.png b/desktop/asset-work/georgia/kick-16.png new file mode 100644 index 00000000..5acaa93b Binary files /dev/null and b/desktop/asset-work/georgia/kick-16.png differ diff --git a/desktop/asset-work/georgia/kick-17.png b/desktop/asset-work/georgia/kick-17.png new file mode 100644 index 00000000..ec40ecc2 Binary files /dev/null and b/desktop/asset-work/georgia/kick-17.png differ diff --git a/desktop/asset-work/georgia/kick-18.png b/desktop/asset-work/georgia/kick-18.png new file mode 100644 index 00000000..783fa459 Binary files /dev/null and b/desktop/asset-work/georgia/kick-18.png differ diff --git a/desktop/asset-work/georgia/kick-19.png b/desktop/asset-work/georgia/kick-19.png new file mode 100644 index 00000000..514f77d1 Binary files /dev/null and b/desktop/asset-work/georgia/kick-19.png differ diff --git a/desktop/asset-work/georgia/kick-2.png b/desktop/asset-work/georgia/kick-2.png new file mode 100644 index 00000000..aa9e5faa Binary files /dev/null and b/desktop/asset-work/georgia/kick-2.png differ diff --git a/desktop/asset-work/georgia/kick-20.png b/desktop/asset-work/georgia/kick-20.png new file mode 100644 index 00000000..4149d6cb Binary files /dev/null and b/desktop/asset-work/georgia/kick-20.png differ diff --git a/desktop/asset-work/georgia/kick-3.png b/desktop/asset-work/georgia/kick-3.png new file mode 100644 index 00000000..5cab8e03 Binary files /dev/null and b/desktop/asset-work/georgia/kick-3.png differ diff --git a/desktop/asset-work/georgia/kick-4.png b/desktop/asset-work/georgia/kick-4.png new file mode 100644 index 00000000..aa9e5faa Binary files /dev/null and b/desktop/asset-work/georgia/kick-4.png differ diff --git a/desktop/asset-work/georgia/kick-5.png b/desktop/asset-work/georgia/kick-5.png new file mode 100644 index 00000000..0a9c4635 Binary files /dev/null and b/desktop/asset-work/georgia/kick-5.png differ diff --git a/desktop/asset-work/georgia/kick-6.png b/desktop/asset-work/georgia/kick-6.png new file mode 100644 index 00000000..60395357 Binary files /dev/null and b/desktop/asset-work/georgia/kick-6.png differ diff --git a/desktop/asset-work/georgia/kick-7.png b/desktop/asset-work/georgia/kick-7.png new file mode 100644 index 00000000..1f8aafd6 Binary files /dev/null and b/desktop/asset-work/georgia/kick-7.png differ diff --git a/desktop/asset-work/georgia/kick-8.png b/desktop/asset-work/georgia/kick-8.png new file mode 100644 index 00000000..0790bd0a Binary files /dev/null and b/desktop/asset-work/georgia/kick-8.png differ diff --git a/desktop/asset-work/georgia/kick-9.png b/desktop/asset-work/georgia/kick-9.png new file mode 100644 index 00000000..02fc889e Binary files /dev/null and b/desktop/asset-work/georgia/kick-9.png differ diff --git a/desktop/asset-work/georgia/stand.png b/desktop/asset-work/georgia/stand.png index 173898ea..72f2aa8c 100644 Binary files a/desktop/asset-work/georgia/stand.png and b/desktop/asset-work/georgia/stand.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 7570f23e..8b8f902e 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -32,6 +32,13 @@ behindhouse/stick orig: 24, 42 offset: 0, 0 index: -1 +black + rotate: false + xy: 503, 3 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 butterfly rotate: false xy: 414, 348 @@ -104,7 +111,7 @@ cat-tree/cat index: -1 cat-tree/cat-stand rotate: false - xy: 529, 11 + xy: 537, 11 size: 198, 11 orig: 198, 11 offset: 0, 0 @@ -172,13 +179,6 @@ wizard/dot orig: 1, 1 offset: 0, 0 index: -1 -cat-tree/inventory - rotate: false - xy: 485, 3 - size: 42, 42 - orig: 42, 42 - offset: 0, 0 - index: -1 cat-tree/monocle rotate: false xy: 992, 839 @@ -186,20 +186,6 @@ cat-tree/monocle orig: 28, 7 offset: 0, 0 index: -1 -cloud - rotate: false - xy: 849, 7 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 -space/cloud - rotate: false - xy: 849, 7 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 cloudy rotate: false xy: 962, 244 @@ -354,6 +340,13 @@ ending-castle/ending-castle2-assets/foreground orig: 344, 109 offset: 0, 0 index: -1 +georgia/stand + rotate: false + xy: 441, 2 + size: 60, 43 + orig: 60, 43 + offset: 0, 0 + index: -1 held/dot rotate: false xy: 849, 784 @@ -377,7 +370,7 @@ outside-jail/dot index: -1 held/flesh rotate: false - xy: 765, 2 + xy: 773, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -440,7 +433,7 @@ inside-cafeteria/warriors-stand index: -1 inside-castle/books rotate: false - xy: 729, 3 + xy: 737, 3 size: 34, 19 orig: 34, 19 offset: 0, 0 @@ -454,7 +447,7 @@ inside-castle/hands-fight index: -1 inside-castle/magic rotate: false - xy: 787, 2 + xy: 795, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -524,7 +517,7 @@ inside-house/safe-screen index: -1 inside-jail/ball-n-chain rotate: false - xy: 809, 6 + xy: 503, 29 size: 38, 16 orig: 38, 16 offset: 0, 0 @@ -564,13 +557,6 @@ inside-stash/lid orig: 23, 7 offset: 0, 0 index: -1 -inventory - rotate: false - xy: 441, 3 - size: 42, 42 - orig: 42, 42 - offset: 0, 0 - index: -1 outside-castle/bird rotate: false xy: 842, 783 @@ -585,6 +571,13 @@ outside-castle/brush-bl orig: 60, 60 offset: 0, 0 index: -1 +outside-castle/flies + rotate: false + xy: 817, 7 + size: 45, 15 + orig: 45, 15 + offset: 0, 0 + index: -1 outside-jail/alarm-clock rotate: false xy: 753, 542 @@ -745,13 +738,6 @@ behindhouse/abc orig: 320, 62 offset: 0, 0 index: -1 -black - rotate: false - xy: 608, 43 - size: 32, 24 - orig: 32, 24 - offset: 0, 0 - index: -1 castle-gate/background rotate: false xy: 2, 311 @@ -787,13 +773,6 @@ cat-tree/grandma orig: 275, 36 offset: 0, 0 index: -1 -cat-tree/grandma-cry-1 - rotate: false - xy: 634, 895 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 dream/background rotate: false xy: 324, 311 @@ -948,6 +927,13 @@ ending-castle/ending-castle2-assets/background orig: 320, 240 offset: 0, 0 index: -1 +georgia/kick-1 + rotate: false + xy: 634, 892 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 held/background rotate: false xy: 646, 418 @@ -962,6 +948,13 @@ inside-antique/background orig: 320, 240 offset: 0, 0 index: -1 +inside-antique/shopkeep + rotate: false + xy: 988, 184 + size: 18, 21 + orig: 18, 21 + offset: 0, 0 + index: -1 inside-antique/shopkeep-talk rotate: false xy: 504, 637 @@ -1116,9 +1109,16 @@ outsidehouse/sheep-anim orig: 429, 21 offset: 0, 0 index: -1 +talk-bg-2 + rotate: false + xy: 676, 895 + size: 21, 40 + orig: 21, 40 + offset: 0, 0 + index: -1 white rotate: false - xy: 988, 181 + xy: 608, 43 size: 32, 24 orig: 32, 24 offset: 0, 0 @@ -1157,6 +1157,20 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none +cloud + rotate: false + xy: 611, 2 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +space/cloud + rotate: false + xy: 611, 2 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 ego/cat-toy rotate: false xy: 404, 4 @@ -1255,13 +1269,6 @@ ego/love-9 orig: 50, 70 offset: 0, 0 index: -1 -ego/warden - rotate: false - xy: 975, 13 - size: 42, 41 - orig: 42, 41 - offset: 0, 0 - index: -1 inside-antique/beard rotate: false xy: 813, 2 @@ -1318,6 +1325,13 @@ inside-stash/background orig: 320, 240 offset: 0, 0 index: -1 +inventory + rotate: false + xy: 975, 12 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 outside-castle/background rotate: false xy: 646, 782 @@ -1325,13 +1339,6 @@ outside-castle/background orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/flies - rotate: false - xy: 611, 2 - size: 45, 15 - orig: 45, 15 - offset: 0, 0 - index: -1 outside-castle/steer rotate: false xy: 611, 19 @@ -1408,13 +1415,6 @@ behindhouse/fgleft orig: 161, 50 offset: 0, 0 index: -1 -castle-gate/stash-closed - rotate: false - xy: 842, 253 - size: 70, 41 - orig: 70, 41 - offset: 0, 0 - index: -1 close rotate: false xy: 977, 2 @@ -1450,6 +1450,13 @@ dream/clouds2 orig: 320, 240 offset: 0, 0 index: -1 +ego/grow + rotate: false + xy: 884, 258 + size: 90, 36 + orig: 90, 36 + offset: 0, 0 + index: -1 ego/jump-straight rotate: false xy: 333, 4 @@ -1513,6 +1520,20 @@ ending-castle/ending-castle2-assets/collision orig: 320, 240 offset: 0, 0 index: -1 +georgia/kick-2 + rotate: false + xy: 842, 251 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-4 + rotate: false + xy: 842, 251 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 inside-antique/closed-blinds rotate: false xy: 2, 296 @@ -1562,13 +1583,6 @@ inside-jail/bars- orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/balloons - rotate: false - xy: 914, 258 - size: 60, 36 - orig: 60, 36 - offset: 0, 0 - index: -1 outside-castle/blanket rotate: false xy: 655, 248 @@ -1794,21 +1808,14 @@ inside-antique/glow index: -1 inside-antique/portrait rotate: false - xy: 786, 2 + xy: 766, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -inside-antique/shopkeep - rotate: false - xy: 694, 10 - size: 18, 21 - orig: 18, 21 - offset: 0, 0 - index: -1 inside-antique/teddy rotate: false - xy: 822, 2 + xy: 802, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1843,7 +1850,7 @@ inside-castle/fight-1 index: -1 inside-house/flask rotate: false - xy: 714, 10 + xy: 694, 10 size: 16, 21 orig: 16, 21 offset: 0, 0 @@ -1871,7 +1878,7 @@ inside-jail/glow index: -1 outside-castle/note rotate: false - xy: 732, 15 + xy: 712, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1892,7 +1899,7 @@ outsidehouse/lamb-walk index: -1 outsidehouse/note rotate: false - xy: 750, 15 + xy: 730, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1906,14 +1913,14 @@ outsidehouse/sheep-walk index: -1 pathfind-test rotate: false - xy: 768, 15 + xy: 748, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 save rotate: false - xy: 804, 2 + xy: 784, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2017,259 +2024,266 @@ filter: Nearest,Nearest repeat: none behindhouse/house rotate: false - xy: 324, 767 + xy: 324, 772 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +cat-tree/inventory + rotate: false + xy: 922, 2 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 cat-tree/owl rotate: false - xy: 2, 9 + xy: 2, 14 size: 168, 30 orig: 168, 30 offset: 0, 0 index: -1 cat-tree/sillhoute rotate: false - xy: 646, 283 + xy: 646, 288 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/pedestals rotate: false - xy: 324, 41 + xy: 324, 46 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -ego/grow - rotate: false - xy: 922, 2 - size: 90, 36 - orig: 90, 36 - offset: 0, 0 - index: -1 ego/hold-up-to-window rotate: false - xy: 812, 3 + xy: 812, 8 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 172, 3 + xy: 172, 8 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 300, 3 + xy: 300, 8 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 556, 3 + xy: 556, 8 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 684, 3 + xy: 684, 8 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 held/hand rotate: false - xy: 2, 767 + xy: 2, 772 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/head rotate: false - xy: 2, 525 + xy: 2, 530 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/open-blinds rotate: false - xy: 324, 283 + xy: 324, 288 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/pedestal-overlay rotate: false - xy: 646, 525 + xy: 646, 530 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/sillhoute rotate: false - xy: 646, 41 + xy: 646, 46 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inventory-overlay rotate: false - xy: 324, 525 + xy: 324, 530 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/house rotate: false - xy: 2, 283 + xy: 2, 288 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/later rotate: false - xy: 646, 767 + xy: 646, 772 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/susp rotate: false - xy: 428, 3 + xy: 428, 8 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 title/logo rotate: false - xy: 2, 41 + xy: 2, 46 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +title/screenshot-backdrop + rotate: false + xy: 966, 5 + size: 48, 38 + orig: 48, 38 + offset: 0, 0 + index: -1 wizard/experiment-23 rotate: false - xy: 968, 952 + xy: 968, 957 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 968, 895 + xy: 968, 900 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 968, 838 + xy: 968, 843 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 968, 781 + xy: 968, 786 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 968, 724 + xy: 968, 729 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 968, 667 + xy: 968, 672 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 968, 610 + xy: 968, 615 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-30 rotate: false - xy: 968, 553 + xy: 968, 558 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 968, 496 + xy: 968, 501 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 968, 439 + xy: 968, 444 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 968, 382 + xy: 968, 387 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 968, 325 + xy: 968, 330 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 968, 268 + xy: 968, 273 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 968, 211 + xy: 968, 216 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 968, 154 + xy: 968, 159 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 968, 97 + xy: 968, 102 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 968, 40 + xy: 968, 45 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2282,434 +2296,476 @@ filter: Nearest,Nearest repeat: none castle-gate/goon-2-talk rotate: false - xy: 988, 948 + xy: 738, 337 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 +castle-gate/stash-closed + rotate: false + xy: 2, 10 + size: 70, 41 + orig: 70, 41 + offset: 0, 0 + index: -1 castle-gate/throw-walkie-1 rotate: false - xy: 646, 882 + xy: 324, 716 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-2 rotate: false - xy: 2, 156 + xy: 324, 494 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 324, 473 + xy: 531, 474 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 2, 18 + xy: 598, 716 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 324, 335 + xy: 324, 356 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-6 rotate: false - xy: 646, 744 + xy: 531, 336 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-7 rotate: false - xy: 646, 606 + xy: 324, 218 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-8 rotate: false - xy: 639, 468 + xy: 324, 80 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-9 rotate: false - xy: 324, 197 + xy: 738, 479 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 -cat-tree/grandma-cry-10 +cat-tree/grandma-cry-1 rotate: false - xy: 963, 278 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-11 - rotate: false - xy: 963, 236 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-12 - rotate: false - xy: 963, 194 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-13 - rotate: false - xy: 963, 152 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-14 - rotate: false - xy: 963, 110 + xy: 954, 427 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-2 rotate: false - xy: 961, 689 + xy: 954, 385 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-3 rotate: false - xy: 961, 647 + xy: 963, 240 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-4 rotate: false - xy: 963, 530 + xy: 963, 198 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-5 rotate: false - xy: 963, 488 + xy: 963, 156 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-6 rotate: false - xy: 963, 446 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 963, 404 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-8 - rotate: false - xy: 963, 362 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-9 - rotate: false - xy: 963, 320 + xy: 963, 114 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 2, 536 + xy: 2, 537 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-r rotate: false - xy: 853, 778 + xy: 531, 612 size: 65, 240 orig: 65, 240 offset: 0, 0 index: -1 dream/broom rotate: false - xy: 491, 129 + xy: 990, 721 size: 15, 66 orig: 15, 66 offset: 0, 0 index: -1 +dream/cliff + rotate: false + xy: 921, 282 + size: 81, 87 + orig: 81, 87 + offset: 0, 0 + index: -1 dream/sword rotate: false - xy: 1007, 607 + xy: 970, 855 size: 15, 38 orig: 15, 38 offset: 0, 0 index: -1 ego/frog rotate: false - xy: 988, 982 + xy: 987, 857 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 +ego/georgia + rotate: false + xy: 764, 339 + size: 90, 30 + orig: 90, 30 + offset: 0, 0 + index: -1 +ego/reach + rotate: false + xy: 945, 507 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 ego/spear rotate: false - xy: 920, 790 + xy: 598, 614 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 -ending-castle/warden-2 +ego/warden rotate: false - xy: 963, 572 + xy: 970, 938 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 +ending-castle/warden-2 + rotate: false + xy: 970, 895 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +georgia/kick-3 + rotate: false + xy: 74, 8 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-5 + rotate: false + xy: 116, 8 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-6 + rotate: false + xy: 158, 8 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-7 + rotate: false + xy: 200, 8 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-8 + rotate: false + xy: 242, 8 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-9 + rotate: false + xy: 284, 8 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 held/bloodclot-head-1 rotate: false - xy: 855, 26 + xy: 324, 632 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-2 + rotate: false + xy: 766, 632 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-3 + rotate: false + xy: 823, 17 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-2 rotate: false - xy: 209, 19 + xy: 738, 371 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-3 rotate: false - xy: 317, 20 + xy: 846, 371 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-4 +inside-cafeteria/knights rotate: false - xy: 531, 2 - size: 106, 106 - orig: 106, 106 + xy: 690, 617 + size: 74, 97 + orig: 74, 97 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-5 +inside-cafeteria/ladder-guard rotate: false - xy: 639, 26 - size: 106, 106 - orig: 106, 106 - offset: 0, 0 - index: -1 -inside-cafeteria/hands-fight-6 - rotate: false - xy: 747, 26 - size: 106, 106 - orig: 106, 106 + xy: 747, 12 + size: 74, 87 + orig: 74, 87 offset: 0, 0 index: -1 inside-cafeteria/warriors rotate: false - xy: 920, 892 + xy: 805, 726 size: 66, 126 orig: 66, 126 offset: 0, 0 index: -1 -inside-castle/hands-1 - rotate: false - xy: 425, 22 - size: 104, 104 - orig: 104, 104 - offset: 0, 0 - index: -1 -inside-castle/roof - rotate: false - xy: 961, 731 - size: 57, 57 - orig: 57, 57 - offset: 0, 0 - index: -1 inside-castle/way-back-tree rotate: false - xy: 2, 294 + xy: 2, 53 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +outside-castle/balloons + rotate: false + xy: 954, 469 + size: 60, 36 + orig: 60, 36 + offset: 0, 0 + index: -1 outside-castle/walk-behind rotate: false - xy: 324, 778 + xy: 2, 295 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/guard-sleep rotate: false - xy: 317, 128 + xy: 747, 268 size: 172, 67 orig: 172, 67 offset: 0, 0 index: -1 +outsidehouse/fg1 + rotate: false + xy: 873, 789 + size: 128, 63 + orig: 128, 63 + offset: 0, 0 + index: -1 +outsidehouse/fgtest + rotate: false + xy: 945, 545 + size: 75, 75 + orig: 75, 75 + offset: 0, 0 + index: -1 space/Blergh rotate: false - xy: 538, 611 + xy: 538, 854 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-flex rotate: false - xy: 209, 127 + xy: 646, 854 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 209, 127 + xy: 646, 854 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-talk rotate: false - xy: 531, 444 + xy: 754, 854 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-1 rotate: false - xy: 531, 277 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-10 - rotate: false - xy: 855, 110 + xy: 531, 169 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 639, 301 + xy: 639, 169 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 747, 301 + xy: 862, 854 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 853, 611 + xy: 882, 622 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 531, 110 + xy: 747, 101 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 639, 134 + xy: 855, 101 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 747, 134 + xy: 531, 2 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 855, 444 + xy: 639, 2 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-9 +space/bloodclot-head-talk-1 rotate: false - xy: 855, 277 - size: 106, 165 - orig: 106, 165 + xy: 440, 639 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-2 + rotate: false + xy: 326, 3 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-3 + rotate: false + xy: 410, 3 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-4 + rotate: false + xy: 939, 24 + size: 82, 75 + orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-stand rotate: false - xy: 324, 611 + xy: 324, 854 size: 212, 165 orig: 212, 165 offset: 0, 0 index: -1 -talk-bg-2 - rotate: false - xy: 508, 155 - size: 21, 40 - orig: 21, 40 - offset: 0, 0 - index: -1 the-end rotate: false - xy: 2, 778 + xy: 2, 779 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -title/screenshot-backdrop - rotate: false - xy: 971, 70 - size: 48, 38 - orig: 48, 38 - offset: 0, 0 - index: -1 title/screenshot-backdrop-active rotate: false - xy: 971, 30 + xy: 970, 981 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 wizard/cloud rotate: false - xy: 961, 615 + xy: 856, 339 size: 40, 30 orig: 40, 30 offset: 0, 0 @@ -2720,352 +2776,443 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none +cat-tree/grandma-cry-10 + rotate: false + xy: 662, 896 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-11 + rotate: false + xy: 722, 896 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-12 + rotate: false + xy: 782, 896 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-13 + rotate: false + xy: 842, 896 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-14 + rotate: false + xy: 902, 896 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 738, 799 + xy: 962, 896 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 738, 757 + xy: 194, 171 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 729, 715 + xy: 194, 129 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 729, 673 + xy: 194, 87 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 798, 818 + xy: 254, 171 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 798, 776 + xy: 254, 129 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -dream/cliff +cat-tree/grandma-cry-7 rotate: false - xy: 218, 586 - size: 81, 87 - orig: 81, 87 + xy: 330, 300 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-8 + rotate: false + xy: 542, 896 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 602, 896 + size: 58, 40 + orig: 58, 40 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 2, 172 + xy: 218, 351 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 dream/corner-r rotate: false - xy: 2, 111 + xy: 216, 290 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 -ego/georgia - rotate: false - xy: 2, 2 - size: 90, 30 - orig: 90, 30 - offset: 0, 0 - index: -1 -ego/reach - rotate: false - xy: 655, 726 - size: 72, 36 - orig: 72, 36 - offset: 0, 0 - index: -1 ego/scared rotate: false - xy: 655, 688 + xy: 334, 401 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 -held/bloodclot-head-2 +georgia/kick-10 rotate: false - xy: 434, 925 - size: 114, 82 - orig: 114, 82 + xy: 254, 84 + size: 40, 43 + orig: 40, 43 offset: 0, 0 index: -1 -held/bloodclot-head-3 +georgia/kick-11 rotate: false - xy: 550, 925 - size: 114, 82 - orig: 114, 82 + xy: 300, 245 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-12 + rotate: false + xy: 342, 255 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-13 + rotate: false + xy: 86, 34 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-14 + rotate: false + xy: 128, 49 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-15 + rotate: false + xy: 410, 702 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-16 + rotate: false + xy: 410, 657 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-17 + rotate: false + xy: 410, 612 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-18 + rotate: false + xy: 452, 715 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-19 + rotate: false + xy: 452, 670 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-20 + rotate: false + xy: 452, 625 + size: 40, 43 + orig: 40, 43 offset: 0, 0 index: -1 held/bloodclot-head-4 rotate: false - xy: 666, 925 + xy: 542, 938 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-5 rotate: false - xy: 782, 925 + xy: 658, 938 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-6 rotate: false - xy: 898, 925 + xy: 774, 938 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-7 rotate: false - xy: 434, 841 + xy: 890, 938 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-8 rotate: false - xy: 550, 841 + xy: 218, 496 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 666, 841 + xy: 218, 412 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-7 +inside-cafeteria/hands-fight-4 rotate: false - xy: 2, 233 + xy: 218, 580 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 -inside-cafeteria/knights +inside-cafeteria/hands-fight-5 rotate: false - xy: 110, 409 - size: 74, 97 - orig: 74, 97 + xy: 326, 747 + size: 106, 106 + orig: 106, 106 offset: 0, 0 index: -1 -inside-cafeteria/ladder-guard +inside-cafeteria/hands-fight-6 rotate: false - xy: 326, 753 - size: 74, 87 - orig: 74, 87 + xy: 434, 914 + size: 106, 106 + orig: 106, 106 offset: 0, 0 index: -1 -outsidehouse/fg1 +inside-cafeteria/hands-fight-7 rotate: false - xy: 782, 860 - size: 128, 63 - orig: 128, 63 + xy: 2, 79 + size: 106, 106 + orig: 106, 106 offset: 0, 0 index: -1 -outsidehouse/fgtest +inside-castle/hands-1 rotate: false - xy: 578, 687 - size: 75, 75 - orig: 75, 75 + xy: 110, 248 + size: 104, 104 + orig: 104, 104 + offset: 0, 0 + index: -1 +inside-castle/roof + rotate: false + xy: 332, 342 + size: 57, 57 + orig: 57, 57 + offset: 0, 0 + index: -1 +space/bloodclot-explode-10 + rotate: false + xy: 2, 688 + size: 106, 165 + orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-11 rotate: false - xy: 2, 842 + xy: 110, 855 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 2, 675 + xy: 2, 521 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 110, 842 + xy: 110, 688 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 2, 508 + xy: 218, 855 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 110, 675 + xy: 2, 354 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 218, 842 + xy: 110, 521 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 2, 341 + xy: 218, 688 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 110, 508 + xy: 326, 855 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 218, 675 + xy: 2, 187 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 326, 842 + xy: 110, 354 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-head-talk-1 +space/bloodclot-explode-9 rotate: false - xy: 2, 34 - size: 82, 75 - orig: 82, 75 + xy: 2, 855 + size: 106, 165 + orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 486, 764 + xy: 110, 94 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 570, 764 + xy: 326, 593 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 654, 764 + xy: 334, 516 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 410, 687 + xy: 334, 439 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 494, 687 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-2 - rotate: false - xy: 218, 509 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-3 - rotate: false - xy: 110, 332 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-4 - rotate: false - xy: 110, 255 + xy: 216, 213 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 326, 676 + xy: 434, 837 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 912, 848 + xy: 2, 2 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 116, 178 + xy: 110, 171 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 116, 101 + xy: 326, 670 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 402, 764 + xy: 434, 760 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 858, 818 + xy: 494, 718 size: 40, 40 orig: 40, 40 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 010544d8..fcaa85ec 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index 9daf24a4..4b7ed0dd 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index c2045fac..4c352f15 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index 6d70a25a..cb9f8358 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 d7bf5a91..938ac13d 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 6a40a68a..99c27a9c 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 c79a82d2..7d64c3e0 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 73f1e257..8cb0fd5a 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index 9facb6e4..9e279a48 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -19,106 +19,18 @@ (defn make-night [entities] entities) -(defn walk-to-frankie [entities] - (actions/walk-to entities :ego [268 61] :face :left)) - - -(defn drop-walkie-talkie [entities] - (actions/talk entities :ego "I'll drop one of these off in here.") - (actions/walk-to entities :ego [155 64]) - (actions/walk-straight-to entities :ego [106 18] :face :left) - (actions/play-animation entities :ego :squat) - (actions/remove-item entities :walkie-talkies) - (actions/give entities :walkie-talkie) - (actions/walk-straight-to entities :ego [155 64])) - - - -(defn present-frankie-choices [entities] - (actions/present-choices entities {:choices ["Please, Frankie. Give me my stuff back!" - {:run #(do (actions/respond entities % - :frankie "Not a chance, Dipstick." - :frankie "Burglers like us gotta eat too, you know." - :ego "But it's a matter of life and death!" - :ego "Plus, Georgia's counting on me!") - (actions/georgia-say entities "I'm counting on you, Tick!") - (actions/do-dialogue entities - :frankie "Georgia's going steady with me now, Dipstick." - :frankie "No day-dreaming about my girlfriend!") - (actions/play-animation entities :frankie :laugh) - (actions/do-dialogue entities :frankie "You'd be better off if you just packed your bags and left town." - :frankie "Ain't that right, boys?") - (actions/play-animation entities :frankie :glance)) - :choices actions/previous-choices} - - "You guys are nothing but a bunch of crooks!" - {:run #(do (actions/respond entities % - :frankie "Oh please." - :frankie "Like you're so different." - :frankie "Am I right, boys?") - (actions/play-animation entities :frankie :glance) - (actions/do-dialogue entities - :frankie "We steal gold, diamonds, and relic slingshots." - :frankie "And you steal teddy bears.") - (actions/play-animation entities :frankie :laugh)) - :choices actions/previous-choices} - - "Where is your secret stash?" - {:run #(do (actions/respond entities % :frankie "Like I'd ever tell you, Dipstick.") - (actions/play-animation entities :frankie :laugh) - (actions/do-dialogue entities :frankie "That's only for people in the 'Super secret cool club'!")) - :choices actions/previous-choices} - - (when-not (get-in @entities [:state :bubba-gone?]) - "I found your secret stash!") - {:run #(do (actions/respond entities % - :frankie "What?!" - :frankie "Impossible!") - (actions/play-animation entities :frankie :laugh) - (actions/update-state entities (fn [s] (assoc s :bubba-gone? true))) - (actions/do-dialogue entities :frankie "Bubba, go check to make sure our stuff is safe." - :goon-2 "You got it, boss.") - (actions/walk-straight-to entities :goon-2 [0 100]))} - - "Nevermind." - {:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]})) -(defn make-frankie [screen] - (let [stand (utils/make-anim "castle-gate/frankie.png" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) - talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0]) - laugh (utils/make-anim "castle-gate/frankie.png" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0]) - glance (utils/make-anim "castle-gate/frankie.png" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ]) - reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8]) - flex (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])] - (assoc (animation->texture screen stand) - :x 235 :y 90 :baseline 150 - :origin-x 12 - :origin-y 0 - :anim stand - :anim-start 0 - :night-profile :sprite - :scale-x 1.4 - :scale-y 1.4 - :talk-color common/frankie-color - :talk talk - :flex flex - :stand stand - :laugh laugh - :glance glance - :reach reach - :script (actions/get-script entities - (walk-to-frankie entities) - (actions/talk entities :ego "Listen, Frankie...") - (present-frankie-choices entities)) - :scripts {:walkie-talkies (actions/get-script entities - (actions/do-dialogue entities :frankie "Tin cans? What do I need walkie talkies for?")) - :default (actions/get-script entities - (actions/do-dialogue entities :frankie "What? Wanting to give up more of your goodies?"))}))) + + + + + + (defn make-coin-flip [screen] (let [coin-flip (utils/make-anim "castle-gate/coinflip.png" [10 10] 0.05 (range 5))] @@ -277,7 +189,7 @@ (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) + :entities {:frankie (common/make-frankie screen) :goon-1 (make-goon-1 screen) :goon-2 (make-goon-2 screen) :outside-particles (common/make-outside-particles) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 9e880352..8908858d 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -105,6 +105,7 @@ :ego "Don't forget about my secret stash of helpful stuff.\"")) (def frankie-color (Color/valueOf "9907CFFF")) + (defn listen-to-frankie [entities] (let [respond (fn [msg] (actions/talk entities :ego msg :animate? false :stop? false :color frankie-color) @@ -234,6 +235,90 @@ (respond "Leave us alone!"))}]})) ) +(defn walk-to-frankie [entities] + (actions/walk-to entities :ego [268 61] :face :left)) + +(defn present-frankie-choices [entities] + (actions/present-choices entities {:choices ["Please, Frankie. Give me my stuff back!" + {:run #(do (actions/respond entities % + :frankie "Not a chance, Dipstick." + :frankie "Burglers like us gotta eat too, you know." + :ego "But it's a matter of life and death!" + :ego "Plus, Georgia's counting on me!") + (actions/georgia-say entities "I'm counting on you, Tick!") + (actions/do-dialogue entities + :frankie "Georgia's going steady with me now, Dipstick." + :frankie "No day-dreaming about my girlfriend!") + (actions/play-animation entities :frankie :laugh) + (actions/do-dialogue entities :frankie "You'd be better off if you just packed your bags and left town." + :frankie "Ain't that right, boys?") + (actions/play-animation entities :frankie :glance)) + :choices actions/previous-choices} + + "You guys are nothing but a bunch of crooks!" + {:run #(do (actions/respond entities % + :frankie "Oh please." + :frankie "Like you're so different." + :frankie "Am I right, boys?") + (actions/play-animation entities :frankie :glance) + (actions/do-dialogue entities + :frankie "We steal gold, diamonds, and relic slingshots." + :frankie "And you steal teddy bears.") + (actions/play-animation entities :frankie :laugh)) + :choices actions/previous-choices} + + "Where is your secret stash?" + {:run #(do (actions/respond entities % :frankie "Like I'd ever tell you, Dipstick.") + (actions/play-animation entities :frankie :laugh) + (actions/do-dialogue entities :frankie "That's only for people in the 'Super secret cool club'!")) + :choices actions/previous-choices} + + (when-not (get-in @entities [:state :bubba-gone?]) + "I found your secret stash!") + {:run #(do (actions/respond entities % + :frankie "What?!" + :frankie "Impossible!") + (actions/play-animation entities :frankie :laugh) + (actions/update-state entities (fn [s] (assoc s :bubba-gone? true))) + (actions/do-dialogue entities :frankie "Bubba, go check to make sure our stuff is safe." + :goon-2 "You got it, boss.") + (actions/walk-straight-to entities :goon-2 [0 100]))} + + "Nevermind." + {:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]})) + +(defn make-frankie [screen] + (let [stand (utils/make-anim "castle-gate/frankie.png" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) + talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0]) + laugh (utils/make-anim "castle-gate/frankie.png" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0]) + glance (utils/make-anim "castle-gate/frankie.png" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ]) + reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8]) + flex (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])] + (assoc (animation->texture screen stand) + :x 235 :y 90 :baseline 150 + :origin-x 12 + :origin-y 0 + :anim stand + :anim-start 0 + :night-profile :sprite + :scale-x 1.4 + :scale-y 1.4 + :talk-color frankie-color + :talk talk + :flex flex + :stand stand + :laugh laugh + :glance glance + :reach reach + :script (actions/get-script entities + (walk-to-frankie entities) + (actions/talk entities :ego "Listen, Frankie...") + (present-frankie-choices entities)) + + :scripts {:walkie-talkies (actions/get-script entities + (actions/do-dialogue entities :frankie "Tin cans? What do I need walkie talkies for?")) + :default (actions/get-script entities + (actions/do-dialogue entities :frankie "What? Wanting to give up more of your goodies?"))}))) (defn explode [entities] @@ -317,7 +402,24 @@ entities) (skip-type [this screen entities] :none))) +(defn georgia-appear [entities] + (actions/run-action entities + (begin [this screen entities] + (-> entities + (assoc-in [:room :entities :georgia] (get-in entities [:room :georgia])) + (assoc-in [:tweens :appear-georgia] + (tween/tween :appear-georgia screen [:room :entities :georgia :opacity] 0.0 1.0 0.5 :ease tween/ease-in-out-quintic)))) + (continue [this screen entities] + entities) + + (done? [this screen entities] + (= 1.0 (get-in entities [:room :entities :georgia :opacity]))) + + (terminate [this screen entities] + entities) + (skip-type [this screen entities] + :none))) (defn fade-out [entities] (actions/run-action entities (begin [this screen entities] @@ -414,35 +516,37 @@ (Thread/sleep 400) (actions/do-stop entities :ego :face :left) (Thread/sleep 400) - (actions/do-dialogue entities :ego "Where's Georgia McGorgeous?") + (actions/do-dialogue entities :ego "Where's Gandarf?") + (actions/do-dialogue entities :ego "And Georgia McGorgeous?") (actions/walk-straight-to entities :gandarf-cloud [215 100] :update-baseline? false) - (actions/do-dialogue entities :gandarf "Quickly, boy!") (actions/do-stop entities :ego :face :right) (actions/do-dialogue entities :ego "Gandarf?" :gandarf "Yes, it is I!" - :ego "How did you escape?" - :gandarf "No time for that!" - :gandarf "Georgia McGorgeous has been captured!" - :ego "Captured?! By who?" - :gandarf "Bloodclot's second-in-command, Swinebreath." - :gandarf "I'm afraid that I can't save her." - :gandarf "This is a job for a knight." - :gandarf "If you are willing, Tick..." - :duke "That's 'Sir Tick'..." - :gandarf "Quite right, quite right." - :gandarf "If you are willing, Sir Tick..." - :gandarf "I can transport you to the land where her prision lies." - :gandarf "But it is far out of my sight, and I know not what you'll find." - :gandarf "Well? What say you?" - :ego "I'll do it! " - :gandarf "Very good." - :gandarf "Prepare yourself.") - (Thread/sleep 300) - (actions/talk entities :gandarf "Beamium Up!!!" :anim :talk-angry) + :gandarf "I have escaped!" + :gandarf "And I brought someone with me!") + (Thread/sleep 600) + (actions/talk entities :gandarf "Beautius appearium!!" :anim :talk-angry) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start) - (disappear entities) - (Thread/sleep 2000) + (georgia-appear entities) + (actions/do-stop entities :ego :face :left) + (Thread/sleep 3000) + (actions/do-dialogue entities + :georgia "Hey, I'm home!" + :georgia "Tick, was it really you that saved me?" + :ego "Aww, it was nothing." + :georgia "My hero!" + :frankie "Wait a hot second!") + (Thread/sleep 500) + (actions/walk-straight-to entities :frankie [85 24] :anim :stand) + (actions/do-dialogue entities + :frankie "Come along, Georgia." + :frankie "No sense in thanking Dipstick.") + (actions/play-animation entities :frankie :laugh) + (actions/play-animation entities :georgia :kick) + (actions/walk-straight-to entities :frankie [-41 24] :anim :stand :speed 5.0) + (actions/do-dialogue entities + :georgia "Let's go, Sir Hunk.") (fade-out entities) (on-gl (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits))) ) diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index fe76201b..d5714820 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -14,7 +14,8 @@ [play-clj.math :refer :all] [play-clj.ui :refer :all] [play-clj.utils :refer :all] - [play-clj.g2d :refer :all])) + [play-clj.g2d :refer :all]) + (:import [com.badlogic.gdx.graphics Color])) (defn make [screen] (let [ @@ -34,6 +35,12 @@ duke-reach (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [3 4 5 6]) duke-reach-talk (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [6 7]) duke-knight (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [8 9 10 9 8]) + + georgia-stand (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 20 0) 1 (repeat 10 0) 1])) + georgia-talk (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [0 2 0 2 0 1 0 0 2])) + georgia-kick (utils/make-anim-seq "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2) + 3 4 5 6 7 8 9 10 11 12 13 (repeat 10 14) + 15 16 17 18 19 (repeat 10 0)])) scaler (utils/scaler-fn-with-baseline 20 0.01 1.20)] (rooms/make :music :dream :name "Ending" @@ -42,6 +49,19 @@ (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 )) + :georgia (rooms/make-entity :georgia (assoc (animation->texture screen georgia-stand) + :x 101 :y 23 :baseline 217 + :scale-x 1.2 + :scale-y 1.2 + :talk-color (Color/valueOf "ffabe0ff") + :opacity 0.0 + :anim georgia-stand + :anim-start 0 + :stand georgia-stand + :talk georgia-talk + :kick georgia-kick + :anim-merges {georgia-stand {:origin-x 10 :origin-y 0} + georgia-kick {:origin-x 20 :origin-y 0}})) :entities {:peddler (assoc (animation->texture screen peddler-stand) :x 245 :y 46 :baseline 200 :anim peddler-stand @@ -52,8 +72,11 @@ :anim warden-stand :anim-start 0 :scale-x 1.1 - :scale-y 1.1 - ) + :scale-y 1.1) + :frankie (assoc (common/make-frankie screen) + :x 28 :y 21 :baseline 200 + :scale-x 1.2 + :scale-y 1.2) :gandarf (assoc (common/make-wizard screen {:x 205 :y 400 :baseline 199}) :update-fn (fn [screen entities gandarf] (assoc gandarf :y (or (get-in entities [:gandarf-cloud :y]) @@ -71,9 +94,9 @@ :reach duke-reach :reach-talk duke-reach-talk :knight duke-knight) - :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 140 :y 49 + :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 91 :y 23 :baseline 241) - (particle-effect! :set-position 150 49)) + (particle-effect! :set-position 91 23)) :ladder-guard-1 (assoc (animation->texture screen ladder-guard-stand-1) :x 75 :y 69 :baseline (- 240 69) :anim ladder-guard-stand-1 diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index fa18ba6e..c93bc8f4 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -84,6 +84,7 @@ :entities {:bloodclot-head (assoc (animation->texture screen bloodclot-stand) :x 211 :y 115 :baseline 240 :origin-x 57 :origin-y 0 + :talk-color (color 0.95 0.4 0.2 1.0) :stand bloodclot-stand :talk bloodclot-talk :anim bloodclot-stand