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

all rooms now!

Browse Source
This commit is contained in:
Bryce Covert
2017-05-29 09:31:28 -07:00
parent ad1f73ef9d
commit f0bce2180f
19 changed files with 825 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/project.clj
View File

@@ -2,7 +2,7 @@
(def packs (into ["do"] (def packs (into ["do"]
(mapcat (fn [directory] (mapcat (fn [directory]
["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")]) ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")])
["inside-jail"] ["global" "ending-castle"]
#_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title" #_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title"
"castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard" "castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard"
"cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ]))) "cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ])))

147
desktop/resources/packed/castle-gate.atlas
View File

@@ -6,7 +6,7 @@ filter: Nearest,Nearest
repeat: none repeat: none
Untitled Untitled
rotate: false rotate: false
xy: 638, 460 xy: 142, 80
size: 192, 35 size: 192, 35
orig: 192, 35 orig: 192, 35
offset: 0, 0 offset: 0, 0
@@ -25,107 +25,44 @@ coinflip
orig: 50, 10 orig: 50, 10
offset: 0, 0 offset: 0, 0
index: -1 index: -1
frankie
rotate: false
xy: 324, 460
size: 312, 35
orig: 312, 35
offset: 0, 0
index: -1
frankie-walk-1
rotate: false
xy: 763, 104
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
frankie-walk-2
rotate: false
xy: 835, 147
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
frankie-walk-3
rotate: false
xy: 763, 67
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
frankie-walk-4
rotate: false
xy: 789, 104
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
frankie-walk-5
rotate: false
xy: 861, 147
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
frankie-walk-6
rotate: false
xy: 789, 67
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
frankie-walk-7
rotate: false
xy: 887, 147
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
frankie-walk-8
rotate: false
xy: 913, 147
size: 24, 35
orig: 24, 35
offset: 0, 0
index: -1
goon-1 goon-1
rotate: false rotate: false
xy: 142, 14 xy: 945, 419
size: 26, 33 size: 26, 33
orig: 26, 33 orig: 26, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
goon-2 goon-2
rotate: false rotate: false
xy: 192, 49 xy: 763, 119
size: 24, 32 size: 24, 32
orig: 24, 32 orig: 24, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
goon-2-flip goon-2-flip
rotate: false rotate: false
xy: 142, 49 xy: 763, 153
size: 48, 32 size: 48, 32
orig: 48, 32 orig: 48, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
goon-2-search goon-2-search
rotate: false rotate: false
xy: 142, 83 xy: 763, 187
size: 192, 32 size: 192, 32
orig: 192, 32 orig: 192, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
goon-2-talk goon-2-talk
rotate: false rotate: false
xy: 939, 150 xy: 813, 153
size: 24, 32 size: 24, 32
orig: 24, 32 orig: 24, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
goon-2-walk goon-2-walk
rotate: false rotate: false
xy: 832, 461 xy: 142, 44
size: 168, 34 size: 168, 34
orig: 168, 34 orig: 168, 34
offset: 0, 0 offset: 0, 0
@@ -139,71 +76,71 @@ overlay
index: -1 index: -1
stash-closed stash-closed
rotate: false rotate: false
xy: 763, 141 xy: 945, 454
size: 70, 41 size: 70, 41
orig: 70, 41 orig: 70, 41
offset: 0, 0 offset: 0, 0
index: -1 index: -1
throw-walkie-1 throw-walkie
rotate: false rotate: false
xy: 324, 322 xy: 324, 359
size: 205, 136 size: 205, 136
orig: 205, 136 orig: 205, 136
offset: 0, 0 offset: 0, 0
index: -1 index: 0
throw-walkie-2 throw-walkie
rotate: false
xy: 531, 359
size: 205, 136
orig: 205, 136
offset: 0, 0
index: 1
throw-walkie
rotate: false
xy: 738, 359
size: 205, 136
orig: 205, 136
offset: 0, 0
index: 2
throw-walkie
rotate: false rotate: false
xy: 142, 117 xy: 142, 117
size: 205, 136 size: 205, 136
orig: 205, 136 orig: 205, 136
offset: 0, 0 offset: 0, 0
index: -1 index: 3
throw-walkie-3 throw-walkie
rotate: false rotate: false
xy: 349, 184 xy: 349, 221
size: 205, 136 size: 205, 136
orig: 205, 136 orig: 205, 136
offset: 0, 0 offset: 0, 0
index: -1 index: 4
throw-walkie-4 throw-walkie
rotate: false rotate: false
xy: 349, 46 xy: 556, 221
size: 205, 136 size: 205, 136
orig: 205, 136 orig: 205, 136
offset: 0, 0 offset: 0, 0
index: -1 index: 5
throw-walkie-5 throw-walkie
rotate: false rotate: false
xy: 531, 322 xy: 763, 221
size: 205, 136 size: 205, 136
orig: 205, 136 orig: 205, 136
offset: 0, 0 offset: 0, 0
index: -1 index: 6
throw-walkie-6 throw-walkie
rotate: false rotate: false
xy: 556, 184 xy: 349, 83
size: 205, 136 size: 205, 136
orig: 205, 136 orig: 205, 136
offset: 0, 0 offset: 0, 0
index: -1 index: 7
throw-walkie-7 throw-walkie
rotate: false rotate: false
xy: 556, 46 xy: 556, 83
size: 205, 136 size: 205, 136
orig: 205, 136 orig: 205, 136
offset: 0, 0 offset: 0, 0
index: -1 index: 8
throw-walkie-8
rotate: false
xy: 738, 322
size: 205, 136
orig: 205, 136
offset: 0, 0
index: -1
throw-walkie-9
rotate: false
xy: 763, 184
size: 205, 136
orig: 205, 136
offset: 0, 0
index: -1

BIN
desktop/resources/packed/castle-gate.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 41 KiB

432
desktop/resources/packed/ending-castle.atlas
View File

@@ -1,180 +1,356 @@
ending-castle.png ending-castle.png
size: 512,256 size: 1024,512
format: RGBA8888 format: RGBA4444
filter: Nearest,Nearest filter: Nearest,Nearest
repeat: none repeat: none
Untitled Untitled
rotate: false rotate: false
xy: 238, 98 xy: 983, 426
size: 28, 39 size: 28, 39
orig: 28, 39 orig: 28, 39
offset: 0, 0 offset: 0, 0
index: -1 index: -1
game-player game-player
rotate: false rotate: false
xy: 238, 98 xy: 983, 426
size: 28, 39 size: 28, 39
orig: 28, 39 orig: 28, 39
offset: 0, 0 offset: 0, 0
index: -1 index: -1
cat-stand
rotate: false
xy: 2, 15
size: 198, 11
orig: 198, 11
offset: 0, 0
index: -1
crowd-left crowd-left
rotate: false rotate: false
xy: 2, 60 xy: 324, 176
size: 116, 135 size: 116, 135
orig: 116, 135 orig: 116, 135
offset: 0, 0 offset: 0, 0
index: -1 index: -1
crowd-right crowd-right
rotate: false rotate: false
xy: 120, 60 xy: 324, 39
size: 116, 135 size: 116, 135
orig: 116, 135 orig: 116, 135
offset: 0, 0 offset: 0, 0
index: -1 index: -1
duke duke
rotate: false rotate: false
xy: 2, 197 xy: 324, 462
size: 440, 48 size: 440, 48
orig: 440, 48 orig: 440, 48
offset: 0, 0 offset: 0, 0
index: -1 index: -1
frankie-fall-1
rotate: false
xy: 31, 23
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-10
rotate: false
xy: 241, 23
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-11
rotate: false
xy: 268, 123
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-12
rotate: false
xy: 310, 123
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-2
rotate: false
xy: 267, 160
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-3
rotate: false
xy: 73, 23
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-4
rotate: false
xy: 309, 160
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-5
rotate: false
xy: 115, 23
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-6
rotate: false
xy: 351, 160
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-7
rotate: false
xy: 157, 23
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-8
rotate: false
xy: 393, 160
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-9
rotate: false
xy: 199, 23
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
guard-1
rotate: false
xy: 2, 2
size: 27, 56
orig: 27, 56
offset: 0, 0
index: -1
guard-2
rotate: false
xy: 238, 139
size: 27, 56
orig: 27, 56
offset: 0, 0
index: -1
hand-hold
rotate: false
xy: 238, 60
size: 36, 36
orig: 36, 36
offset: 0, 0
index: -1
warden-2
rotate: false
xy: 444, 204
size: 42, 41
orig: 42, 41
offset: 0, 0
index: -1
ending-castle2.png
size: 1024,256
format: RGBA8888
filter: Nearest,Nearest
repeat: none
ending-castle2-assets/background ending-castle2-assets/background
rotate: false rotate: false
xy: 2, 2 xy: 2, 270
size: 320, 240 size: 320, 240
orig: 320, 240 orig: 320, 240
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ending-castle2-assets/collision ending-castle2-assets/collision
rotate: false rotate: false
xy: 324, 2 xy: 2, 28
size: 320, 240 size: 320, 240
orig: 320, 240 orig: 320, 240
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ending-castle2-assets/foreground ending-castle2-assets/foreground
rotate: false rotate: false
xy: 646, 133 xy: 324, 351
size: 344, 109 size: 344, 109
orig: 344, 109 orig: 344, 109
offset: 0, 0 offset: 0, 0
index: -1 index: -1
frankie-fall-1
rotate: false
xy: 324, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-10
rotate: false
xy: 492, 13
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-11
rotate: false
xy: 534, 21
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-12
rotate: false
xy: 576, 36
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-2
rotate: false
xy: 366, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-3
rotate: false
xy: 408, 2
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-4
rotate: false
xy: 442, 45
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-5
rotate: false
xy: 526, 58
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-6
rotate: false
xy: 670, 350
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-7
rotate: false
xy: 568, 110
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-8
rotate: false
xy: 568, 73
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
frankie-fall-9
rotate: false
xy: 450, 8
size: 40, 35
orig: 40, 35
offset: 0, 0
index: -1
georgia/kick
rotate: false
xy: 928, 467
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 0
georgia/kick
rotate: false
xy: 471, 185
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 1
georgia/kick
rotate: false
xy: 471, 185
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 3
georgia/kick
rotate: false
xy: 970, 467
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 2
georgia/kick
rotate: false
xy: 731, 417
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 4
georgia/kick
rotate: false
xy: 773, 422
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 5
georgia/kick
rotate: false
xy: 815, 422
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 6
georgia/kick
rotate: false
xy: 857, 422
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 7
georgia/kick
rotate: false
xy: 899, 422
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 8
georgia/kick
rotate: false
xy: 941, 422
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 9
georgia/kick
rotate: false
xy: 513, 185
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 10
georgia/kick
rotate: false
xy: 544, 230
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 11
georgia/kick
rotate: false
xy: 555, 185
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 12
georgia/kick
rotate: false
xy: 442, 127
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 13
georgia/kick
rotate: false
xy: 442, 82
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 14
georgia/kick
rotate: false
xy: 484, 140
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 15
georgia/kick
rotate: false
xy: 484, 95
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 16
georgia/kick
rotate: false
xy: 526, 140
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 17
georgia/kick
rotate: false
xy: 484, 50
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 18
georgia/kick
rotate: false
xy: 526, 95
size: 40, 43
orig: 40, 43
offset: 0, 0
index: 19
georgia/stand
rotate: false
xy: 442, 230
size: 100, 43
orig: 100, 43
offset: 0, 0
index: -1
georgia/walk
rotate: false
xy: 766, 467
size: 160, 43
orig: 160, 43
offset: 0, 0
index: -1
grandma
rotate: false
xy: 324, 313
size: 275, 36
orig: 275, 36
offset: 0, 0
index: -1
guard-1
rotate: false
xy: 702, 404
size: 27, 56
orig: 27, 56
offset: 0, 0
index: -1
guard-2
rotate: false
xy: 442, 172
size: 27, 56
orig: 27, 56
offset: 0, 0
index: -1
hand-hold
rotate: false
xy: 568, 147
size: 36, 36
orig: 36, 36
offset: 0, 0
index: -1
ladder-guard-2
rotate: false
xy: 670, 387
size: 30, 73
orig: 30, 73
offset: 0, 0
index: -1
peddler-talk
rotate: false
xy: 442, 275
size: 126, 36
orig: 126, 36
offset: 0, 0
index: -1
warden-2
rotate: false
xy: 601, 308
size: 42, 41
orig: 42, 41
offset: 0, 0
index: -1

BIN
desktop/resources/packed/ending-castle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 83 KiB

BIN
desktop/resources/packed/ending-castle2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

327
desktop/resources/packed/global.atlas
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 174 KiB

36
desktop/resources/packed/held.atlas
View File

@@ -11,69 +11,69 @@ background
orig: 320, 240 orig: 320, 240
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bloodclot-head-1 bloodclot-head
rotate: false rotate: false
xy: 324, 182 xy: 324, 182
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 0
bloodclot-head-2 bloodclot-head
rotate: false rotate: false
xy: 646, 424 xy: 646, 424
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 1
bloodclot-head-3 bloodclot-head
rotate: false rotate: false
xy: 324, 98 xy: 324, 98
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 2
bloodclot-head-4 bloodclot-head
rotate: false rotate: false
xy: 440, 182 xy: 440, 182
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 3
bloodclot-head-5 bloodclot-head
rotate: false rotate: false
xy: 646, 340 xy: 646, 340
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 4
bloodclot-head-6 bloodclot-head
rotate: false rotate: false
xy: 762, 424 xy: 762, 424
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 5
bloodclot-head-7 bloodclot-head
rotate: false rotate: false
xy: 440, 98 xy: 440, 98
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 6
bloodclot-head-8 bloodclot-head
rotate: false rotate: false
xy: 762, 340 xy: 762, 340
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 7
bloodclot-head-9 bloodclot-head
rotate: false rotate: false
xy: 878, 424 xy: 878, 424
size: 114, 82 size: 114, 82
orig: 114, 82 orig: 114, 82
offset: 0, 0 offset: 0, 0
index: -1 index: 8
dot dot
rotate: false rotate: false
xy: 324, 95 xy: 324, 95

9
desktop/resources/packed/inside-stash.atlas
View File

@@ -13,11 +13,18 @@ background
index: -1 index: -1
candle candle
rotate: false rotate: false
xy: 324, 247 xy: 324, 218
size: 16, 4 size: 16, 4
orig: 16, 4 orig: 16, 4
offset: 0, 0 offset: 0, 0
index: -1 index: -1
candle-aura
rotate: false
xy: 324, 224
size: 108, 27
orig: 108, 27
offset: 0, 0
index: -1
lid lid
rotate: false rotate: false
xy: 2, 2 xy: 2, 2

BIN
desktop/resources/packed/inside-stash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

338
desktop/resources/packed/space.atlas
View File

@@ -46,265 +46,265 @@ blergh-talk
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bloodclot-explode-1 bloodclot-explode
rotate: false rotate: false
xy: 538, 682 xy: 538, 682
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 0
bloodclot-explode-10 bloodclot-explode
rotate: false
xy: 218, 198
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-11
rotate: false
xy: 218, 31
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-12
rotate: false
xy: 756, 515
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-13
rotate: false
xy: 862, 682
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-14
rotate: false
xy: 864, 515
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-15
rotate: false
xy: 326, 310
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-16
rotate: false
xy: 326, 143
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-17
rotate: false
xy: 434, 310
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-18
rotate: false
xy: 434, 143
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-19
rotate: false
xy: 542, 348
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-2
rotate: false rotate: false
xy: 2, 31 xy: 2, 31
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 1
bloodclot-explode-20 bloodclot-explode
rotate: false
xy: 542, 181
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-21
rotate: false
xy: 650, 348
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-22
rotate: false
xy: 650, 181
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-23
rotate: false
xy: 758, 348
size: 106, 165
orig: 106, 165
offset: 0, 0
index: -1
bloodclot-explode-3
rotate: false rotate: false
xy: 110, 198 xy: 110, 198
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 2
bloodclot-explode-4 bloodclot-explode
rotate: false rotate: false
xy: 432, 515 xy: 432, 515
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 3
bloodclot-explode-5 bloodclot-explode
rotate: false rotate: false
xy: 646, 682 xy: 646, 682
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 4
bloodclot-explode-6 bloodclot-explode
rotate: false rotate: false
xy: 110, 31 xy: 110, 31
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 5
bloodclot-explode-7 bloodclot-explode
rotate: false rotate: false
xy: 540, 515 xy: 540, 515
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 6
bloodclot-explode-8 bloodclot-explode
rotate: false rotate: false
xy: 754, 682 xy: 754, 682
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 7
bloodclot-explode-9 bloodclot-explode
rotate: false rotate: false
xy: 648, 515 xy: 648, 515
size: 106, 165 size: 106, 165
orig: 106, 165 orig: 106, 165
offset: 0, 0 offset: 0, 0
index: -1 index: 8
bloodclot-head-talk-1 bloodclot-explode
rotate: false
xy: 218, 198
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 9
bloodclot-explode
rotate: false
xy: 218, 31
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 10
bloodclot-explode
rotate: false
xy: 756, 515
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 11
bloodclot-explode
rotate: false
xy: 862, 682
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 12
bloodclot-explode
rotate: false
xy: 864, 515
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 13
bloodclot-explode
rotate: false
xy: 326, 310
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 14
bloodclot-explode
rotate: false
xy: 326, 143
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 15
bloodclot-explode
rotate: false
xy: 434, 310
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 16
bloodclot-explode
rotate: false
xy: 434, 143
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 17
bloodclot-explode
rotate: false
xy: 542, 348
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 18
bloodclot-explode
rotate: false
xy: 542, 181
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 19
bloodclot-explode
rotate: false
xy: 650, 348
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 20
bloodclot-explode
rotate: false
xy: 650, 181
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 21
bloodclot-explode
rotate: false
xy: 758, 348
size: 106, 165
orig: 106, 165
offset: 0, 0
index: 22
bloodclot-head-talk
rotate: false rotate: false
xy: 326, 66 xy: 326, 66
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 0
bloodclot-head-talk-10 bloodclot-head-talk
rotate: false
xy: 578, 27
size: 82, 75
orig: 82, 75
offset: 0, 0
index: -1
bloodclot-head-talk-11
rotate: false
xy: 662, 27
size: 82, 75
orig: 82, 75
offset: 0, 0
index: -1
bloodclot-head-talk-12
rotate: false
xy: 842, 271
size: 82, 75
orig: 82, 75
offset: 0, 0
index: -1
bloodclot-head-talk-13
rotate: false
xy: 842, 194
size: 82, 75
orig: 82, 75
offset: 0, 0
index: -1
bloodclot-head-talk-14
rotate: false
xy: 758, 117
size: 82, 75
orig: 82, 75
offset: 0, 0
index: -1
bloodclot-head-talk-2
rotate: false rotate: false
xy: 758, 271 xy: 758, 271
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 1
bloodclot-head-talk-3 bloodclot-head-talk
rotate: false rotate: false
xy: 866, 438 xy: 866, 438
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 2
bloodclot-head-talk-4 bloodclot-head-talk
rotate: false rotate: false
xy: 410, 66 xy: 410, 66
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 3
bloodclot-head-talk-5 bloodclot-head-talk
rotate: false rotate: false
xy: 758, 194 xy: 758, 194
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 4
bloodclot-head-talk-6 bloodclot-head-talk
rotate: false rotate: false
xy: 866, 361 xy: 866, 361
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 5
bloodclot-head-talk-7 bloodclot-head-talk
rotate: false rotate: false
xy: 494, 66 xy: 494, 66
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 6
bloodclot-head-talk-8 bloodclot-head-talk
rotate: false rotate: false
xy: 578, 104 xy: 578, 104
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 7
bloodclot-head-talk-9 bloodclot-head-talk
rotate: false rotate: false
xy: 662, 104 xy: 662, 104
size: 82, 75 size: 82, 75
orig: 82, 75 orig: 82, 75
offset: 0, 0 offset: 0, 0
index: -1 index: 8
bloodclot-head-talk
rotate: false
xy: 578, 27
size: 82, 75
orig: 82, 75
offset: 0, 0
index: 9
bloodclot-head-talk
rotate: false
xy: 662, 27
size: 82, 75
orig: 82, 75
offset: 0, 0
index: 10
bloodclot-head-talk
rotate: false
xy: 842, 271
size: 82, 75
orig: 82, 75
offset: 0, 0
index: 11
bloodclot-head-talk
rotate: false
xy: 842, 194
size: 82, 75
orig: 82, 75
offset: 0, 0
index: 12
bloodclot-head-talk
rotate: false
xy: 758, 117
size: 82, 75
orig: 82, 75
offset: 0, 0
index: 13
bloodclot-stand bloodclot-stand
rotate: false rotate: false
xy: 324, 682 xy: 324, 682

45
desktop/src-common/advent/screens/rooms/castle_gate.clj
View File

@@ -20,8 +20,8 @@
(defn make-night [entities] (defn make-night [entities]
entities) entities)
(defn make-coin-flip [screen] (defn make-coin-flip [screen atlas]
(let [coin-flip (utils/make-anim "castle-gate/coinflip.png" [10 10] 0.05 (range 5))] (let [coin-flip (utils/make-anim atlas "coinflip" [10 10] 0.05 (range 5))]
(assoc (animation->texture screen coin-flip) (assoc (animation->texture screen coin-flip)
:x 212 :y 114 :baseline 151 :x 212 :y 114 :baseline 151
:opacity 0.0 :opacity 0.0
@@ -40,8 +40,8 @@
:walk coin-flip :walk coin-flip
:coinflip coin-flip))) :coinflip coin-flip)))
(defn make-goon-1 [screen] (defn make-goon-1 [screen atlas]
(let [stand (utils/make-anim "castle-gate/goon-1.png" [13 33] 0.21 [0 0 0 0 0 0 0 0 0 1])] (let [stand (utils/make-anim atlas "goon-1" [13 33] 0.21 [0 0 0 0 0 0 0 0 0 1])]
(assoc (animation->texture screen stand) (assoc (animation->texture screen stand)
:x 244 :y 102 :baseline 138 :x 244 :y 102 :baseline 138
:label "Goon" :label "Goon"
@@ -53,12 +53,13 @@
:anim-start 0 :anim-start 0
:stand stand))) :stand stand)))
(defn make-goon-2 [screen] (defn make-goon-2 [screen atlas]
(let [stand (utils/make-anim "castle-gate/goon-2.png" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1]) (let [
talk (utils/make-anim "castle-gate/goon-2-talk.png" [12 32] 0.175 (range 2)) stand (utils/make-anim atlas "goon-2" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1])
flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ]) talk (utils/make-anim atlas "goon-2-talk" [12 32] 0.175 (range 2))
search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0]) flip (utils/make-anim atlas "goon-2-flip" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ])
walk (utils/flip (utils/make-anim "castle-gate/goon-2-walk.png" [24 34] 0.075 (range 7)))] search (utils/make-anim atlas "goon-2-search" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0])
walk (utils/flip (utils/make-anim atlas "goon-2-walk" [24 34] 0.075 (range 7)))]
(assoc (animation->texture screen stand) (assoc (animation->texture screen stand)
:x 214 :y 102 :baseline 151 :x 214 :y 102 :baseline 151
:scale-x 1.4 :scale-x 1.4
@@ -197,9 +198,11 @@
(sign-note entities))}}) (sign-note entities))}})
(defn make [screen] (defn make [screen]
(let [throw-walkie (utils/make-anim-seq "castle-gate/throw-walkie" [205 136] 0.1 (flatten [(repeat 55 0) (range 9) (repeat 55 8)])) (let [[screen atlas] (utils/acquire-atlas screen "packed/castle-gate.atlas")
walkie-visible (animation 1.0 [(utils/get-texture "castle-gate/throw-walkie-9.png")]) [screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")
walkie-invisible (animation 1.0 [(utils/get-texture "castle-gate/throw-walkie-1.png")])] throw-walkie (utils/make-anim-seq atlas "throw-walkie" [205 136] 0.1 (flatten [(repeat 55 0) (range 9) (repeat 55 8)]))
walkie-visible (animation 1.0 [(utils/atlas->texture atlas "throw-walkie" 8)])
walkie-invisible (animation 1.0 [(utils/atlas->texture atlas "throw-walkie" 0)])]
(rooms/make :music {:day :town-2 :night :night} (rooms/make :music {:day :town-2 :night :night}
:name "Castle gate" :name "Castle gate"
:timers {:taunt [1.0 6.0 flip-coin]} :timers {:taunt [1.0 6.0 flip-coin]}
@@ -234,15 +237,15 @@
(actions/walk-straight-to entities :ego [285 71]))}} (actions/walk-straight-to entities :ego [285 71]))}}
:note (make-note)} :note (make-note)}
:layers {:day [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) :layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)] (assoc (utils/atlas->texture atlas "overlay") :x 0 :y 0 :baseline 240)]
:night [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) :night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]} (assoc (utils/atlas->texture atlas "overlay") :x 0 :y 0 :baseline 240)]}
:entities {:frankie (common/make-frankie screen) :entities {:frankie (common/make-frankie screen global-atlas)
:goon-1 (make-goon-1 screen) :goon-1 (make-goon-1 screen atlas)
:goon-2 (make-goon-2 screen) :goon-2 (make-goon-2 screen atlas)
:outside-particles (common/make-outside-particles) :outside-particles (common/make-outside-particles)
:coin-flip (make-coin-flip screen) :coin-flip (make-coin-flip screen atlas)
} }
:walkie-talkies (rooms/make-entity :walkie-talkies :walkie-talkies (rooms/make-entity :walkie-talkies
(assoc (animation->texture screen walkie-visible) (assoc (animation->texture screen walkie-visible)

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

@@ -294,14 +294,14 @@
"Nevermind." "Nevermind."
{:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]})) {:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]}))
(defn make-frankie [screen] (defn make-frankie [screen atlas]
(let [stand (utils/make-anim "castle-gate/frankie.png" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) (let [stand (utils/make-anim atlas "frankie" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0]) talk (utils/make-anim atlas "frankie" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0])
walk (utils/make-anim-seq "castle-gate/frankie-walk" [24 35] 0.2 (range 8)) walk (utils/make-anim-seq atlas "frankie-walk" [24 35] 0.2 (range 8))
laugh (utils/make-anim "castle-gate/frankie.png" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0]) laugh (utils/make-anim atlas "frankie" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0])
glance (utils/make-anim "castle-gate/frankie.png" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ]) glance (utils/make-anim atlas "frankie" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ])
reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8]) reach (utils/make-anim atlas "frankie" [24 35] 0.2 [0 8 9 9 9 9 8])
flex (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])] flex (utils/make-anim atlas "frankie" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])]
(assoc (animation->texture screen stand) (assoc (animation->texture screen stand)
:x 235 :y 90 :baseline 150 :x 235 :y 90 :baseline 150
:label "Frankie Rockfist" :label "Frankie Rockfist"

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

@@ -18,39 +18,41 @@
(:import [com.badlogic.gdx.graphics Color])) (:import [com.badlogic.gdx.graphics Color]))
(defn make [screen] (defn make [screen]
(let [ (let [[screen atlas] (utils/acquire-atlas screen "packed/ending-castle.atlas")
peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36) [screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")
peddler-sheet (texture! (utils/atlas->texture atlas "peddler-talk" ) :split 18 36)
peddler-stand (utils/flip (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])] peddler-stand (utils/flip (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])]
(aget peddler-sheet 0 i)))) (aget peddler-sheet 0 i))))
warden-stand (utils/make-anim "ending-castle/warden-2.png" [21 41] 0.21 (flatten [(repeat 7 0) 1])) warden-stand (utils/make-anim atlas "warden-2" [21 41] 0.21 (flatten [(repeat 7 0) 1]))
game-player-stand (utils/make-anim "ending-castle/game-player.png" [14 39] 0.2 (flatten [(repeat 5 0) 1] )) game-player-stand (utils/make-anim atlas "game-player" [14 39] 0.2 (flatten [(repeat 5 0) 1] ))
ladder-guard-stand-1 (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) ladder-guard-stand-1 (animation 0.1 [(utils/atlas->texture atlas "ladder-guard-2")])
ladder-guard-stand-2 (utils/flip (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")])) ladder-guard-stand-2 (utils/flip (animation 0.1 [(utils/atlas->texture atlas "ladder-guard-2")]))
grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) grandma-stand (utils/make-anim atlas "grandma" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
cat-stand (utils/make-anim "cat-tree/cat-stand.png" [22 10] 0.15 (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])) cat-stand (utils/make-anim atlas "cat-stand" [22 10] 0.15 (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0]))
duke-stand (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 (flatten [(repeat 4 0) 1])) duke-stand (utils/make-anim atlas "duke" [40 48] 0.23 (flatten [(repeat 4 0) 1]))
duke-talk (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [0 2 0 2 1 2]) duke-talk (utils/make-anim atlas "duke" [40 48] 0.23 [0 2 0 2 1 2])
duke-reach (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [3 4 5 6]) duke-reach (utils/make-anim atlas "duke" [40 48] 0.23 [3 4 5 6])
duke-reach-talk (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [6 7]) duke-reach-talk (utils/make-anim atlas "duke" [40 48] 0.23 [6 7])
duke-knight (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [8 9 10 9 8]) duke-knight (utils/make-anim atlas "duke" [40 48] 0.23 [8 9 10 9 8])
georgia-stand (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 20 0) 1 (repeat 10 0) 1])) georgia-stand (utils/make-anim atlas "georgia/stand" [20 43] 0.2 (flatten [(repeat 20 0) 1 (repeat 10 0) 1]))
georgia-hand-hold (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 3 0) 3 4])) georgia-hand-hold (utils/make-anim atlas "georgia/stand" [20 43] 0.2 (flatten [(repeat 3 0) 3 4]))
georgia-talk (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [0 2 0 2 0 1 0 0 2])) georgia-talk (utils/make-anim atlas "georgia/stand" [20 43] 0.2 (flatten [0 2 0 2 0 1 0 0 2]))
georgia-kick (utils/make-anim-seq "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2) georgia-kick (utils/make-anim-seq atlas "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2)
3 4 5 6 7 8 9 10 11 12 13 (repeat 10 14) 3 4 5 6 7 8 9 10 11 12 13 (repeat 10 14)
15 16 17 18 19 (repeat 10 0)])) 15 16 17 18 19 (repeat 10 0)]))
frankie-fall (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 (flatten [(range 8) (repeat 20 7) 8 9 10 11 7])) frankie-fall (utils/make-anim-seq atlas "frankie-fall" [40 35] 0.1 (flatten [(range 8) (repeat 20 7) 8 9 10 11 7]))
frankie-down (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 [0]) frankie-down (utils/make-anim-seq atlas "frankie-fall" [40 35] 0.1 [0])
scaler (utils/scaler-fn-with-baseline 20 1.3 1.30)] scaler (utils/scaler-fn-with-baseline 20 1.3 1.30)]
(rooms/make :music :dream (rooms/make :music :dream
:sounds {:cloud (utils/load-sound "ending-castle/cloud.ogg")} :sounds {:cloud (utils/load-sound "ending-castle/cloud.ogg")}
:name "Ending" :name "Ending"
:interactions {} :interactions {}
:layers [(assoc (utils/get-texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) :layers [(assoc (utils/atlas->texture atlas "ending-castle2-assets/background") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0)
(assoc (utils/get-texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] (assoc (utils/atlas->texture atlas "ending-castle2-assets/foreground") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)]
:apply-state (fn [screen e] :apply-state (fn [screen e]
(as-> e e (as-> e e
(utils/play-sound! screen e :cloud (fn [e] (utils/play-sound! screen e :cloud (fn [e]
@@ -70,14 +72,14 @@
:stand georgia-stand :stand georgia-stand
:talk georgia-talk :talk georgia-talk
:kick georgia-kick :kick georgia-kick
:walk (utils/make-anim "georgia/walk.png" [20 43] 0.2 (range 8)) :walk (utils/make-anim atlas "georgia/walk" [20 43] 0.2 (range 8))
:hand-hold georgia-hand-hold :hand-hold georgia-hand-hold
:kick-sound (utils/load-sound "georgia/kick.ogg") :kick-sound (utils/load-sound "georgia/kick.ogg")
:anim-sound-frames {georgia-kick {27 [:kick-sound (constantly 0.6)]}} :anim-sound-frames {georgia-kick {27 [:kick-sound (constantly 0.6)]}}
:anim-merges {georgia-stand {:origin-x 10 :origin-y 1} :anim-merges {georgia-stand {:origin-x 10 :origin-y 1}
:default {:origin-x 10 :origin-y 1} :default {:origin-x 10 :origin-y 1}
georgia-kick {:origin-x 19 :origin-y 0}})) georgia-kick {:origin-x 19 :origin-y 0}}))
:entities {:frankie (assoc (common/make-frankie screen) :entities {:frankie (assoc (common/make-frankie screen global-atlas)
:x 28 :y 21 :baseline 200 :x 28 :y 21 :baseline 200
:fall frankie-fall :fall frankie-fall
:down frankie-down :down frankie-down
@@ -88,7 +90,7 @@
:anim-merges {:default {:origin-x 12 :origin-y 0} :anim-merges {:default {:origin-x 12 :origin-y 0}
frankie-fall {:origin-x 22 :origin-y 0} frankie-fall {:origin-x 22 :origin-y 0}
frankie-down {: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 239}) :gandarf (assoc (common/make-wizard screen global-atlas {:x 205 :y 400 :baseline 239})
:update-fn (fn [screen entities gandarf] :update-fn (fn [screen entities gandarf]
(assoc gandarf :y (or (get-in entities [:gandarf-cloud :y]) (assoc gandarf :y (or (get-in entities [:gandarf-cloud :y])
(:y gandarf))))) (:y gandarf)))))
@@ -119,22 +121,22 @@
:scale-x 0.65 :scale-x 0.65
:scale-y 0.65 :scale-y 0.65
:scaled true) :scaled true)
:crowd-left (assoc (utils/get-texture "ending-castle/crowd-left.png") :crowd-left (assoc (utils/atlas->texture atlas "crowd-left")
:x 0 :y 0 :x 0 :y 0
:scale-x 1.3 :scale-x 1.3
:scale-y 1.3 :scale-y 1.3
:baseline 239) :baseline 239)
:crowd-right (assoc (utils/get-texture "ending-castle/crowd-right.png") :crowd-right (assoc (utils/atlas->texture atlas "crowd-right")
:x 196 :y 0 :x 196 :y 0
:scale-x 1.3 :scale-x 1.3
:scale-y 1.3 :scale-y 1.3
:baseline 238) :baseline 238)
:guard-1 (assoc (utils/get-texture "ending-castle/guard-1.png") :guard-1 (assoc (utils/atlas->texture atlas "guard-1")
:x 91 :y 73 :x 91 :y 73
:scale-x 0.9 :scale-x 0.9
:scale-y 0.9 :scale-y 0.9
:baseline 140) :baseline 140)
:guard-2 (assoc (utils/get-texture "ending-castle/guard-2.png") :guard-2 (assoc (utils/atlas->texture atlas "guard-2")
:x 182 :y 73 :x 182 :y 73
:scale-x 0.9 :scale-x 0.9
:scale-y 0.9 :scale-y 0.9

9
desktop/src-common/advent/screens/rooms/held.clj
View File

@@ -57,8 +57,9 @@
(actions/talk entities who msg))) (actions/talk entities who msg)))
(defn make [screen] (defn make [screen]
(let [bloodclot-talk (utils/make-anim-seq "held/bloodclot-head" [114 82] 0.1 [0 1 2 1 0 3 3 0 1 2 1 0 3 4 5 6 5 3 3 1 2 1 3 3 3 3 3 0 0 0 7 8 7]) (let [[screen atlas] (utils/acquire-atlas screen "packed/held.atlas")
bloodclot-stand (utils/make-anim-seq "held/bloodclot-head" [114 82] 0.1 (flatten [(repeat 15 0) 7 8 7]))] bloodclot-talk (utils/make-anim-seq atlas "bloodclot-head" [114 82] 0.1 [0 1 2 1 0 3 3 0 1 2 1 0 3 4 5 6 5 3 3 1 2 1 3 3 3 3 3 0 0 0 7 8 7])
bloodclot-stand (utils/make-anim-seq atlas "bloodclot-head" [114 82] 0.1 (flatten [(repeat 15 0) 7 8 7]))]
(rooms/make :music :fight (rooms/make :music :fight
:name "Held" :name "Held"
:interactions {:bloodclot {:box [182 42 270 196] :interactions {:bloodclot {:box [182 42 270 196]
@@ -81,8 +82,8 @@
(actions/talk entities :bloodclot-head "Don't make me laugh, kid!"))) (actions/talk entities :bloodclot-head "Don't make me laugh, kid!")))
}} }}
:timers {:taunt [5.0 1.0 add-second]} :timers {:taunt [5.0 1.0 add-second]}
:layers [(assoc (utils/get-texture "held/background.png") :x 0 :y 0 :baseline 0) :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "held/hand.png") :x 0 :y 0 :baseline 240)] (assoc (utils/atlas->texture atlas "hand") :x 0 :y 0 :baseline 240)]
:entities {:bloodclot-head (assoc (animation->texture screen bloodclot-stand) :entities {:bloodclot-head (assoc (animation->texture screen bloodclot-stand)
:x 211 :y 115 :baseline 240 :x 211 :y 115 :baseline 240
:origin-x 57 :origin-y 0 :origin-x 57 :origin-y 0

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

@@ -547,7 +547,7 @@
:cursor :talk :cursor :talk
:x 257 :x 257
:y 135 :y 135
:baseline 0 :baseline 1
:night-profile :sprite :night-profile :sprite
:script (actions/get-script entities :script (actions/get-script entities
(actions/talk entities :ego "Let's see if this thing works.") (actions/talk entities :ego "Let's see if this thing works.")

9
desktop/src-common/advent/screens/rooms/inside_stash.clj
View File

@@ -55,8 +55,9 @@
(defn make [screen] (defn make [screen]
(let [candle-flame (utils/make-anim "inside-stash/candle.png" [4 4] 0.1 (range 4)) (let [[screen atlas] (utils/acquire-atlas screen "packed/inside-stash.atlas")
candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1] ) candle-flame (utils/make-anim atlas "candle" [4 4] 0.1 (range 4))
candle-aura (utils/make-anim atlas "candle-aura" [27 27] 0.2 [0 1 2 3 2 1] )
] ]
(rooms/make :music {:day :secret-hideout :night :secret-hideout} (rooms/make :music {:day :secret-hideout :night :secret-hideout}
:name "Inside stash" :name "Inside stash"
@@ -95,8 +96,8 @@
(bust-chest entities)) (bust-chest entities))
:key (actions/get-script entities :key (actions/get-script entities
(unlock-chest entities))}}} (unlock-chest entities))}}}
:layers [(assoc (utils/get-texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0 :night-profile :none)]
:entities {:lid (assoc (utils/get-texture "inside-stash/lid.png") :entities {:lid (assoc (utils/atlas->texture atlas "lid")
:x 156 :y 116 :baseline 125 :night-profile :none) :x 156 :y 116 :baseline 125 :night-profile :none)
:candle-flame (assoc (animation->texture screen candle-flame) :candle-flame (assoc (animation->texture screen candle-flame)
:x 165 :y 135 :baseline 1 :x 165 :y 135 :baseline 1

29
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -80,7 +80,7 @@
(skip-type [this screen entities] (skip-type [this screen entities]
:none))) :none)))
(defn swing-at-blergh [entities] (defn swing-at-blergh [entities atlas]
(let [jump-path (bezier (map #(apply vector-2* %) [[35 45] [110 145] [195 180]])) (let [jump-path (bezier (map #(apply vector-2* %) [[35 45] [110 145] [195 180]]))
swing-path (bezier (map #(apply vector-2* %) [[195 180] [205 45]])) swing-path (bezier (map #(apply vector-2* %) [[195 180] [205 45]]))
jump-dist (utils/dist 35 45 205 45) jump-dist (utils/dist 35 45 205 45)
@@ -94,7 +94,7 @@
(utils/play-sound! screen entities :jump (constantly 0.9)) (utils/play-sound! screen entities :jump (constantly 0.9))
(-> entities (-> entities
(assoc-in [:room :entities :cloud] (assoc (utils/get-texture "space/cloud.png") (assoc-in [:room :entities :cloud] (assoc (utils/atlas->texture atlas "cloud")
:x (- (get-in entities [:room :entities :ego :x]) 10) :x (- (get-in entities [:room :entities :ego :x]) 10)
:y (get-in entities [:room :entities :ego :y]) :y (get-in entities [:room :entities :ego :y])
:origin-x 7 :origin-x 7
@@ -183,13 +183,14 @@
(* 0.3 (get-in entities [:room :entities :bloodclot :opacity]))) (* 0.3 (get-in entities [:room :entities :bloodclot :opacity])))
(defn make [screen] (defn make [screen]
(let [bloodclot-head-talk-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) (let [[screen atlas] (utils/acquire-atlas screen "packed/space.atlas")
bloodclot-head-stand-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3]) bloodclot-head-talk-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7])
bloodclot-head-shoot-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11]) bloodclot-head-stand-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3])
bloodclot-head-keep-shoot-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [12 13]) bloodclot-head-shoot-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11])
blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.9 [0 1]) bloodclot-head-keep-shoot-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [12 13])
bloodclot-explode (utils/make-anim-seq "space/bloodclot-explode" [106 165] 0.075 [0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 4 4 4 5 5 5 5 5 5 5 5 5 6 6 6 6 7 7 7 7 7 7 7 7 7 7 7 8 8 8 7 7 7 7 8 8 8 8 8 7 7 7 7 8 8 7 7 7 7 8 8 8 7 8 8 8 8 8 8 8 8 9 8 8 8 8 9 9 8 8 8 8 8 8 8 9 9 9 8 8 8 8 8 9 9 9 9 9 9 9 9 9 9 9 9 9 10 9 10 10 8 9 9 9 9 9 10 10 10 10 9 9 9 9 9 9 9 9 9 9 10 10 10 10 9 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 13 14 15 16 17 18 19 20 21 22]) blergh-stand-anim (utils/make-anim atlas "bloodclot-stand" [106 165] 0.9 [0 1])
bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7]) bloodclot-explode (utils/make-anim-seq atlas "bloodclot-explode" [106 165] 0.075 [0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 4 4 4 5 5 5 5 5 5 5 5 5 6 6 6 6 7 7 7 7 7 7 7 7 7 7 7 8 8 8 7 7 7 7 8 8 8 8 8 7 7 7 7 8 8 7 7 7 7 8 8 8 7 8 8 8 8 8 8 8 8 9 8 8 8 8 9 9 8 8 8 8 8 8 8 9 9 9 8 8 8 8 8 9 9 9 9 9 9 9 9 9 9 9 9 9 10 9 10 10 8 9 9 9 9 9 10 10 10 10 9 9 9 9 9 9 9 9 9 9 10 10 10 10 9 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 13 14 15 16 17 18 19 20 21 22])
bullet (utils/make-anim atlas "bullet" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7])
effect (particle-effect "particles/appear") effect (particle-effect "particles/appear")
blowup-effect (particle-effect "particles/blowup") blowup-effect (particle-effect "particles/blowup")
lightning-effect (particle-effect "particles/lightning") lightning-effect (particle-effect "particles/lightning")
@@ -202,13 +203,13 @@
:swing-sword (utils/load-sound "space/swingsword.ogg")} :swing-sword (utils/load-sound "space/swingsword.ogg")}
:interactions :interactions
{} {}
:layers [(assoc (utils/get-texture "space/background.png") :x 0 :y 0 :baseline 0)] :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)]
:timers {:taunt [10.0 8.0 taunt] :timers {:taunt [10.0 8.0 taunt]
:shock [5.0 15.0 shock]} :shock [5.0 15.0 shock]}
:entities {:appear (assoc effect :entities {:appear (assoc effect
:x 240 :y 50 :x 240 :y 50
:baseline 200) :baseline 200)
:later (assoc (utils/get-texture "space/later.png") :later (assoc (utils/atlas->texture atlas "later")
:x 0 :y 0 :x 0 :y 0
:baseline 240 :baseline 240
:opacity 0.0) :opacity 0.0)
@@ -273,7 +274,7 @@
(if (actions/has-item? entities :magic-slingshot) (if (actions/has-item? entities :magic-slingshot)
(if (get-in @entities [:state :broke-jewel?]) (if (get-in @entities [:state :broke-jewel?])
(do (do
(swing-at-blergh entities) (swing-at-blergh entities atlas)
(actions/do-dialogue entities (actions/do-dialogue entities
:bloodclot-head "Ha ha ha! Still a weakling, I see." :bloodclot-head "Ha ha ha! Still a weakling, I see."
:bloodclot-head "But you'll not best me!") :bloodclot-head "But you'll not best me!")
@@ -286,7 +287,7 @@
(actions/update-entity entities :ego (fn [e] (actions/update-entity entities :ego (fn [e]
(dissoc e :stand-override :talk-override))) (dissoc e :stand-override :talk-override)))
(actions/update-entity entities :ego #(assoc % :get-script (:original-get-script %))) (actions/update-entity entities :ego #(assoc % :get-script (:original-get-script %)))
(swing-at-blergh entities) (swing-at-blergh entities atlas)
(actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?" (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?"
:bloodclot-head "Take this!") :bloodclot-head "Take this!")
@@ -338,7 +339,7 @@
:bullet (assoc (animation->texture screen bullet) :bullet (assoc (animation->texture screen bullet)
:x 37 :y 85 :baseline 241 :x 37 :y 85 :baseline 241
:walk bullet) :walk bullet)
:broken-jewel (assoc (utils/get-texture "space/broken-jewel.png") :broken-jewel (assoc (utils/atlas->texture atlas "broken-jewel")
:x 225 :y 170 :baseline 240) :x 225 :y 170 :baseline 240)
:collision "space/collision.png" :collision "space/collision.png"
:scale-fn (constantly 1.5) :scale-fn (constantly 1.5)