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

added poking.

Browse Source
This commit is contained in:
Bryce Covert
2016-02-15 23:31:46 -08:00
parent a47093f607
commit 4ad9373ccf
18 changed files with 1471 additions and 1432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -378,10 +378,15 @@
(actions/talk entities :ego "I can't get his attention from way down here.")))
:stick (actions/get-script entities
(if (get-in @entities [:room :entities :ladder])
(actions/do-dialogue entities
:ego "He's still too far for me to poke him."
:ego "Maybe I can encourage him to come down on his own.")
(actions/talk entities :ego "I can't poke him from way down here.")))
(do
(actions/play-animation entities :ego :poke)
(actions/do-dialogue entities
:ego "He's still too far for me to poke him."
:ego "Maybe I can encourage him to come down on his own."))
(do
(actions/walk-to entities :ego [210 58] :face :right)
(actions/play-animation entities :ego :poke)
(actions/talk entities :ego "I can't poke him from way down here."))))
:default (actions/get-script entities (actions/talk entities :ego "Kitty seems disinterested in it."))})
cat-stand)
:grandma (let [gma (assoc (animation->texture screen grandma-stand)

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

@@ -519,6 +519,7 @@ void main ()
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])
poke (utils/make-anim "ego/poke.png" [20 50] 0.2 [0 1 2 3 2 3 2 3 2 3 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))
@@ -615,6 +616,7 @@ void main ()
:hand-hold hand-hold
:shy shy
:climb climb
:poke poke
}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
@@ -664,6 +666,7 @@ void main ()
:hand-hold (utils/flip hand-hold)
:shy (utils/flip shy)
:climb (utils/flip climb)
:poke (utils/flip poke)
}
:baseline (- 240 (last start-pos))
:facing :right
@@ -758,6 +761,8 @@ void main ()
(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 :poke]) {:origin-x 10}
(get-in ego [:right :poke]) {:origin-x 10}
(get-in ego [:left :jumping-straight]) {:origin-x 9}
(get-in ego [:left :cat-toy]) {:origin-x 32}
(get-in ego [:right :jumping-straight]) {:origin-x 9}