mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-22 23:48:11 +00:00
Update hitboxes for consistency (#608)
Co-authored-by: Joe H <97353363+JHDev2006@users.noreply.github.com>
This commit is contained in:
John Cooper McDonald
committed by
GitHub
GitHub
parent
ed297891fd
commit
9a17f140e0
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=11 format=3 uid="uid://bpsrc21amnlgb"]
|
||||
[gd_scene load_steps=12 format=3 uid="uid://bpsrc21amnlgb"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://bbp3jg7yg1700" path="res://Scripts/Classes/Entities/Enemies/Boo.gd" id="1_ilcde"]
|
||||
[ext_resource type="Texture2D" uid="uid://c3l6ynlufxcfp" path="res://Assets/Sprites/Enemies/Boo.png" id="1_mkqqf"]
|
||||
@@ -6,6 +6,7 @@
|
||||
[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Boo.json" id="3_xhmhl"]
|
||||
[ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_xhmhl"]
|
||||
[ext_resource type="Script" uid="uid://d4a7yp6e55u8t" path="res://Scripts/Classes/Components/TrackJoint.gd" id="6_7u2yg"]
|
||||
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="7_wu7y3"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_wu7y3"]
|
||||
atlas = ExtResource("1_mkqqf")
|
||||
@@ -37,12 +38,14 @@ animations = [{
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ilcde"]
|
||||
size = Vector2(12, 12)
|
||||
|
||||
[node name="Boo" type="Node2D" groups=["Enemies"]]
|
||||
[node name="Boo" type="CharacterBody2D" groups=["Enemies"]]
|
||||
script = ExtResource("1_ilcde")
|
||||
metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
|
||||
|
||||
[node name="Sprite" type="AnimatedSprite2D" parent="."]
|
||||
position = Vector2(0, -8)
|
||||
scale = Vector2(-1, 1)
|
||||
rotation = -3.1415927
|
||||
scale = Vector2(1, -1)
|
||||
sprite_frames = SubResource("SpriteFrames_i46bk")
|
||||
animation = &"WhiteIdle"
|
||||
flip_h = true
|
||||
@@ -74,5 +77,14 @@ script = ExtResource("6_7u2yg")
|
||||
disable_physics = false
|
||||
metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("7_wu7y3")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
|
||||
[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="killed" from="." to="." method="summon_smoke_particle" unbinds=1]
|
||||
[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
|
||||
[connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
|
||||
[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=16 format=3 uid="uid://coasuq2vsmlce"]
|
||||
[gd_scene load_steps=17 format=3 uid="uid://coasuq2vsmlce"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://c3l6ynlufxcfp" path="res://Assets/Sprites/Enemies/Boo.png" id="1_bek6j"]
|
||||
[ext_resource type="Script" uid="uid://djdtghrjbpv2i" path="res://Scripts/Classes/Entities/Enemies/BooBuddies.gd" id="1_vavt3"]
|
||||
@@ -10,6 +10,7 @@
|
||||
[ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="6_5b8ig"]
|
||||
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="8_ifdhg"]
|
||||
[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/BooBuddy.json" id="9_ifdhg"]
|
||||
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="10_al3pe"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_7u2yg"]
|
||||
atlas = ExtResource("1_bek6j")
|
||||
@@ -62,8 +63,9 @@ func _physics_process(delta: float) -> void:
|
||||
idx += 1
|
||||
"
|
||||
|
||||
[node name="BooBuddies" type="Node2D" groups=["Enemies"]]
|
||||
[node name="BooBuddies" type="CharacterBody2D" groups=["Enemies"]]
|
||||
script = ExtResource("1_vavt3")
|
||||
metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
|
||||
|
||||
[node name="RotationJoint" type="Sprite2D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
@@ -106,6 +108,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo1/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo1" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo2" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -130,6 +137,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo2/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo2" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo3" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -154,6 +166,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo3/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo3" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo4" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -178,6 +195,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo4/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo4" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo5" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -202,6 +224,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo5/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo5" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo6" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -226,6 +253,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo6/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo6" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo7" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -250,6 +282,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo7/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo7" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo8" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -274,6 +311,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo8/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo8" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo9" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -298,6 +340,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo9/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo9" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo10" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -322,6 +369,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo10/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo10" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo11" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -346,6 +398,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo11/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo11" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="Boo12" type="Node2D" parent="Boos"]
|
||||
visible = false
|
||||
|
||||
@@ -370,6 +427,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||
[node name="Shape" type="CollisionShape2D" parent="Boos/Boo12/Hitbox"]
|
||||
shape = SubResource("RectangleShape2D_1eh5v")
|
||||
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo12" node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("10_al3pe")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[node name="BooPositioner" type="Node" parent="."]
|
||||
process_mode = 3
|
||||
script = SubResource("GDScript_vavt3")
|
||||
@@ -378,15 +440,27 @@ script = SubResource("GDScript_vavt3")
|
||||
script = ExtResource("6_5b8ig")
|
||||
properties = Array[String](["length", "direction", "boo_amount", "spread_boos"])
|
||||
|
||||
[connection signal="area_entered" from="Boos/Boo1/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo2/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo3/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo4/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo5/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo6/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo7/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo8/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo9/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo10/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo11/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="area_entered" from="Boos/Boo12/Hitbox" to="." method="on_area_entered"]
|
||||
[connection signal="player_hit" from="Boos/Boo1/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo1/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo2/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo2/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo3/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo3/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo4/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo4/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo5/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo5/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo6/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo6/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo7/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo7/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo8/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo8/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo9/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo9/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo10/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo10/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo11/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo11/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_hit" from="Boos/Boo12/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="Boos/Boo12/EnemyPlayerDetection" to="." method="damage_player"]
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
[gd_scene load_steps=10 format=3 uid="uid://blbarreyjem4l"]
|
||||
[gd_scene load_steps=11 format=3 uid="uid://blbarreyjem4l"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://t5lgshoxlohe" path="res://Assets/Sprites/Items/BowserFlame.png" id="1_4hwux"]
|
||||
[ext_resource type="Script" uid="uid://btstbvjk6e6aw" path="res://Scripts/Classes/Entities/Enemies/BowserFlame.gd" id="1_dq7qg"]
|
||||
[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_ktnk0"]
|
||||
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_ktnk0"]
|
||||
[ext_resource type="JSON" path="res://Assets/Sprites/Items/BowserFlame.json" id="5_0e5kh"]
|
||||
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="6_0e5kh"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_iikig"]
|
||||
atlas = ExtResource("1_4hwux")
|
||||
@@ -31,11 +32,13 @@ animations = [{
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ohhuu"]
|
||||
size = Vector2(12, 4)
|
||||
|
||||
[node name="BowserFlame" type="Node2D" groups=["Enemies"]]
|
||||
[node name="BowserFlame" type="CharacterBody2D" groups=["Enemies"]]
|
||||
script = ExtResource("1_dq7qg")
|
||||
metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
|
||||
|
||||
[node name="Sprite" type="AnimatedSprite2D" parent="."]
|
||||
scale = Vector2(-1, 1)
|
||||
rotation = -3.1415927
|
||||
scale = Vector2(1, -1)
|
||||
sprite_frames = SubResource("SpriteFrames_oy8b6")
|
||||
autoplay = "default"
|
||||
frame_progress = 0.67141116
|
||||
@@ -60,6 +63,12 @@ shape = SubResource("RectangleShape2D_ohhuu")
|
||||
position = Vector2(-2.38419e-07, 0)
|
||||
scale = Vector2(1.6, 1)
|
||||
|
||||
[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
|
||||
[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
|
||||
script = ExtResource("6_0e5kh")
|
||||
hitbox = NodePath("../Hitbox")
|
||||
metadata/_custom_type_script = "uid://chj8hu207lrh"
|
||||
|
||||
[connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="play_sfx"]
|
||||
[connection signal="screen_exited" from="VisibleOnScreenEnabler2D" to="." method="queue_free"]
|
||||
[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
|
||||
[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]
|
||||
|
||||
Reference in New Issue
Block a user