GitHub/Super-Mario-Bros.-Remastered-Public
1
0
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-10-22 15:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update hitboxes for consistency (#608)

Browse Source 
Co-authored-by: Joe H <97353363+JHDev2006@users.noreply.github.com>
This commit is contained in:
John Cooper McDonald
2025-10-17 11:12:57 -05:00
committed by GitHub
parent ed297891fd
commit 9a17f140e0
27 changed files with 246 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Scenes/Prefabs/Entities/Objects/Bumper.tscn
View File

@@ -84,12 +84,12 @@ property_name = "sprite_frames"
resource_json = ExtResource("5_ix70v")
metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[node name="Hitbox" type="Area2D" parent="."]
[node name="PlayerDetection" type="Area2D" parent="."]
collision_layer = 255
script = ExtResource("3_cgc3p")
metadata/_custom_type_script = "uid://cnheej0sxmoxg"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
shape = SubResource("CircleShape2D_tbo6k")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
@@ -107,4 +107,4 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("RectangleShape2D_tbo6k")
[connection signal="player_entered" from="Hitbox" to="." method="bounce_player"]
[connection signal="player_entered" from="PlayerDetection" to="." method="bounce_player"]

27
Scenes/Prefabs/Entities/Objects/LongFirebar.tscn
View File

@@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://pidoncb5gcax" path="res://Assets/Sprites/Items/Fireball.png" id="2_s1hms"]
[sub_resource type="SegmentShape2D" id="SegmentShape2D_s77o2"]
b = Vector2(0, 80)
b = Vector2(0, -40)
[sub_resource type="Animation" id="Animation_vag0n"]
length = 0.001
@@ -47,31 +47,31 @@ _data = {
[node name="Firebar" instance=ExtResource("1_m6o3e")]
[node name="RemoteTransform2D17" type="RemoteTransform2D" parent="RotationJoint" index="6"]
[node name="RemoteTransform2D19" type="RemoteTransform2D" parent="RotationJoint" index="6"]
position = Vector2(0, 48)
remote_path = NodePath("../../Fireballs/Fireball7")
update_rotation = false
update_scale = false
[node name="RemoteTransform2D18" type="RemoteTransform2D" parent="RotationJoint" index="7"]
[node name="RemoteTransform2D20" type="RemoteTransform2D" parent="RotationJoint" index="7"]
position = Vector2(0, 56)
remote_path = NodePath("../../Fireballs/Fireball8")
update_rotation = false
update_scale = false
[node name="RemoteTransform2D19" type="RemoteTransform2D" parent="RotationJoint" index="8"]
[node name="RemoteTransform2D21" type="RemoteTransform2D" parent="RotationJoint" index="8"]
position = Vector2(0, 64)
remote_path = NodePath("../../Fireballs/Fireball9")
update_rotation = false
update_scale = false
[node name="RemoteTransform2D20" type="RemoteTransform2D" parent="RotationJoint" index="9"]
[node name="RemoteTransform2D22" type="RemoteTransform2D" parent="RotationJoint" index="9"]
position = Vector2(0, 72)
remote_path = NodePath("../../Fireballs/Fireball10")
update_rotation = false
update_scale = false
[node name="RemoteTransform2D21" type="RemoteTransform2D" parent="RotationJoint" index="10"]
[node name="RemoteTransform2D23" type="RemoteTransform2D" parent="RotationJoint" index="10"]
position = Vector2(0, 80)
remote_path = NodePath("../../Fireballs/Fireball11")
update_rotation = false
@@ -84,23 +84,28 @@ shape = SubResource("SegmentShape2D_s77o2")
z_index = 4096
z_as_relative = false
[node name="Fireball17" type="Sprite2D" parent="Fireballs" index="6"]
[node name="Fireball19" type="Sprite2D" parent="Fireballs" index="6"]
visible = false
position = Vector2(33.9411, 33.9411)
texture = ExtResource("2_s1hms")
[node name="Fireball18" type="Sprite2D" parent="Fireballs" index="7"]
[node name="Fireball20" type="Sprite2D" parent="Fireballs" index="7"]
visible = false
position = Vector2(39.598, 39.598)
texture = ExtResource("2_s1hms")
[node name="Fireball19" type="Sprite2D" parent="Fireballs" index="8"]
[node name="Fireball21" type="Sprite2D" parent="Fireballs" index="8"]
visible = false
position = Vector2(45.2548, 45.2548)
texture = ExtResource("2_s1hms")
[node name="Fireball20" type="Sprite2D" parent="Fireballs" index="9"]
[node name="Fireball22" type="Sprite2D" parent="Fireballs" index="9"]
visible = false
position = Vector2(50.9117, 50.9117)
texture = ExtResource("2_s1hms")
[node name="Fireball21" type="Sprite2D" parent="Fireballs" index="10"]
[node name="Fireball23" type="Sprite2D" parent="Fireballs" index="10"]
visible = false
position = Vector2(56.5685, 56.5686)
texture = ExtResource("2_s1hms")