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

progress

Browse Source
This commit is contained in:
Bryce Covert
2017-05-31 20:00:33 -07:00
parent 6580bbb52b
commit 67cbac3dbd
42 changed files with 398 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
View File

@@ -265,7 +265,7 @@
(actions/talk entities :ladder-guard "Do not toucheth, young sire.")))}
:collision "inside-cafeteria/collision.png"
:fight (make-fight-entity global-atlas)
:hands-fight (assoc (animation->texture screen hands-fight-win)
:hands-fight (assoc (utils/atlas->texture atlas "fight-new-assets/fight" 0)
:origin-x 128
:origin-y 96
:x 150

10
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -474,14 +474,14 @@
#_(actions/in-love entities))}}
:layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)
(assoc (utils/atlas->texture atlas "bookstack") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)]
:night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)]
:sunrise [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]}
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)]}
:blackout (assoc (utils/atlas->texture global-atlas "black")
:x -10 :y -10
:width 340
@@ -524,12 +524,12 @@
:sign (assoc (animation->texture screen sign )
:anim sign
:anim-start 0
:x 125 :y 138 :baseline 239)
:x 125 :y 138 :baseline 237)
:bird-2 (utils/make-bird screen global-atlas (as-> [[220 225] [195 235] [210 230] [250 225]] p
(concat p (reverse p))))
:outside-particles (common/make-outside-particles)
:door (assoc (animation->texture screen door)
:door (assoc (animation->texture (assoc screen :total-time 0) door)
:x 160 :y 97 :baseline 99
:open door
:door-sound (utils/load-sound "door.ogg")