From 7babb27960c811d0331df10b8482edad3549bfa6 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sat, 13 Jul 2024 02:19:33 -0400 Subject: [PATCH] fixed last rolling fiend issue --- maps/boss/boss3_arena.tscn | 6 +----- objects/enemy/boss/famira.gd | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/maps/boss/boss3_arena.tscn b/maps/boss/boss3_arena.tscn index 0bfde0c..26217b9 100644 --- a/maps/boss/boss3_arena.tscn +++ b/maps/boss/boss3_arena.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=2] +[gd_scene load_steps=33 format=2] [ext_resource path="res://objects/enemy/boss/sg2083.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_laboratory.tres" type="TileSet" id=2] @@ -27,7 +27,6 @@ [ext_resource path="res://objects/lore/hills/sg.tscn" type="PackedScene" id=25] [ext_resource path="res://objects/lore/lab/scope.tscn" type="PackedScene" id=26] [ext_resource path="res://shaders/can_stain.tres" type="Material" id=27] -[ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=28] [sub_resource type="ShaderMaterial" id=4] shader = ExtResource( 19 ) @@ -366,9 +365,6 @@ anims/drop-stg = SubResource( 2 ) position = Vector2( -9001, 167 ) texture = ExtResource( 23 ) -[node name="RollingFiend" parent="." instance=ExtResource( 28 )] -position = Vector2( 65, 171 ) - [connection signal="cutscene_finished" from="FamiCutscene" to="." method="_on_cutscene_finished"] [connection signal="energy_changed" from="2083" to="." method="_on_2083_energy_changed"] [connection signal="health_changed" from="2083" to="." method="_on_2083_health_changed"] diff --git a/objects/enemy/boss/famira.gd b/objects/enemy/boss/famira.gd index c35530e..8478500 100644 --- a/objects/enemy/boss/famira.gd +++ b/objects/enemy/boss/famira.gd @@ -148,11 +148,4 @@ func _on_Shooting_state_physics_processing(delta) -> void: func _on_Hitbox_area_entered(area: Area2D) -> void: if area.is_in_group("hurt_famira"): - hurt(area.damage) - var death_particles = DeathParticles.instance() - death_particles.global_position = area.global_position - death_particles.emitting = true - death_particles.spray_scale = 2.0 - death_particles.spray_ammount = 2 - get_parent().add_child(death_particles) area.queue_free()