diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 70ce9836..06930a08 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -144,14 +144,14 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-jail/dot +title/dot rotate: false xy: 704, 916 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -inside-antique/dot +inside-jail/dot rotate: false xy: 704, 916 size: 1, 1 @@ -165,14 +165,14 @@ ego/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-house/dot +inside-antique/dot rotate: false xy: 704, 916 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -outsidehouse/dot +wizard/dot rotate: false xy: 704, 916 size: 1, 1 @@ -186,14 +186,14 @@ dream/dot orig: 1, 1 offset: 0, 0 index: -1 -title/dot +outsidehouse/dot rotate: false xy: 704, 916 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -wizard/dot +inside-house/dot rotate: false xy: 704, 916 size: 1, 1 @@ -620,14 +620,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 2007, 468 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 2007, 468 size: 1, 1 @@ -2263,6 +2263,97 @@ castle-gate/throw-walkie-9 orig: 205, 136 offset: 0, 0 index: -1 +cat-tree/eye-1 + rotate: false + xy: 209, 198 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-6 + rotate: false + xy: 209, 198 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-10 + rotate: false + xy: 1939, 533 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-11 + rotate: false + xy: 1985, 533 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-12 + rotate: false + xy: 1913, 483 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-13 + rotate: false + xy: 1959, 483 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-2 + rotate: false + xy: 725, 723 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-3 + rotate: false + xy: 631, 7 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-4 + rotate: false + xy: 1674, 402 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-5 + rotate: false + xy: 1687, 345 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-7 + rotate: false + xy: 1687, 345 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-8 + rotate: false + xy: 1122, 37 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 +cat-tree/eye-9 + rotate: false + xy: 1893, 535 + size: 44, 48 + orig: 44, 48 + offset: 0, 0 + index: -1 cat-tree/grandma-cry-10 rotate: false xy: 412, 79 @@ -2286,56 +2377,56 @@ cat-tree/grandma-cry-12 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 631, 15 + xy: 1374, 407 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 1374, 407 + xy: 1374, 365 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 1374, 365 + xy: 381, 37 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 1891, 687 + xy: 1572, 510 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 381, 37 + xy: 1773, 494 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 1572, 510 + xy: 1486, 346 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 1773, 494 + xy: 1593, 297 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 1833, 494 + xy: 1710, 452 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2363,7 +2454,7 @@ cat-tree/grandma-cry-9 index: -1 cat-tree/inventory rotate: false - xy: 725, 729 + xy: 1100, 238 size: 42, 42 orig: 42, 42 offset: 0, 0 @@ -2412,21 +2503,21 @@ ego/grow index: -1 ego/grow-talk rotate: false - xy: 1853, 684 + xy: 1833, 498 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hand-hold rotate: false - xy: 1951, 691 + xy: 1855, 536 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ending-castle/hand-hold rotate: false - xy: 1951, 691 + xy: 1855, 536 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2552,14 +2643,14 @@ ego/love-24 index: -1 ego/love-25 rotate: false - xy: 691, 25 + xy: 1887, 657 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-26 rotate: false - xy: 743, 25 + xy: 1887, 585 size: 50, 70 orig: 50, 70 offset: 0, 0 @@ -2685,7 +2776,7 @@ ego/throw index: -1 ego/warden rotate: false - xy: 1688, 305 + xy: 1911, 440 size: 42, 41 orig: 42, 41 offset: 0, 0 @@ -2699,21 +2790,21 @@ ending-castle/crowd-right index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 1252, 380 + xy: 1168, 18 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 1163, 343 + xy: 2005, 451 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 1205, 343 + xy: 1165, 380 size: 40, 35 orig: 40, 35 offset: 0, 0 @@ -2727,196 +2818,196 @@ ending-castle/frankie-fall-2 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 1997, 356 + xy: 1131, 201 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 1142, 247 + xy: 1871, 498 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 1142, 210 + xy: 1908, 358 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 1070, 18 + xy: 1950, 358 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 1112, 18 + xy: 1992, 358 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 1168, 380 + xy: 1700, 251 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 1210, 380 + xy: 1169, 55 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 1081, 374 + xy: 1955, 440 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 georgia/kick-1 rotate: false - xy: 1951, 528 + xy: 1908, 395 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 1993, 483 + xy: 1207, 372 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-11 rotate: false - xy: 1993, 438 + xy: 1249, 372 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-12 rotate: false - xy: 1993, 393 + xy: 771, 8 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-13 rotate: false - xy: 1989, 686 + xy: 813, 40 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-14 rotate: false - xy: 1981, 641 + xy: 855, 39 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 1998, 596 + xy: 897, 39 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 1079, 329 + xy: 1123, 337 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 1084, 284 + xy: 1165, 335 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 1100, 239 + xy: 1207, 327 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 1121, 329 + xy: 1249, 327 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-2 rotate: false - xy: 1909, 468 + xy: 1950, 395 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-4 rotate: false - xy: 1909, 468 + xy: 1950, 395 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 1126, 284 + xy: 1126, 282 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-3 rotate: false - xy: 1951, 483 + xy: 2005, 488 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-5 rotate: false - xy: 1909, 423 + xy: 1992, 395 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-6 rotate: false - xy: 1951, 438 + xy: 1079, 329 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-7 rotate: false - xy: 1909, 378 + xy: 1084, 284 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 1951, 393 + xy: 1081, 381 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 1993, 528 + xy: 1123, 382 size: 40, 43 orig: 40, 43 offset: 0, 0 @@ -3126,14 +3217,14 @@ inside-house/candle index: -1 inside-jail/chest-top rotate: false - xy: 1548, 354 + xy: 1664, 460 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 inside-jail/chest-top-open rotate: false - xy: 1951, 359 + xy: 675, 63 size: 44, 32 orig: 44, 32 offset: 0, 0 @@ -3196,7 +3287,7 @@ outside-castle/steer index: -1 outside-jail/closed-stash rotate: false - xy: 1664, 462 + xy: 1939, 583 size: 52, 30 orig: 52, 30 offset: 0, 0 @@ -3616,7 +3707,7 @@ talk-bg index: -1 title/balloon rotate: false - xy: 1486, 356 + xy: 1986, 699 size: 60, 30 orig: 60, 30 offset: 0, 0 @@ -3630,14 +3721,14 @@ wizard/Untitled index: -1 wizard/cloud rotate: false - xy: 1718, 462 + xy: 721, 65 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 wizard/experiment-10 rotate: false - xy: 1857, 555 + xy: 1993, 585 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3735,49 +3826,49 @@ wizard/experiment-22 index: -1 wizard/experiment-23 rotate: false - xy: 1674, 405 + xy: 1546, 331 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 1721, 405 + xy: 1593, 339 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 1768, 437 + xy: 1640, 339 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 1768, 380 + xy: 1653, 282 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 1815, 437 + xy: 1770, 437 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 1815, 380 + xy: 1817, 437 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 1862, 437 + xy: 1083, 144 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3791,70 +3882,70 @@ wizard/experiment-3 index: -1 wizard/experiment-30 rotate: false - xy: 1862, 380 + xy: 677, 6 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 1594, 339 + xy: 724, 8 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 1641, 339 + xy: 1720, 395 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 1688, 348 + xy: 1767, 380 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 1083, 144 + xy: 1814, 380 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 1887, 627 + xy: 1700, 288 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 1904, 570 + xy: 1861, 380 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 1934, 630 + xy: 1864, 441 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 1951, 573 + xy: 1130, 144 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 1904, 513 + xy: 1122, 87 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3882,28 +3973,28 @@ wizard/experiment-6 index: -1 wizard/experiment-7 rotate: false - xy: 795, 28 + xy: 1939, 672 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-8 rotate: false - xy: 842, 28 + xy: 1939, 615 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 889, 27 + xy: 1986, 642 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 209, 196 + xy: 1169, 92 size: 40, 50 orig: 40, 50 offset: 0, 0 diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index 1f3141a3..2fb55f3c 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index ac67fe06..85fd6306 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -260,6 +260,7 @@ owl-stand (utils/make-anim "cat-tree/owl.png" [21 30] 0.2 [0 0 0 0 0 0 0 2]) owl-talk (utils/make-anim "cat-tree/owl.png" [21 30] 0.2 [1 0 1 0 1 0 0 0 2 0]) owl-puke (utils/make-anim "cat-tree/owl.png" [21 30] 0.10 [0 0 2 2 3 2 2 3 3 2 3 3 3 4 5 6 7 4 4 3 3 2 2 2 2 2]) + owl-eye (utils/make-anim-seq "cat-tree/eye" [44 48] 0.10 [0 0 1 1 2 2 2 2 2 2 2 1 1 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 3 4 4 4 3 4 4 4 5 6 7 8 9 9 9 9 9 9 9 9 9 10 11 12 12 11 10 9 9 9 9 9 9 9 9 10 11 12 12 12 11 10 9 9 9 9 9 8 7 6 5]) puke (particle-effect "particles/puke")] (rooms/make :music {:day :town-2 :night :night} :name "Tree" @@ -423,6 +424,7 @@ :stand owl-stand :talk owl-talk :puke owl-puke + :eye owl-eye :talk-color (color 0.5 0.5 1.0 1.0) :anim owl-stand :anim-start 0 @@ -430,8 +432,43 @@ :puke-sound (utils/load-sound "cat-tree/owl-puke.ogg") :script (actions/get-script entities (talk-to-owl entities)) :anim-sound-frames {owl-puke {9 [:puke-sound (constantly 0.6)]}} + :anim-merges {owl-stand {:origin-x 0} + owl-eye {:origin-x 11}} :scripts #(condp = % - :monocle (actions/get-script entities (give-monocle entities)) + :flask-2 (actions/get-script entities + (cond + (get-in @entities [:state :knows-owl-trouble?]) + (do + (actions/walk-to entities :ego [141 54] :face :right) + (actions/do-dialogue entities + :ego "Could you use this flask as a monocle?" + :owl "I don't think it matches my prescription.") + (do-puke entities)) + + :else + (actions/talk entities :ego "Why would an owl want that?"))) + :flask-1-strength (actions/get-script entities + (cond + (get-in @entities [:state :knows-owl-trouble?]) + (do + (actions/walk-to entities :ego [141 54] :face :right) + (actions/do-dialogue entities + :ego "Try this strength potion." + :ego "Maybe it'll cure your eye.") + (when (get-in @entities [:state :owl-tried-strength?]) + (actions/do-dialogue entities :owl "Again?")) + (actions/do-dialogue entities + :owl "Okay, just a drop.") + (actions/play-animation entities :owl :eye) + (actions/do-dialogue entities + :owl "I don't think that helped that much.") + (when (actions/has-obtained? entities :feather) + (actions/do-dialogue entities :owl "I think I'll just stick to the monocle.")) + (actions/update-state entities (fn [s] (assoc s :owl-tried-strength? true)))) + :else + (actions/talk entities :ego "Why would an owl want that?"))) + :monocle (actions/get-script entities + (give-monocle entities)) (actions/get-script entities (if (get-in @entities [:state :knows-owl-trouble?]) (do (actions/do-dialogue entities :ego "Is this your monocle?")