diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 04f23073..4583f140 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -2211,13 +2211,6 @@ outside-jail/fountain orig: 320, 240 offset: 0, 0 index: -1 -ego/georgia - rotate: false - xy: 704, 22 - size: 90, 30 - orig: 90, 30 - offset: 0, 0 - index: -1 ego/grow rotate: false xy: 612, 16 @@ -2225,6 +2218,13 @@ ego/grow orig: 90, 36 offset: 0, 0 index: -1 +ego/jump-straight + rotate: false + xy: 704, 4 + size: 90, 48 + orig: 90, 48 + offset: 0, 0 + index: -1 ego/scared-walk rotate: false xy: 514, 16 @@ -2458,14 +2458,14 @@ wizard/experiment-29 index: -1 wizard/talk rotate: false - xy: 796, 6 + xy: 878, 6 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 878, 2 + xy: 796, 2 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -2478,105 +2478,98 @@ filter: Nearest,Nearest repeat: none cat-tree/grandma-cry-10 rotate: false - xy: 242, 2 + xy: 396, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 302, 2 + xy: 456, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 362, 2 + xy: 516, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 422, 2 + xy: 576, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 482, 2 + xy: 636, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 542, 2 + xy: 696, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 602, 2 + xy: 756, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 662, 2 + xy: 816, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 722, 2 + xy: 876, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 782, 2 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-20 - rotate: false - xy: 842, 2 + xy: 936, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-6 rotate: false - xy: 2, 2 + xy: 156, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-7 rotate: false - xy: 62, 2 + xy: 216, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-8 rotate: false - xy: 122, 2 + xy: 276, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 182, 2 + xy: 336, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2595,6 +2588,13 @@ dream/pedestals orig: 320, 240 offset: 0, 0 index: -1 +ego/georgia + rotate: false + xy: 2, 12 + size: 90, 30 + orig: 90, 30 + offset: 0, 0 + index: -1 inside-antique/open-blinds rotate: false xy: 324, 528 @@ -2660,7 +2660,7 @@ title index: -1 title/balloon rotate: false - xy: 902, 12 + xy: 94, 12 size: 60, 30 orig: 60, 30 offset: 0, 0 @@ -2776,6 +2776,13 @@ castle-gate/throw-walkie-9 orig: 205, 136 offset: 0, 0 index: -1 +cat-tree/grandma-cry-20 + rotate: false + xy: 961, 973 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 cat-tree/tree-and-rock rotate: false xy: 324, 773 diff --git a/desktop/resources/packed/pack6.png b/desktop/resources/packed/pack6.png index 75e4d957..5456a8d1 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 00778320..25320c79 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 3d270064..3bbd3496 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/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 564163dd..3c1c431f 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -397,12 +397,13 @@ (actions/give entities :dream-sword) (actions/do-dialogue entities :ego "Yes! Now, before he gets back!") (actions/pause-camera entities) - (actions/walk-straight-to entities :ego [173 51] :anim :jump :update-baseline? false :speed 2.0) + (actions/play-animation entities :ego :jump-straight :stop? false) + (actions/walk-straight-to entities :ego [173 51] :anim :jumping-straight :update-baseline? false :speed 2.0) (actions/play-sound entities (get-in @entities [:room :entities :ego :drop-sound]) 0.2 false) - (actions/walk-straight-to entities :ego [200 -80] :anim :stand :update-baseline? false :speed 3.0) + (actions/walk-straight-to entities :ego [200 -80] :anim :jumping-straight :update-baseline? false :speed 3.0) (actions/remove-item entities :dream-sword) (actions/remove-item entities :broom) (actions/remove-item entities :shovel) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index bd59d459..23e52069 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -510,6 +510,8 @@ void main () frog-nod (utils/make-anim "ego/frog.png" [16 36] 0.2 [0 1 0 1 0 1 0 1]) hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0]) jump (utils/make-anim "ego/swing.png" [36 75] 0.2 (flatten [[1 2]])) + jump-straight (utils/make-anim "ego/jump-straight.png" [18 48] 0.075 [0 1 1 1 1 1 1 2 3]) + jumping-straight (utils/make-anim "ego/jump-straight.png" [18 48] 0.075 (repeat 30 4)) swing (utils/make-anim "ego/swing.png" [36 75] 0.145 (flatten [[3 4 5 6 7 ]])) grow-talk (utils/make-anim "ego/grow-talk.png" [18 36] 0.2 (range 2)) get-sick (utils/make-anim "ego/get-sick.png" [18 36] 0.1 (flatten [(range 6) (repeat 10 5) (reverse (range 6) ) 0 0 0 0 0 0])) @@ -568,6 +570,8 @@ void main () :reach-down reach-down :reach-start reach-start :jump jump + :jump-straight jump-straight + :jumping-straight jumping-straight :reach-stop reach-stop :shoot shoot [:fire 1] fire-1-anim @@ -618,6 +622,8 @@ void main () :reach-up (utils/flip reach-up) :reach-down (utils/flip reach-down) :reach-start (utils/flip reach-start) + :jump-straight (utils/flip jump-straight) + :jumping-straight (utils/flip jumping-straight) :reach-stop (utils/flip reach-stop) :shoot (utils/flip shoot) [:fire 1] (utils/flip fire-1-anim) @@ -710,6 +716,10 @@ void main () (get-in ego [:right :swing-shovel]) {3 [:breakglass-sound 1.0]}} :anim-merges {(get-in ego [:right :shock]) {:origin-x 15} (get-in ego [:left :frustrated-talk]) {:origin-x 7} + (get-in ego [:left :jump-straight]) {:origin-x 9} + (get-in ego [:right :jump-straight]) {:origin-x 9} + (get-in ego [:left :jumping-straight]) {:origin-x 9} + (get-in ego [:right :jumping-straight]) {:origin-x 9} (get-in ego [:left :swing-shovel]) {:origin-x 26} (get-in ego [:right :swing-shovel]) {:origin-x 26} (get-in ego [:left :glad]) {:origin-x 11}