more ending tweaks.

This commit is contained in:
Bryce Covert
2015-11-16 09:31:01 -08:00
parent 920e8b3ff6
commit 851b0caa2c
14 changed files with 557 additions and 552 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

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: 216 KiB

After

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 KiB

After

Width:  |  Height:  |  Size: 257 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 135 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 201 KiB

View File

@@ -21,14 +21,6 @@
(def credit-messages
[["\"Tick's Tales\" Created By"
"Bryce Covert"]
["Artwork"
"Bryce Covert"]
["Programming"
"Bryce Covert"]
["Music"
"Bryce Covert"]
["Sound Effects"
"Bryce Covert"]
["Frog Legs"
"Marya Yama"]
["Perspective Tutorials"

View File

@@ -44,7 +44,7 @@
15 16 17 18 19 (repeat 10 0)]))
frankie-fall (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 (flatten [(range 8) (repeat 20 7) 8 9 10 11 7]))
frankie-down (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 [0])
scaler (utils/scaler-fn-with-baseline 20 1.2 1.20)]
scaler (utils/scaler-fn-with-baseline 20 1.3 1.30)]
(rooms/make :music :dream
:name "Ending"
:interactions {}
@@ -54,9 +54,9 @@
(update-in e [:room :entities :ego] dissoc :talk-override ))
:georgia (rooms/make-entity :georgia (assoc (animation->texture screen georgia-stand)
:x 111 :y 22 :baseline 218
:scale-x 1.2
:scale-y 1.2
:talk-color (Color/valueOf "ffabe0ff")
:scale-x 1.3
:scale-y 1.3
:talk-color3(Color/valueOf "ffabe0ff")
:opacity 0.0
:anim georgia-stand
:anim-start 0
@@ -67,18 +67,12 @@
:anim-merges {georgia-stand {:origin-x 10 :origin-y 1}
:default {:origin-x 10 :origin-y 1}
georgia-kick {:origin-x 19 :origin-y 0}}))
:entities {:peddler (assoc (animation->texture screen peddler-stand)
:x 245 :y 46 :baseline 200
:anim peddler-stand
:anim-start 0
:scaled true)
:frankie (assoc (common/make-frankie screen)
:entities {:frankie (assoc (common/make-frankie screen)
:x 28 :y 21 :baseline 200
:fall frankie-fall
:down frankie-down
:scale-x 1.2
:scale-y 1.2
:scale-x 1.3
:scale-y 1.3
:anim-merges {:default {:origin-x 12 :origin-y 0}
frankie-fall {:origin-x 22 :origin-y 0}
frankie-down {:origin-x 22 :origin-y 0}})
@@ -91,8 +85,8 @@
(particle-effect! :set-position 215 130))
:duke (assoc (animation->texture screen duke-stand)
:x 117 :y 50 :baseline (- 240 50)
:scale-x 1.2
:scale-y 1.2
:scale-x 1.3
:scale-y 1.3
:anim duke-stand
:anim-start 0
:talk-color (color 0.4 0.5 0.94 1.0)
@@ -115,18 +109,23 @@
:scaled true)
:crowd-left (assoc (utils/get-texture "ending-castle/crowd-left.png")
:x 0 :y 0
:scale-x 1.2
:scale-y 1.2
:scale-x 1.3
:scale-y 1.3
:baseline 239)
:crowd-right (assoc (utils/get-texture "ending-castle/crowd-right.png")
:x 196 :y 0
:scale-x 1.2
:scale-y 1.2
:scale-x 1.3
:scale-y 1.3
:baseline 238)
:guard-1 (assoc (utils/get-texture "ending-castle/guard-1.png")
:x 91 :y 73
:scale-x 0.9
:scale-y 0.9
:baseline 140)
:guard-2 (assoc (utils/get-texture "ending-castle/guard-2.png")
:x 182 :y 73
:scale-x 0.9
:scale-y 0.9
:baseline 140)}
:collision "ending-castle/ending-castle2-assets/collision.png"
:scale-fn scaler