diff --git a/assets/textures/enemies/slime_green_atlas.png b/assets/textures/enemies/slime_green_atlas.png new file mode 100644 index 0000000..4fcc2bd Binary files /dev/null and b/assets/textures/enemies/slime_green_atlas.png differ diff --git a/assets/textures/enemies/slime_green_atlas.png.import b/assets/textures/enemies/slime_green_atlas.png.import new file mode 100644 index 0000000..bc1884b --- /dev/null +++ b/assets/textures/enemies/slime_green_atlas.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ca1es3hoj53wg" +path="res://.godot/imported/slime_green_atlas.png-e4460cfe974755b8ce33e1b93831e12b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/enemies/slime_green_atlas.png" +dest_files=["res://.godot/imported/slime_green_atlas.png-e4460cfe974755b8ce33e1b93831e12b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/project.godot b/project.godot index 5f28ef2..8dfbb0b 100644 --- a/project.godot +++ b/project.godot @@ -145,6 +145,10 @@ locale/translations_pot_files=PackedStringArray() 2d_physics/layer_1="World" 2d_physics/layer_2="Interactable" +[physics] + +2d/run_on_separate_thread=true + [rendering] global_illumination/gi/use_half_resolution=true diff --git a/scenes/overworld.tscn b/scenes/overworld.tscn index 801eec8..a391e65 100644 --- a/scenes/overworld.tscn +++ b/scenes/overworld.tscn @@ -39,7 +39,7 @@ layer_1/modulate = Color(1, 1, 1, 1) layer_1/y_sort_enabled = true layer_1/y_sort_origin = 0 layer_1/z_index = 0 -layer_1/tile_data = PackedInt32Array(-262141, 0, 0, -196605, 0, 0, -196604, 0, 0, -196603, 0, 0, -196602, 0, 0, -262138, 0, 0, -262139, 0, 0, -262140, 0, 0, -6, 1, 131072, -262150, 2, 65536, 4, 4, 65536) +layer_1/tile_data = PackedInt32Array(-262141, 0, 0, -196605, 0, 0, -196604, 0, 0, -196603, 0, 0, -196602, 0, 0, -262138, 0, 0, -262139, 0, 0, -262140, 0, 0, -6, 0, 131072, -262150, 0, 196608, 4, 0, 65536, 131073, 5, 65536) metadata/_edit_lock_ = true [node name="player" parent="." instance=ExtResource("2_0skrb")] diff --git a/scenes/player.tscn b/scenes/player.tscn index 9b744b7..9d1960e 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -90,6 +90,7 @@ height = 54.0 [node name="player" type="CharacterBody2D"] process_mode = 1 +motion_mode = 1 script = ExtResource("1_qehox") metadata/_edit_lock_ = true diff --git a/scenes/tiles/enemies/slime.tscn b/scenes/tiles/enemies/slime.tscn new file mode 100644 index 0000000..9891db5 --- /dev/null +++ b/scenes/tiles/enemies/slime.tscn @@ -0,0 +1,56 @@ +[gd_scene load_steps=8 format=3 uid="uid://cpu7t7csffoxg"] + +[ext_resource type="Texture2D" uid="uid://ca1es3hoj53wg" path="res://assets/textures/enemies/slime_green_atlas.png" id="1_bw6us"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_eghup"] +atlas = ExtResource("1_bw6us") +region = Rect2(0, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_8p5ni"] +atlas = ExtResource("1_bw6us") +region = Rect2(64, 0, 64, 64) + +[sub_resource type="AtlasTexture" id="AtlasTexture_j8570"] +atlas = ExtResource("1_bw6us") +region = Rect2(128, 0, 64, 64) + +[sub_resource type="SpriteFrames" id="SpriteFrames_bwr2v"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_eghup") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_8p5ni") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_j8570") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_eghup") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="GDScript" id="GDScript_6slvi"] +resource_name = "animation" +script/source = "extends AnimatedSprite2D + +func _ready(): + play() +" + +[sub_resource type="CircleShape2D" id="CircleShape2D_ochsc"] +radius = 26.0192 + +[node name="slime" type="CharacterBody2D"] + +[node name="animated_sprite_2d" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_bwr2v") +frame_progress = 0.486509 +script = SubResource("GDScript_6slvi") + +[node name="collision_shape_2d" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_ochsc") diff --git a/scenes/tiles/first_debug_tile.tscn b/scenes/tiles/first_debug_tile.tscn index c4d0638..99f097b 100644 --- a/scenes/tiles/first_debug_tile.tscn +++ b/scenes/tiles/first_debug_tile.tscn @@ -8,6 +8,7 @@ radius = 33.1361 [node name="rigid_body_2d" type="RigidBody2D"] collision_layer = 2 collision_mask = 3 +collision_priority = 20.0 gravity_scale = 0.0 [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/tilesets/main_tileset.tres b/tilesets/main_tileset.tres index e6a8fa1..0405f83 100644 --- a/tilesets/main_tileset.tres +++ b/tilesets/main_tileset.tres @@ -1,36 +1,30 @@ -[gd_resource type="TileSet" load_steps=11 format=3 uid="uid://dcg1tdmkkx22p"] +[gd_resource type="TileSet" load_steps=10 format=3 uid="uid://dcg1tdmkkx22p"] [ext_resource type="PackedScene" uid="uid://dk7fqaw2b3w1k" path="res://scenes/tiles/first_debug_tile.tscn" id="1_uxmn6"] [ext_resource type="PackedScene" uid="uid://dckxciecwjfgf" path="res://scenes/tiles/cupcake.tscn" id="2_v4037"] [ext_resource type="PackedScene" uid="uid://c4dkrtswpv8cv" path="res://scenes/tiles/sound_debug_tile.tscn" id="3_lf2fs"] [ext_resource type="Texture2D" uid="uid://d3l4uomk1gw8c" path="res://assets/textures/debug/grass_tile.png" id="4_k7c1q"] [ext_resource type="PackedScene" uid="uid://ct6s1gfjkciva" path="res://scenes/tiles/3d_cube_tile.tscn" id="5_x3uol"] +[ext_resource type="PackedScene" uid="uid://cpu7t7csffoxg" path="res://scenes/tiles/enemies/slime.tscn" id="6_mcy76"] [sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_lcrun"] -resource_name = "test" +resource_name = "debug" scenes/0/scene = ExtResource("1_uxmn6") - -[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_eskkr"] -resource_name = "cupcake" +scenes/1/scene = ExtResource("5_x3uol") scenes/2/scene = ExtResource("2_v4037") - -[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_xtxu0"] -resource_name = "sounddebug" -scenes/1/scene = ExtResource("3_lf2fs") +scenes/3/scene = ExtResource("3_lf2fs") [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_na45g"] texture = ExtResource("4_k7c1q") texture_region_size = Vector2i(64, 64) 0:0/0 = 0 -[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_loadc"] -resource_name = "3d cube" -scenes/1/scene = ExtResource("5_x3uol") +[sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_d4uti"] +resource_name = "enemies" +scenes/1/scene = ExtResource("6_mcy76") [resource] tile_size = Vector2i(64, 64) sources/0 = SubResource("TileSetScenesCollectionSource_lcrun") -sources/1 = SubResource("TileSetScenesCollectionSource_eskkr") -sources/2 = SubResource("TileSetScenesCollectionSource_xtxu0") sources/3 = SubResource("TileSetAtlasSource_na45g") -sources/4 = SubResource("TileSetScenesCollectionSource_loadc") +sources/5 = SubResource("TileSetScenesCollectionSource_d4uti")