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

new fight incorporated.

Browse Source
This commit is contained in:
Bryce Covert
2015-12-29 18:15:36 -08:00
parent 8c9c2dc4bc
commit 53b17f0d17
11 changed files with 1898 additions and 1798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/inside-castle/big-tick.psd
View File

Binary file not shown.

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

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 KiB

After

Width:  |  Height:  |  Size: 216 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 239 KiB

After

Width:  |  Height:  |  Size: 218 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 188 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 70 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 172 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 247 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 99 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 KiB

After

Width:  |  Height:  |  Size: 194 KiB

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

@@ -12,9 +12,11 @@
[play-clj.g2d :refer :all]))
(defn make-fight-entity []
(assoc (utils/get-texture "inside-cafeteria/fight.png")
(assoc (utils/get-texture "black.png")
:x 0
:y 0
:scale-x 21
:scale-y 21
:baseline 1000))
(defn play-battle [entities anim]
@@ -181,11 +183,17 @@
#_#_ladder-guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]]
(aget ladder-guard-sheet 0 i)))
base-fight (repeat 3 [0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 1 0 1 0 1 0 0 0 0 1 1 1 1 0 0 0 4 0 1 2 2 2 2 2 2 1 1 1 1 2 2 2 2 2 2 1 1 1 0 0 0 1 1 2 2 2 1 1 1 1 0 0 0 0 0 0 0 0 1 1 0 1 0 4 0 1 0 4 0 4 0 4 0 4 0 4 4 4 4 4 4 5 5 5 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0 ])
hands-fight-win (utils/make-anim-seq "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten (concat
base-fight
[1 1 1 1 1 0 1 0 1 2 2 1 1 2 2 1 1 2 2 2 1 1 0 1 1 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3])))
hands-fight-lose (utils/make-anim-seq "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 5 5 5 6 6 6 6 6 6]))]
hands-fight-win (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.1 (flatten [0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 0 1 1 1 1 0 0 0 4 0 1 1 1 1 1 1 1 1 4 0 4 0 4 0 4 5 5 5 5 5 5 5 5 5 5 5 5
(repeat 15 [7 8])
(repeat 15 [9])
(repeat 10 [7 8])
(repeat 15 [9])
(repeat 5 [7 8])
(repeat 15 [9])
(repeat 10 [10 11])
(repeat 15 [9])
0 0 0 0 2 1 1 2 2 1 1 2 2 2 1 1 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3]))
hands-fight-lose (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.1 (flatten [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 5 5 5 6 6 6 6 6 6]))]
(rooms/make :music :town-1
:name "Cafeteria"
:interactions
@@ -241,8 +249,10 @@
:collision "inside-cafeteria/collision.png"
:fight (make-fight-entity)
:hands-fight (assoc (animation->texture screen hands-fight-win)
:x 121
:y 37
:origin-x 128
:origin-y 96
:x 150
:y 120
:baseline 1001
:win hands-fight-win
:lose hands-fight-lose)