added poking.
Bryce Covert
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
BIN
desktop/asset-work/ego/poke.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
desktop/asset-work/ego/poke.pxa/0.pxi
Normal file
BIN
desktop/asset-work/ego/poke.pxa/1.pxi
Normal file
BIN
desktop/asset-work/ego/poke.pxa/2.pxi
Normal file
BIN
desktop/asset-work/ego/poke.pxa/3.pxi
Normal file
22
desktop/asset-work/ego/poke.pxa/CelData.plist
Normal file
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<array>
|
||||
<dict>
|
||||
<key>duration</key>
|
||||
<real>1</real>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>duration</key>
|
||||
<real>1</real>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>duration</key>
|
||||
<real>1</real>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>duration</key>
|
||||
<real>1</real>
|
||||
</dict>
|
||||
</array>
|
||||
</plist>
|
||||
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 244 KiB |
|
Before Width: | Height: | Size: 207 KiB After Width: | Height: | Size: 204 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 86 KiB |
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 83 KiB |
|
Before Width: | Height: | Size: 259 KiB After Width: | Height: | Size: 298 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 151 KiB |
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 125 KiB |
@@ -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)
|
||||
|
||||
@@ -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}
|
||||
|
||||