BowserBro palettes and slight Bowser file clean-up (#636 )

* Different world palettes for BowserBro, and slight optimization to Bowser. BowserBro still will not use Bowser's green palette in any of the areas where the game would genuinely use the green palette, but he will follow the rules of other non-green palette areas so he has more consistency in those areas. * BowserBro palette and sprite now correctly set. * Fix Bowser.png
Make the rest of the credits images pack replacable (#640 )
2025-10-22 15:38:14 +00:00 · 2025-10-20 21:56:34 +01:00 · 2025-10-20 21:01:25 +01:00 · 2025-10-20 20:57:50 +01:00 · 2025-10-20 09:43:34 +01:00 · 2025-10-20 09:41:45 +01:00
30 changed files with 484 additions and 328 deletions
--- a/Assets/Sprites/Enemies/Bowser.json
+++ b/Assets/Sprites/Enemies/Bowser.json
@@ -74,15 +74,6 @@
 		}
 	},
 	"variations": {
-		"Overworld": {
-			"source": "Bowser.png",
-			"rect": [
-				0.0,
-				0.0,
-				96.0,
-				96.0
-			]
-		},
 		"default": {
 			"source": "Bowser.png",
 			"rect": [
@@ -93,4 +84,4 @@
 			]
 		}
 	}
-}
+}
--- a/Assets/Sprites/Enemies/Bowser.png
+++ b/Assets/Sprites/Enemies/Bowser.png
--- a/Assets/Sprites/Enemies/BowsersBro.json
+++ b/Assets/Sprites/Enemies/BowsersBro.json
@@ -74,15 +74,6 @@
 		}
 	},
 	"variations": {
-		"Overworld": {
-			"source": "BowsersBro.png",
-			"rect": [
-				0.0,
-				0.0,
-				96.0,
-				96.0
-			]
-		},
 		"default": {
 			"source": "BowsersBro.png",
 			"rect": [
@@ -91,6 +82,54 @@
 				96.0,
 				96.0
 			]
+		},
+		"Underwater": {
+			"source": "BowsersBro.png",
+			"rect": [
+				96.0,
+				0.0,
+				96.0,
+				96.0
+			]
+		},
+		"CastleWater": {
+			"link": "Underwater"
+		},
+		"Snow": {
+			"source": "BowsersBro.png",
+			"rect": [
+				192.0,
+				0.0,
+				96.0,
+				96.0
+			]
+		},
+		"Space": {
+			"source": "BowsersBro.png",
+			"rect": [
+				0.0,
+				96.0,
+				96.0,
+				96.0
+			]
+		},
+		"Volcano": {
+			"source": "BowsersBro.png",
+			"rect": [
+				96.0,
+				96.0,
+				96.0,
+				96.0
+			]
+		},
+		"Bonus": {
+			"source": "BowsersBro.png",
+			"rect": [
+				192.0,
+				96.0,
+				96.0,
+				96.0
+			]
 		}
 	}
-}
+}
--- a/Assets/Sprites/Enemies/BowsersBro.png
+++ b/Assets/Sprites/Enemies/BowsersBro.png
--- a/Resources/AssetRipper/Sprites/Enemies/Bowser.json
+++ b/Resources/AssetRipper/Sprites/Enemies/Bowser.json
--- a/Resources/AssetRipper/Sprites/Enemies/BowsersBro.json
+++ b/Resources/AssetRipper/Sprites/Enemies/BowsersBro.json
--- a/Scenes/Levels/AchievementMenu.tscn
+++ b/Scenes/Levels/AchievementMenu.tscn
@@ -90,7 +90,6 @@ script/source = "extends AchievementProgressCalculator
 func get_progress() -> int:
 	var medal_amount := 0
 	SpeedrunHandler.load_best_times(campaign)
-	print(SpeedrunHandler.best_level_warpless_times)
 	var world := 0
 	for x in SpeedrunHandler.best_level_warpless_times:
 		var level := 0
@@ -100,7 +99,6 @@ func get_progress() -> int:
 			level += 1
 		world += 1
 	for x in SpeedrunHandler.best_level_any_times:
-		print(SpeedrunHandler.best_level_any_times)
 		if SpeedrunHandler.best_level_any_times[x] <= SpeedrunHandler.LEVEL_GOLD_ANY_TIMES[campaign][x] * SpeedrunHandler.MEDAL_CONVERSIONS[medal_index] and SpeedrunHandler.best_level_any_times[x] > 0:
 			medal_amount += 1
 	var save = JSON.parse_string(FileAccess.open(Global.config_path.path_join(\"saves/\" + campaign + \".sav\"), FileAccess.READ).get_as_text())
--- a/Scenes/Levels/Credits.tscn
+++ b/Scenes/Levels/Credits.tscn
@@ -382,6 +382,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_s34bh")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label3" type="Label" parent="Labels/TileArtists/Label"]
 layout_mode = 0
@@ -401,6 +403,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_ouss1")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label4" type="Label" parent="Labels/TileArtists/Label"]
 layout_mode = 0
@@ -420,6 +424,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_yji2n")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label5" type="Label" parent="Labels/TileArtists/Label"]
 layout_mode = 0
@@ -439,6 +445,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_4ssyu")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label6" type="Label" parent="Labels/TileArtists/Label"]
 layout_mode = 0
@@ -458,6 +466,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_8pyc7")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="TextureRect" type="TextureRect" parent="Labels/TileArtists"]
 layout_mode = 0
@@ -466,6 +476,8 @@ offset_top = 120.0
 offset_right = 248.0
 offset_bottom = 232.0
 texture = ExtResource("4_j3afk")
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="BGArtists" type="Control" parent="Labels"]
 visible = false
@@ -516,6 +528,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_s34bh")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label3" type="Label" parent="Labels/BGArtists/Label"]
 layout_mode = 0
@@ -535,6 +549,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_6kpe2")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label4" type="Label" parent="Labels/BGArtists/Label"]
 layout_mode = 0
@@ -554,6 +570,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_3s1o5")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label6" type="Label" parent="Labels/BGArtists/Label"]
 layout_mode = 0
@@ -573,6 +591,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_x745s")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label5" type="Label" parent="Labels/BGArtists/Label"]
 layout_mode = 0
@@ -592,6 +612,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_g2gtw")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="TextureRect" type="TextureRect" parent="Labels/BGArtists"]
 layout_mode = 0
@@ -600,6 +622,8 @@ offset_top = 112.0
 offset_right = 144.0
 offset_bottom = 224.0
 texture = ExtResource("6_s34bh")
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="EnemyArtists" type="Control" parent="Labels"]
 visible = false
@@ -650,6 +674,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_s34bh")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label3" type="Label" parent="Labels/EnemyArtists/Label"]
 layout_mode = 0
@@ -669,6 +695,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_g2gtw")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label4" type="Label" parent="Labels/EnemyArtists/Label"]
 layout_mode = 0
@@ -688,6 +716,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_885hu")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label5" type="Label" parent="Labels/EnemyArtists/Label"]
 layout_mode = 0
@@ -707,6 +737,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_j5uy1")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label6" type="Label" parent="Labels/EnemyArtists/Label"]
 layout_mode = 0
@@ -726,6 +758,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_oqk7k")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label7" type="Label" parent="Labels/EnemyArtists/Label"]
 layout_mode = 0
@@ -745,6 +779,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_ud3pl")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="TextureRect" type="TextureRect" parent="Labels/EnemyArtists"]
 layout_mode = 0
@@ -753,6 +789,8 @@ offset_top = 120.0
 offset_right = 248.0
 offset_bottom = 232.0
 texture = ExtResource("7_k6bv2")
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label10" type="Label" parent="Labels/EnemyArtists"]
 layout_mode = 0
@@ -773,6 +811,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_isghj")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="LevelDesign" type="Control" parent="Labels"]
 visible = false
@@ -823,6 +863,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_s34bh")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label4" type="Label" parent="Labels/LevelDesign/Label"]
 layout_mode = 0
@@ -842,6 +884,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_oe1k8")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label5" type="Label" parent="Labels/LevelDesign/Label/Label4"]
 layout_mode = 0
@@ -861,6 +905,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_sqdyg")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label5" type="Label" parent="Labels/LevelDesign/Label"]
 layout_mode = 0
@@ -880,6 +926,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_4ssyu")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label7" type="Label" parent="Labels/LevelDesign/Label"]
 layout_mode = 0
@@ -899,6 +947,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_0ixvh")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="TextureRect2" type="TextureRect" parent="Labels/LevelDesign/Label/Label7/TextureRect"]
 layout_mode = 1
@@ -910,6 +960,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_txoml")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label3" type="Label" parent="Labels/LevelDesign/Label"]
 layout_mode = 0
@@ -929,6 +981,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_g2gtw")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label2" type="Label" parent="Labels/LevelDesign"]
 layout_mode = 0
@@ -969,6 +1023,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_s34bh")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label2" type="Label" parent="Labels/LevelDesign/Label2"]
 layout_mode = 0
@@ -988,6 +1044,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_shsp7")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label3" type="Label" parent="Labels/LevelDesign"]
 layout_mode = 0
@@ -1027,6 +1085,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_i063v")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="TextureRect" type="TextureRect" parent="Labels/LevelDesign"]
 layout_mode = 0
@@ -1035,6 +1095,8 @@ offset_top = 120.0
 offset_right = 248.0
 offset_bottom = 232.0
 texture = ExtResource("8_3648a")
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Sound" type="Control" parent="Labels"]
 layout_mode = 3
@@ -1084,6 +1146,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_s34bh")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label3" type="Label" parent="Labels/Sound/Label"]
 layout_mode = 0
@@ -1103,6 +1167,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_23b0w")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label4" type="Label" parent="Labels/Sound/Label"]
 layout_mode = 0
@@ -1122,6 +1188,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_yeh4c")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label6" type="Label" parent="Labels/Sound/Label"]
 layout_mode = 0
@@ -1141,6 +1209,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_mjy6w")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label2" type="Label" parent="Labels/Sound"]
 layout_mode = 0
@@ -1180,6 +1250,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_irr87")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label6" type="Label" parent="Labels/Sound/Label2"]
 layout_mode = 0
@@ -1199,6 +1271,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_mjy6w")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label7" type="Label" parent="Labels/Sound/Label2"]
 layout_mode = 0
@@ -1218,6 +1292,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_3diwr")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label8" type="Label" parent="Labels/Sound/Label2"]
 layout_mode = 0
@@ -1237,6 +1313,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_ttapi")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="TextureRect" type="TextureRect" parent="Labels/Sound"]
 layout_mode = 0
@@ -1372,6 +1450,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_4e2pw")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label3" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1404,6 +1484,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_17gvw")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label4" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1436,6 +1518,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_suvme")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label5" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1468,6 +1552,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_d4vu4")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label6" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1500,6 +1586,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_ekvxv")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label7" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1532,6 +1620,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_txoml")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label8" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1564,6 +1654,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_txoml")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label9" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1596,6 +1688,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_d2mcn")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label10" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1628,6 +1722,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_igtl7")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label11" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1660,6 +1756,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_wjira")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label12" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1692,6 +1790,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_s2n2q")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="Label13" type="Label" parent="Labels/Localizers/Label"]
 layout_mode = 0
@@ -1724,6 +1824,8 @@ offset_bottom = 16.0
 grow_horizontal = 0
 texture = SubResource("AtlasTexture_bdyah")
 stretch_mode = 2
+script = ExtResource("11_d4vu4")
+metadata/_custom_type_script = "uid://ca3bew33g45eq"

 [node name="TextureRect" type="TextureRect" parent="Labels/Localizers"]
 layout_mode = 0
--- a/Scenes/Levels/LevelTransition.tscn
+++ b/Scenes/Levels/LevelTransition.tscn
@@ -132,6 +132,7 @@ offset_left = -44.0
 offset_top = -11.0
 offset_right = 156.0
 offset_bottom = 5.0
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 text = "CHALLENGE_DIALOGUE_SCORE"
 uppercase = true

@@ -143,8 +144,10 @@ offset_left = -8.0
 offset_top = -11.0
 offset_right = 56.0
 offset_bottom = 12.0
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 text = "0"
 horizontal_alignment = 2
+uppercase = true

 [node name="Target" type="Label" parent="BG/Control/ChallengeScoreText"]
 layout_mode = 1
@@ -155,8 +158,10 @@ offset_left = -8.0
 offset_right = 8.0
 offset_bottom = 23.0
 theme_override_colors/font_color = Color(0.462745, 0.52549, 1, 1)
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 text = "/00000"
 horizontal_alignment = 2
+uppercase = true

 [node name="ChallengeCoins2" type="Label" parent="BG/Control"]
 unique_name_in_owner = true
@@ -166,6 +171,7 @@ offset_left = -44.0
 offset_top = -27.0
 offset_right = 156.0
 offset_bottom = -11.0
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
 text = "CHALLENGE_DIALOGUE_COINS"
 uppercase = true

@@ -230,7 +236,7 @@ metadata/_custom_type_script = "uid://co6tjg3w6qpd8"

 [node name="TextShadowColourChanger" type="Node" parent="." node_paths=PackedStringArray("labels")]
 script = ExtResource("10_abjth")
-labels = [NodePath("../BG/Control/World"), NodePath("../BG/Control/LivesCount"), NodePath("../BG/Control/MarathonPB"), NodePath("../BG/Control/WorldNum"), NodePath("../BG/Control/CustomLevelName"), NodePath("../BG/Control/CustomLevelAuthor")]
+labels = [NodePath("../BG/Control/World"), NodePath("../BG/Control/LivesCount"), NodePath("../BG/Control/MarathonPB"), NodePath("../BG/Control/WorldNum"), NodePath("../BG/Control/CustomLevelName"), NodePath("../BG/Control/CustomLevelAuthor"), NodePath("../BG/Control/ChallengeScore"), NodePath("../BG/Control/ChallengeScoreText"), NodePath("../BG/Control/ChallengeScoreText/Target"), NodePath("../BG/Control/ChallengeCoins2")]
 metadata/_custom_type_script = "uid://dt2p68xl462v2"

 [connection signal="timeout" from="Timer" to="." method="transition"]
--- a/Scenes/Levels/SMB1/World2/2-1.tscn
+++ b/Scenes/Levels/SMB1/World2/2-1.tscn
@@ -238,7 +238,7 @@ metadata/_custom_type_script = "uid://pfwgmuchergf"

 [node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
 script = ExtResource("27_nvjju")
-nodes_to_delete = [NodePath("../Blocks/QuestionBlock2"), null, NodePath("../Blocks/BrickBlock7")]
+nodes_to_delete = [NodePath("../Blocks/QuestionBlock2"), NodePath("../Blocks/BrickBlock7")]
 metadata/_custom_type_script = "uid://cgm3opb5qudc1"

 [node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("28_t63mw")]
--- a/Scenes/Levels/SMB1/World3/3-2.tscn
+++ b/Scenes/Levels/SMB1/World3/3-2.tscn
@@ -164,9 +164,8 @@ position = Vector2(3192, 0)
 [node name="Checkpoint" parent="." instance=ExtResource("20_xv2tb")]
 position = Vector2(1328, 0)

-[node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
+[node name="ChallengeNodes" type="Node" parent="."]
 script = ExtResource("21_8rqg6")
-nodes_to_delete = [null]
 metadata/_custom_type_script = "uid://cgm3opb5qudc1"

 [node name="RedCoin" parent="ChallengeNodes" instance=ExtResource("22_cxldk")]
--- a/Scenes/Levels/SMB1/World4/4-1.tscn
+++ b/Scenes/Levels/SMB1/World4/4-1.tscn
@@ -112,7 +112,7 @@ tile_map_data = PackedByteArray("AAD7////AAAAAAAAAAD8////AAABAAAAAAD+////AAABAAA

 [node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
 script = ExtResource("21_f001g")
-nodes_to_delete = [NodePath("../Blocks/QuestionBlock3"), NodePath("../Coin"), null, NodePath("../Blocks/QuestionBlock4")]
+nodes_to_delete = [NodePath("../Blocks/QuestionBlock3"), NodePath("../Coin"), NodePath("../Blocks/QuestionBlock4")]
 metadata/_custom_type_script = "uid://cgm3opb5qudc1"

 [node name="QuestionBlock" parent="ChallengeNodes" instance=ExtResource("9_vtupl")]
--- a/Scenes/Levels/SMB1/World7/7-3.tscn
+++ b/Scenes/Levels/SMB1/World7/7-3.tscn
@@ -1054,7 +1054,7 @@ position = Vector2(2976, -96)
 [node name="InvisibleQuestionBlock" parent="ChallengeNodes" index="5"]
 position = Vector2(504, -104)

-[node name="InvisibleQuestionBlock2" parent="ChallengeNodes" index="6" instance=ExtResource("3_dfskb")]
+[node name="InvisibleQuestionBlock3" parent="ChallengeNodes" index="6" instance=ExtResource("3_dfskb")]
 position = Vector2(1176, -104)

 [node name="Enemies" type="Node" parent="." index="13"]
--- a/Scenes/Levels/SMB1/World8/8-2.tscn
+++ b/Scenes/Levels/SMB1/World8/8-2.tscn
@@ -185,7 +185,7 @@ optional = true

 [node name="ChallengeNodes" type="Node" parent="." node_paths=PackedStringArray("nodes_to_delete")]
 script = ExtResource("20_8cbri")
-nodes_to_delete = [NodePath("../Enemies/Lakitu"), NodePath("../DecoTiles"), NodePath("../Blocks")]
+nodes_to_delete = [NodePath("../Blocks")]
 force_on = true
 metadata/_custom_type_script = "uid://cgm3opb5qudc1"

--- a/Scenes/Levels/SMBLL/World3/3-3.tscn
+++ b/Scenes/Levels/SMBLL/World3/3-3.tscn
--- a/Scenes/Prefabs/Entities/Enemies/Bowser.tscn
+++ b/Scenes/Prefabs/Entities/Enemies/Bowser.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=41 format=3 uid="uid://duptcik2j0b04"]
+[gd_scene load_steps=40 format=3 uid="uid://duptcik2j0b04"]

 [ext_resource type="Texture2D" uid="uid://d3sxabber73q6" path="res://Assets/Sprites/Enemies/Bowser.png" id="1_8mi7o"]
 [ext_resource type="Script" uid="uid://wtypg4d0l6j2" path="res://Scripts/Classes/Entities/Enemies/Bowser.gd" id="1_ma5fd"]
@@ -11,7 +11,6 @@
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Bowser.json" id="6_nf6hu"]
 [ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="6_pvhfi"]
 [ext_resource type="Script" uid="uid://c3gg32ivrlq8n" path="res://Scripts/Classes/Components/GibSpawner.gd" id="6_va0n6"]
-[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Goomba.json" id="9_exf4b"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="11_pvhfi"]
 [ext_resource type="Script" uid="uid://cqif1li7otvpl" path="res://Scripts/Parts/SpriteFramesToJsonConverter.gd" id="14_nf6hu"]
 [ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="15_nf6hu"]
@@ -300,7 +299,7 @@ metadata/_custom_type_script = "uid://caq1qiwmy0mox"
 script = ExtResource("5_17x2r")
 node_to_affect = NodePath("..")
 property_name = "sprite_frames"
-resource_json = ExtResource("9_exf4b")
+resource_json = ExtResource("6_nf6hu")
 use_cache = false
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"

@@ -344,6 +343,7 @@ metadata/_custom_type_script = "uid://dri2d5jtu0fbq"
 [node name="GibSpawner" type="Node" parent="." node_paths=PackedStringArray("visuals")]
 script = ExtResource("6_va0n6")
 visuals = NodePath("../SpriteScaleJoint/DeathSprite")
+gib_type = 1
 metadata/_custom_type_script = "uid://c3gg32ivrlq8n"

 [node name="ScoreNoteSpawner" type="Node" parent="."]
@@ -403,13 +403,14 @@ hitbox = NodePath("../SpriteScaleJoint/Sprite/Hitbox")
 metadata/_custom_type_script = "uid://ba18grqjixded"

 [connection signal="killed" from="." to="GibSpawner" method="summon_gib"]
-[connection signal="killed" from="." to="." method="show_smoke" unbinds=1]
 [connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [5000]]
+[connection signal="killed" from="." to="." method="show_smoke" unbinds=1]
 [connection signal="area_entered" from="SpriteScaleJoint/Sprite/Hitbox" to="." method="on_area_entered"]
 [connection signal="timeout" from="JumpTimer" to="." method="jump"]
 [connection signal="timeout" from="HammerTime" to="." method="throw_hammers"]
 [connection signal="timeout" from="FlameTimer" to="." method="breathe_fire"]
 [connection signal="fireball_hit" from="FireballDetection" to="." method="fireball_hit" unbinds=1]
+[connection signal="gib_about_to_spawn" from="GibSpawner" to="." method="on_gib_about_to_spawn"]
 [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="play_music" flags=6]
 [connection signal="attached" from="TrackJoint" to="MoveAnimation" method="play" binds= ["RESET"]]
 [connection signal="moving_shell_entered" from="ShellDetection" to="ShellDetection" method="destroy_shell"]
--- a/Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn
+++ b/Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn
@@ -11,3 +11,6 @@ resource_json = ExtResource("2_qcxx5")

 [node name="ResourceSetterNew" parent="SpriteScaleJoint/DeathSprite" index="0"]
 resource_json = ExtResource("2_qcxx5")
+
+[node name="GibSpawner" parent="." index="8" node_paths=PackedStringArray("visuals")]
+visuals = NodePath("../SpriteScaleJoint/DeathSprite")
--- a/Scenes/Prefabs/Entities/Enemies/TrueBowser.tscn
+++ b/Scenes/Prefabs/Entities/Enemies/TrueBowser.tscn
@@ -5,7 +5,7 @@

 [node name="TrueBowser" instance=ExtResource("1_xtf8a")]
 can_hammer = true
-metadata/is_real = true
+is_real = true

 [node name="ResourceSetterNew" parent="SpriteScaleJoint/DeathSprite" index="0"]
 resource_json = ExtResource("4_ryqkh")
--- a/Scenes/Prefabs/LevelObjects/EndFlagpole.tscn
+++ b/Scenes/Prefabs/LevelObjects/EndFlagpole.tscn
@@ -1,8 +1,7 @@
-[gd_scene load_steps=24 format=3 uid="uid://c6loucilra6da"]
+[gd_scene load_steps=22 format=3 uid="uid://c6loucilra6da"]

 [ext_resource type="Script" uid="uid://dwfnvpioh2kvi" path="res://Scripts/Parts/EndFlagpole.gd" id="1_3rtm4"]
 [ext_resource type="Texture2D" uid="uid://3vg41a5plc4e" path="res://Assets/Sprites/Tilesets/FlagPole.png" id="1_hnd65"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="4_62gix"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Tilesets/FlagPole.json" id="4_nykv5"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_dm4yn"]
 [ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="5_jihtx"]
@@ -57,9 +56,6 @@ _data = {
 &"RESET": SubResource("Animation_xwflf")
 }

-[sub_resource type="CircleShape2D" id="CircleShape2D_c56yc"]
-radius = 4.0
-
 [sub_resource type="Animation" id="Animation_uwkl1"]
 length = 0.001
 tracks/0/type = "value"
@@ -170,14 +166,6 @@ libraries = {
 &"": SubResource("AnimationLibrary_62gix")
 }

-[node name="Top" type="Area2D" parent="."]
-script = ExtResource("4_62gix")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Top"]
-position = Vector2(0, -164)
-shape = SubResource("CircleShape2D_c56yc")
-
 [node name="ScoreNoteSpawner" type="Node" parent="."]
 script = ExtResource("5_dm4yn")
 note_offset = Vector2(0, -160)
@@ -211,5 +199,3 @@ json_file_path = "res://Assets/Sprites/Tilesets/FlagPole.json"
 metadata/_custom_type_script = "uid://cqif1li7otvpl"

 [connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
-[connection signal="player_entered" from="Top" to="." method="on_player_entered"]
-[connection signal="player_entered" from="Top" to="ScoreNoteSpawner" method="spawn_one_up_note" unbinds=1]
--- a/Scenes/Prefabs/UI/SettingsMenu.tscn
+++ b/Scenes/Prefabs/UI/SettingsMenu.tscn
@@ -447,7 +447,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("SpecialScrollingMode"), NodePath("ColourfulPipes"), NodePath("FirebarStyle"), NodePath("ExtraParticles")]
+options = [NodePath("ParallaxStyle"), NodePath("BGParticles"), NodePath("HUDStyle"), NodePath("RainbowEffect"), NodePath("TransformationEffect"), NodePath("TextShadows"), NodePath("BridgeDestructionAnimation"), NodePath("VisibleTimers"), NodePath("TransitionAnimation"), null, NodePath("ColourfulPipes"), NodePath("FirebarStyle"), NodePath("ExtraParticles")]

 [node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals"]
 custom_minimum_size = Vector2(0, 4)
@@ -516,13 +516,6 @@ title = "VISUAL_TRANSITION_EFFECT"
 values = ["VISUAL_TRANSITION_CLASSIC", "VISUAL_TRANSITION_SMOOTH"]
 settings_category = "visuals"

-[node name="SpecialScrollingMode" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals" groups=["Options"] instance=ExtResource("3_dl6kk")]
-layout_mode = 2
-option_key = "smbs_scroll"
-title = "VISUAL_SMBS_SCROLL"
-values = ["VISUAL_SMBS_SCROLL_OFF", "VISUAL_SMBS_SCROLL_X1", "VISUAL_SMBS_SCROLL_PC8801"]
-settings_category = "visuals"
-
 [node name="ColourfulPipes" parent="PanelContainer/MarginContainer/VBoxContainer/Visuals" groups=["Options"] instance=ExtResource("3_dl6kk")]
 layout_mode = 2
 option_key = "colour_pipes"
@@ -1020,7 +1013,6 @@ script = ExtResource("19_k6yev")
 [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/BridgeDestructionAnimation" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="bridge_changed"]
 [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/SpecialScrollingMode" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="smbs_scroll_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="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Visuals/ExtraParticles" to="PanelContainer/MarginContainer/VBoxContainer/Visuals/VisualsSetter" method="extra_particles"]
--- a/Scripts/Classes/Entities/Enemies/Bowser.gd
+++ b/Scripts/Classes/Entities/Enemies/Bowser.gd
@@ -50,15 +50,12 @@ func get_target_y(player: Player) -> float:
 		return player.global_position.y - 8

 func show_smoke() -> void:
-	# guzlad: ugly but it'll have to do until we move the metadata stuff to actual variables
-	if (((Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL) or (Global.current_game_mode == Global.GameMode.LEVEL_EDITOR)) and !is_real):
-		var smoke = preload("res://Scenes/Prefabs/Particles/SmokeParticle.tscn").instantiate()
-		smoke.scale = Vector2(2, 2)
-		smoke.global_position =global_position
-		AudioManager.play_sfx("magic", global_position)
-		add_sibling(smoke)
-	elif has_meta("is_real"):
-		return
+	if is_real: return
+	var smoke = preload("res://Scenes/Prefabs/Particles/SmokeParticle.tscn").instantiate()
+	smoke.scale = Vector2(2, 2)
+	smoke.global_position =global_position
+	AudioManager.play_sfx("magic", global_position)
+	add_sibling(smoke)

 func breathe_fire() -> void:
 	if can_fire == false:
@@ -133,7 +130,8 @@ func fireball_hit() -> void:
 func play_music() -> void:
 	for i: EntityGenerator in get_tree().get_nodes_in_group("EntityGenerators"):
 		if i.entity_scene != null:
-			if i.entity_scene.resource_path == "res://Scenes/Prefabs/Entities/Enemies/BowserFlame.tscn":
+			if i.entity_scene.resource_path == "res://Scenes/
+			Prefabs/Entities/Enemies/BowserFlame.tscn":
 				i.queue_free()
 	if Settings.file.audio.extra_bgm == 0: return
 	if Global.level_editor != null:
@@ -141,6 +139,14 @@ func play_music() -> void:
 	if music_enabled:
 		AudioManager.set_music_override(AudioManager.MUSIC_OVERRIDES.BOWSER, 5, false)

-
 func on_timeout() -> void:
 	move_dir = [-1, 1].pick_random()
+
+func on_gib_about_to_spawn() -> void:
+	if is_real:
+		$FallSFX.play()
+		$FallSFX.finished.connect($FallSFX.queue_free)
+		$FallSFX.reparent(get_parent())
+	# guzlad: ugly but it'll have to do until we move the metadata stuff to actual variables
+	if ((Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL) or (Global.current_game_mode == Global.GameMode.LEVEL_EDITOR)) and !is_real:
+		$SpriteScaleJoint/DeathSprite/ResourceSetterNew.resource_json = load("res://Assets/Sprites/Enemies/Goomba.json")
--- a/Scripts/Classes/Entities/Items/SuperMushroom.gd
+++ b/Scripts/Classes/Entities/Items/SuperMushroom.gd
@@ -18,10 +18,10 @@ func on_area_entered(area: Area2D) -> void:
 func give_life(_player: Player) -> void:
 	DiscoLevel.combo_amount += 1
 	AudioManager.play_sfx("1_up", global_position)
-	if Global.current_game_mode == Global.GameMode.CHALLENGE or Settings.file.difficulty.inf_lives:
+	if [Global.GameMode.CHALLENGE, Global.GameMode.BOO_RACE].has(Global.current_game_mode) or Settings.file.difficulty.inf_lives:
 		Global.score += 2000
 		$ScoreNoteSpawner.spawn_note(2000)
 	else:
-		$ScoreNoteSpawner.spawn_one_up_note()
 		Global.lives += 1
+		$ScoreNoteSpawner.spawn_one_up_note()
 	queue_free()
--- a/Scripts/Classes/Entities/Objects/Bumper.gd
+++ b/Scripts/Classes/Entities/Objects/Bumper.gd
@@ -32,7 +32,7 @@ func bounce_player(player: Player) -> void:
 	$Sprite.play("Idle")

 func refresh_hitbox() -> void:
-	$Hitbox/CollisionShape2D.set_deferred("disabled", true)
+	$PlayerDetection/CollisionShape2D.set_deferred("disabled", true)
 	await get_tree().physics_frame
-	$Hitbox/CollisionShape2D.set_deferred("disabled", false)
+	$PlayerDetection/CollisionShape2D.set_deferred("disabled", false)
 	
--- a/Scripts/Classes/Entities/Player.gd
+++ b/Scripts/Classes/Entities/Player.gd
@@ -216,7 +216,9 @@ func _ready() -> void:
 	character = CHARACTERS[int(Global.player_characters[player_id])]
 	Global.can_time_tick = true
 	if [Global.GameMode.BOO_RACE, Global.GameMode.MARATHON, Global.GameMode.MARATHON_PRACTICE].has(Global.current_game_mode) == false:
-		apply_character_physics()
+		apply_character_physics(true)
+	else:
+		apply_character_physics(false)
 	apply_character_sfx_map()
 	Global.level_theme_changed.connect(apply_character_sfx_map)
 	Global.level_theme_changed.connect(apply_character_physics)
@@ -232,22 +234,24 @@ func _ready() -> void:
 	if Global.level_editor == null:
 		recenter_camera()

-func apply_character_physics() -> void:
+func apply_character_physics(apply: bool) -> void:
 	var path = "res://Assets/Sprites/Players/" + character + "/CharacterInfo.json"
 	if int(Global.player_characters[player_id]) > 3:
 		path = path.replace("res://Assets/Sprites/Players", Global.config_path.path_join("custom_characters/"))
 	path = ResourceSetter.get_pure_resource_path(path)
 	var json = JSON.parse_string(FileAccess.open(path, FileAccess.READ).get_as_text())
-	for i in json.physics:
-		set(i, json.physics[i])
+	
+	if apply:
+		for i in json.physics:
+			set(i, json.physics[i])
 	
 	for i in get_tree().get_nodes_in_group("SmallCollisions"):
-		var hitbox_scale = json.get("small_hitbox_scale", [1, 1])
-		i.hitbox = Vector3(hitbox_scale[0], hitbox_scale[1] if i.get_meta("scalable", true) else 1, json.get("small_crouch_scale", 0.75))
+		var hitbox_scale = json.get("small_hitbox_scale", [1, 1]) if apply else [1, 1]
+		i.hitbox = Vector3(hitbox_scale[0], hitbox_scale[1] if i.get_meta("scalable", true) else 1, json.get("small_crouch_scale", 0.75) if apply else 0.5)
 		i._physics_process(0)
 	for i in get_tree().get_nodes_in_group("BigCollisions"):
-		var hitbox_scale = json.get("big_hitbox_scale", [1, 1])
-		i.hitbox = Vector3(hitbox_scale[0], hitbox_scale[1] if i.get_meta("scalable", true) else 1, json.get("big_crouch_scale", 0.5))
+		var hitbox_scale = json.get("big_hitbox_scale", [1, 1]) if apply else [1, 1]
+		i.hitbox = Vector3(hitbox_scale[0], hitbox_scale[1] if i.get_meta("scalable", true) else 1, json.get("big_crouch_scale", 0.5) if apply else 0.5)
 		i._physics_process(0)

 func apply_classic_physics() -> void:
@@ -445,7 +449,7 @@ func enemy_bounce_off(add_combo := true, award_score := true) -> void:
 func add_stomp_combo(award_score := true) -> void:
 	if stomp_combo >= 10:
 		if award_score:
-			if Global.current_game_mode == Global.GameMode.CHALLENGE or Settings.file.difficulty.inf_lives:
+			if [Global.GameMode.CHALLENGE, Global.GameMode.BOO_RACE].has(Global.current_gamemode) or Settings.file.difficulty.inf_lives:
 				Global.score += 10000
 				score_note_spawner.spawn_note(10000)
 			else:
@@ -698,12 +702,13 @@ func set_power_state_frame() -> void:
 		can_bump_fly = %Sprite.sprite_frames.has_animation("FlyBump")
 		can_kick_anim = %Sprite.sprite_frames.has_animation("Kick")

-func get_power_up(power_name := "") -> void:
+func get_power_up(power_name := "", give_points := true) -> void:
 	if is_dead:
 		return
-	Global.score += 1000
-	DiscoLevel.combo_amount += 1
-	score_note_spawner.spawn_note(1000)
+	if give_points:
+		Global.score += 1000
+		DiscoLevel.combo_amount += 1
+		score_note_spawner.spawn_note(1000)
 	AudioManager.play_sfx("power_up", global_position)
 	if Settings.file.difficulty.damage_style == 0 and power_state.state_name != power_name:
 		if power_name != "Big" and power_state.state_name != "Big":
--- a/Scripts/Classes/Entities/ShellClass.gd
+++ b/Scripts/Classes/Entities/ShellClass.gd
@@ -67,7 +67,7 @@ func on_player_hit(hit_player: Player) -> void:
 		
 func award_score(award_level: int) -> void:
 	if award_level >= 10:
-		if Global.current_game_mode == Global.GameMode.CHALLENGE or Settings.file.difficulty.inf_lives:
+		if [Global.GameMode.CHALLENGE, Global.GameMode.BOO_RACE].has(Global.current_game_mode) or Settings.file.difficulty.inf_lives:
 			$ScoreNoteSpawner.spawn_note(10000)
 		else:
 			AudioManager.play_global_sfx("1_up")
--- a/Scripts/Parts/Checkpoint.gd
+++ b/Scripts/Parts/Checkpoint.gd
@@ -62,7 +62,7 @@ func on_area_entered(area: Area2D) -> void:
 			sublevel_id = Global.level_editor.sub_level_id
 		if Settings.file.difficulty.checkpoint_style == 2 and has_meta("is_flag"):
 			if player.power_state.state_name == "Small":
-				player.get_power_up("Big")
+				player.get_power_up("Big", false)
 		respawn_position = global_position
 		crossed.emit(area.owner)

--- a/Scripts/Parts/EndCastle.gd
+++ b/Scripts/Parts/EndCastle.gd
@@ -85,9 +85,13 @@ func do_lost_levels_firework_check() -> void:
 		else:
 			await show_fireworks(3)
 		if Global.coins % 11 == 0:
-			spawn_one_up_note()
 			AudioManager.play_sfx("1_up", global_position)
-			Global.lives += 1
+			if [Global.GameMode.CHALLENGE, Global.GameMode.BOO_RACE].has(Global.current_game_mode) or Settings.file.difficulty.inf_lives:
+				Global.score += 2000
+				$ScoreNoteSpawner.spawn_note(2000)
+			else:
+				Global.lives += 1
+				spawn_one_up_note()

 const ONE_UP_NOTE = preload("uid://dopxwjj37gu0l")

--- a/Scripts/Parts/EndFlagpole.gd
+++ b/Scripts/Parts/EndFlagpole.gd
@@ -6,17 +6,10 @@ signal player_reached

 signal sequence_begin

-func _ready() -> void:
-	if Settings.file.difficulty.flagpole_lives == 0:
-		print(Settings.file.difficulty)
-		$Top.queue_free()
-
 func on_area_entered(area: Area2D) -> void:
 	if area.owner is Player:
 		player_touch(area.owner)

-
-
 func player_touch(player: Player) -> void:
 	player_reached.emit()
 	if Global.current_game_mode == Global.GameMode.MARATHON_PRACTICE:
@@ -50,10 +43,10 @@ func give_points(player: Player) -> void:
 	var value = clamp(int(lerp(0, 4, (player.global_position.y / -144))), 0, 4)
 	var nearest_value = FLAG_POINTS[value]
 	$Score.text = str(nearest_value)
-	Global.score += nearest_value
-	$Score/Animation2.play("ScoreRise")
-
-func on_player_entered(player: Player) -> void:
-	player_touch(player)
-	Global.lives += 1
-	AudioManager.play_sfx("1_up", global_position)
+	if nearest_value == 5000 and Settings.file.difficulty.flagpole_lives and not [Global.GameMode.CHALLENGE, Global.GameMode.BOO_RACE].has(Global.current_game_mode) and not Settings.file.difficulty.inf_lives:
+		AudioManager.play_sfx("1_up", global_position)
+		Global.lives += 1
+		$ScoreNoteSpawner.spawn_one_up_note()
+	else:
+		Global.score += nearest_value
+		$Score/Animation2.play("ScoreRise")
--- a/Scripts/Parts/LevelTransition.gd
+++ b/Scripts/Parts/LevelTransition.gd
@@ -106,7 +106,7 @@ func handle_challenge_mode_transition() -> void:
 	%ChallengeScoreText/Target.show()
 	%ChallengeCoins2.show()
 	%ChallengeCoins.show()
-	%ChallengeScoreText.text = str(Global.score)
+	%ChallengeScoreText.text = str(int(ChallengeModeHandler.top_challenge_scores[Global.world_num - 1][Global.level_num - 1]))
 	var idx = 0
 	for i in %ChallengeCoins.get_children():
 		if ChallengeModeHandler.is_coin_collected(idx, ChallengeModeHandler.red_coins_collected[Global.world_num - 1][Global.level_num - 1]):
--- a/Scripts/Parts/ResourcePackTemplateCreator.gd
+++ b/Scripts/Parts/ResourcePackTemplateCreator.gd
@@ -3,6 +3,10 @@ extends Node
 var files := []
 var directories := []

+signal fnt_file_downloaded(text: String)
+
+var downloaded_fnt_text := []
+
 const base_info_json := {
 	"name": "New Pack",
 	"description": "Template, give me a description!",
@@ -19,14 +23,26 @@ func create_template() -> void:
 			destination = i.replace("res://Assets", Global.config_path.path_join("resource_packs/new_pack"))
 		else:
 			destination = i.replace(Global.config_path.path_join("resource_packs/BaseAssets"), Global.config_path.path_join("resource_packs/new_pack"))
-		print("Copying '" + i + "' to: '" + destination)
-		var old_file = FileAccess.open(i, FileAccess.READ)
-		if old_file != null:
-			var new_file = FileAccess.open(destination, FileAccess.WRITE)
-			new_file.store_buffer(old_file.get_buffer(old_file.get_length()))
+		var data = []
+		if i.contains(".fnt"):
+			data = await download_fnt_text(i) 
+			## Imagine being one of the best open source game engines, yet not able to get the FUCKING CONTENTS
+			## OF AN FNT FILE SO INSTEAD YOU HAVE TO WRITE THE MOST BULLSHIT CODE TO DOWNLOAD THE FUCKING FILE
+			## FROM THE FUCKING GITHUB REPO. WHY? BECAUSE GODOT IS SHIT. FUCK GODOT.
+		elif i.contains(".bgm") == false and i.contains(".ctex") == false and i.contains(".json") == false and i.contains("res://") and i.contains(".fnt") == false:
+			var resource = load(i)
+			if resource is Texture:
+				data = resource.get_image().save_png_to_buffer()
+			elif resource is AudioStream:
+				data = resource.get_data()
+		else:
+			var old_file = FileAccess.open(i, FileAccess.READ)
+			data = old_file.get_buffer(old_file.get_length())
 			old_file.close()
-			new_file.close()
-			
+
+		var new_file = FileAccess.open(destination, FileAccess.WRITE)
+		new_file.store_buffer(data)
+		new_file.close()
 	
 	var pack_info_path = Global.config_path.path_join("resource_packs/new_pack/pack_info.json")
 	DirAccess.make_dir_recursive_absolute(pack_info_path.get_base_dir())
@@ -35,9 +51,24 @@ func create_template() -> void:
 	file.close()
 	print("Done")

+func download_fnt_text(file_path := "") -> PackedByteArray:
+	var http = HTTPRequest.new()
+	const GITHUB_URL = "https://raw.githubusercontent.com/JHDev2006/Super-Mario-Bros.-Remastered-Public/refs/heads/main/"
+	var url = GITHUB_URL + file_path.replace("res://", "")
+	add_child(http)
+	http.request_completed.connect(file_downloaded)
+	http.request(url, [], HTTPClient.METHOD_GET)
+	await fnt_file_downloaded
+	http.queue_free()
+	return downloaded_fnt_text
+
+func file_downloaded(result: int, response_code: int, headers: PackedStringArray, body: PackedByteArray) -> void:
+	downloaded_fnt_text = body
+	fnt_file_downloaded.emit(downloaded_fnt_text)
+
 func get_directories(base_dir := "", files := [], directories := []) -> void:
 	for i in DirAccess.get_directories_at(base_dir):
-		if base_dir.contains("LevelGuides") == false:
+		if base_dir.contains("LevelGuides") == false and base_dir.contains(".godot") == false:
 			directories.append(base_dir + "/" + i)
 			get_directories(base_dir + "/" + i, files, directories)
 			get_files(base_dir + "/" + i, files)
Author	SHA1	Message	Date
SkyanUltra	f04b20e5b8	BowserBro palettes and slight Bowser file clean-up (#636 ) * Different world palettes for BowserBro, and slight optimization to Bowser. BowserBro still will not use Bowser's green palette in any of the areas where the game would genuinely use the green palette, but he will follow the rules of other non-green palette areas so he has more consistency in those areas. * BowserBro palette and sprite now correctly set. * Fix Bowser.png	2025-10-20 21:56:34 +01:00
John Cooper McDonald	fbe86af2cd	Make the rest of the credits images pack replacable (#640 ) * Make the rest of the credits images pack replacable * Update Credits.tscn	2025-10-20 21:01:25 +01:00
John Cooper McDonald	6a373125b1	Fix challenge transition text shadow + show high score (#641 )	2025-10-20 20:57:50 +01:00
KirbyKidJ	50da5f62f3	Some Fake Bowser Fixes (#635 ) This PR fixes the issues mentioned in #557 with Fake and Real Bowsers. Also for fun, I got the Bowser fall SFX to work when you kill a REAL Bowser or Bowser Bro by moving it outside of Bowser before they were freed from the scene.	2025-10-20 09:43:34 +01:00
SkyanUltra	b87d6e6a7c	Fix for broken crouch size in marathon/boo races. (#632 ) Previously, if you entered a boo race your hitbox scale changes would never be applied, meaning your crouch size would be unchanged from your standing stance. This fixes that, and adds a single parameter to apply character physics.	2025-10-20 09:41:45 +01:00
JHDev2006	65718342c6	Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public	2025-10-19 21:31:11 +01:00
JHDev2006	f77e1510cf	fixed bumpers crashing, and FINALLY HAVE SORTED RESOURCE PACK EXTRACTION, ONLY TOOK BEING ABLE TO DOWNLOAD SOME OF THE FILES FROM THE FUCKING GITHUB TO WORK YEAAAAAAAAAAAAAA I LOVE GODOT	2025-10-19 21:31:09 +01:00
John Cooper McDonald	2d0c34ce69	Fix Lakitu and deco not spawning in Challenge 8-2 (#629 )	2025-10-19 18:16:34 +01:00
John Cooper McDonald	d37910a379	Don't give points for the powerup from a checkpoint (#628 )	2025-10-19 09:53:26 +01:00
JHDev2006	6011e6f63b	Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public	2025-10-19 09:45:49 +01:00
JHDev2006	23345bbbf1	removed sp scrolling from settings menu i coded it in about 10 minutes as a joke, and didnt really intend on it being something proper + it comes with a whole new slew of bugs which im not willing to commit to yet, soz. its still in the code so should be relatively easy to hack in, maybe itll come back in future, who knows	2025-10-19 09:45:48 +01:00
John Cooper McDonald	568d45ee31	Change 1-up flagpole to replace the 5000 point bonus (#550 ) * Change 1-up flagpole to replace the 5000 point bonus * Also no 1-ups in you vs boo * Update EndFlagpole.gd * Style * Update EndFlagpole.tscn	2025-10-18 14:42:51 +01:00