From ca2ea40b23896bd3f6cccf12d7d756bf4a531e7f Mon Sep 17 00:00:00 2001 From: VoidTwo Date: Tue, 30 Nov 2021 21:22:52 -0600 Subject: [PATCH] Fixed some Area2D detection --- Enemies/Glowing Ghost.gd | 5 +++-- Levels/Traps/Spawn Trap.gd | 17 +++++++++-------- Player/Player.tscn | 10 +++++----- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Enemies/Glowing Ghost.gd b/Enemies/Glowing Ghost.gd index 2825b5c..562659f 100644 --- a/Enemies/Glowing Ghost.gd +++ b/Enemies/Glowing Ghost.gd @@ -22,6 +22,7 @@ func _on_player_detector_area_entered(area: Area2D) -> void: return -func _on_player_detector_area_exited(_area: Area2D): - player = null +func _on_player_detector_area_exited(area: Area2D): + if area.get_parent().name == 'Player': + player = null return diff --git a/Levels/Traps/Spawn Trap.gd b/Levels/Traps/Spawn Trap.gd index 7e356e7..38a24b8 100644 --- a/Levels/Traps/Spawn Trap.gd +++ b/Levels/Traps/Spawn Trap.gd @@ -5,14 +5,15 @@ export var relative_x_tiles: int export var relative_y_tiles: int -func _on_spawn_trap_area_entered(_area: Area2D) -> void: - set_deferred('monitoring', false) - $Tile.set_deferred('disabled', true) +func _on_spawn_trap_area_entered(area: Area2D) -> void: + if area.get_parent().name == 'Player': + set_deferred('monitoring', false) - var enemy: KinematicBody2D = load(enemy_path).instance() - enemy.position.x = position.x + (relative_x_tiles * 16 + 8) - enemy.position.y = position.y + (relative_y_tiles * 16 + 8) + var enemy: KinematicBody2D = load(enemy_path).instance() + enemy.position.x = position.x + (relative_x_tiles * 16 + 8) + enemy.position.y = position.y + (relative_y_tiles * 16 + 8) - var enemies: YSort = get_tree().get_current_scene().get_node('YSort/Enemies') - enemies.call_deferred('add_child', enemy) + var enemies: YSort = get_tree().get_current_scene().get_node('YSort/Enemies') + enemies.call_deferred('add_child', enemy) + call_deferred('queue_free') return diff --git a/Player/Player.tscn b/Player/Player.tscn index 4988cd5..ec99e23 100644 --- a/Player/Player.tscn +++ b/Player/Player.tscn @@ -13,6 +13,11 @@ animations = [ { "name": "look_right", "speed": 5.0 }, { +"frames": [ ExtResource( 3 ) ], +"loop": false, +"name": "look_down", +"speed": 5.0 +}, { "frames": [ ExtResource( 4 ) ], "loop": false, "name": "look_up", @@ -22,11 +27,6 @@ animations = [ { "loop": false, "name": "look_left", "speed": 5.0 -}, { -"frames": [ ExtResource( 3 ) ], -"loop": false, -"name": "look_down", -"speed": 5.0 } ] [sub_resource type="CapsuleShape2D" id=2]