Undoing me deletingn daniel's branch out of mine

This commit is contained in:
Jasmine Hyder
2021-12-05 17:23:19 -06:00
parent da4f26ceab
commit 1a8ef7ff92
7 changed files with 109 additions and 77 deletions

View File

@@ -28,8 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
svg/scale=1.0

View File

@@ -1,6 +1,6 @@
[gd_resource type="TileSet" load_steps=2 format=2]
[ext_resource path="./tileset_mk_16_16_nature_tileset_godot.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.png" type="Texture" id=1]
[resource]
0/name = "tileset_mk_16_16_nature_tileset_godot.png 0"
@@ -20,6 +20,10 @@
0/autotile/z_index_map = [ ]
0/occluder_offset = Vector2( 0, 0 )
0/navigation_offset = Vector2( 0, 0 )
0/shape_offset = Vector2( 0, 0 )
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
0/shape_one_way = false
0/shape_one_way_margin = 0.0
0/shapes = [ ]
0/z_index = 0
1/name = "tileset_mk_16_16_nature_tileset_godot.png 1"
@@ -39,6 +43,10 @@
1/autotile/z_index_map = [ ]
1/occluder_offset = Vector2( 0, 0 )
1/navigation_offset = Vector2( 0, 0 )
1/shape_offset = Vector2( 0, 0 )
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
1/shape_one_way = false
1/shape_one_way_margin = 0.0
1/shapes = [ ]
1/z_index = 0
2/name = "tileset_mk_16_16_nature_tileset_godot.png 2"
@@ -58,6 +66,10 @@
2/autotile/z_index_map = [ ]
2/occluder_offset = Vector2( 0, 0 )
2/navigation_offset = Vector2( 0, 0 )
2/shape_offset = Vector2( 0, 0 )
2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
2/shape_one_way = false
2/shape_one_way_margin = 0.0
2/shapes = [ ]
2/z_index = 0
3/name = "tileset_mk_16_16_nature_tileset_godot.png 3"
@@ -77,6 +89,10 @@
3/autotile/z_index_map = [ ]
3/occluder_offset = Vector2( 0, 0 )
3/navigation_offset = Vector2( 0, 0 )
3/shape_offset = Vector2( 0, 0 )
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
3/shape_one_way = false
3/shape_one_way_margin = 0.0
3/shapes = [ ]
3/z_index = 0
4/name = "tileset_mk_16_16_nature_tileset_godot.png 4"
@@ -96,6 +112,10 @@
4/autotile/z_index_map = [ ]
4/occluder_offset = Vector2( 0, 0 )
4/navigation_offset = Vector2( 0, 0 )
4/shape_offset = Vector2( 0, 0 )
4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
4/shape_one_way = false
4/shape_one_way_margin = 0.0
4/shapes = [ ]
4/z_index = 0
5/name = "tileset_mk_16_16_nature_tileset_godot.png 5"
@@ -115,6 +135,10 @@
5/autotile/z_index_map = [ ]
5/occluder_offset = Vector2( 0, 0 )
5/navigation_offset = Vector2( 0, 0 )
5/shape_offset = Vector2( 0, 0 )
5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
5/shape_one_way = false
5/shape_one_way_margin = 0.0
5/shapes = [ ]
5/z_index = 0
6/name = "tileset_mk_16_16_nature_tileset_godot.png 6"
@@ -134,6 +158,10 @@
6/autotile/z_index_map = [ ]
6/occluder_offset = Vector2( 0, 0 )
6/navigation_offset = Vector2( 0, 0 )
6/shape_offset = Vector2( 0, 0 )
6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
6/shape_one_way = false
6/shape_one_way_margin = 0.0
6/shapes = [ ]
6/z_index = 0
7/name = "tileset_mk_16_16_nature_tileset_godot.png 7"
@@ -153,6 +181,10 @@
7/autotile/z_index_map = [ ]
7/occluder_offset = Vector2( 0, 0 )
7/navigation_offset = Vector2( 0, 0 )
7/shape_offset = Vector2( 0, 0 )
7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
7/shape_one_way = false
7/shape_one_way_margin = 0.0
7/shapes = [ ]
7/z_index = 0
8/name = "tileset_mk_16_16_nature_tileset_godot.png 8"
@@ -172,6 +204,10 @@
8/autotile/z_index_map = [ ]
8/occluder_offset = Vector2( 0, 0 )
8/navigation_offset = Vector2( 0, 0 )
8/shape_offset = Vector2( 0, 0 )
8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
8/shape_one_way = false
8/shape_one_way_margin = 0.0
8/shapes = [ ]
8/z_index = 0
9/name = "tileset_mk_16_16_nature_tileset_godot.png 9"
@@ -191,6 +227,10 @@
9/autotile/z_index_map = [ ]
9/occluder_offset = Vector2( 0, 0 )
9/navigation_offset = Vector2( 0, 0 )
9/shape_offset = Vector2( 0, 0 )
9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
9/shape_one_way = false
9/shape_one_way_margin = 0.0
9/shapes = [ ]
9/z_index = 0
10/name = "tileset_mk_16_16_nature_tileset_godot.png 10"
@@ -210,6 +250,10 @@
10/autotile/z_index_map = [ ]
10/occluder_offset = Vector2( 0, 0 )
10/navigation_offset = Vector2( 0, 0 )
10/shape_offset = Vector2( 0, 0 )
10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
10/shape_one_way = false
10/shape_one_way_margin = 0.0
10/shapes = [ ]
10/z_index = 0
11/name = "tileset_mk_16_16_nature_tileset_godot.png 11"
@@ -219,7 +263,7 @@
11/region = Rect2( 0, 0, 960, 400 )
11/tile_mode = 1
11/autotile/bitmask_mode = 1
11/autotile/bitmask_flags = [ Vector2( 49, 6 ), 432, Vector2( 49, 7 ), 438, Vector2( 49, 8 ), 54, Vector2( 49, 9 ), 48, Vector2( 50, 6 ), 504, Vector2( 50, 7 ), 511, Vector2( 50, 8 ), 63, Vector2( 50, 9 ), 56, Vector2( 51, 6 ), 216, Vector2( 51, 7 ), 219, Vector2( 51, 8 ), 27, Vector2( 51, 9 ), 24, Vector2( 52, 6 ), 144, Vector2( 52, 7 ), 146, Vector2( 52, 8 ), 18, Vector2( 52, 9 ), 16, Vector2( 53, 6 ), 176, Vector2( 53, 7 ), 182, Vector2( 53, 8 ), 434, Vector2( 53, 9 ), 50, Vector2( 54, 6 ), 248, Vector2( 54, 7 ), 255, Vector2( 54, 8 ), 507, Vector2( 54, 9 ), 59, Vector2( 55, 6 ), 440, Vector2( 55, 7 ), 447, Vector2( 55, 8 ), 510, Vector2( 55, 9 ), 62, Vector2( 56, 6 ), 152, Vector2( 56, 7 ), 155, Vector2( 56, 8 ), 218, Vector2( 56, 9 ), 26, Vector2( 57, 6 ), 184, Vector2( 57, 7 ), 191, Vector2( 57, 8 ), 506, Vector2( 57, 9 ), 58, Vector2( 58, 6 ), 443, Vector2( 58, 7 ), 254, Vector2( 58, 8 ), 442, Vector2( 58, 9 ), 190, Vector2( 59, 8 ), 250, Vector2( 59, 9 ), 187, Vector2( 53, 10 ), 178, Vector2( 54, 10 ), 251, Vector2( 55, 10 ), 446, Vector2( 56, 10 ), 154, Vector2( 57, 10 ), 186 ]
11/autotile/bitmask_flags = [ Vector2( 49, 6 ), 432, Vector2( 49, 7 ), 438, Vector2( 49, 8 ), 54, Vector2( 49, 9 ), 48, Vector2( 50, 6 ), 504, Vector2( 50, 7 ), 511, Vector2( 50, 8 ), 63, Vector2( 50, 9 ), 56, Vector2( 51, 6 ), 216, Vector2( 51, 7 ), 219, Vector2( 51, 8 ), 27, Vector2( 51, 9 ), 24, Vector2( 52, 6 ), 144, Vector2( 52, 7 ), 146, Vector2( 52, 8 ), 18, Vector2( 52, 9 ), 16, Vector2( 53, 6 ), 176, Vector2( 53, 7 ), 182, Vector2( 53, 8 ), 434, Vector2( 53, 9 ), 50, Vector2( 53, 10 ), 178, Vector2( 54, 6 ), 248, Vector2( 54, 7 ), 255, Vector2( 54, 8 ), 507, Vector2( 54, 9 ), 59, Vector2( 54, 10 ), 251, Vector2( 55, 6 ), 440, Vector2( 55, 7 ), 447, Vector2( 55, 8 ), 510, Vector2( 55, 9 ), 62, Vector2( 55, 10 ), 446, Vector2( 56, 6 ), 152, Vector2( 56, 7 ), 155, Vector2( 56, 8 ), 218, Vector2( 56, 9 ), 26, Vector2( 56, 10 ), 154, Vector2( 57, 6 ), 184, Vector2( 57, 7 ), 191, Vector2( 57, 8 ), 506, Vector2( 57, 9 ), 58, Vector2( 57, 10 ), 186, Vector2( 58, 6 ), 443, Vector2( 58, 7 ), 254, Vector2( 58, 8 ), 442, Vector2( 58, 9 ), 190, Vector2( 59, 8 ), 250, Vector2( 59, 9 ), 187 ]
11/autotile/icon_coordinate = Vector2( 50, 7 )
11/autotile/tile_size = Vector2( 16, 16 )
11/autotile/spacing = 0
@@ -229,5 +273,9 @@
11/autotile/z_index_map = [ ]
11/occluder_offset = Vector2( 0, 0 )
11/navigation_offset = Vector2( 0, 0 )
11/shape_offset = Vector2( 0, 0 )
11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
11/shape_one_way = false
11/shape_one_way_margin = 0.0
11/shapes = [ ]
11/z_index = 0
11/z_index = 0