diff --git a/Scenes/Prefabs/Entities/Enemies/HammerBro.tscn b/Scenes/Prefabs/Entities/Enemies/HammerBro.tscn index ca7d979..aa2eb34 100644 --- a/Scenes/Prefabs/Entities/Enemies/HammerBro.tscn +++ b/Scenes/Prefabs/Entities/Enemies/HammerBro.tscn @@ -69,14 +69,14 @@ loop_mode = 2 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite:position") +tracks/0/path = NodePath("MovementJoint:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0, 1), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [Vector2(8, -12), Vector2(-8, -12)] +"values": [Vector2(8, 0), Vector2(-8, 0)] } [sub_resource type="Animation" id="Animation_scjjh"] @@ -84,14 +84,14 @@ length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Sprite:position") +tracks/0/path = NodePath("MovementJoint:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(0, -12)] +"values": [Vector2(0, 0)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_2vqj5"] @@ -187,9 +187,12 @@ on_screen_enabler = NodePath("VisibleOnScreenEnabler2D") score_note_adder = NodePath("ScoreNoteSpawner") metadata/_custom_type_script = "uid://bpydbpyjk1mt4" -[node name="Sprite" type="AnimatedSprite2D" parent="."] +[node name="MovementJoint" type="Node2D" parent="."] + +[node name="Sprite" type="AnimatedSprite2D" parent="MovementJoint"] position = Vector2(0, -12) -scale = Vector2(-1, 1) +rotation = 3.1415927 +scale = Vector2(1, -1) sprite_frames = SubResource("SpriteFrames_cl1av") animation = &"Idle" frame_progress = 0.755197 @@ -198,14 +201,14 @@ flip_h = true script = ExtResource("3_hx42c") metadata/_custom_type_script = "uid://caq1qiwmy0mox" -[node name="Hammer" type="Sprite2D" parent="Sprite"] +[node name="Hammer" type="Sprite2D" parent="MovementJoint/Sprite"] visible = false show_behind_parent = true position = Vector2(0, -17) texture = SubResource("AtlasTexture_hx42c") flip_h = true -[node name="ResourceSetterNew" type="Node" parent="Sprite/Hammer" node_paths=PackedStringArray("node_to_affect")] +[node name="ResourceSetterNew" type="Node" parent="MovementJoint/Sprite/Hammer" node_paths=PackedStringArray("node_to_affect")] script = ExtResource("7_pvn5i") node_to_affect = NodePath("..") property_name = "texture" @@ -213,7 +216,7 @@ mode = 1 resource_json = ExtResource("6_0w8yj") metadata/_custom_type_script = "uid://cbal8ms2oe1ik" -[node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect")] +[node name="ResourceSetterNew" type="Node" parent="MovementJoint/Sprite" node_paths=PackedStringArray("node_to_affect")] script = ExtResource("7_pvn5i") node_to_affect = NodePath("..") property_name = "sprite_frames" @@ -274,7 +277,7 @@ metadata/_custom_type_script = "uid://dri2d5jtu0fbq" [node name="GibSpawner" type="Node" parent="." node_paths=PackedStringArray("visuals")] script = ExtResource("8_1mp8k") -visuals = NodePath("../Sprite") +visuals = NodePath("../MovementJoint/Sprite") metadata/_custom_type_script = "uid://c3gg32ivrlq8n" [node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."] @@ -324,7 +327,7 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t" [connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]] [connection signal="fireball_hit" from="FireballDetection" to="." method="die_from_object"] [connection signal="fireball_hit" from="FireballDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]] -[connection signal="gib_about_to_spawn" from="GibSpawner" to="Sprite/Hammer" method="hide"] +[connection signal="gib_about_to_spawn" from="GibSpawner" to="MovementJoint/Sprite/Hammer" method="hide"] [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="on_screen_entered"] [connection signal="timeout" from="Timer" to="." method="charge"] [connection signal="moving_shell_entered" from="ShellDetection" to="." method="die_from_object"]