From 321b9f3a85736ef490950d41929a522b7e6e6bbf Mon Sep 17 00:00:00 2001 From: Fusselkater Date: Mon, 18 Jul 2022 03:56:03 +0200 Subject: [PATCH] add decorations --- common/tiles/assets/decorations.svg | 153 ++++++++++++++++ ...ater.svg.import => decorations.svg.import} | 6 +- common/tiles/assets/grass.svg | 78 +++++++- common/tiles/assets/water.svg | 51 ------ common/tiles/base.tres | 169 +++++++++++++++++- objects/characters/player.tscn | 1 - scenes/levels/01/level_01.tscn | 20 +-- 7 files changed, 406 insertions(+), 72 deletions(-) create mode 100644 common/tiles/assets/decorations.svg rename common/tiles/assets/{water.svg.import => decorations.svg.import} (69%) delete mode 100644 common/tiles/assets/water.svg diff --git a/common/tiles/assets/decorations.svg b/common/tiles/assets/decorations.svg new file mode 100644 index 0000000..df27d27 --- /dev/null +++ b/common/tiles/assets/decorations.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/tiles/assets/water.svg.import b/common/tiles/assets/decorations.svg.import similarity index 69% rename from common/tiles/assets/water.svg.import rename to common/tiles/assets/decorations.svg.import index bf0d841..33a2365 100644 --- a/common/tiles/assets/water.svg.import +++ b/common/tiles/assets/decorations.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/water.svg-589a7f6f3af50104b42b9d564f2834e5.stex" +path="res://.import/decorations.svg-46dd817b14903befeb9b5870b11ca710.stex" metadata={ "vram_texture": false } [deps] -source_file="res://common/tiles/assets/water.svg" -dest_files=[ "res://.import/water.svg-589a7f6f3af50104b42b9d564f2834e5.stex" ] +source_file="res://common/tiles/assets/decorations.svg" +dest_files=[ "res://.import/decorations.svg-46dd817b14903befeb9b5870b11ca710.stex" ] [params] diff --git a/common/tiles/assets/grass.svg b/common/tiles/assets/grass.svg index e15f6db..e3433c0 100644 --- a/common/tiles/assets/grass.svg +++ b/common/tiles/assets/grass.svg @@ -3,8 +3,8 @@ @@ -196,6 +196,72 @@ fill="#c99869" d="m 47.000008,526.49995 11.65,-11.5 11.7,11.5 11.700001,-11.5 11.600001,11.5 11.7,-11.5 11.65,11.5 v 15 l -11.65,-11.5 -11.7,11.5 -11.600001,-11.5 -11.700001,11.5 -11.7,-11.5 -1.45,1.45 -10.15,10.05 h -0.05 v -15 m 0,30.2 1.8,-1.8 -0.05,-0.05 9.95,-9.85 11.7,11.5 11.700001,-11.5 11.600001,11.5 11.7,-11.5 9.9,9.8 -0.05,0.05 1.75,1.75 v 1.4 H 47.000008 v -1.3" id="path97-7-4" /> + + + + + + + + + + + + + + + + + + - - - - - - - - - diff --git a/common/tiles/base.tres b/common/tiles/base.tres index f389f78..70958a4 100644 --- a/common/tiles/base.tres +++ b/common/tiles/base.tres @@ -1,7 +1,8 @@ -[gd_resource type="TileSet" load_steps=32 format=2] +[gd_resource type="TileSet" load_steps=37 format=2] [ext_resource path="res://common/tiles/assets/grass.svg" type="Texture" id=1] [ext_resource path="res://common/tiles/assets/liquid.svg" type="Texture" id=2] +[ext_resource path="res://common/tiles/assets/decorations.svg" type="Texture" id=3] [sub_resource type="ConvexPolygonShape2D" id=1] points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) @@ -45,6 +46,18 @@ points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) [sub_resource type="ConvexPolygonShape2D" id=29] points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) +[sub_resource type="ConvexPolygonShape2D" id=30] +points = PoolVector2Array( 0, 0, 70, 0, 0, 70, 0, 70 ) + +[sub_resource type="ConvexPolygonShape2D" id=31] +points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=32] +points = PoolVector2Array( 0, 0, 0, 0, 70, 70, 0, 70 ) + +[sub_resource type="ConvexPolygonShape2D" id=33] +points = PoolVector2Array( 0, 70, 70, 0, 70, 70, 0, 70 ) + [sub_resource type="ConvexPolygonShape2D" id=8] points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) @@ -557,3 +570,157 @@ points = PoolVector2Array( 0, 70, 70, 0, 70, 70, 0, 70 ) "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 15/z_index = 0 +16/name = "Cave 1" +16/texture = ExtResource( 1 ) +16/tex_offset = Vector2( 0, 0 ) +16/modulate = Color( 1, 1, 1, 1 ) +16/region = Rect2( 0, 480, 70, 70 ) +16/tile_mode = 0 +16/occluder_offset = Vector2( 0, 0 ) +16/navigation_offset = Vector2( 0, 0 ) +16/shape_offset = Vector2( 0, 0 ) +16/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +16/shape = SubResource( 30 ) +16/shape_one_way = false +16/shape_one_way_margin = 1.0 +16/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 30 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +16/z_index = 0 +17/name = "Cave 2" +17/texture = ExtResource( 1 ) +17/tex_offset = Vector2( 0, 0 ) +17/modulate = Color( 1, 1, 1, 1 ) +17/region = Rect2( 80, 480, 70, 70 ) +17/tile_mode = 0 +17/occluder_offset = Vector2( 0, 0 ) +17/navigation_offset = Vector2( 0, 0 ) +17/shape_offset = Vector2( 0, 0 ) +17/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +17/shape = SubResource( 31 ) +17/shape_one_way = false +17/shape_one_way_margin = 1.0 +17/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 31 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +17/z_index = 0 +18/name = "Cave 3" +18/texture = ExtResource( 1 ) +18/tex_offset = Vector2( 0, 0 ) +18/modulate = Color( 1, 1, 1, 1 ) +18/region = Rect2( 160, 480, 70, 70 ) +18/tile_mode = 0 +18/occluder_offset = Vector2( 0, 0 ) +18/navigation_offset = Vector2( 0, 0 ) +18/shape_offset = Vector2( 0, 0 ) +18/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +18/shape = SubResource( 32 ) +18/shape_one_way = false +18/shape_one_way_margin = 1.0 +18/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 32 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +18/z_index = 0 +19/name = "Cave 4" +19/texture = ExtResource( 1 ) +19/tex_offset = Vector2( 0, 0 ) +19/modulate = Color( 1, 1, 1, 1 ) +19/region = Rect2( 240, 480, 70, 70 ) +19/tile_mode = 0 +19/occluder_offset = Vector2( 0, 0 ) +19/navigation_offset = Vector2( 0, 0 ) +19/shape_offset = Vector2( 0, 0 ) +19/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +19/shape = SubResource( 33 ) +19/shape_one_way = false +19/shape_one_way_margin = 1.0 +19/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 33 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +19/z_index = 0 +20/name = "Bush" +20/texture = ExtResource( 3 ) +20/tex_offset = Vector2( 0, 0 ) +20/modulate = Color( 1, 1, 1, 1 ) +20/region = Rect2( 0, 0, 70, 70 ) +20/tile_mode = 0 +20/occluder_offset = Vector2( 0, 0 ) +20/navigation_offset = Vector2( 0, 0 ) +20/shape_offset = Vector2( 0, 0 ) +20/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +20/shape_one_way = false +20/shape_one_way_margin = 0.0 +20/shapes = [ ] +20/z_index = 0 +21/name = "Cactus" +21/texture = ExtResource( 3 ) +21/tex_offset = Vector2( 0, 0 ) +21/modulate = Color( 1, 1, 1, 1 ) +21/region = Rect2( 80, 0, 70, 70 ) +21/tile_mode = 0 +21/occluder_offset = Vector2( 0, 0 ) +21/navigation_offset = Vector2( 0, 0 ) +21/shape_offset = Vector2( 0, 0 ) +21/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +21/shape_one_way = false +21/shape_one_way_margin = 0.0 +21/shapes = [ ] +21/z_index = 0 +22/name = "Plant" +22/texture = ExtResource( 3 ) +22/tex_offset = Vector2( 0, 0 ) +22/modulate = Color( 1, 1, 1, 1 ) +22/region = Rect2( 160, 0, 70, 70 ) +22/tile_mode = 0 +22/occluder_offset = Vector2( 0, 0 ) +22/navigation_offset = Vector2( 0, 0 ) +22/shape_offset = Vector2( 0, 0 ) +22/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +22/shape_one_way = false +22/shape_one_way_margin = 0.0 +22/shapes = [ ] +22/z_index = 0 +23/name = "Fly Amantia" +23/texture = ExtResource( 3 ) +23/tex_offset = Vector2( 0, 0 ) +23/modulate = Color( 1, 1, 1, 1 ) +23/region = Rect2( 240, 0, 70, 70 ) +23/tile_mode = 0 +23/occluder_offset = Vector2( 0, 0 ) +23/navigation_offset = Vector2( 0, 0 ) +23/shape_offset = Vector2( 0, 0 ) +23/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +23/shape_one_way = false +23/shape_one_way_margin = 0.0 +23/shapes = [ ] +23/z_index = 0 +24/name = "Mushroom" +24/texture = ExtResource( 3 ) +24/tex_offset = Vector2( 0, 0 ) +24/modulate = Color( 1, 1, 1, 1 ) +24/region = Rect2( 0, 80, 70, 70 ) +24/tile_mode = 0 +24/occluder_offset = Vector2( 0, 0 ) +24/navigation_offset = Vector2( 0, 0 ) +24/shape_offset = Vector2( 0, 0 ) +24/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +24/shape_one_way = false +24/shape_one_way_margin = 0.0 +24/shapes = [ ] +24/z_index = 0 diff --git a/objects/characters/player.tscn b/objects/characters/player.tscn index edbe0ca..dfc17be 100644 --- a/objects/characters/player.tscn +++ b/objects/characters/player.tscn @@ -20,7 +20,6 @@ script = ExtResource( 11 ) [node name="Sprite" type="AnimatedSprite" parent="."] frames = ExtResource( 1 ) animation = "idle" -frame = 6 playing = true __meta__ = { "_edit_lock_": true diff --git a/scenes/levels/01/level_01.tscn b/scenes/levels/01/level_01.tscn index 08425b7..e14c937 100644 --- a/scenes/levels/01/level_01.tscn +++ b/scenes/levels/01/level_01.tscn @@ -13,22 +13,22 @@ script = ExtResource( 2 ) bgm_path = "res://scenes/levels/01/assets/bgm.ogg" -[node name="Player" parent="." instance=ExtResource( 7 )] -position = Vector2( 105, 910 ) -scale = Vector2( 0.2, 0.2 ) -background_scene = ExtResource( 1 ) - -[node name="monster_01" parent="." instance=ExtResource( 6 )] -position = Vector2( 1015, 945 ) -reverse_direction = true - [node name="TileMap" type="TileMap" parent="."] tile_set = ExtResource( 4 ) cell_size = Vector2( 70, 70 ) collision_layer = 4 collision_mask = 0 format = 1 -tile_data = PoolIntArray( 524305, 1, 0, 524306, 1, 1, 524307, 1, 1, 524308, 1, 1, 524309, 1, 2, 589835, 1, 0, 589836, 1, 1, 589837, 1, 1, 589838, 1, 2, 786449, 0, 1, 786450, 0, 2, 786451, 0, 3, 786459, 1, 0, 786460, 4, 0, 786461, 4, 0, 786462, 4, 0, 786463, 4, 0, 786464, 7, 0, 851990, 9, 0, 851991, 4, 0, 851992, 15, 0, 851996, 5, 0, 851997, 5, 0, 851998, 5, 0, 851999, 5, 0, 852000, 8, 0, 852001, 7, 0, 983039, 4, 0, 917504, 4, 0, 917505, 4, 0, 917506, 4, 0, 917507, 4, 0, 917508, 4, 0, 917509, 4, 0, 917510, 4, 0, 917511, 4, 0, 917512, 4, 0, 917513, 4, 0, 917514, 4, 0, 917515, 4, 0, 917516, 4, 0, 917517, 4, 0, 917518, 4, 0, 917519, 7, 0, 917525, 9, 0, 917526, 10, 0, 917527, 5, 0, 917528, 5, 0, 917529, 11, 0, 917530, 11, 0, 917531, 11, 0, 917532, 5, 0, 917533, 4, 0, 917534, 4, 0, 917535, 4, 0, 917536, 5, 0, 917537, 8, 0, 917538, 7, 0, 1048575, 5, 0, 983040, 5, 0, 983041, 5, 0, 983042, 5, 0, 983043, 5, 0, 983044, 5, 0, 983045, 5, 0, 983046, 5, 0, 983047, 5, 0, 983048, 5, 0, 983049, 5, 0, 983050, 5, 0, 983051, 5, 0, 983052, 5, 0, 983053, 5, 0, 983054, 5, 0, 983055, 8, 0, 983056, 4, 0, 983057, 4, 0, 983058, 4, 0, 983059, 4, 0, 983060, 4, 0, 983061, 10, 0, 983062, 5, 0, 983063, 5, 0, 983064, 5, 0, 983065, 12, 0, 983066, 12, 0, 983067, 12, 0, 983068, 5, 0, 983069, 5, 0, 983070, 5, 0, 983071, 5, 0, 983072, 5, 0, 983073, 5, 0, 983074, 8, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 983080, 4, 0, 983081, 4, 0 ) +tile_data = PoolIntArray( 524305, 1, 0, 524306, 1, 1, 524307, 1, 1, 524308, 1, 1, 524309, 1, 2, 589835, 1, 0, 589836, 1, 1, 589837, 1, 1, 589838, 1, 2, 720925, 23, 0, 720926, 22, 0, 786449, 0, 1, 786450, 0, 2, 786451, 0, 3, 786456, 22, 0, 786459, 1, 0, 786460, 4, 0, 786461, 4, 0, 786462, 4, 0, 786463, 4, 0, 786464, 7, 0, 851971, 20, 0, 851973, 23, 0, 851975, 22, 0, 851977, 24, 0, 851979, 20, 0, 851981, 22, 0, 851990, 9, 0, 851991, 4, 0, 851992, 15, 0, 851996, 5, 0, 851997, 5, 0, 851998, 5, 0, 851999, 5, 0, 852000, 8, 0, 852001, 7, 0, 983039, 4, 0, 917504, 4, 0, 917505, 4, 0, 917506, 4, 0, 917507, 4, 0, 917508, 4, 0, 917509, 4, 0, 917510, 4, 0, 917511, 4, 0, 917512, 4, 0, 917513, 4, 0, 917514, 4, 0, 917515, 4, 0, 917516, 4, 0, 917517, 4, 0, 917518, 4, 0, 917519, 7, 0, 917521, 23, 0, 917523, 20, 0, 917525, 9, 0, 917526, 10, 0, 917527, 5, 0, 917528, 5, 0, 917529, 11, 0, 917530, 11, 0, 917531, 11, 0, 917532, 5, 0, 917533, 5, 0, 917534, 5, 0, 917535, 5, 0, 917536, 5, 0, 917537, 8, 0, 917538, 7, 0, 917540, 22, 0, 917542, 20, 0, 1048575, 5, 0, 983040, 5, 0, 983041, 5, 0, 983042, 5, 0, 983043, 5, 0, 983044, 5, 0, 983045, 5, 0, 983046, 5, 0, 983047, 5, 0, 983048, 5, 0, 983049, 5, 0, 983050, 5, 0, 983051, 5, 0, 983052, 5, 0, 983053, 5, 0, 983054, 5, 0, 983055, 8, 0, 983056, 4, 0, 983057, 4, 0, 983058, 4, 0, 983059, 4, 0, 983060, 4, 0, 983061, 10, 0, 983062, 5, 0, 983063, 5, 0, 983064, 5, 0, 983065, 12, 0, 983066, 12, 0, 983067, 12, 0, 983068, 5, 0, 983069, 5, 0, 983070, 5, 0, 983071, 5, 0, 983072, 5, 0, 983073, 5, 0, 983074, 8, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 983080, 4, 0, 983081, 4, 0 ) + +[node name="monster_01" parent="." instance=ExtResource( 6 )] +position = Vector2( 1015, 945 ) +reverse_direction = true + +[node name="Player" parent="." instance=ExtResource( 7 )] +position = Vector2( 105, 910 ) +scale = Vector2( 0.2, 0.2 ) +background_scene = ExtResource( 1 ) [node name="Coin" parent="." instance=ExtResource( 5 )] position = Vector2( 315, 700 )