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

Fix lingering Hammer issues (#607)

Browse Source 
* Fix lingering Hammer issues

* CannonBall gib

* Spike Block and Rocky Wrench cleanup

* Update SpikeBlock.tscn

* Update PlayerDetection.gd
This commit is contained in:
John Cooper McDonald
2025-10-16 12:02:29 -05:00
committed by GitHub
parent 8474bc3c19
commit ae4317f9e5
9 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Scenes/Prefabs/Entities/Enemies/Icicle.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource type="Script" uid="uid://cx0ak5ctcg0mi" path="res://Scripts/Classes/Entities/Enemies/Icicle.gd" id="1_dnx1i"]
[ext_resource type="Texture2D" uid="uid://rbln0ee0fknc" path="res://Assets/Sprites/Enemies/Icicle.png" id="2_1h8cl"]
[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_1h8cl"]
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="2_5y583"]
[ext_resource type="Script" uid="uid://364rywt44hy6" path="res://Scripts/Classes/UI/PackSprite.gd" id="3_dnx1i"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_dnx1i"]
@@ -52,6 +52,11 @@ collision_mask = 55
script = ExtResource("1_dnx1i")
metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
script = ExtResource("2_5y583")
hitbox = NodePath("../Hitbox")
metadata/_custom_type_script = "uid://chj8hu207lrh"
[node name="Sprite" type="Sprite2D" parent="."]
position = Vector2(0, -8)
texture = ExtResource("2_1h8cl")
@@ -65,8 +70,6 @@ shape = SubResource("RectangleShape2D_dnx1i")
[node name="Hitbox" type="Area2D" parent="."]
visible = false
script = ExtResource("3_1h8cl")
metadata/_custom_type_script = "uid://cnheej0sxmoxg"
[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
position = Vector2(0, -6)
@@ -81,5 +84,10 @@ libraries = {
&"": SubResource("AnimationLibrary_2sios")
}
[connection signal="player_entered" from="Hitbox" to="." method="damage_player"]
[connection signal="player_entered" from="Hitbox" to="." method="destroy" unbinds=1]
[connection signal="killed" from="." to="." method="destroy" 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_hit" from="EnemyPlayerDetection" to="." method="destroy" unbinds=1]
[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]
[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="destroy" unbinds=1]

16
Scenes/Prefabs/Entities/Enemies/Muncher.tscn
View File

@@ -4,10 +4,10 @@
[ext_resource type="Texture2D" uid="uid://dg7yxoq44gaae" path="res://Assets/Sprites/Enemies/Muncher.png" id="2_ad4wf"]
[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_fcan1"]
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_6tj01"]
[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="4_ad4wf"]
[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Muncher.json" id="5_cgdwi"]
[ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_r7ue2"]
[ext_resource type="Script" uid="uid://bx6r8sjar6cwr" path="res://Scripts/Classes/Components/BasicStaticMovement.gd" id="8_3kryf"]
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="8_cgdwi"]
[sub_resource type="AtlasTexture" id="AtlasTexture_r7ue2"]
atlas = ExtResource("2_ad4wf")
@@ -69,11 +69,9 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
shape = SubResource("RectangleShape2D_cgdwi")
one_way_collision = true
[node name="PlayerDetection" type="Area2D" parent="."]
script = ExtResource("4_ad4wf")
metadata/_custom_type_script = "uid://cnheej0sxmoxg"
[node name="Hitbox" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
position = Vector2(0, -0.75)
shape = SubResource("RectangleShape2D_r7ue2")
@@ -94,4 +92,10 @@ sync_to_physics = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="AnimatableBody2D"]
shape = SubResource("RectangleShape2D_3kryf")
[connection signal="player_entered" from="PlayerDetection" to="." method="damage_player"]
[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
script = ExtResource("8_cgdwi")
hitbox = NodePath("../Hitbox")
metadata/_custom_type_script = "uid://chj8hu207lrh"
[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

5
Scenes/Prefabs/Entities/Enemies/RockyWrench.tscn
View File

@@ -1,11 +1,10 @@
[gd_scene load_steps=35 format=3 uid="uid://c3m38c2skawpj"]
[gd_scene load_steps=34 format=3 uid="uid://c3m38c2skawpj"]
[ext_resource type="Script" uid="uid://bfsh8bhcmknkh" path="res://Scripts/Classes/Entities/Enemies/RockyWrench.gd" id="1_pl7bt"]
[ext_resource type="Texture2D" uid="uid://bfora2lrmtyj4" path="res://Assets/Sprites/Enemies/RockyWrench.png" id="2_8y80u"]
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_4h1b4"]
[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_wom81"]
[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/RockyWrench.json" id="4_pl7bt"]
[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="5_4h1b4"]
[ext_resource type="Script" uid="uid://bx6r8sjar6cwr" path="res://Scripts/Classes/Components/BasicStaticMovement.gd" id="5_8y80u"]
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="7_pl7bt"]
[ext_resource type="Texture2D" uid="uid://cop8x5m20cqal" path="res://Assets/Sprites/Items/WrenchProjectile.png" id="7_w66sd"]
@@ -294,8 +293,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[node name="StompHitbox" type="Area2D" parent="Sprite"]
position = Vector2(0, -11)
script = ExtResource("5_4h1b4")
metadata/_custom_type_script = "uid://cnheej0sxmoxg"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/StompHitbox"]
position = Vector2(0, 2.5)