notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ending progress

Browse Source
This commit is contained in:
Bryce Covert
2015-11-13 21:43:23 -08:00
parent 3260b1cca5
commit 756be88a81
5 changed files with 103 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/src-common/advent/screens/rooms/ending.clj
View File

@@ -41,6 +41,8 @@
georgia-kick (utils/make-anim-seq "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2)
3 4 5 6 7 8 9 10 11 12 13 (repeat 10 14)
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 0.01 1.20)]
(rooms/make :music :dream
:name "Ending"
@@ -60,8 +62,8 @@
:stand georgia-stand
:talk georgia-talk
:kick georgia-kick
:anim-merges {georgia-stand {:origin-x 10 :origin-y 0}
georgia-kick {:origin-x 20 :origin-y 0}}))
:anim-merges {georgia-stand {: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
@@ -75,8 +77,13 @@
:scale-y 1.1)
: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-y 1.2
: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}})
:gandarf (assoc (common/make-wizard screen {:x 205 :y 400 :baseline 199})
:update-fn (fn [screen entities gandarf]
(assoc gandarf :y (or (get-in entities [:gandarf-cloud :y])