fairy godfather magic

This commit is contained in:
Bryce Covert
2015-10-08 16:38:06 -07:00
parent 0422d172a3
commit c247afe96f
19 changed files with 1366 additions and 1327 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@@ -0,0 +1,26 @@
<?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>
<dict>
<key>duration</key>
<real>1</real>
</dict>
</array>
</plist>

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 KiB

After

Width:  |  Height:  |  Size: 221 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 KiB

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 102 KiB

View File

@@ -198,6 +198,7 @@
:fairy-godfather "Behold!")
(particle-effect! (get-in @entities [:room :entities :magic]) :reset)
(particle-effect! (get-in @entities [:room :entities :magic]) :start)
(actions/play-animation entities :fairy-godfather :magic)
(sound! (utils/load-sound "dream/appear.ogg") :play (utils/current-sound-volume))
(fade-in-tools entities)
@@ -340,7 +341,8 @@
(defn make [screen]
(let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1])
fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6])]
fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6])
fairy-godfather-magic-anim (utils/make-anim "dream/fairy-godfather-magic.png" [100 77] 0.15 [0 1 2 3 4 4 4 4 4 4 4 4 4 3 2 1 0])]
(rooms/make :music {:intro :wind :day :dream}
:interactions {:pit {:box [54 0 219 36]
:script (actions/get-script entities
@@ -467,10 +469,14 @@
:scaled true
:left {:walk fairy-godfather-anim
:talk fairy-godfather-talk-anim
:stand fairy-godfather-anim}
:stand fairy-godfather-anim
:magic fairy-godfather-magic-anim}
:right {:walk (utils/flip fairy-godfather-anim)
:stand (utils/flip fairy-godfather-anim)
:talk (utils/flip fairy-godfather-talk-anim)}
:talk (utils/flip fairy-godfather-talk-anim)
:magic fairy-godfather-magic-anim}
:anim-merges {fairy-godfather-magic-anim {:origin-x 59}
:default {:origin-x 31}}
:facing :left
:update-fn (fn [s es e] (if (:path e)
(utils/update-path-location 0.2 s es e)