more ending tweaks.

This commit is contained in:
Bryce Covert
2015-11-17 19:35:00 -08:00
parent b4a8f7cbcc
commit e2ef12d3ca
36 changed files with 649 additions and 506 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,38 @@
<?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>
<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>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,38 @@
<?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>
<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: 227 KiB

After

Width:  |  Height:  |  Size: 227 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 KiB

After

Width:  |  Height:  |  Size: 191 KiB

View File

@@ -293,6 +293,7 @@
(defn make-frankie [screen] (defn make-frankie [screen]
(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]) (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]) talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0])
walk (utils/make-anim-seq "castle-gate/frankie-walk" [24 35] 0.2 (range 8))
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]) 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 ]) 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]) reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8])
@@ -313,6 +314,8 @@
:laugh laugh :laugh laugh
:glance glance :glance glance
:reach reach :reach reach
:right {:walk walk}
:left {:walk (utils/flip walk)}
:script (actions/get-script entities :script (actions/get-script entities
(walk-to-frankie entities) (walk-to-frankie entities)
(actions/talk entities :ego "Listen, Frankie...") (actions/talk entities :ego "Listen, Frankie...")
@@ -546,13 +549,13 @@
(Thread/sleep 500) (Thread/sleep 500)
(actions/do-dialogue entities :frankie "Wait a hot second!") (actions/do-dialogue entities :frankie "Wait a hot second!")
(Thread/sleep 500) (Thread/sleep 500)
(actions/walk-straight-to entities :frankie [95 23] :anim :stand) (actions/walk-straight-to entities :frankie [95 23])
(actions/do-dialogue entities (actions/do-dialogue entities
:frankie "Come along, Georgia." :frankie "Come along, Georgia."
:frankie "No sense in thanking Dipstick.") :frankie "No sense in thanking Dipstick.")
(actions/play-animation entities :frankie :laugh) (actions/play-animation entities :frankie :laugh)
(actions/play-animation entities :georgia :kick) (actions/play-animation entities :georgia :kick)
(actions/walk-straight-to entities :georgia [131 40] :anim :stand :speed 1.0) (actions/walk-straight-to entities :georgia [131 40] :speed 0.8)
(actions/play-animation entities :frankie :fall :stop? false) (actions/play-animation entities :frankie :fall :stop? false)
(actions/do-dialogue entities :georgia "Let's go, Sir Hunk.") (actions/do-dialogue entities :georgia "Let's go, Sir Hunk.")
(actions/play-animation entities :georgia :hand-hold :stop? false) (actions/play-animation entities :georgia :hand-hold :stop? false)

View File

@@ -56,13 +56,14 @@
:x 111 :y 22 :baseline 218 :x 111 :y 22 :baseline 218
:scale-x 1.3 :scale-x 1.3
:scale-y 1.3 :scale-y 1.3
:talk-color3(Color/valueOf "ffabe0ff") :talk-color (Color/valueOf "ffabe0ff")
:opacity 0.0 :opacity 0.0
:anim georgia-stand :anim georgia-stand
:anim-start 0 :anim-start 0
:stand georgia-stand :stand georgia-stand
:talk georgia-talk :talk georgia-talk
:kick georgia-kick :kick georgia-kick
:walk (utils/make-anim "georgia/walk.png" [20 43] 0.2 (range 8))
:hand-hold georgia-hand-hold :hand-hold georgia-hand-hold
:anim-merges {georgia-stand {:origin-x 10 :origin-y 1} :anim-merges {georgia-stand {:origin-x 10 :origin-y 1}
:default {:origin-x 10 :origin-y 1} :default {:origin-x 10 :origin-y 1}