Merge remote-tracking branch 'upstream/main' into pulls/small-crouch-hitbox-fix

Scenes/Prefabs/Entities/Enemies/Muncher.tscn

@@ -51,6 +51,7 @@ metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 metadata/block_spawn_offset = Vector2(0, -8)
 
 [node name="Sprite" type="AnimatedSprite2D" parent="."]
+process_mode = 1
 sprite_frames = SubResource("SpriteFrames_6tj01")
 frame_progress = 0.602985
 script = ExtResource("2_fcan1")

Scenes/Prefabs/Entities/Enemies/RockyWrench.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=34 format=3 uid="uid://c3m38c2skawpj"]
+[gd_scene load_steps=35 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"]
@@ -15,6 +15,7 @@
 [ext_resource type="Script" uid="uid://bbww34oiexbx2" path="res://Scripts/Classes/Components/ShellDetection.gd" id="10_w66sd"]
 [ext_resource type="Script" uid="uid://ba18grqjixded" path="res://Scripts/Classes/Components/ExplosionDetection.gd" id="13_h21ug"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="14_el25t"]
+[ext_resource type="Script" uid="uid://cmg61722ktg2m" path="res://Scripts/Classes/Components/BlockBouncingDetection.gd" id="16_q44ss"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_nqvoc"]
 atlas = ExtResource("2_8y80u")
@@ -391,6 +392,11 @@ script = ExtResource("14_el25t")
 add_score = true
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
+[node name="BlockBouncingDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("16_q44ss")
+hitbox = NodePath("../Sprite/EntityHitbox")
+metadata/_custom_type_script = "uid://cmg61722ktg2m"
+
 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
 [connection signal="player_stomped_on" from="Sprite/StompHitbox/EnemyPlayerDetection" to="." method="on_player_stomped_on"]
 [connection signal="invincible_player_hit" from="Sprite/EntityHitbox/EnemyPlayerDetection" to="." method="die_from_object"]
@@ -405,3 +411,5 @@ metadata/_custom_type_script = "uid://5octqlf4ohel"
 [connection signal="timeout" from="Timer" to="." method="on_timeout"]
 [connection signal="explosion_entered" from="ExplosionDetection" to="." method="die_from_object"]
 [connection signal="explosion_entered" from="ExplosionDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [500]]
+[connection signal="block_bounced" from="BlockBouncingDetection" to="." method="die_from_object"]
+[connection signal="block_bounced" from="BlockBouncingDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [500]]

Scenes/Prefabs/Entities/Enemies/Spiny.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=22 format=3 uid="uid://dinpjmg0q23rv"]
+[gd_scene load_steps=23 format=3 uid="uid://dinpjmg0q23rv"]
 
 [ext_resource type="Script" uid="uid://bds7rntb0btee" path="res://Scripts/Classes/Entities/Enemies/Spiny.gd" id="1_u8w4p"]
 [ext_resource type="Texture2D" uid="uid://diemx33h3bxa2" path="res://Assets/Sprites/Enemies/Spiny.png" id="2_u8w4p"]
+[ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_m3lgl"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_velug"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Spiny.json" id="4_a74i7"]
 [ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="4_qcd6q"]
@@ -80,6 +81,8 @@ animation = &"Walk"
 autoplay = "Walk"
 offset = Vector2(0, 1)
 flip_h = true
+script = ExtResource("3_m3lgl")
+metadata/_custom_type_script = "uid://caq1qiwmy0mox"
 
 [node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect")]
 script = ExtResource("3_velug")

Scenes/Prefabs/Entities/Objects/BuzzyBeetleShell.tscn

@@ -20,6 +20,9 @@ size = Vector2(12, 12)
 [node name="BuzzyBeetleShell" type="CharacterBody2D" node_paths=PackedStringArray("on_screen_enabler", "score_note_adder") groups=["Enemies"]]
 collision_layer = 32
 collision_mask = 6
+floor_constant_speed = true
+floor_max_angle = 0.87266463
+floor_snap_length = 4.0
 script = ExtResource("1_67hvo")
 on_screen_enabler = NodePath("VisibleOnScreenEnabler2D")
 score_note_adder = NodePath("ScoreNoteSpawner")

Scenes/Prefabs/Entities/Objects/Cannon.tscn

@@ -89,4 +89,6 @@ script = SubResource("GDScript_ywjuo")
 [node name="Timer" type="Timer" parent="."]
 wait_time = 3.0
 
+[node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."]
+
 [connection signal="timeout" from="Timer" to="." method="shoot"]

Scenes/Prefabs/Entities/Objects/Firebar.tscn

@@ -13,14 +13,23 @@
 [sub_resource type="GDScript" id="GDScript_e2e05"]
 script/source = "extends Node2D
 
-@export_range(4, 16) var length := 6
+# guzlad: Changed from 16 to 18 to mimick SMM
+@export_range(4, 18) var length := 6
 
-@export_range(0, 360, 45) var starting_angle := 0
+@export_range(0, 360) var starting_angle := 0
 
 @export_enum(\"C-Clockwise\", \"Clockwise\") var direction := 0
 
+var smooth_rotation := false
+
+var bar_rotation := 0.0
+
 func _physics_process(delta: float) -> void:
-	$RotationJoint.global_rotation_degrees += 90 * delta * [-1, 1][direction]
+	bar_rotation += 108 * delta * [-1, 1][direction]
+	if Settings.file.visuals.firebar_style == 1:
+		$RotationJoint.global_rotation_degrees = bar_rotation
+	else:
+		$RotationJoint.global_rotation_degrees = snapped(bar_rotation, 11.25)
 
 func on_area_entered(area: Area2D) -> void:
 	if area.owner is Player:
@@ -93,6 +102,7 @@ func _process(_delta: float) -> void:
 "
 
 [node name="Firebar" type="Node2D"]
+physics_interpolation_mode = 2
 script = SubResource("GDScript_e2e05")
 
 [node name="FireBar" type="Sprite2D" parent="."]
@@ -103,6 +113,7 @@ texture = ExtResource("1_e2e05")
 
 [node name="RotationJoint" type="Node2D" parent="."]
 unique_name_in_owner = true
+physics_interpolation_mode = 2
 z_index = 20
 
 [node name="RemoteTransform2D" type="RemoteTransform2D" parent="RotationJoint"]
@@ -200,6 +211,18 @@ remote_path = NodePath("../../Fireballs/Fireball16")
 update_rotation = false
 update_scale = false
 
+[node name="RemoteTransform2D17" type="RemoteTransform2D" parent="RotationJoint"]
+position = Vector2(0, -128)
+remote_path = NodePath("../../Fireballs/Fireball17")
+update_rotation = false
+update_scale = false
+
+[node name="RemoteTransform2D18" type="RemoteTransform2D" parent="RotationJoint"]
+position = Vector2(0, -136)
+remote_path = NodePath("../../Fireballs/Fireball18")
+update_rotation = false
+update_scale = false
+
 [node name="Hitbox" type="Area2D" parent="RotationJoint"]
 
 [node name="Shape" type="CollisionShape2D" parent="RotationJoint/Hitbox"]
@@ -522,6 +545,46 @@ property_name = "sprite_frames"
 resource_json = ExtResource("4_ym371")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
+[node name="Fireball17" type="AnimatedSprite2D" parent="Fireballs"]
+visible = false
+position = Vector2(0, -128)
+script = ExtResource("2_kpo86")
+do_offset = false
+metadata/_custom_type_script = "uid://caq1qiwmy0mox"
+
+[node name="Animation" type="AnimationPlayer" parent="Fireballs/Fireball17"]
+libraries = {
+&"": SubResource("AnimationLibrary_ytedt")
+}
+autoplay = "Spin"
+
+[node name="ResourceSetter" type="Node" parent="Fireballs/Fireball17" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("3_kpo86")
+node_to_affect = NodePath("..")
+property_name = "sprite_frames"
+resource_json = ExtResource("4_ym371")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
+
+[node name="Fireball18" type="AnimatedSprite2D" parent="Fireballs"]
+visible = false
+position = Vector2(0, -136)
+script = ExtResource("2_kpo86")
+do_offset = false
+metadata/_custom_type_script = "uid://caq1qiwmy0mox"
+
+[node name="Animation" type="AnimationPlayer" parent="Fireballs/Fireball18"]
+libraries = {
+&"": SubResource("AnimationLibrary_ytedt")
+}
+autoplay = "Spin"
+
+[node name="ResourceSetter" type="Node" parent="Fireballs/Fireball18" node_paths=PackedStringArray("node_to_affect")]
+script = ExtResource("3_kpo86")
+node_to_affect = NodePath("..")
+property_name = "sprite_frames"
+resource_json = ExtResource("4_ym371")
+metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
+
 [node name="RemoteTransform2D" type="RemoteTransform2D" parent="."]
 remote_path = NodePath("../FireBar")
 update_rotation = false

Scenes/Prefabs/Entities/Player.tscn

@@ -7,7 +7,7 @@
 [ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="3_a1d2e"]
 [ext_resource type="Script" uid="uid://blxvov3jyx8gg" path="res://Scripts/Classes/States/Player/Normal.gd" id="3_f6bau"]
 [ext_resource type="Texture2D" uid="uid://bdurtsr7cld64" path="res://Assets/Sprites/Players/Mario/ColourPalette.png" id="3_x2idl"]
-[ext_resource type="SpriteFrames" uid="uid://328p7l1rmy00" path="res://Resources/SpriteFrames/Player/Toad/Big.tres" id="4_fqdtv"]
+[ext_resource type="SpriteFrames" uid="uid://df4enjjl84mji" path="res://Resources/SpriteFrames/Player/Mario/Small.tres" id="4_fqdtv"]
 [ext_resource type="Script" uid="uid://dvbib1gtmmvui" path="res://Scripts/Classes/States/Player/Pipe.gd" id="5_hodem"]
 [ext_resource type="Script" uid="uid://c8xvkkv34fjr4" path="res://Scripts/Classes/PowerStates/PowerUpState.gd" id="5_rs3l8"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="5_x2idl"]