Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

develop #50

Merged
cromer merged 47 commits from develop into master 2022-09-02 00:37:34 -04:00
Conversation 0 Commits 47 Files Changed 45 +3 -12
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 011a1b8007 - Show all commits

5
godot/characters/enemies/WalkingEnemy.gd
View File

@ -1,9 +1,6 @@
extends KinematicBody2D extends KinematicBody2D
signal player_touched
var velocity = Vector2() var velocity = Vector2()
export var direction = -1 export var direction = -1
export var detect_edges = true export var detect_edges = true
@ -32,7 +29,7 @@ func _physics_process(_delta: float) -> void:
for i in get_slide_count(): for i in get_slide_count():
var collision = get_slide_collision(i) var collision = get_slide_collision(i)
if collision.collider.name == "Player": 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) Event.emit_signal("object_updated", self.get_name(), "Walking", global_position, velocity)

5
godot/characters/enemies/blightwing/Blightwing.gd
View File

@ -1,9 +1,6 @@
extends KinematicBody2D extends KinematicBody2D
signal player_touched
export var direction = -1 export var direction = -1
export var speed = 50 export var speed = 50
export var follow_path = false 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: func wall_checker_collided(wall_checker: RayCast2D) -> void:
if wall_checker.get_collider().name == "Player": if wall_checker.get_collider().name == "Player":
emit_signal("player_touched") Event.emit_signal("player_touched", 3)
direction *= -1 direction *= -1
$AnimatedSprite.flip_h = not $AnimatedSprite.flip_h $AnimatedSprite.flip_h = not $AnimatedSprite.flip_h

5
godot/characters/enemies/blockface/Blockface.gd
View File

@ -1,9 +1,6 @@
extends KinematicBody2D extends KinematicBody2D
signal player_touched
onready var start_position = position onready var start_position = position
var velocity = Vector2() var velocity = Vector2()
export var speed = 50.0 export var speed = 50.0
@ -25,7 +22,7 @@ func _physics_process(delta: float) -> void:
return_to_start = true return_to_start = true
$AnimatedSprite.play("normal") $AnimatedSprite.play("normal")
if collision.collider.name == "Player": 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) Event.emit_signal("object_updated", self.get_name(), "Falling", global_position, velocity)
if position.y <= start_position.y: if position.y <= start_position.y: