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

improved fight.

Browse Source
This commit is contained in:
Bryce Covert
2016-01-07 23:28:51 -08:00
parent cfb5e2f7b6
commit b0afc51ad9
20 changed files with 506 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-13.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-14.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
desktop/asset-work/inside-cafeteria/fight-new.psd
View File

Binary file not shown.

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

Binary file not shown.

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

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 193 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 136 KiB

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

@@ -186,15 +186,21 @@
#_#_ladder-guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]]
(aget ladder-guard-sheet 0 i)))
hands-fight-win (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.025 (flatten [(pace [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] 0)
hands-fight-win (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.025 (flatten [(pace [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 4 4 4] 0)
(pace (flatten (repeat 6 [12 13])) 0)
(pace (flatten (repeat 15 [7 8])) 0)
(pace (flatten (repeat 15 [9])) 0)
(pace (flatten (repeat 6 [12 13])) 0)
(pace (flatten (repeat 15 [7 8])) 1)
(pace (flatten (repeat 15 [9])) 0)
(pace (flatten (repeat 6 [12 13])) 0)
(pace (flatten (repeat 15 [7 8])) 2)
(pace (flatten (repeat 15 [9])) 0)
(pace (flatten (repeat 15 [10 11])) 3)
(pace (flatten (repeat 6 [12 13])) 0)
(pace (flatten (repeat 15 [10 11])) 2)
(pace (flatten (repeat 15 [9])) 0)
(pace (flatten (repeat 6 [12 13])) 0)
(pace [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] 0)]))
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