anim for reaching

This commit is contained in:
Bryce Covert
2015-07-30 17:52:35 -07:00
parent 5217685c15
commit 51d6325391
16 changed files with 23 additions and 8 deletions

1
desktop/pre-rob.edn Normal file
View File

@@ -0,0 +1 @@
{:active? true, :seen-intro? true, :seen-frankie? false, :knows-about-stash? true, :convinced-wizard? true, :time :night, :broke-lock? true, :opened-bars? true, :inventory (:slingshot :trophy :medal :flask-1-strength :walkie-talkie :note-2 :spear :camera :note-1 :key :crowbar :ladder :grass :kiss :sword), :wizard-left? false, :dropped-ball? true, :hay-searches 4, :clues #{}, :stop? false, :warden-sleeping? true, :current-riddle :wool, :warden-fast-asleep? true, :last-room :outside-castle, :wants-toy true, :bent-bars? true, :chest-contents [], :mints-eaten 0, :object nil, :talked-to-owl? true, :obtained-items #{:flask-2 :key :slingshot :flies :rope :kiss :spear :medal :sword :magic-slingshot :flask-flies-ash :flask-1 :flask-1-strength :flask-water-flies :walkie-talkies :ash :grass :camera :sack-lunch :ladder :walkie-talkie :trophy :broken-clock :monocle :alarm-clock :crowbar :note-1 :flask-water :note-2 :ball-n-chain :feather :spell-component}}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Binary file not shown.

View File

@@ -34,5 +34,13 @@
<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>

View File

@@ -75,13 +75,14 @@
(defn make-frankie [screen]
(let [stand (utils/make-anim "castle-gate/frankie.png" [48 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
talk (utils/make-anim "castle-gate/frankie.png" [48 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0])
laugh (utils/make-anim "castle-gate/frankie.png" [48 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0])
glance (utils/make-anim "castle-gate/frankie.png" [48 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ])]
(let [stand (utils/make-anim "castle-gate/frankie.png" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0])
laugh (utils/make-anim "castle-gate/frankie.png" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0])
glance (utils/make-anim "castle-gate/frankie.png" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ])
reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8])]
(assoc (animation->texture screen stand)
:x 235 :y 90 :baseline 150
:origin-x 24
:origin-x 12
:origin-y 0
:anim stand
:anim-start 0
@@ -93,6 +94,7 @@
:stand stand
:laugh laugh
:glance glance
:reach reach
:script (actions/get-script entities
(walk-to-frankie entities)
(actions/talk entities :ego "Listen, Frankie...")

View File

@@ -205,13 +205,17 @@
:frankie "Now.")
(actions/walk-straight-to entities :ego [254 80])
(actions/do-dialogue entities
:frankie "Now what have we got to give us today, Dipstick?"
:frankie "Now what have we got to give us today, Dipstick?")
(actions/play-animation entities :frankie :reach)
(actions/do-dialogue entities
:frankie "A strength potion, oh very nice!"
:frankie "And some gold..."
:frankie "And what's this?"
:frankie "And what's this?")
(actions/play-animation entities :frankie :reach)
(actions/do-dialogue entities
:frankie "The Slinger's Shot?"
:ego "No, not the Slinger's Shot!"
:frankie "Look like we hit the jackpot tonight boys!")
:frankie "Look like we hit the jackpot tonight boys!")
(frankie-comment-on-item entities)
(actions/do-dialogue entities
:frankie "Bubba, put this stuff in the secret stash."