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

more ending imporvements

Browse Source
This commit is contained in:
Bryce Covert
2015-11-16 09:19:46 -08:00
parent d2f44b08f4
commit 920e8b3ff6
7 changed files with 212 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/ending-castle/crowd-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
desktop/asset-work/ending-castle/crowd-right.pxi Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/outside-castle/crowd-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

394
desktop/resources/packed/pack.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
desktop/resources/packed/pack7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 135 KiB

BIN
desktop/resources/packed/pack8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 163 KiB

After

Width:  |  Height:  |  Size: 176 KiB

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

@@ -82,12 +82,12 @@
: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})
:gandarf (assoc (common/make-wizard screen {:x 205 :y 400 :baseline 239})
:update-fn (fn [screen entities gandarf]
(assoc gandarf :y (or (get-in entities [:gandarf-cloud :y])
(:y gandarf)))))
:gandarf-cloud (doto (assoc (particle-effect "particles/gandarf-cloud") :x 215 :y 400
:baseline 200)
:baseline 240)
(particle-effect! :set-position 215 130))
:duke (assoc (animation->texture screen duke-stand)
:x 117 :y 50 :baseline (- 240 50)
@@ -106,14 +106,6 @@
(particle-effect! :set-position 101 23))
:game-player (assoc (animation->texture screen game-player-stand)
:x 216 :y 69 :baseline (- 240 69)
:anim game-player-stand
:anim-start 0
:scale-x (scaler [179 69])
:scale-y (scaler [179 69])
:scaled true)
:cat (assoc (animation->texture screen cat-stand)
:x 73 :y 194 :baseline (- 240 195)
:anim cat-stand
@@ -121,11 +113,16 @@
:scale-x 0.65
:scale-y 0.65
:scaled true)
:crowd (assoc (utils/get-texture "ending-castle/crowd-left.png")
:crowd-left (assoc (utils/get-texture "ending-castle/crowd-left.png")
:x 0 :y 0
:scale-x 1.2
:scale-y 1.2
: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
:baseline 238)
:guard-1 (assoc (utils/get-texture "ending-castle/guard-1.png")
:x 91 :y 73
:scale-x 0.9