Merge remote-tracking branch 'origin/levelz'

This commit is contained in:
Alice Gaudon 2020-08-18 19:32:11 +02:00
commit 4493cecedc
7 changed files with 1424 additions and 101 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,15 @@ cell_size = Vector2( 16, 16 )
cell_quadrant_size = 8 cell_quadrant_size = 8
cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 ) cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 )
format = 1 format = 1
tile_data = PoolIntArray( -131078, 49, 2, -196605, 49, 65554, -196601, 49, 65553, -196600, 49, 4, -196597, 49, 15, -196596, 49, 65554, -196593, 49, 11, -196592, 49, 65542, -196591, 49, 65545, -196590, 49, 4, -196587, 49, 15, -131069, 49, 65537, -131068, 49, 65550, -131066, 49, 65542, -131056, 49, 65540, -131052, 49, 13, -131051, 49, 65549, -1, 49, 65551, -65531, 49, 4, -65516, 49, 17, 2, 49, 65549, 19, 49, 65538, 20, 49, 13, 23, 49, 65546, 65542, 49, 65542, 65543, 49, 5, 65551, 49, 65546, 65555, 49, 6, 65558, 49, 65551, 65559, 49, 17, 196605, 49, 65554, 196606, 49, 65537, 196607, 49, 12, 131075, 49, 65555, 131078, 49, 13, 131081, 49, 15, 131092, 49, 65542, 131093, 49, 65537, 131094, 49, 65545, 196610, 49, 65543, 196630, 49, 16, 262146, 49, 65549, 262148, 49, 16, 262156, 49, 10, 262157, 49, 4, 262161, 49, 2, 262165, 49, 10, 262166, 49, 14, 262167, 49, 14, 393210, 49, 65548, 393212, 49, 65544, 327691, 49, 65553, 327692, 49, 65549, 327695, 49, 65548, 327696, 49, 10, 327703, 49, 5, 458746, 49, 14, 458747, 49, 65544, 458749, 49, 65548, 393227, 49, 65539, 393231, 49, 9, 393237, 49, 65547, 393238, 49, 14 ) tile_data = PoolIntArray( -131078, 49, 2, -196605, 49, 65554, -196601, 49, 65553, -196600, 49, 4, -196597, 49, 15, -196596, 49, 65554, -196593, 49, 11, -196592, 49, 65542, -196591, 49, 65545, -196590, 49, 4, -196587, 49, 15, -131069, 49, 65537, -131068, 49, 65550, -131066, 49, 65542, -131056, 49, 65540, -131052, 49, 13, -131051, 49, 65549, -1, 49, 65551, -65531, 49, 4, -65524, -1073741756, 0, -65516, 49, 17, 2, 49, 65549, 19, 49, 65538, 20, 49, 13, 23, 49, 65546, 65542, 49, 65542, 65543, 49, 5, 65551, 49, 65546, 65555, 49, 6, 65558, 49, 65551, 65559, 49, 17, 196605, 49, 65554, 196606, 49, 65537, 196607, 49, 12, 131075, 49, 65555, 131078, 49, 13, 131081, 49, 15, 131092, 49, 65542, 131093, 49, 65537, 131094, 49, 65545, 196610, 49, 65543, 196630, 49, 16, 262146, 49, 65549, 262148, 49, 16, 262156, 49, 10, 262157, 49, 4, 262161, 49, 2, 262165, 49, 10, 262166, 49, 14, 262167, 49, 14, 393210, 49, 65548, 393212, 49, 65544, 327691, 49, 65553, 327692, 49, 65549, 327695, 49, 65548, 327696, 49, 10, 327703, 49, 5, 458746, 49, 14, 458747, 49, 65544, 458749, 49, 65548, 393227, 49, 65539, 393231, 49, 9, 393237, 49, 65547, 393238, 49, 14 )
[node name="Special" type="TileMap" parent="."]
tile_set = ExtResource( 1 )
cell_size = Vector2( 16, 16 )
cell_quadrant_size = 8
cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 )
format = 1
tile_data = PoolIntArray( 0, 71, 0, 10, -1073741819, 0, 196618, 5, 0, 196627, 72, 0 )
[node name="Props" type="TileMap" parent="."] [node name="Props" type="TileMap" parent="."]
tile_set = ExtResource( 1 ) tile_set = ExtResource( 1 )
@ -26,7 +34,7 @@ cell_size = Vector2( 16, 16 )
cell_quadrant_size = 8 cell_quadrant_size = 8
cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 ) cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 )
format = 1 format = 1
tile_data = PoolIntArray( -262138, 11, 0, -131076, 50, 65539, -131075, 50, 65547, -131073, 9, 0, -196608, 24, 0, -196607, 11, 0, -196604, 30, 0, -196603, 11, 0, -196600, 10, 0, -196598, 8, 0, -196596, 10, 0, -65543, 11, 0, -65542, 13, 0, -65541, 9, 0, -65540, 15, 0, -65539, 23, 0, -131072, 50, 10, -131070, 15, 0, -131068, 8, 0, -131065, 22, 0, -131061, 15, 0, -131057, 20, 0, -7, 11, 0, -4, 50, 65542, -3, 38, 0, -1, 25, 4, -65536, 24, 0, -65525, 26, 0, -65522, 24, 0, 65532, 20, 0, 10, -1073741819, 0, 11, 11, 0, 18, 8, 0, 131066, 13, 0, 131069, 8, 0, 131071, 41, 0, 65536, 40, 0, 65537, 42, 0, 65539, 44, 0, 65550, 20, 0, 196601, 50, 65547, 131073, 39, 0, 131082, 5, 0, 131084, 24, 0, 131086, 15, 0, 262137, 12, 0, 262139, 9, 0, 262140, 16, 0, 262142, 50, 65540, 262143, 28, 0, 196611, 44, 0, 196613, 18, 0, 196617, 20, 0, 327674, 50, 65546, 262149, 39, 0, 262154, 50, 65544, 262156, 23, 0, 262157, 8, 0, 327687, 40, 0, 327697, 40, 0, 393224, 41, 0, 393227, 18, 0, 393229, 42, 0, 393232, 39, 0 ) tile_data = PoolIntArray( -262138, 11, 0, -131076, 50, 65539, -131075, 50, 65547, -131073, 9, 0, -196608, 24, 0, -196607, 11, 0, -196604, 30, 0, -196603, 11, 0, -196600, 10, 0, -196598, 8, 0, -196596, 10, 0, -65543, 11, 0, -65542, 13, 0, -65541, 9, 0, -65540, 15, 0, -65539, 23, 0, -131072, 50, 10, -131070, 15, 0, -131068, 8, 0, -131065, 22, 0, -131061, 15, 0, -131057, 20, 0, -7, 11, 0, -4, 50, 65542, -3, 38, 0, -1, 25, 4, -65536, 24, 0, -65525, 26, 0, -65522, 50, 65547, 65532, 20, 0, 11, 11, 0, 14, 50, 3, 131066, 13, 0, 131069, 8, 0, 131071, 41, 0, 65536, 40, 0, 65537, 42, 0, 65539, 44, 0, 65550, 20, 0, 196601, 50, 65547, 131073, 39, 0, 131084, 24, 0, 131086, 15, 0, 262137, 12, 0, 262139, 9, 0, 262140, 16, 0, 262142, 50, 65540, 262143, 28, 0, 196611, 44, 0, 196613, 18, 0, 196617, 20, 0, 327674, 50, 65546, 262149, 39, 0, 262156, 23, 0, 262157, 8, 0, 262163, 14, 0, 327687, 40, 0, 327697, 40, 0, 393224, 41, 0, 393227, 18, 0, 393229, 42, 0, 393232, 39, 0 )
[node name="Air" type="TileMap" parent="."] [node name="Air" type="TileMap" parent="."]
z_index = 1 z_index = 1
@ -35,4 +43,4 @@ cell_size = Vector2( 16, 16 )
cell_quadrant_size = 8 cell_quadrant_size = 8
cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 ) cell_custom_transform = Transform2D( 0, 0, 0, 0, 0, 0 )
format = 1 format = 1
tile_data = PoolIntArray( 7, 536870946, 0, 65551, 32, 0 ) tile_data = PoolIntArray( 7, 536870946, 0, 18, 8, 0, 65551, 32, 0 )

File diff suppressed because one or more lines are too long

45
scenes/game1/Level3.tscn Normal file

File diff suppressed because one or more lines are too long

47
scenes/game1/Level4.tscn Normal file

File diff suppressed because one or more lines are too long

46
scenes/game1/Level5.tscn Normal file

File diff suppressed because one or more lines are too long