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

2025-10-22 15:38:14 +00:00 · 2025-09-26 10:51:17 -07:00
parent cd2e7522b5 1c309ce731
commit 4f06366c94
128 changed files with 14908 additions and 11655 deletions
--- a/Scenes/Prefabs/Blocks/BrickBlocks/BrickBlock.tscn
+++ b/Scenes/Prefabs/Blocks/BrickBlocks/BrickBlock.tscn
@@ -25,6 +25,7 @@ destruction_particle_scene = ExtResource("2_x80g6")
 metadata/_custom_type_script = "uid://b5ejlbl0vp1gm"

 [node name="Sprite" type="AnimatedSprite2D" parent="."]
+process_mode = 1
 script = ExtResource("3_x80g6")
 do_offset = false
 metadata/_custom_type_script = "uid://caq1qiwmy0mox"
--- a/Scenes/Prefabs/Blocks/Fan.tscn
+++ b/Scenes/Prefabs/Blocks/Fan.tscn
@@ -119,6 +119,7 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 shape = SubResource("RectangleShape2D_wvrj8")

 [node name="Hitbox" type="Area2D" parent="."]
+monitorable = false

 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(128, 0)
--- a/Scenes/Prefabs/Blocks/SpikeBlock.tscn
+++ b/Scenes/Prefabs/Blocks/SpikeBlock.tscn
@@ -136,6 +136,7 @@ script = ExtResource("1_gcnju")
 metadata/_custom_type_script = "uid://bpydbpyjk1mt4"

 [node name="Sprite" type="AnimatedSprite2D" parent="."]
+process_mode = 1
 sprite_frames = SubResource("SpriteFrames_bcd7j")
 autoplay = "default"
 frame_progress = 0.177236
--- a/Scenes/Prefabs/Entities/Enemies/Muncher.tscn
+++ b/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")
--- a/Scenes/Prefabs/Entities/Enemies/RockyWrench.tscn
+++ b/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]]
--- a/Scenes/Prefabs/Entities/Enemies/Spiny.tscn
+++ b/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")
--- a/Scenes/Prefabs/Entities/Objects/BuzzyBeetleShell.tscn
+++ b/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")
--- a/Scenes/Prefabs/Entities/Objects/Cannon.tscn
+++ b/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"]
--- a/Scenes/Prefabs/Entities/Objects/Firebar.tscn
+++ b/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
--- a/Scenes/Prefabs/Entities/Player.tscn
+++ b/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"]
--- a/Scenes/Prefabs/GameHud.tscn
+++ b/Scenes/Prefabs/GameHud.tscn
@@ -22,12 +22,12 @@
 [ext_resource type="Script" uid="uid://xem6lai3ufyj" path="res://Scripts/Classes/UI/PackNinePatch.gd" id="14_h6dkv"]
 [ext_resource type="Script" uid="uid://dwtrmo82e12ud" path="res://Scripts/Parts/ColourPaletteSampler.gd" id="15_8qasw"]
 [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="15_jwl8o"]
-[ext_resource type="Texture2D" uid="uid://dt0qtxu2l646n" path="res://Assets/Sprites/Tilesets/Terrain/Overworld.png" id="15_niy8w"]
 [ext_resource type="PackedScene" uid="uid://n2e3jgmkilvt" path="res://Scenes/Prefabs/UI/MarathonResults.tscn" id="16_cfljn"]
-[ext_resource type="JSON" path="res://Assets/Sprites/Tilesets/Terrain/TerrainTiles.json" id="16_jt73e"]
 [ext_resource type="FontVariation" uid="uid://djxdgxy1iv8yv" path="res://Resources/ThemedResources/FontLLMain.tres" id="17_2w8b3"]
 [ext_resource type="PackedScene" uid="uid://b85i7uni0twpe" path="res://Scenes/Prefabs/UI/DiscoResults.tscn" id="17_ocsy5"]
 [ext_resource type="Script" uid="uid://dt2p68xl462v2" path="res://Scripts/Parts/TextShadowColourChanger.gd" id="18_jwl8o"]
+[ext_resource type="Texture2D" uid="uid://w74s6oi3l8k8" path="res://Assets/Sprites/UI/TextShadowColours.png" id="24_h6dkv"]
+[ext_resource type="JSON" path="res://Assets/Sprites/UI/TextShadow.json" id="25_oeqb4"]

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_eon7h"]
 shader = ExtResource("6_r3m7e")
@@ -1021,8 +1021,7 @@ visible = false

 [node name="ColourPaletteSampler" type="Node" parent="." node_paths=PackedStringArray("node_to_affect")]
 script = ExtResource("15_8qasw")
-texture = ExtResource("15_niy8w")
-coords = Vector2i(67, 16)
+texture = ExtResource("24_h6dkv")
 node_to_affect = NodePath("../TextShadowColourChanger")
 value_to_set = "global_text_shadow_color"
 metadata/_custom_type_script = "uid://dwtrmo82e12ud"
@@ -1032,7 +1031,7 @@ script = ExtResource("3_jt73e")
 node_to_affect = NodePath("..")
 property_name = "texture"
 mode = 1
-resource_json = ExtResource("16_jt73e")
+resource_json = ExtResource("25_oeqb4")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"

 [node name="TextShadowColourChanger" type="Node" parent="." node_paths=PackedStringArray("labels", "shadow_node")]
--- a/Scenes/Prefabs/Global.tscn
+++ b/Scenes/Prefabs/Global.tscn
@@ -379,7 +379,7 @@ modulate = Color(1, 0, 0, 1)
 layout_mode = 2
 theme_override_colors/font_shadow_color = Color(0.121569, 0.121569, 0.121569, 1)
 text = "ERROR! PLEASE REPORT!"
-autowrap_mode = 2
+autowrap_mode = 1
 uppercase = true

 [node name="Warning" type="Label" parent="CanvasLayer/VBoxContainer"]
@@ -388,7 +388,7 @@ modulate = Color(1, 1, 0, 1)
 layout_mode = 2
 theme_override_colors/font_shadow_color = Color(0.121569, 0.121569, 0.121569, 1)
 text = "Warning!"
-autowrap_mode = 2
+autowrap_mode = 1
 uppercase = true

 [node name="Comment" type="Label" parent="CanvasLayer/VBoxContainer"]
@@ -396,7 +396,7 @@ visible = false
 layout_mode = 2
 theme_override_colors/font_shadow_color = Color(0.121569, 0.121569, 0.121569, 1)
 text = "Comment"
-autowrap_mode = 2
+autowrap_mode = 1
 uppercase = true

 [node name="PanelSetter" type="Node" parent="."]
--- a/Scenes/Prefabs/LevelObjects/CastleToad.tscn
+++ b/Scenes/Prefabs/LevelObjects/CastleToad.tscn
@@ -58,6 +58,7 @@ sprite_frames = SubResource("SpriteFrames_jvnky")
 animation = &"Emote"
 autoplay = "Emote"
 frame_progress = 0.91931444
+offset = Vector2(0, 1)
 script = ExtResource("3_puq45")
 metadata/_custom_type_script = "uid://caq1qiwmy0mox"

--- a/Scenes/Prefabs/LevelObjects/EndFinalCastle.tscn
+++ b/Scenes/Prefabs/LevelObjects/EndFinalCastle.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=4 uid="uid://bney0cc8cfm5s"]
+[gd_scene load_steps=20 format=4 uid="uid://bney0cc8cfm5s"]

 [ext_resource type="Script" uid="uid://qq26qw7ltflb" path="res://Scripts/Parts/EndCastle.gd" id="1_hwcne"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_1kswc"]
@@ -7,6 +7,7 @@
 [ext_resource type="JSON" path="res://Assets/Sprites/Tilesets/CastleFlag.json" id="4_wqi45"]
 [ext_resource type="PackedScene" uid="uid://bikdod5ra10ra" path="res://Scenes/Parts/LargeCastleVisual.tscn" id="6_w7qld"]
 [ext_resource type="Script" uid="uid://73oviwf6bbys" path="res://Scripts/Classes/Components/TilesetTextureSetter.gd" id="8_akqko"]
+[ext_resource type="PackedScene" uid="uid://bem5ht17ukgcs" path="res://Scenes/Parts/LargeSPCastleVisual.tscn" id="10_kd4m5"]
 [ext_resource type="Texture2D" uid="uid://dt0qtxu2l646n" path="res://Assets/Sprites/Tilesets/Terrain/Overworld.png" id="10_wqi45"]
 [ext_resource type="Texture2D" uid="uid://dkcs5i8l1y4y6" path="res://Assets/Sprites/Tilesets/EndingFinalCastleSprite.png" id="11_wqi45"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Tilesets/FinalCastle.json" id="12_kd4m5"]
@@ -118,6 +119,10 @@ autostart = true
 z_index = -10
 position = Vector2(0, -40)

+[node name="SmallCastleVisual2" parent="." instance=ExtResource("10_kd4m5")]
+visible = false
+position = Vector2(32, -40)
+
 [node name="OverlaySprite" type="Sprite2D" parent="."]
 visible = false
 z_index = 10
--- a/Scenes/Prefabs/LevelObjects/EndFinalSpCastle.tscn
+++ b/Scenes/Prefabs/LevelObjects/EndFinalSpCastle.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=6 format=3 uid="uid://b5o0j3kfv2xys"]
+[gd_scene load_steps=5 format=3 uid="uid://b5o0j3kfv2xys"]

 [ext_resource type="PackedScene" uid="uid://bney0cc8cfm5s" path="res://Scenes/Prefabs/LevelObjects/EndFinalCastle.tscn" id="1_fa5ur"]
-[ext_resource type="PackedScene" uid="uid://bem5ht17ukgcs" path="res://Scenes/Parts/LargeSPCastleVisual.tscn" id="2_jlw6s"]
 [ext_resource type="Texture2D" uid="uid://gnqt7rl36kxy" path="res://Assets/Sprites/Tilesets/CastleFlag.png" id="2_jp1ee"]

 [sub_resource type="AtlasTexture" id="AtlasTexture_uq0jd"]
@@ -29,8 +28,8 @@ do_offset = false
 [node name="SmallCastleVisual" parent="." index="3"]
 visible = false

-[node name="SmallCastleVisual2" parent="." index="6" instance=ExtResource("2_jlw6s")]
-position = Vector2(32, -40)
+[node name="SmallCastleVisual2" parent="." index="4"]
+visible = true

 [node name="Overlay" parent="." index="7"]
 visible = true
--- a/Scenes/Prefabs/LevelObjects/PipeGenerator.tscn
+++ b/Scenes/Prefabs/LevelObjects/PipeGenerator.tscn
@@ -24,7 +24,6 @@ tracks/0/keys = {

 [sub_resource type="Animation" id="Animation_a0wqs"]
 resource_name = "Left"
-length = 0.5
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -32,10 +31,10 @@ tracks/0/path = NodePath("Joint:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.5),
+"times": PackedFloat32Array(0, 1),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(-16, 0), Vector2(0, 0)]
+"values": [Vector2(-16, 8), Vector2(8, 8)]
 }

 [sub_resource type="Animation" id="Animation_f1jdk"]
@@ -55,7 +54,6 @@ tracks/0/keys = {

 [sub_resource type="Animation" id="Animation_6pkd4"]
 resource_name = "Right"
-length = 0.5
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -63,10 +61,10 @@ tracks/0/path = NodePath("Joint:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.5),
+"times": PackedFloat32Array(0, 1),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(16, 0), Vector2(0, 0)]
+"values": [Vector2(16, 8), Vector2(-8, 8)]
 }

 [sub_resource type="Animation" id="Animation_amwyv"]
@@ -124,7 +122,7 @@ wait_time = 3.0
 script = ExtResource("4_f1jdk")
 properties = Array[String](["item", "direction"])
 filters = Dictionary[String, String]({
-"item": "can_be_stored"
+"item": "can_pipe_gen"
 })

 [node name="Check" type="RayCast2D" parent="."]
@@ -132,4 +130,6 @@ target_position = Vector2(0, 16)
 collision_mask = 6
 hit_from_inside = true

+[node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."]
+
 [connection signal="timeout" from="Timer" to="." method="on_timeout"]
--- a/Scenes/Prefabs/UI/CharacterSelect.tscn
+++ b/Scenes/Prefabs/UI/CharacterSelect.tscn
@@ -26,9 +26,9 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = -88.0
+offset_left = -76.0
 offset_top = -48.0
-offset_right = 88.0
+offset_right = 76.0
 offset_bottom = 48.0
 grow_horizontal = 2
 grow_vertical = 2
--- a/Scenes/Prefabs/UI/LevelSelect.tscn
+++ b/Scenes/Prefabs/UI/LevelSelect.tscn
@@ -1,9 +1,8 @@
-[gd_scene load_steps=6 format=3 uid="uid://d1kedqb68p7vw"]
+[gd_scene load_steps=5 format=3 uid="uid://d1kedqb68p7vw"]

 [ext_resource type="Script" uid="uid://bupc8brk48aqi" path="res://Scripts/UI/LevelSelect.gd" id="1_mvafj"]
 [ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="2_k7cgt"]
 [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="3_a7p1d"]
-[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="4_r15fi"]

 [sub_resource type="StyleBoxLine" id="StyleBoxLine_k7cgt"]
 color = Color(1, 1, 1, 1)
@@ -103,5 +102,4 @@ uppercase = true
 [node name="LabelFontChanger" type="Node" parent="PanelContainer" node_paths=PackedStringArray("labels")]
 script = ExtResource("3_a7p1d")
 labels = [NodePath("../MarginContainer/VBoxContainer/Label"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level1"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level2"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level3"), NodePath("../MarginContainer/VBoxContainer/SlotContainer/Level4"), NodePath("../MarginContainer/VBoxContainer/Control/Cursor")]
-resource = ExtResource("4_r15fi")
 metadata/_custom_type_script = "uid://co6tjg3w6qpd8"
--- a/Scenes/Prefabs/UI/LevelSelectNew.tscn
+++ b/Scenes/Prefabs/UI/LevelSelectNew.tscn
@@ -1071,6 +1071,23 @@ offset_bottom = 8.0
 size_flags_vertical = 4
 texture = SubResource("AtlasTexture_r70xa")

+[node name="ChallengeBits" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_constants/separation = -8
+alignment = 1
+
+[node name="HighScore" type="Label" parent="Panel/MarginContainer/VBoxContainer/ChallengeBits"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "SCORE: 00000"
+
+[node name="ScoreTarget" type="Label" parent="Panel/MarginContainer/VBoxContainer/ChallengeBits"]
+unique_name_in_owner = true
+modulate = Color(0.4627451, 0.5254902, 1, 1)
+layout_mode = 2
+text = "/24000"
+
 [node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")]
 script = ExtResource("5_x05vu")
 labels = [NodePath("../Panel/MarginContainer/VBoxContainer/Title")]
--- a/Scenes/Prefabs/UI/QuestSelect.tscn
+++ b/Scenes/Prefabs/UI/QuestSelect.tscn
@@ -13,7 +13,7 @@ color = Color(1, 1, 1, 1)
 layout_mode = 3
 anchors_preset = 0
 offset_right = 136.0
-offset_bottom = 104.0
+offset_bottom = 77.0
 script = ExtResource("1_6lbpd")

 [node name="PanelContainer" type="PanelContainer" parent="."]
@@ -55,6 +55,7 @@ grow_vertical = 0
 theme_override_styles/separator = SubResource("StyleBoxLine_6lbpd")

 [node name="FirstQuest" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"]
+visible = false
 layout_mode = 2
 text = "QUEST_FIRST"
 horizontal_alignment = 1
--- a/Scenes/Prefabs/UI/SettingsMenu.tscn
+++ b/Scenes/Prefabs/UI/SettingsMenu.tscn
@@ -401,7 +401,7 @@ size_flags_vertical = 3
 theme_override_constants/separation = -4
 script = ExtResource("4_avtty")
 category_name = "SETTINGS_VISUALS"
-options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), NodePath("ColourfulPipes")]
+options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), NodePath("ColourfulPipes"), NodePath("FirebarStyle")]

 [node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals"]
 custom_minimum_size = Vector2(0, 4)
@@ -477,6 +477,13 @@ title = "VISUAL_COLOURFUL_PIPES"
 values = ["SETTING_OFF", "SETTING_ON"]
 settings_category = "visuals"

+[node name="FirebarStyle" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals" groups=["Options"] instance=ExtResource("3_dl6kk")]
+layout_mode = 2
+option_key = "firebar_style"
+title = "FIREBAR STYLE"
+values = ["Classic", "Modern"]
+settings_category = "visuals"
+
 [node name="VisualsSetter" type="Node" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals"]
 script = ExtResource("9_kfq5n")

@@ -612,8 +619,8 @@ settings_category = "difficulty"
 layout_mode = 2
 option_key = "time_limit"
 title = "DIFFI_TIME"
-value_descs = Array[String](["DESC_TIME_0", "DESC_TIME_1"])
-values = ["SETTING_OFF", "SETTING_ON"]
+value_descs = Array[String](["DESC_TIME_0", "DESC_TIME_1", "DESC_TIME_2"])
+values = ["SETTING_OFF", "SETTINGS_CLASSIC", "SETTINGS_MODERN"]
 settings_category = "difficulty"

 [node name="LakituStyle" parent="PanelContainer/MarginContainer/VBoxContainer/Difficulty" groups=["Options"] instance=ExtResource("3_dl6kk")]
@@ -839,7 +846,7 @@ layout_mode = 2

 [node name="RegenROM" parent="PanelContainer/MarginContainer/VBoxContainer/Data" instance=ExtResource("9_t6b48")]
 layout_mode = 2
-title = "Delete Generated Resource Pack"
+title = "Reverify ROM"

 [node name="Control" type="Control" parent="PanelContainer"]
 custom_minimum_size = Vector2(24, 0)
@@ -908,6 +915,7 @@ script = ExtResource("19_k6yev")
 [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisibleTimers" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="visible_timers_changed"]
 [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/TransitionAnimation" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="transition_style_changed"]
 [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/ColourfulPipes" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="colourful_pipes_changed"]
+[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/FirebarStyle" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="firebar_style_changed"]
 [connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode" to="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/ResourcePackLoader" method="open_folder"]
 [connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode2" to="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/ResourcePackLoader" method="get_resource_packs"]
 [connection signal="button_pressed" from="PanelContainer/MarginContainer/VBoxContainer/ResourcePacks/SelectableOptionNode3" to="ResourcePackTemplateCreator" method="create_template"]