From 011a1b8007a266cac6b0eb2e2dfc5c5337bdd925 Mon Sep 17 00:00:00 2001 From: Martin Araneda Date: Thu, 1 Sep 2022 21:59:21 -0400 Subject: [PATCH] make the enemies use the event bus --- godot/characters/enemies/WalkingEnemy.gd | 5 +---- godot/characters/enemies/blightwing/Blightwing.gd | 5 +---- godot/characters/enemies/blockface/Blockface.gd | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/godot/characters/enemies/WalkingEnemy.gd b/godot/characters/enemies/WalkingEnemy.gd index 94a01b5..15707dc 100644 --- a/godot/characters/enemies/WalkingEnemy.gd +++ b/godot/characters/enemies/WalkingEnemy.gd @@ -1,9 +1,6 @@ extends KinematicBody2D -signal player_touched - - var velocity = Vector2() export var direction = -1 export var detect_edges = true @@ -32,7 +29,7 @@ func _physics_process(_delta: float) -> void: for i in get_slide_count(): var collision = get_slide_collision(i) if collision.collider.name == "Player": - emit_signal("player_touched") + Event.emit_signal("player_touched", 3) Event.emit_signal("object_updated", self.get_name(), "Walking", global_position, velocity) diff --git a/godot/characters/enemies/blightwing/Blightwing.gd b/godot/characters/enemies/blightwing/Blightwing.gd index 1446628..a41b7a1 100644 --- a/godot/characters/enemies/blightwing/Blightwing.gd +++ b/godot/characters/enemies/blightwing/Blightwing.gd @@ -1,9 +1,6 @@ extends KinematicBody2D -signal player_touched - - export var direction = -1 export var speed = 50 export var follow_path = false @@ -82,7 +79,7 @@ func get_velocity_towards_target(delta: float) -> Vector2: func wall_checker_collided(wall_checker: RayCast2D) -> void: if wall_checker.get_collider().name == "Player": - emit_signal("player_touched") + Event.emit_signal("player_touched", 3) direction *= -1 $AnimatedSprite.flip_h = not $AnimatedSprite.flip_h diff --git a/godot/characters/enemies/blockface/Blockface.gd b/godot/characters/enemies/blockface/Blockface.gd index 3f52a5a..fab7b04 100644 --- a/godot/characters/enemies/blockface/Blockface.gd +++ b/godot/characters/enemies/blockface/Blockface.gd @@ -1,9 +1,6 @@ extends KinematicBody2D -signal player_touched - - onready var start_position = position var velocity = Vector2() export var speed = 50.0 @@ -25,7 +22,7 @@ func _physics_process(delta: float) -> void: return_to_start = true $AnimatedSprite.play("normal") if collision.collider.name == "Player": - emit_signal("player_touched") + Event.emit_signal("player_touched", 3) Event.emit_signal("object_updated", self.get_name(), "Falling", global_position, velocity) if position.y <= start_position.y: