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

16
Scenes/Prefabs/Entities/Objects/Burner.tscn
View File

@@ -4,10 +4,10 @@
[ext_resource type="Texture2D" uid="uid://dhk5jdqjqo77p" path="res://Assets/Sprites/Blocks/BurnerFlame.png" id="1_vrk50"]
[ext_resource type="Texture2D" uid="uid://4l2medldwrwh" path="res://Assets/Sprites/Blocks/Burner.png" id="2_4fveq"]
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_fsldu"]
[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_sqxap"]
[ext_resource type="JSON" path="res://Assets/Sprites/Blocks/BurnerFlame.json" id="4_m4qew"]
[ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="5_sqxap"]
[ext_resource type="JSON" path="res://Assets/Sprites/Blocks/BurnerBlock.json" id="5_w52fl"]
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="7_m4qew"]
[ext_resource type="Script" uid="uid://cqif1li7otvpl" path="res://Scripts/Parts/SpriteFramesToJsonConverter.gd" id="7_w52fl"]
[ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="8_oeevx"]
[ext_resource type="Script" uid="uid://d4a7yp6e55u8t" path="res://Scripts/Classes/Components/TrackJoint.gd" id="10_oeevx"]
@@ -205,16 +205,19 @@ mode = 1
resource_json = ExtResource("5_w52fl")
metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[node name="PlayerDetection" type="Area2D" parent="RotationJoint"]
script = ExtResource("3_sqxap")
metadata/_custom_type_script = "uid://cnheej0sxmoxg"
[node name="Hitbox" type="Area2D" parent="RotationJoint"]
[node name="Hitbox" type="CollisionShape2D" parent="RotationJoint/PlayerDetection"]
[node name="Shape" type="CollisionShape2D" parent="RotationJoint/Hitbox"]
unique_name_in_owner = true
position = Vector2(0, -32)
shape = SubResource("RectangleShape2D_jssei")
disabled = true
[node name="EnemyPlayerDetection" type="Node" parent="RotationJoint" node_paths=PackedStringArray("hitbox")]
script = ExtResource("7_m4qew")
hitbox = NodePath("../Hitbox")
metadata/_custom_type_script = "uid://chj8hu207lrh"
[node name="Timer" type="Timer" parent="."]
wait_time = 3.0
one_shot = true
@@ -241,5 +244,6 @@ offset = Vector2(0, 0)
disable_physics = false
metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
[connection signal="player_entered" from="RotationJoint/PlayerDetection" to="." method="damage_player"]
[connection signal="player_hit" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
[connection signal="player_stomped_on" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
[connection signal="timeout" from="Timer" to="." method="do_cycle"]

12
Scenes/Prefabs/Entities/Objects/CannonBall.tscn
View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=9 format=3 uid="uid://bumvqjhs2xxka"]
[gd_scene load_steps=8 format=3 uid="uid://bumvqjhs2xxka"]
[ext_resource type="Script" uid="uid://bfdtqldkrv4dn" path="res://Scripts/Classes/Entities/Enemies/CannonBall.gd" id="1_yim3j"]
[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="2_il73j"]
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="2_yim3j"]
[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/CannonBall.json" id="3_874xq"]
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="3_pydrn"]
@@ -28,16 +27,14 @@ mode = 1
resource_json = ExtResource("3_874xq")
metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[node name="PlayerDetection" type="Area2D" parent="."]
script = ExtResource("2_il73j")
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"]
shape = SubResource("RectangleShape2D_yim3j")
[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
script = ExtResource("3_pydrn")
hitbox = NodePath("../PlayerDetection")
hitbox = NodePath("../Hitbox")
height = 0
metadata/_custom_type_script = "uid://chj8hu207lrh"
@@ -52,6 +49,7 @@ metadata/_custom_type_script = "uid://c3gg32ivrlq8n"
script = ExtResource("5_il73j")
metadata/_custom_type_script = "uid://5octqlf4ohel"
[connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
[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"]

11
Scenes/Prefabs/Entities/Objects/WrenchProjectile.tscn
View File

@@ -1,9 +1,8 @@
[gd_scene load_steps=14 format=3 uid="uid://p42vcj0qmhxl"]
[gd_scene load_steps=13 format=3 uid="uid://p42vcj0qmhxl"]
[ext_resource type="Texture2D" uid="uid://cop8x5m20cqal" path="res://Assets/Sprites/Items/WrenchProjectile.png" id="1_bh1cs"]
[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_wtsxo"]
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_7wlxe"]
[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_tfqn5"]
[ext_resource type="JSON" path="res://Assets/Sprites/Items/WrenchProjectile.json" id="4_5s4r1"]
[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="4_7wlxe"]
@@ -85,16 +84,14 @@ property_name = "sprite_frames"
resource_json = ExtResource("4_5s4r1")
metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[node name="PlayerDetection" type="Area2D" parent="."]
script = ExtResource("3_tfqn5")
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"]
shape = SubResource("CircleShape2D_srvot")
[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
script = ExtResource("4_7wlxe")
hitbox = NodePath("../PlayerDetection")
hitbox = NodePath("../Hitbox")
metadata/_custom_type_script = "uid://chj8hu207lrh"
[node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."]