climbing.

This commit is contained in:
Bryce Covert
2016-02-15 23:20:45 -08:00
parent bdf44b8760
commit a47093f607
22 changed files with 530 additions and 462 deletions

View File

@@ -222,7 +222,13 @@
:ego "Thanks, I guess."))
(defn make-ladder-area [box]
{:box box
:script (actions/get-script entities (actions/talk entities :ego "It's a really big tree!"))
:script (actions/get-script entities
(actions/walk-to entities :ego [144 58] )
(actions/talk entities :ego "Maybe I can climb it!")
(actions/walk-straight-to entities :ego [144 72] :face :right)
(actions/play-animation entities :ego :climb)
(actions/walk-straight-to entities :ego [144 58])
(actions/talk entities :ego "Nope."))
:scripts {:ladder (actions/get-script entities
(actions/talk entities :ego "I'll just set this up.")
(actions/walk-to entities :ego [151 50] :face :left)

View File

@@ -518,6 +518,7 @@ void main ()
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])
climb (utils/make-anim "ego/climb.png" [22 46] 0.3 [0 1 3 2 4 3 2 4 3 5 6 5 6 5 6 5 6 5 6 7 8 7 8 9 10 9 10 10 10 10 10 8 8 6 6 1 0])
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))
@@ -613,6 +614,7 @@ void main ()
:frustrated-talk frustrated-talk
:hand-hold hand-hold
:shy shy
:climb climb
}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
@@ -661,6 +663,7 @@ void main ()
:frustrated-talk (utils/flip frustrated-talk)
:hand-hold (utils/flip hand-hold)
:shy (utils/flip shy)
:climb (utils/flip climb)
}
:baseline (- 240 (last start-pos))
:facing :right
@@ -762,6 +765,8 @@ void main ()
(get-in ego [:right :swing-shovel]) {:origin-x 26}
(get-in ego [:left :glad]) {:origin-x 11}
(get-in ego [:right :glad]) {:origin-x 11}
(get-in ego [:left :climb]) {:origin-x 11}
(get-in ego [:right :climb]) {:origin-x 11}
(get-in ego [:right :standup]) {:origin-x 32}
(get-in ego [:right :crawl]) {:origin-x 32}
(get-in ego [:right :crawl-hide]) {:origin-x 32}