notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jumping replacement.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-27 23:25:11 -07:00
parent 38610968c7
commit d99e4084ec
6 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -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)

10
desktop/src-common/advent/screens/scene.clj
View File

@@ -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}