mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-22 15:38:14 +00:00
Fix lingering Hammer issues (#607)
* Fix lingering Hammer issues * CannonBall gib * Spike Block and Rocky Wrench cleanup * Update SpikeBlock.tscn * Update PlayerDetection.gd
This commit is contained in:

committed by
GitHub

parent
8474bc3c19
commit
ae4317f9e5
@@ -10,9 +10,9 @@ func do_cycle() -> void:
|
||||
AudioManager.play_sfx("burner", global_position)
|
||||
do_animation()
|
||||
await get_tree().create_timer(0.25, false).timeout
|
||||
%Hitbox.set_deferred("disabled", false)
|
||||
%Shape.set_deferred("disabled", false)
|
||||
await get_tree().create_timer(1.5, false).timeout
|
||||
%Hitbox.set_deferred("disabled", true)
|
||||
%Shape.set_deferred("disabled", true)
|
||||
$Timer.start()
|
||||
|
||||
func do_animation() -> void:
|
||||
|
@@ -9,11 +9,11 @@ func _ready() -> void:
|
||||
area_exited.connect(on_area_exited)
|
||||
|
||||
func on_area_entered(area: Area2D) -> void:
|
||||
if area.owner is Player:
|
||||
if area.owner is Player and area.name != "HammerHitbox":
|
||||
player_entered.emit(area.owner)
|
||||
|
||||
func on_area_exited(area: Area2D) -> void:
|
||||
if area.owner is Player:
|
||||
if area.owner is Player and area.name != "HammerHitbox":
|
||||
player_exited.emit(area.owner)
|
||||
|
||||
func is_player_in_area() -> bool:
|
||||
|
Reference in New Issue
Block a user