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

pack not used on first room.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-28 06:41:36 -07:00
parent ad38708873
commit 36b83cd1e8
6 changed files with 167 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -614,6 +614,7 @@
sheep-2 (utils/make-anim atlas "sheep-2" [33 21] 0.15 (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 2 1 (repeat 25 0) (repeat 15 9)]))
sheep-3 (utils/make-anim atlas "sheep-3" [33 21] 0.15 (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 2 1 (repeat 25 0) (repeat 15 9)]))
door (utils/make-anim atlas "door" [24 58] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3]))
door-closed (utils/make-anim atlas "door" [24 58] 0.15 [0])
sheep-walk (animation 0.05 (for [i (range 6)]
(aget sheep-walk-sheet 0 i)))
butterfly-stand (utils/make-anim atlas "butterfly" [7 7] 0.1 [0 1])
@@ -791,7 +792,7 @@
:x 153
:y 105
:baseline 238)
:door (assoc (animation->texture screen door)
:door (assoc (animation->texture screen door-closed)
:x 252 :y 88 :baseline 123
:open door
:door-sound (utils/load-sound "door.ogg")

6
desktop/src-common/advent/screens/title.clj
View File

@@ -376,8 +376,8 @@
(let [font (utils/get-font "ego/font.fnt")
music (utils/make-music "music/intro.ogg")
balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))
banner-back (utils/make-anim "title/banner-back.png" [180 42] 0.2 [0 1 2 1 0 1 2 1])]
balloon (utils/make-anim title-atlas "balloon" [15 30] 0.45 (range 4))
banner-back (utils/make-anim title-atlas "banner-back" [180 42] 0.2 [0 1 2 1 0 1 2 1])]
(graphics! :set-cursor (utils/cursor "cursor.png" :hourglass))
@@ -426,7 +426,7 @@
:main-menu (->> (main-menu screen)
(utils/add-actor-to-stage screen))
:saves-list (utils/snapshot-screenshots)
:saves-list (utils/snapshot-screenshots title-atlas)
:save-index 0
:font font
:music music