diff --git a/scenes/game.tscn b/scenes/game.tscn index 295c9a1..effae99 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -6,9 +6,9 @@ [ext_resource type="Texture2D" uid="uid://c4i3fnr6gpjp" path="res://assets/tileset/Tiled_files/details.png" id="7_gee14"] [ext_resource type="PackedScene" uid="uid://b4v0ntaukg2je" path="res://scenes/witch.tscn" id="7_u5sy4"] [ext_resource type="Texture2D" uid="uid://0xu8ohipv2mj" path="res://assets/tileset/Tiled_files/Objects.png" id="8_0tnpc"] -[ext_resource type="PackedScene" path="res://scenes/tile_map_layer(background).tscn" id="8_vtaks"] -[ext_resource type="PackedScene" path="res://scenes/tile_map_layer(objects).tscn" id="9_kvpfn"] -[ext_resource type="PackedScene" path="res://scenes/tile_map_layer(overlay).tscn" id="10_dinhu"] +[ext_resource type="PackedScene" uid="uid://cgu7w2jd42f3a" path="res://scenes/tile_map_layer(background).tscn" id="8_vtaks"] +[ext_resource type="PackedScene" uid="uid://bgpsc6dvsn7ak" path="res://scenes/tile_map_layer(objects).tscn" id="9_kvpfn"] +[ext_resource type="PackedScene" uid="uid://co8t1fr3b3kub" path="res://scenes/tile_map_layer(overlay).tscn" id="10_dinhu"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_vtaks"] texture = ExtResource("7_gee14") diff --git a/scripts/enemy_base.gd b/scripts/enemy_base.gd index 97aff93..685dcb2 100644 --- a/scripts/enemy_base.gd +++ b/scripts/enemy_base.gd @@ -8,6 +8,7 @@ var speed var witch var player var death_sound = preload("res://assets/music&sfx/sfx/hit2.wav") +signal died func _ready() -> void: witch = get_node("/root/Game/Witch") @@ -16,6 +17,7 @@ func _ready() -> void: func _die(): is_dying = true + collision_layer = 0 animated_sprite_2d.play("death") var player = AudioStreamPlayer.new() add_child(player) diff --git a/scripts/slime.gd b/scripts/slime.gd index 823da47..56f1b30 100644 --- a/scripts/slime.gd +++ b/scripts/slime.gd @@ -15,6 +15,8 @@ func _process(delta: float) -> void: pass func _on_area_2d_body_entered(body: Node2D) -> void: + if is_dying: + return if body == player: _die() pass # Replace with function body.