diff --git a/Resources/woods.tres b/Resources/woods.tres index ffffba5..4b188f6 100644 --- a/Resources/woods.tres +++ b/Resources/woods.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=27 format=2] +[gd_resource type="TileSet" load_steps=29 format=2] [ext_resource path="res://Tiles/morning.png" type="Texture" id=1] [ext_resource path="res://Tiles/mountains.png" type="Texture" id=2] @@ -26,6 +26,8 @@ [ext_resource path="res://Tiles/gumtree-flat2.png" type="Texture" id=24] [ext_resource path="res://Tiles/small-flower.png" type="Texture" id=25] [ext_resource path="res://Tiles/baobab.png" type="Texture" id=26] +[ext_resource path="res://Tiles/gumtree-small.png" type="Texture" id=27] +[ext_resource path="res://Tiles/gumtree-small2.png" type="Texture" id=28] [resource] 0/name = "Morning" @@ -406,3 +408,31 @@ 28/shape_one_way_margin = 0.0 28/shapes = [ ] 28/z_index = 0 +29/name = "gumtree-small.png 29" +29/texture = ExtResource( 27 ) +29/tex_offset = Vector2( 0, 0 ) +29/modulate = Color( 1, 1, 1, 1 ) +29/region = Rect2( 0, 0, 180, 240 ) +29/tile_mode = 0 +29/occluder_offset = Vector2( 0, 0 ) +29/navigation_offset = Vector2( 0, 0 ) +29/shape_offset = Vector2( 0, 0 ) +29/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +29/shape_one_way = false +29/shape_one_way_margin = 0.0 +29/shapes = [ ] +29/z_index = 0 +30/name = "gumtree-small2.png 30" +30/texture = ExtResource( 28 ) +30/tex_offset = Vector2( 0, 0 ) +30/modulate = Color( 1, 1, 1, 1 ) +30/region = Rect2( 0, 0, 180, 240 ) +30/tile_mode = 0 +30/occluder_offset = Vector2( 0, 0 ) +30/navigation_offset = Vector2( 0, 0 ) +30/shape_offset = Vector2( 0, 0 ) +30/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +30/shape_one_way = false +30/shape_one_way_margin = 0.0 +30/shapes = [ ] +30/z_index = 0 diff --git a/Story/Ch1S1.tscn b/Story/Ch1S1.tscn index c902286..10a00b1 100644 --- a/Story/Ch1S1.tscn +++ b/Story/Ch1S1.tscn @@ -72,7 +72,7 @@ motion_mirroring = Vector2( 2880, 0 ) tile_set = ExtResource( 1 ) cell_size = Vector2( 60, 60 ) format = 1 -tile_data = PoolIntArray( -65532, 27, 0, -65506, 27, 0 ) +tile_data = PoolIntArray( -65532, 27, 0, -65506, 27, 0, 14, 536870942, 0, 22, 29, 0, 41, 30, 0, 45, 29, 0 ) [node name="Grass" type="TileMap" parent="Background/Furthest"] tile_set = ExtResource( 1 ) @@ -119,7 +119,7 @@ motion_mirroring = Vector2( 2880, 0 ) tile_set = ExtResource( 1 ) cell_y_sort = true format = 1 -tile_data = PoolIntArray( -262127, 536870935, 0, -262108, 23, 0, -196608, 24, 0, -65509, 22, 0, 6, 28, 0 ) +tile_data = PoolIntArray( -262132, 536870935, 0, -262108, 23, 0, -196608, 24, 0, -65505, 22, 0, 17, 28, 0 ) [node name="Grass" type="TileMap" parent="Background/Close"] tile_set = ExtResource( 1 ) diff --git a/Tiles/gumtree-bigger.png b/Tiles/gumtree-bigger.png deleted file mode 100644 index fdcab9c..0000000 Binary files a/Tiles/gumtree-bigger.png and /dev/null differ diff --git a/Tiles/gumtree-bigger2.png b/Tiles/gumtree-bigger2.png deleted file mode 100644 index ef43a32..0000000 Binary files a/Tiles/gumtree-bigger2.png and /dev/null differ diff --git a/Tiles/gumtree-bigger2.png.import b/Tiles/gumtree-bigger2.png.import deleted file mode 100644 index 54264e7..0000000 --- a/Tiles/gumtree-bigger2.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/gumtree-bigger2.png-8b67470ab3d393918c342e7d3154dd79.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Tiles/gumtree-bigger2.png" -dest_files=[ "res://.import/gumtree-bigger2.png-8b67470ab3d393918c342e7d3154dd79.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -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 diff --git a/Tiles/gumtree-small.png b/Tiles/gumtree-small.png new file mode 100644 index 0000000..262959c Binary files /dev/null and b/Tiles/gumtree-small.png differ diff --git a/Tiles/sapling.png.import b/Tiles/gumtree-small.png.import similarity index 70% rename from Tiles/sapling.png.import rename to Tiles/gumtree-small.png.import index 87461ed..b104c66 100644 --- a/Tiles/sapling.png.import +++ b/Tiles/gumtree-small.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sapling.png-6a3561f0969c68fc0ab544023647d3e0.stex" +path="res://.import/gumtree-small.png-15ed6c75023673d8bb164b2303de048f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://Tiles/sapling.png" -dest_files=[ "res://.import/sapling.png-6a3561f0969c68fc0ab544023647d3e0.stex" ] +source_file="res://Tiles/gumtree-small.png" +dest_files=[ "res://.import/gumtree-small.png-15ed6c75023673d8bb164b2303de048f.stex" ] [params] diff --git a/Tiles/gumtree-small2.png b/Tiles/gumtree-small2.png new file mode 100644 index 0000000..2cfd3d0 Binary files /dev/null and b/Tiles/gumtree-small2.png differ diff --git a/Tiles/gumtree-bigger.png.import b/Tiles/gumtree-small2.png.import similarity index 70% rename from Tiles/gumtree-bigger.png.import rename to Tiles/gumtree-small2.png.import index 6eeead2..0ff2c4e 100644 --- a/Tiles/gumtree-bigger.png.import +++ b/Tiles/gumtree-small2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gumtree-bigger.png-139742aa8731c90dfec7e26955f627db.stex" +path="res://.import/gumtree-small2.png-a15768bfe5ebef4f7b4fd21b0e5318db.stex" metadata={ "vram_texture": false } [deps] -source_file="res://Tiles/gumtree-bigger.png" -dest_files=[ "res://.import/gumtree-bigger.png-139742aa8731c90dfec7e26955f627db.stex" ] +source_file="res://Tiles/gumtree-small2.png" +dest_files=[ "res://.import/gumtree-small2.png-a15768bfe5ebef4f7b4fd21b0e5318db.stex" ] [params] diff --git a/Tiles/sapling.png b/Tiles/sapling.png deleted file mode 100644 index e072a58..0000000 Binary files a/Tiles/sapling.png and /dev/null differ