Skip to content

Commit 37aaed8

Browse files
choongjaechoongjae
committed
2 parents d4d2f50 + 6d20389 commit 37aaed8

File tree

13 files changed

+868
-900
lines changed

13 files changed

+868
-900
lines changed

‎assets/jsons/assets.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@
105105
"wall-top": "world/decor/wall-top.png",
106106
"coke": "world/decor/coke.png",
107107
"test-tubes": "world/decor/test-tubes.png",
108-
"tank": "world/decor/tank.png"
108+
"tank": "world/decor/tank.png",
109+
"coming-soon": "world/decor/coming-soon.png"
109110
},
110111
"jsons" : {
111112
"constants": "jsons/constants.json",
@@ -128,8 +129,8 @@
128129
"tiledLevel12": "levels/level-beta-med1.json",
129130
"tiledLevel13": "levels/super-jump.json",
130131
// "tiledLevel5": "levels/level-beta-hard.json",
131-
"tiledLevel14": "levels/party-room.json",
132-
"tiledLevel15": "levels/test-forest.json"
132+
// "tiledLevel14": "levels/party-room.json",
133+
"tiledLevel14": "levels/test-forest.json"
133134
},
134135
"soundfx" : {
135136
"jump" : "sounds/jump-CELESTE.wav",

‎assets/levels/activator-door-tutorial.json

+95-94
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
{ "compressionlevel":-1,
2-
"editorsettings":
3-
{
4-
"export":
5-
{
6-
"format":"tmx",
7-
"target":"level-template2.tmx"
8-
}
9-
},
10-
"height":21,
2+
"height":18,
113
"infinite":false,
124
"layers":[
135
{
@@ -16,23 +8,20 @@
168
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
179
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1810
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
19-
0, 0, 0, 0, 0, 0, 0, 80, 81, 81, 81, 81, 112, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
20-
0, 0, 0, 0, 0, 0, 0, 92, 93, 93, 93, 93, 93, 94, 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 69, 69, 69, 69, 107, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
11+
0, 0, 0, 0, 0, 0, 0, 80, 81, 81, 81, 81, 112, 94, 0, 0, 68, 69, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 92, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
12+
0, 0, 0, 0, 0, 0, 0, 92, 93, 93, 93, 93, 93, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2113
80, 81, 81, 81, 81, 81, 81, 112, 93, 93, 93, 93, 93, 94, 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, 0, 0, 0, 0, 0, 0, 0,
22-
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 68, 69, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 82,
14+
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 82,
2315
104, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 106, 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, 104, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 106,
24-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 69, 70, 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,
25-
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, 0, 0, 0, 68, 69, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
26-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 69, 70, 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, 0,
16+
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
17+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 69, 69, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2718
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2819
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
29-
80, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 82, 0, 0, 0,
30-
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 0,
31-
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 0,
32-
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 0,
33-
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 0,
34-
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 0],
35-
"height":21,
20+
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
21+
80, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 82, 0, 0, 0, 0,
22+
92, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, 0, 0, 0, 0,
23+
104, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 106, 0, 0, 0, 0],
24+
"height":18,
3625
"id":17,
3726
"name":"metalWalls",
3827
"opacity":1,
@@ -60,11 +49,8 @@
6049
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6150
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6251
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
63-
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
64-
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
65-
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6652
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
67-
"height":21,
53+
"height":18,
6854
"id":18,
6955
"name":"climbables",
7056
"opacity":1,
@@ -134,7 +120,7 @@
134120
{
135121
"name":"bY",
136122
"type":"float",
137-
"value":3
123+
"value":0
138124
},
139125
{
140126
"name":"isZoomRelative",
@@ -186,7 +172,7 @@
186172
{
187173
"name":"bY",
188174
"type":"float",
189-
"value":3
175+
"value":0
190176
},
191177
{
192178
"name":"isZoomRelative",
@@ -238,7 +224,7 @@
238224
{
239225
"name":"bY",
240226
"type":"float",
241-
"value":5
227+
"value":0
242228
},
243229
{
244230
"name":"isZoomRelative",
@@ -258,7 +244,7 @@
258244
{
259245
"name":"zoom",
260246
"type":"float",
261-
"value":0.7
247+
"value":0.67
262248
}],
263249
"rotation":0,
264250
"type":"CameraRegion",
@@ -364,11 +350,11 @@
364350
"y":3072
365351
},
366352
{
367-
"x":49152,
353+
"x":48128,
368354
"y":3072
369355
},
370356
{
371-
"x":49152,
357+
"x":48128,
372358
"y":0
373359
}],
374360
"rotation":0,
@@ -404,7 +390,7 @@
404390
"visible":true,
405391
"width":0,
406392
"x":16384,
407-
"y":12288
393+
"y":11264
408394
},
409395
{
410396
"height":0,
@@ -436,39 +422,7 @@
436422
"visible":true,
437423
"width":0,
438424
"x":22528,
439-
"y":10240
440-
},
441-
{
442-
"height":0,
443-
"id":122,
444-
"name":"",
445-
"polygon":[
446-
{
447-
"x":0,
448-
"y":0
449-
},
450-
{
451-
"x":0,
452-
"y":1024
453-
},
454-
{
455-
"x":6144,
456-
"y":1024
457-
},
458-
{
459-
"x":6144,
460-
"y":0
461-
},
462-
{
463-
"x":0,
464-
"y":0
465-
}],
466-
"rotation":0,
467-
"type":"",
468-
"visible":true,
469-
"width":0,
470-
"x":22528,
471-
"y":6144
425+
"y":8192
472426
},
473427
{
474428
"height":0,
@@ -496,7 +450,7 @@
496450
"visible":true,
497451
"width":0,
498452
"x":16384,
499-
"y":8192
453+
"y":5120
500454
},
501455
{
502456
"height":0,
@@ -609,7 +563,18 @@
609563
"draworder":"topdown",
610564
"id":20,
611565
"name":"goal",
612-
"objects":[],
566+
"objects":[
567+
{
568+
"height":6144,
569+
"id":123,
570+
"name":"",
571+
"rotation":0,
572+
"type":"",
573+
"visible":true,
574+
"width":1024,
575+
"x":49152,
576+
"y":2048
577+
}],
613578
"opacity":1,
614579
"type":"objectgroup",
615580
"visible":true,
@@ -636,13 +601,37 @@
636601
{
637602
"gid":3,
638603
"height":2048,
639-
"id":123,
604+
"id":105,
640605
"name":"",
641606
"rotation":0,
642607
"type":"",
643608
"visible":true,
644609
"width":1024,
645-
"x":47104,
610+
"x":16384,
611+
"y":13312
612+
},
613+
{
614+
"gid":3,
615+
"height":2048,
616+
"id":106,
617+
"name":"",
618+
"rotation":0,
619+
"type":"",
620+
"visible":true,
621+
"width":1024,
622+
"x":43008,
623+
"y":13312
624+
},
625+
{
626+
"gid":3,
627+
"height":2048,
628+
"id":122,
629+
"name":"",
630+
"rotation":0,
631+
"type":"",
632+
"visible":true,
633+
"width":1024,
634+
"x":1024,
646635
"y":13312
647636
}],
648637
"opacity":1,
@@ -675,38 +664,39 @@
675664
},
676665
{
677666
"draworder":"topdown",
678-
"id":14,
679-
"name":"boxes",
667+
"id":8,
668+
"name":"spikes",
680669
"objects":[
681670
{
682-
"gid":2,
671+
"gid":10,
683672
"height":1024,
684-
"id":124,
673+
"id":95,
685674
"name":"",
686-
"rotation":0,
675+
"rotation":180,
687676
"type":"",
688677
"visible":true,
689678
"width":1024,
690-
"x":24576,
691-
"y":5120
679+
"x":19456,
680+
"y":3072
681+
},
682+
{
683+
"gid":11,
684+
"height":1024,
685+
"id":96,
686+
"name":"",
687+
"rotation":180,
688+
"type":"",
689+
"visible":true,
690+
"width":1024,
691+
"x":18432,
692+
"y":3072
692693
}],
693694
"opacity":1,
694695
"type":"objectgroup",
695696
"visible":true,
696697
"x":0,
697698
"y":0
698699
},
699-
{
700-
"draworder":"topdown",
701-
"id":8,
702-
"name":"spikes",
703-
"objects":[],
704-
"opacity":1,
705-
"type":"objectgroup",
706-
"visible":true,
707-
"x":0,
708-
"y":0
709-
},
710700
{
711701
"draworder":"topdown",
712702
"id":15,
@@ -780,7 +770,7 @@
780770
"type":"",
781771
"visible":true,
782772
"width":1024,
783-
"x":45056,
773+
"x":46080,
784774
"y":14336
785775
}],
786776
"opacity":1,
@@ -940,6 +930,17 @@
940930
"x":0,
941931
"y":0
942932
},
933+
{
934+
"draworder":"topdown",
935+
"id":14,
936+
"name":"boxes",
937+
"objects":[],
938+
"opacity":1,
939+
"type":"objectgroup",
940+
"visible":true,
941+
"x":0,
942+
"y":0
943+
},
943944
{
944945
"draworder":"topdown",
945946
"id":11,
@@ -981,7 +982,7 @@
981982
"y":0
982983
}],
983984
"nextlayerid":24,
984-
"nextobjectid":125,
985+
"nextobjectid":124,
985986
"orientation":"orthogonal",
986987
"properties":[
987988
{
@@ -996,19 +997,19 @@
996997
"tilesets":[
997998
{
998999
"firstgid":1,
999-
"source":"..\/..\/objects\/objects.tsx"
1000+
"source":"..\/..\/level-editor\/objects\/objects.tsx"
10001001
},
10011002
{
10021003
"firstgid":15,
1003-
"source":"..\/..\/tilesets\/metal-walls.tsx"
1004+
"source":"..\/..\/level-editor\/tilesets\/metal-walls.tsx"
10041005
},
10051006
{
10061007
"firstgid":63,
1007-
"source":"..\/..\/tilesets\/climbables.tsx"
1008+
"source":"..\/..\/level-editor\/tilesets\/climbables.tsx"
10081009
},
10091010
{
10101011
"firstgid":67,
1011-
"source":"..\/..\/tilesets\/default-metal-walls.tsx"
1012+
"source":"..\/..\/level-editor\/tilesets\/default-metal-walls.tsx"
10121013
}],
10131014
"tilewidth":1024,
10141015
"type":"map",

0 commit comments

Comments
 (0)