Fix Thwomp not awarding any points (#653 )

Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public
removed window size saving, not too happy with how it was implemented, and think it would be better off saving it for later, so i can get it right
2025-10-22 23:48:11 +00:00 · 2025-10-22 21:12:34 +01:00 · 2025-10-22 21:10:23 +01:00 · 2025-10-22 21:10:22 +01:00 · 2025-10-22 21:08:14 +01:00 · 2025-10-22 19:51:52 +01:00
63 changed files with 1223 additions and 725 deletions
--- a/Assets/Sprites/Backgrounds/Hills/Hill.json
+++ b/Assets/Sprites/Backgrounds/Hills/Hill.json
@@ -1,10 +1,20 @@
 {
 	"properties": {
-		"primary_layer_size": [512, 512]
+		"primary_layer_size": [
+			512.0,
+			512.0
+		]
 	},
 	"animations": {
 		"default": {
-			"frames": [[0, 0, 512, 512]],
+			"frames": [
+				[
+					0.0,
+					0.0,
+					512.0,
+					512.0
+				]
+			],
 			"speed": 5.0,
 			"loop": true
 		}
@@ -20,12 +30,20 @@
 				}
 			},
 			"SMBLL": {
-				"Day": {"source": "OverworldLL.png"},
-				"Night": {"source": "OverworldNightLL.png"}
+				"Day": {
+					"source": "OverworldLL.png"
+				},
+				"Night": {
+					"source": "OverworldNightLL.png"
+				}
 			},
 			"SMBANN": {
-				"Day": {"source": "OverworldANN.png"},
-				"Night": {"source": "OverworldNightANN.png"}
+				"Day": {
+					"source": "OverworldANN.png"
+				},
+				"Night": {
+					"source": "OverworldNightANN.png"
+				}
 			}
 		},
 		"Desert": {
@@ -49,28 +67,66 @@
 		"Underground": {
 			"SMB1": {
 				"source": "Underground.png",
-				"animations": {"default": {
-					"frames": [[0, 0, 512, 512], [512, 0, 512, 512]],
+				"animation_overrides": {
+					"default": {
+						"frames": [
+							[
+								0.0,
+								0.0,
+								512.0,
+								512.0
+							],
+							[
+								512.0,
+								0.0,
+								512.0,
+								512.0
+							]
+						],
 						"speed": 5.0,
 						"loop": true
-				}}
+					}
+				}
 			},
 			"SMBLL": {
 				"source": "UndergroundLL.png",
-				"animations": {"default": {
-					"frames": [[0, 0, 512, 512], [512, 0, 512, 512]],
+				"animation_overrides": {
+					"default": {
+						"frames": [
+							[
+								0.0,
+								0.0,
+								512.0,
+								512.0
+							],
+							[
+								512.0,
+								0.0,
+								512.0,
+								512.0
+							]
+						],
 						"speed": 5.0,
 						"loop": true
-				}}
+					}
+				}
 			}
 		},
 		"Castle": {
-			"SMB1": {"source": "Castle.png"},
-			"SMBLL": {"source": "CastleLL.png"}
+			"SMB1": {
+				"source": "Castle.png"
+			},
+			"SMBLL": {
+				"source": "CastleLL.png"
+			}
 		},
 		"GhostHouse": {
-			"SMB1": {"source": "GhostHouse.png"},
-			"SMBLL": {"source": "GhostHouseLL.png"}
+			"SMB1": {
+				"source": "GhostHouse.png"
+			},
+			"SMBLL": {
+				"source": "GhostHouseLL.png"
+			}
 		},
 		"Snow": {
 			"SMB1": {
@@ -98,111 +154,184 @@
 				}
 			}
 		},
-		"Jungle":
-		{
-			"SMB1": {"source": "Jungle.png"},
-			"SMBLL": {"source": "JungleLL.png"}
+		"Jungle": {
+			"SMB1": {
+				"source": "Jungle.png"
+			},
+			"SMBLL": {
+				"source": "JungleLL.png"
+			}
 		},
 		"Autumn": {
-			"Day":
-			{
-				"SMB1": {"source": "Autumn.png"},
-				"SMBLL": {"source": "AutumnLL.png"}
+			"Day": {
+				"SMB1": {
+					"source": "Autumn.png"
+				},
+				"SMBLL": {
+					"source": "AutumnLL.png"
+				}
 			},
 			"Night": {
-				"SMB1": {"source": "AutumnNight.png"},
-				"SMBLL": {"source": "AutumnNightLL.png"}
+				"SMB1": {
+					"source": "AutumnNight.png"
+				},
+				"SMBLL": {
+					"source": "AutumnNightLL.png"
+				}
 			}
 		},
 		"Pipeland": {
-			"Day":
-			{
-				"SMB1": {"source": "Pipeland.png"},
-				"SMBLL": {"source": "PipelandLL.png"}
-			},
-			"Night": {
-				"SMB1": {"source": "PipelandNight.png"},
-				"SMBLL": {"source": "PipelandNightLL.png"}
-			}
-		},
-		"Volcano":
-		{
-			"SMB1": {"source": "Volcano.png"},
-			"SMBLL": {"source": "VolcanoLL.png"}
-		},
-		"Mountain":
-		{
+			"Day": {
 				"SMB1": {
-				"Day": {"source": "Mountain.png"},
-				"Night": {"source": "MountainNight.png"}
+					"source": "Pipeland.png"
 				},
 				"SMBLL": {
-				"Day": {"source": "MountainLL.png"},
-				"Night": {"source": "MountainNightLL.png"}
+					"source": "PipelandLL.png"
+				}
+			},
+			"Night": {
+				"SMB1": {
+					"source": "PipelandNight.png"
+				},
+				"SMBLL": {
+					"source": "PipelandNightLL.png"
+				}
+			}
+		},
+		"Volcano": {
+			"SMB1": {
+				"source": "Volcano.png"
+			},
+			"SMBLL": {
+				"source": "VolcanoLL.png"
+			}
+		},
+		"Mountain": {
+			"SMB1": {
+				"Day": {
+					"source": "Mountain.png"
+				},
+				"Night": {
+					"source": "MountainNight.png"
+				}
+			},
+			"SMBLL": {
+				"Day": {
+					"source": "MountainLL.png"
+				},
+				"Night": {
+					"source": "MountainNightLL.png"
+				}
 			}
 		},
 		"Skyland": {
 			"Day": {
-				"SMB1": {"source": "Sky.png"},
-				"SMBLL": {"source": "SkyLL.png"}
+				"SMB1": {
+					"source": "Sky.png"
+				},
+				"SMBLL": {
+					"source": "SkyLL.png"
+				}
 			},
 			"Night": {
-				"SMB1": {"source": "SkyNight.png"},
-				"SMBLL": {"source": "SkyNightLL.png"}
-			}
-		},
-		"Beach":
-		{
 				"SMB1": {
-				"Day": {"source": "BeachHills.png"},
-				"Night": {"source": "BeachHillsNight.png"}
+					"source": "SkyNight.png"
 				},
 				"SMBLL": {
-				"Day": {"source": "BeachLL.png"},
-				"Night": {"source": "BeachNightLL.png"}
+					"source": "SkyNightLL.png"
+				}
 			}
 		},
-		"Underwater":
-		{
+		"Beach": {
 			"SMB1": {
-				"Day": {"source": "Underwater.png"},
-				"Night": {"source": "UnderwaterNight.png"}
+				"Day": {
+					"source": "BeachHills.png"
+				},
+				"Night": {
+					"source": "BeachHillsNight.png"
+				}
 			},
 			"SMBLL": {
-				"Day": {"source": "UnderwaterLL.png"},
-				"Night": {"source": "UnderwaterNightLL.png"}
+				"Day": {
+					"source": "BeachLL.png"
+				},
+				"Night": {
+					"source": "BeachNightLL.png"
+				}
+			}
+		},
+		"Underwater": {
+			"SMB1": {
+				"Day": {
+					"source": "Underwater.png"
+				},
+				"Night": {
+					"source": "UnderwaterNight.png"
+				}
+			},
+			"SMBLL": {
+				"Day": {
+					"source": "UnderwaterLL.png"
+				},
+				"Night": {
+					"source": "UnderwaterNightLL.png"
+				}
 			}
 		},
 		"Garden": {
 			"SMB1": {
-				"Day": {"source": "GardenHill.png"},
-				"Night": {"source": "GardenNight.png"}
+				"Day": {
+					"source": "GardenHill.png"
 				},
-			"SMBLL": {
-				"Day": {"source": "GardenHillLL.png"},
-				"Night": {"source": "GardenHillNightLL.png"}
+				"Night": {
+					"source": "GardenNight.png"
 				}
-			
-		},
-		"CastleWater":
-		{
-			"SMB1": {
-				"Day": {"source": "CastleWater.png"},
-				"Night": {"source": "CastleWaterNight.png"}
 			},
 			"SMBLL": {
-				"Day": {"source": "CastleWaterLL.png"},
-				"Night": {"source": "CastleWaterNightLL.png"}
+				"Day": {
+					"source": "GardenHillLL.png"
+				},
+				"Night": {
+					"source": "GardenHillNightLL.png"
+				}
+			}
+		},
+		"CastleWater": {
+			"SMB1": {
+				"Day": {
+					"source": "CastleWater.png"
+				},
+				"Night": {
+					"source": "CastleWaterNight.png"
+				}
+			},
+			"SMBLL": {
+				"Day": {
+					"source": "CastleWaterLL.png"
+				},
+				"Night": {
+					"source": "CastleWaterNightLL.png"
+				}
 			}
 		},
 		"Space": {
-			"SMB1": {"source": "Space.png"},
-			"SMBLL": {"source": "SpaceLL.png"}
+			"SMB1": {
+				"source": "Space.png"
+			},
+			"SMBLL": {
+				"source": "SpaceLL.png"
+			}
+		},
+		"Airship": {
+			"link": "Skyland"
 		},
-		"Airship": {"link": "Skyland"},
 		"Bonus": {
-			"SMB1": {"source": "Bonus.png"},
-			"SMBLL": {"source": "BonusLL.png"}
+			"SMB1": {
+				"source": "Bonus.png"
+			},
+			"SMBLL": {
+				"source": "BonusLL.png"
+			}
 		}
 	}
 }
--- a/Assets/Sprites/Editor/CheepCheepSideGenerator.png
+++ b/Assets/Sprites/Editor/CheepCheepSideGenerator.png
--- a/Assets/Sprites/Editor/CheepCheepSideGenerator.png.import
+++ b/Assets/Sprites/Editor/CheepCheepSideGenerator.png.import
@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cd8q0nuveukv1"
+path="res://.godot/imported/CheepCheepSideGenerator.png-09ee2d284f88ce6583cde162f843856a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Editor/CheepCheepSideGenerator.png"
+dest_files=["res://.godot/imported/CheepCheepSideGenerator.png-09ee2d284f88ce6583cde162f843856a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- 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": [
--- 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/Assets/Sprites/UI/Font.fnt.import
+++ b/Assets/Sprites/UI/Font.fnt.import
@@ -14,4 +14,4 @@ dest_files=["res://.godot/imported/Font.fnt-6c6685c58d22178166a8720d2c719ea3.fon

 fallbacks=[]
 compress=true
-scaling_mode=2
+scaling_mode=0
--- a/Assets/Sprites/UI/Font.png.import
+++ b/Assets/Sprites/UI/Font.png.import
@@ -2,7 +2,7 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://fl3d66h6h0o7"
+uid="uid://w0upk3mm4jf2"
 path="res://.godot/imported/Font.png-641933ef994f12d7d57b3370c1fb44de.ctex"
 metadata={
 "vram_texture": false
--- a/Assets/Sprites/UI/FontGA.png.import
+++ b/Assets/Sprites/UI/FontGA.png.import
@@ -2,7 +2,7 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bmyn0megjnnrx"
+uid="uid://bsepw8fa2vk04"
 path="res://.godot/imported/FontGA.png-d849a866dc513008eabe61624b4d39c8.ctex"
 metadata={
 "vram_texture": false
--- a/Assets/Sprites/UI/FontJP.png.import
+++ b/Assets/Sprites/UI/FontJP.png.import
@@ -2,7 +2,7 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://du7ke62m5mfci"
+uid="uid://ct72gsk4uny04"
 path="res://.godot/imported/FontJP.png-e9d4affae12e83d1ad38e68741a363e2.ctex"
 metadata={
 "vram_texture": false
--- a/Assets/Sprites/UI/FontLL.fnt
+++ b/Assets/Sprites/UI/FontLL.fnt
@@ -1,4 +1,4 @@
-info face="Font.png" size=16 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0
+info face="FontLL.png" size=16 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0
 common lineHeight=16 base=16 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
 page id=0 file="FontLL.png"
 page id=1 file="FontGA.png"
--- a/Assets/Sprites/UI/FontLL.fnt.import
+++ b/Assets/Sprites/UI/FontLL.fnt.import
@@ -2,7 +2,7 @@

 importer="font_data_bmfont"
 type="FontFile"
-uid="uid://b8pt2ab0kg0vw"
+uid="uid://x1bkppv4xsrv"
 path="res://.godot/imported/FontLL.fnt-b0a4b8976c6dfce9e7529f579de98f07.fontdata"

 [deps]
@@ -14,4 +14,4 @@ dest_files=["res://.godot/imported/FontLL.fnt-b0a4b8976c6dfce9e7529f579de98f07.f

 fallbacks=[]
 compress=true
-scaling_mode=2
+scaling_mode=0
--- a/Assets/Sprites/UI/FontLL.png.import
+++ b/Assets/Sprites/UI/FontLL.png.import
@@ -2,7 +2,7 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://gd41bb6k1803"
+uid="uid://bl63bqgh8mpr2"
 path="res://.godot/imported/FontLL.png-8507bc88b2949495a33d1ab1002b7a73.ctex"
 metadata={
 "vram_texture": false
--- a/Assets/Sprites/UI/FontMain.json
+++ b/Assets/Sprites/UI/FontMain.json
@@ -1,7 +1,13 @@
 {
 	"variations": {
-		"SMB1": {"source": "Font.fnt"},
-		"SMBLL": {"source": "FontLL.fnt"},
-		"SMBANN": {"link": "SMBLL"}
+		"SMB1": {
+			"source": "Font.fnt"
+		},
+		"SMBLL": {
+			"source": "FontLL.fnt"
+		},
+		"SMBANN": {
+			"link": "SMBLL"
+		}
 	}
 }
--- a/Assets/Sprites/UI/ScoreFont.png.import
+++ b/Assets/Sprites/UI/ScoreFont.png.import
@@ -1,3 +1,40 @@
 [remap]

-importer="skip"
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cv6no0vc04p8v"
+path="res://.godot/imported/ScoreFont.png-281fa6a3ecebf9e9d4520f2c046dfbdb.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/UI/ScoreFont.png"
+dest_files=["res://.godot/imported/ScoreFont.png-281fa6a3ecebf9e9d4520f2c046dfbdb.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- 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/Resources/Music/MusicBase.tres
+++ b/Resources/Music/MusicBase.tres
@@ -1,7 +1,7 @@
 [gd_resource type="AudioStreamInteractive" load_steps=3 format=3 uid="uid://da4vqkrpqnma0"]

-[ext_resource type="AudioStream" uid="uid://cwe41cd6nkn0u" path="res://Assets/Audio/BGM/Overworld.mp3" id="1_km47y"]
-[ext_resource type="AudioStream" uid="uid://dp3owh2j56xv6" path="res://Assets/Audio/BGM/OverworldHurry.mp3" id="2_i0wg4"]
+[ext_resource type="AudioStream" uid="uid://chknkfu4c0gsp" path="res://Assets/Audio/BGM/Overworld.mp3" id="1_km47y"]
+[ext_resource type="AudioStream" uid="uid://bd0q3pulvt2fr" path="res://Assets/Audio/BGM/OverworldHurry.mp3" id="2_i0wg4"]

 [resource]
 clip_count = 2
--- a/Resources/ThemedResources/FontMain.tres
+++ b/Resources/ThemedResources/FontMain.tres
@@ -1,6 +1,6 @@
 [gd_resource type="FontVariation" load_steps=2 format=3 uid="uid://bl7sbw4nx3l1t"]

-[ext_resource type="FontFile" uid="uid://cd221873lbtj1" path="res://Assets/Sprites/UI/Font.fnt" id="1_6xssw"]
+[ext_resource type="FontFile" uid="uid://djsv6aojrcuyg" path="res://Assets/Sprites/UI/Font.fnt" id="1_6xssw"]

 [resource]
 base_font = ExtResource("1_6xssw")
--- 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/CustomLevelBase.tscn
+++ b/Scenes/Levels/CustomLevelBase.tscn
@@ -0,0 +1,86 @@
+[gd_scene load_steps=8 format=3 uid="uid://broeyye3effot"]
+
+[ext_resource type="Script" path="res://Scripts/Classes/CustomLevel.gd" id="1_8pu80"]
+[ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="2_f32q3"]
+[ext_resource type="Texture2D" uid="uid://cbha2l6hg1kfo" path="res://Assets/Sprites/UI/EditorGrid.png" id="3_e7vnc"]
+[ext_resource type="Texture2D" uid="uid://bxciugu0dg7e8" path="res://Assets/Sprites/Editor/ChunkDisplay.png" id="4_rhepb"]
+[ext_resource type="PackedScene" uid="uid://ct5rrpa7uehkk" path="res://Scenes/Parts/Tiles.tscn" id="5_6gaxc"]
+[ext_resource type="PackedScene" uid="uid://cuh62hlq8errh" path="res://Scenes/Prefabs/Entities/Player.tscn" id="6_13qah"]
+[ext_resource type="PackedScene" uid="uid://cinr6kcbmo6gr" path="res://Scenes/Parts/DropShadowRenderer.tscn" id="7_rcw8p"]
+
+[node name="CustomLevelBase" type="Node"]
+script = ExtResource("1_8pu80")
+metadata/_custom_type_script = "uid://bcqr1v25ygedb"
+
+[node name="LevelBG" parent="." instance=ExtResource("2_f32q3")]
+z_index = -99
+
+[node name="Grid" type="Parallax2D" parent="."]
+unique_name_in_owner = true
+visible = false
+visibility_layer = 2
+z_index = 4096
+z_as_relative = false
+repeat_size = Vector2(512, 512)
+repeat_times = 8
+
+[node name="TextureRect" type="TextureRect" parent="Grid"]
+modulate = Color(0.356863, 0.356863, 0.356863, 0.407843)
+offset_right = 512.0
+offset_bottom = 512.0
+texture = ExtResource("3_e7vnc")
+stretch_mode = 1
+metadata/_edit_use_anchors_ = true
+
+[node name="ChunkGrid" type="Parallax2D" parent="Grid"]
+unique_name_in_owner = true
+visible = false
+visibility_layer = 2
+z_index = 4096
+z_as_relative = false
+scroll_offset = Vector2(0, 32)
+repeat_size = Vector2(512, 512)
+repeat_times = 8
+
+[node name="TextureRect" type="TextureRect" parent="Grid/ChunkGrid"]
+offset_right = 512.0
+offset_bottom = 512.0
+texture = ExtResource("4_rhepb")
+metadata/_edit_use_anchors_ = true
+
+[node name="TileLayer5" parent="." instance=ExtResource("5_6gaxc")]
+unique_name_in_owner = true
+
+[node name="TileLayer4" parent="." instance=ExtResource("5_6gaxc")]
+unique_name_in_owner = true
+
+[node name="TileLayer3" parent="." instance=ExtResource("5_6gaxc")]
+unique_name_in_owner = true
+
+[node name="TileLayer2" parent="." instance=ExtResource("5_6gaxc")]
+unique_name_in_owner = true
+
+[node name="TileLayer1" parent="." instance=ExtResource("5_6gaxc")]
+unique_name_in_owner = true
+
+[node name="EntityLayer5" type="Node2D" parent="."]
+unique_name_in_owner = true
+
+[node name="EntityLayer4" type="Node2D" parent="."]
+unique_name_in_owner = true
+
+[node name="EntityLayer3" type="Node2D" parent="."]
+unique_name_in_owner = true
+
+[node name="EntityLayer2" type="Node2D" parent="."]
+unique_name_in_owner = true
+
+[node name="EntityLayer1" type="Node2D" parent="."]
+unique_name_in_owner = true
+
+[node name="Player" parent="EntityLayer1" instance=ExtResource("6_13qah")]
+position = Vector2(-232, 0)
+metadata/tile_position = Vector2i(-15, -1)
+metadata/no_save = false
+
+[node name="DropShadow" parent="." instance=ExtResource("7_rcw8p")]
--- 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/World-1/-1-1.tscn
+++ b/Scenes/Levels/SMB1/World-1/-1-1.tscn
@@ -109,7 +109,7 @@ metadata/_custom_type_script = "uid://caq1qiwmy0mox"

 [node name="ResourceSetterNew" type="Node" parent="PeachNPC2" node_paths=PackedStringArray("node_to_affect")]
 script = ExtResource("19_xhct6")
-node_to_affect = NodePath("")
+node_to_affect = NodePath("..")
 property_name = "sprite_frames"
 resource_json = ExtResource("20_62ed8")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
@@ -145,25 +145,25 @@ position = Vector2(1592, -16)
 position = Vector2(2008, -96)

 [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67370" to="Tiles/@Node2D@67370/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67371" to="Tiles/@Node2D@67371/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67372" to="Tiles/@Node2D@67372/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67373" to="Tiles/@Node2D@67373/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67374" to="Tiles/@Node2D@67374/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67375" to="Tiles/@Node2D@67375/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67376" to="Tiles/@Node2D@67376/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67377" to="Tiles/@Node2D@67377/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67378" to="Tiles/@Node2D@67378/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67379" to="Tiles/@Node2D@67379/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67380" to="Tiles/@Node2D@67380/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67381" to="Tiles/@Node2D@67381/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67382" to="Tiles/@Node2D@67382/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67383" to="Tiles/@Node2D@67383/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67384" to="Tiles/@Node2D@67384/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67385" to="Tiles/@Node2D@67385/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67386" to="Tiles/@Node2D@67386/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67387" to="Tiles/@Node2D@67387/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67388" to="Tiles/@Node2D@67388/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67389" to="Tiles/@Node2D@67389/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67390" to="Tiles/@Node2D@67390/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@67391" to="Tiles/@Node2D@67391/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48636" to="Tiles/@Node2D@48636/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48637" to="Tiles/@Node2D@48637/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48638" to="Tiles/@Node2D@48638/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48639" to="Tiles/@Node2D@48639/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48640" to="Tiles/@Node2D@48640/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48641" to="Tiles/@Node2D@48641/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48642" to="Tiles/@Node2D@48642/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48643" to="Tiles/@Node2D@48643/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48644" to="Tiles/@Node2D@48644/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48645" to="Tiles/@Node2D@48645/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48646" to="Tiles/@Node2D@48646/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48647" to="Tiles/@Node2D@48647/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48648" to="Tiles/@Node2D@48648/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48649" to="Tiles/@Node2D@48649/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48650" to="Tiles/@Node2D@48650/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48651" to="Tiles/@Node2D@48651/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48652" to="Tiles/@Node2D@48652/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48653" to="Tiles/@Node2D@48653/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48654" to="Tiles/@Node2D@48654/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48655" to="Tiles/@Node2D@48655/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48656" to="Tiles/@Node2D@48656/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@48657" to="Tiles/@Node2D@48657/LevelPersistance" method="set_as_active"]
--- 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/World6/6-2.tscn
+++ b/Scenes/Levels/SMB1/World6/6-2.tscn
@@ -253,13 +253,8 @@ position = Vector2(2624, -32)
 pipe_id = 3
 exit_only = true

-[node name="Checkpoint2" parent="." instance=ExtResource("10_q2h2g")]
-position = Vector2(1296, 0)
-optional = true
-
 [node name="CheckpointFlag" parent="." instance=ExtResource("24_v8ufo")]
 position = Vector2(1296, 0)
-optional = true

 [connection signal="block_destroyed" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active_2"]
 [connection signal="block_emptied" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active"]
--- 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/SMBANN/World7/7-2.tscn
+++ b/Scenes/Levels/SMBANN/World7/7-2.tscn
--- a/Scenes/Levels/SMBLL/World11/11-2.tscn
+++ b/Scenes/Levels/SMBLL/World11/11-2.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=4 uid="uid://bgi3saqcxur3u"]
+[gd_scene load_steps=18 format=4 uid="uid://bgi3saqcxur3u"]

 [ext_resource type="Script" uid="uid://bcqr1v25ygedb" path="res://Scripts/Classes/LevelClass.gd" id="1_lqo4n"]
 [ext_resource type="JSON" path="res://Assets/Audio/BGM/Underwater.json" id="2_5ws2p"]
@@ -15,6 +15,8 @@
 [ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="15_6tii1"]
 [ext_resource type="PackedScene" uid="uid://iq86u4w60yee" path="res://Scenes/Prefabs/Entities/Objects/Firebar.tscn" id="16_6tii1"]
 [ext_resource type="Script" uid="uid://cybpwmw4ywoow" path="res://Scripts/Parts/TileMapConverter.gd" id="16_g83sl"]
+[ext_resource type="PackedScene" uid="uid://d3ptkkqrbxti7" path="res://Scenes/Prefabs/LevelObjects/CheepCheepSideGenerator.tscn" id="16_yldql"]
+[ext_resource type="PackedScene" uid="uid://bdirphnfabey8" path="res://Scenes/Prefabs/Entities/Enemies/GreenCheepCheep.tscn" id="17_eod1w"]

 [node name="B-2" type="Node"]
 script = ExtResource("1_lqo4n")
@@ -128,64 +130,73 @@ position = Vector2(2168.89, -88.0218)
 length = 16
 direction = 1

+[node name="EntityGenerator" parent="." instance=ExtResource("16_yldql")]
+position = Vector2(8, -176)
+
+[node name="EntityGenerator2" parent="." instance=ExtResource("16_yldql")]
+position = Vector2(8, -160)
+threshold = 3.0
+y_pos = 0
+entity_scene = ExtResource("17_eod1w")
+
 [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24099" to="Tiles/@Node2D@24099/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24100" to="Tiles/@Node2D@24100/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24101" to="Tiles/@Node2D@24101/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24102" to="Tiles/@Node2D@24102/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24103" to="Tiles/@Node2D@24103/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24104" to="Tiles/@Node2D@24104/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24105" to="Tiles/@Node2D@24105/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24106" to="Tiles/@Node2D@24106/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24107" to="Tiles/@Node2D@24107/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24108" to="Tiles/@Node2D@24108/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24109" to="Tiles/@Node2D@24109/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24110" to="Tiles/@Node2D@24110/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24111" to="Tiles/@Node2D@24111/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24112" to="Tiles/@Node2D@24112/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24113" to="Tiles/@Node2D@24113/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24114" to="Tiles/@Node2D@24114/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24115" to="Tiles/@Node2D@24115/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24116" to="Tiles/@Node2D@24116/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24117" to="Tiles/@Node2D@24117/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24118" to="Tiles/@Node2D@24118/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24119" to="Tiles/@Node2D@24119/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24120" to="Tiles/@Node2D@24120/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24121" to="Tiles/@Node2D@24121/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24122" to="Tiles/@Node2D@24122/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24123" to="Tiles/@Node2D@24123/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24124" to="Tiles/@Node2D@24124/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24125" to="Tiles/@Node2D@24125/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24126" to="Tiles/@Node2D@24126/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24127" to="Tiles/@Node2D@24127/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24128" to="Tiles/@Node2D@24128/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24129" to="Tiles/@Node2D@24129/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24130" to="Tiles/@Node2D@24130/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24131" to="Tiles/@Node2D@24131/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24132" to="Tiles/@Node2D@24132/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24133" to="Tiles/@Node2D@24133/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24134" to="Tiles/@Node2D@24134/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24135" to="Tiles/@Node2D@24135/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24136" to="Tiles/@Node2D@24136/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24137" to="Tiles/@Node2D@24137/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24138" to="Tiles/@Node2D@24138/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24139" to="Tiles/@Node2D@24139/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24140" to="Tiles/@Node2D@24140/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24141" to="Tiles/@Node2D@24141/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24142" to="Tiles/@Node2D@24142/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24143" to="Tiles/@Node2D@24143/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24144" to="Tiles/@Node2D@24144/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24145" to="Tiles/@Node2D@24145/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24146" to="Tiles/@Node2D@24146/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24147" to="Tiles/@Node2D@24147/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24148" to="Tiles/@Node2D@24148/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24149" to="Tiles/@Node2D@24149/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24150" to="Tiles/@Node2D@24150/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24151" to="Tiles/@Node2D@24151/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24152" to="Tiles/@Node2D@24152/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24153" to="Tiles/@Node2D@24153/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24154" to="Tiles/@Node2D@24154/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24155" to="Tiles/@Node2D@24155/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24156" to="Tiles/@Node2D@24156/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24157" to="Tiles/@Node2D@24157/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@24158" to="Tiles/@Node2D@24158/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32531" to="Tiles/@Node2D@32531/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32532" to="Tiles/@Node2D@32532/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32533" to="Tiles/@Node2D@32533/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32534" to="Tiles/@Node2D@32534/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32535" to="Tiles/@Node2D@32535/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32536" to="Tiles/@Node2D@32536/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32537" to="Tiles/@Node2D@32537/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32538" to="Tiles/@Node2D@32538/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32539" to="Tiles/@Node2D@32539/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32540" to="Tiles/@Node2D@32540/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32541" to="Tiles/@Node2D@32541/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32542" to="Tiles/@Node2D@32542/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32543" to="Tiles/@Node2D@32543/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32544" to="Tiles/@Node2D@32544/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32545" to="Tiles/@Node2D@32545/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32546" to="Tiles/@Node2D@32546/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32547" to="Tiles/@Node2D@32547/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32548" to="Tiles/@Node2D@32548/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32549" to="Tiles/@Node2D@32549/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32550" to="Tiles/@Node2D@32550/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32551" to="Tiles/@Node2D@32551/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32552" to="Tiles/@Node2D@32552/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32553" to="Tiles/@Node2D@32553/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32554" to="Tiles/@Node2D@32554/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32555" to="Tiles/@Node2D@32555/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32556" to="Tiles/@Node2D@32556/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32557" to="Tiles/@Node2D@32557/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32558" to="Tiles/@Node2D@32558/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32559" to="Tiles/@Node2D@32559/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32560" to="Tiles/@Node2D@32560/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32561" to="Tiles/@Node2D@32561/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32562" to="Tiles/@Node2D@32562/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32563" to="Tiles/@Node2D@32563/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32564" to="Tiles/@Node2D@32564/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32565" to="Tiles/@Node2D@32565/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32566" to="Tiles/@Node2D@32566/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32567" to="Tiles/@Node2D@32567/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32568" to="Tiles/@Node2D@32568/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32569" to="Tiles/@Node2D@32569/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32570" to="Tiles/@Node2D@32570/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32571" to="Tiles/@Node2D@32571/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32572" to="Tiles/@Node2D@32572/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32573" to="Tiles/@Node2D@32573/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32574" to="Tiles/@Node2D@32574/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32575" to="Tiles/@Node2D@32575/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32576" to="Tiles/@Node2D@32576/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32577" to="Tiles/@Node2D@32577/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32578" to="Tiles/@Node2D@32578/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32579" to="Tiles/@Node2D@32579/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32580" to="Tiles/@Node2D@32580/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32581" to="Tiles/@Node2D@32581/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32582" to="Tiles/@Node2D@32582/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32583" to="Tiles/@Node2D@32583/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32584" to="Tiles/@Node2D@32584/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32585" to="Tiles/@Node2D@32585/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32586" to="Tiles/@Node2D@32586/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32587" to="Tiles/@Node2D@32587/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32588" to="Tiles/@Node2D@32588/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32589" to="Tiles/@Node2D@32589/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@32590" to="Tiles/@Node2D@32590/LevelPersistance" method="set_as_active"]
--- a/Scenes/Levels/SMBLL/World3/3-2.tscn
+++ b/Scenes/Levels/SMBLL/World3/3-2.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=22 format=4 uid="uid://txd4b614jd5c"]
+[gd_scene load_steps=23 format=4 uid="uid://txd4b614jd5c"]

 [ext_resource type="Script" uid="uid://bcqr1v25ygedb" path="res://Scripts/Classes/LevelClass.gd" id="1_heupp"]
 [ext_resource type="JSON" path="res://Assets/Audio/BGM/Underwater.json" id="2_orrur"]
@@ -21,6 +21,7 @@
 [ext_resource type="PackedScene" uid="uid://ctx0nbkjf2osn" path="res://Scenes/Prefabs/Entities/Items/YoshiEgg.tscn" id="20_ciy4q"]
 [ext_resource type="PackedScene" uid="uid://chjxyhlwohmi6" path="res://Scenes/Prefabs/Entities/Items/Coin.tscn" id="21_r8a30"]
 [ext_resource type="PackedScene" uid="uid://cassl51oehlb6" path="res://Scenes/Prefabs/LevelObjects/CheckpointFlag.tscn" id="22_686wu"]
+[ext_resource type="PackedScene" uid="uid://d3ptkkqrbxti7" path="res://Scenes/Prefabs/LevelObjects/CheepCheepSideGenerator.tscn" id="22_lnx6r"]

 [node name="3-2" type="Node"]
 script = ExtResource("1_heupp")
@@ -203,98 +204,102 @@ position = Vector2(2200, -136)
 [node name="CheckpointFlag" parent="." node_paths=PackedStringArray("nodes_to_delete") instance=ExtResource("22_686wu")]
 position = Vector2(1328, 0)
 nodes_to_delete = [NodePath("../Enemies/Blooper6")]
+optional = true
+
+[node name="EntityGenerator" parent="." instance=ExtResource("22_lnx6r")]
+position = Vector2(-72, -176)

 [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59263" to="Tiles/@Node2D@59263/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59264" to="Tiles/@Node2D@59264/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59265" to="Tiles/@Node2D@59265/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59266" to="Tiles/@Node2D@59266/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59267" to="Tiles/@Node2D@59267/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59268" to="Tiles/@Node2D@59268/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59269" to="Tiles/@Node2D@59269/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59270" to="Tiles/@Node2D@59270/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59271" to="Tiles/@Node2D@59271/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59272" to="Tiles/@Node2D@59272/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59273" to="Tiles/@Node2D@59273/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59274" to="Tiles/@Node2D@59274/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59275" to="Tiles/@Node2D@59275/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59276" to="Tiles/@Node2D@59276/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59277" to="Tiles/@Node2D@59277/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59278" to="Tiles/@Node2D@59278/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59279" to="Tiles/@Node2D@59279/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59280" to="Tiles/@Node2D@59280/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59281" to="Tiles/@Node2D@59281/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59282" to="Tiles/@Node2D@59282/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59283" to="Tiles/@Node2D@59283/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59284" to="Tiles/@Node2D@59284/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59285" to="Tiles/@Node2D@59285/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59286" to="Tiles/@Node2D@59286/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59287" to="Tiles/@Node2D@59287/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59288" to="Tiles/@Node2D@59288/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59289" to="Tiles/@Node2D@59289/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59290" to="Tiles/@Node2D@59290/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59291" to="Tiles/@Node2D@59291/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59292" to="Tiles/@Node2D@59292/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59293" to="Tiles/@Node2D@59293/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59294" to="Tiles/@Node2D@59294/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59295" to="Tiles/@Node2D@59295/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59296" to="Tiles/@Node2D@59296/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@59297" to="Tiles/@Node2D@59297/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41170" to="Tiles/@Node2D@41170/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41171" to="Tiles/@Node2D@41171/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41172" to="Tiles/@Node2D@41172/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41173" to="Tiles/@Node2D@41173/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41174" to="Tiles/@Node2D@41174/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41175" to="Tiles/@Node2D@41175/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41176" to="Tiles/@Node2D@41176/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41177" to="Tiles/@Node2D@41177/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41178" to="Tiles/@Node2D@41178/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41179" to="Tiles/@Node2D@41179/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41180" to="Tiles/@Node2D@41180/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41181" to="Tiles/@Node2D@41181/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41182" to="Tiles/@Node2D@41182/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41183" to="Tiles/@Node2D@41183/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41184" to="Tiles/@Node2D@41184/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41185" to="Tiles/@Node2D@41185/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41186" to="Tiles/@Node2D@41186/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41187" to="Tiles/@Node2D@41187/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41188" to="Tiles/@Node2D@41188/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41189" to="Tiles/@Node2D@41189/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41190" to="Tiles/@Node2D@41190/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41191" to="Tiles/@Node2D@41191/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41192" to="Tiles/@Node2D@41192/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41193" to="Tiles/@Node2D@41193/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41194" to="Tiles/@Node2D@41194/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41195" to="Tiles/@Node2D@41195/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41196" to="Tiles/@Node2D@41196/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41197" to="Tiles/@Node2D@41197/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41198" to="Tiles/@Node2D@41198/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41199" to="Tiles/@Node2D@41199/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41200" to="Tiles/@Node2D@41200/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41201" to="Tiles/@Node2D@41201/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41202" to="Tiles/@Node2D@41202/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41203" to="Tiles/@Node2D@41203/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@41204" to="Tiles/@Node2D@41204/LevelPersistance" method="set_as_active"]
 [connection signal="area_entered" from="Tiles/DeathPit" to="Tiles/DeathPit" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59298" to="Tiles/@Area2D@59298" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59299" to="Tiles/@Area2D@59299" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59300" to="Tiles/@Area2D@59300" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59301" to="Tiles/@Area2D@59301" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59302" to="Tiles/@Area2D@59302" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59303" to="Tiles/@Area2D@59303" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59304" to="Tiles/@Area2D@59304" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59305" to="Tiles/@Area2D@59305" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59306" to="Tiles/@Area2D@59306" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59307" to="Tiles/@Area2D@59307" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59308" to="Tiles/@Area2D@59308" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59309" to="Tiles/@Area2D@59309" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59310" to="Tiles/@Area2D@59310" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59311" to="Tiles/@Area2D@59311" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59312" to="Tiles/@Area2D@59312" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59313" to="Tiles/@Area2D@59313" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59314" to="Tiles/@Area2D@59314" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59315" to="Tiles/@Area2D@59315" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59316" to="Tiles/@Area2D@59316" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59317" to="Tiles/@Area2D@59317" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59318" to="Tiles/@Area2D@59318" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59319" to="Tiles/@Area2D@59319" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59320" to="Tiles/@Area2D@59320" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59321" to="Tiles/@Area2D@59321" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59322" to="Tiles/@Area2D@59322" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59323" to="Tiles/@Area2D@59323" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59324" to="Tiles/@Area2D@59324" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59325" to="Tiles/@Area2D@59325" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59326" to="Tiles/@Area2D@59326" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59327" to="Tiles/@Area2D@59327" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59328" to="Tiles/@Area2D@59328" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59329" to="Tiles/@Area2D@59329" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59330" to="Tiles/@Area2D@59330" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59331" to="Tiles/@Area2D@59331" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59332" to="Tiles/@Area2D@59332" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59333" to="Tiles/@Area2D@59333" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59334" to="Tiles/@Area2D@59334" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59335" to="Tiles/@Area2D@59335" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59336" to="Tiles/@Area2D@59336" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59337" to="Tiles/@Area2D@59337" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59338" to="Tiles/@Area2D@59338" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59339" to="Tiles/@Area2D@59339" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59340" to="Tiles/@Area2D@59340" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59341" to="Tiles/@Area2D@59341" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59342" to="Tiles/@Area2D@59342" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59343" to="Tiles/@Area2D@59343" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59344" to="Tiles/@Area2D@59344" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59345" to="Tiles/@Area2D@59345" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59346" to="Tiles/@Area2D@59346" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59347" to="Tiles/@Area2D@59347" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59348" to="Tiles/@Area2D@59348" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59349" to="Tiles/@Area2D@59349" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59350" to="Tiles/@Area2D@59350" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59351" to="Tiles/@Area2D@59351" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59352" to="Tiles/@Area2D@59352" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59353" to="Tiles/@Area2D@59353" method="area_entered"]
-[connection signal="area_entered" from="Tiles/@Area2D@59354" to="Tiles/@Area2D@59354" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41205" to="Tiles/@Area2D@41205" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41206" to="Tiles/@Area2D@41206" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41207" to="Tiles/@Area2D@41207" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41208" to="Tiles/@Area2D@41208" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41209" to="Tiles/@Area2D@41209" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41210" to="Tiles/@Area2D@41210" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41211" to="Tiles/@Area2D@41211" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41212" to="Tiles/@Area2D@41212" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41213" to="Tiles/@Area2D@41213" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41214" to="Tiles/@Area2D@41214" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41215" to="Tiles/@Area2D@41215" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41216" to="Tiles/@Area2D@41216" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41217" to="Tiles/@Area2D@41217" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41218" to="Tiles/@Area2D@41218" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41219" to="Tiles/@Area2D@41219" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41220" to="Tiles/@Area2D@41220" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41221" to="Tiles/@Area2D@41221" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41222" to="Tiles/@Area2D@41222" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41223" to="Tiles/@Area2D@41223" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41224" to="Tiles/@Area2D@41224" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41225" to="Tiles/@Area2D@41225" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41226" to="Tiles/@Area2D@41226" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41227" to="Tiles/@Area2D@41227" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41228" to="Tiles/@Area2D@41228" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41229" to="Tiles/@Area2D@41229" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41230" to="Tiles/@Area2D@41230" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41231" to="Tiles/@Area2D@41231" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41232" to="Tiles/@Area2D@41232" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41233" to="Tiles/@Area2D@41233" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41234" to="Tiles/@Area2D@41234" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41235" to="Tiles/@Area2D@41235" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41236" to="Tiles/@Area2D@41236" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41237" to="Tiles/@Area2D@41237" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41238" to="Tiles/@Area2D@41238" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41239" to="Tiles/@Area2D@41239" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41240" to="Tiles/@Area2D@41240" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41241" to="Tiles/@Area2D@41241" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41242" to="Tiles/@Area2D@41242" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41243" to="Tiles/@Area2D@41243" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41244" to="Tiles/@Area2D@41244" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41245" to="Tiles/@Area2D@41245" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41246" to="Tiles/@Area2D@41246" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41247" to="Tiles/@Area2D@41247" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41248" to="Tiles/@Area2D@41248" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41249" to="Tiles/@Area2D@41249" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41250" to="Tiles/@Area2D@41250" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41251" to="Tiles/@Area2D@41251" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41252" to="Tiles/@Area2D@41252" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41253" to="Tiles/@Area2D@41253" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41254" to="Tiles/@Area2D@41254" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41255" to="Tiles/@Area2D@41255" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41256" to="Tiles/@Area2D@41256" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41257" to="Tiles/@Area2D@41257" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41258" to="Tiles/@Area2D@41258" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41259" to="Tiles/@Area2D@41259" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41260" to="Tiles/@Area2D@41260" method="area_entered"]
+[connection signal="area_entered" from="Tiles/@Area2D@41261" to="Tiles/@Area2D@41261" method="area_entered"]
--- a/Scenes/Levels/SMBLL/World3/3-3.tscn
+++ b/Scenes/Levels/SMBLL/World3/3-3.tscn
--- a/Scenes/Levels/SMBLL/World6/6-2.tscn
+++ b/Scenes/Levels/SMBLL/World6/6-2.tscn
@@ -205,36 +205,36 @@ position = Vector2(1720, -104)
 item = ExtResource("22_kwbbf")

 [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118281" to="Tiles/@Node2D@118281/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118282" to="Tiles/@Node2D@118282/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118283" to="Tiles/@Node2D@118283/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118284" to="Tiles/@Node2D@118284/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118285" to="Tiles/@Node2D@118285/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118286" to="Tiles/@Node2D@118286/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118287" to="Tiles/@Node2D@118287/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118288" to="Tiles/@Node2D@118288/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118289" to="Tiles/@Node2D@118289/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118290" to="Tiles/@Node2D@118290/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118291" to="Tiles/@Node2D@118291/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118292" to="Tiles/@Node2D@118292/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118293" to="Tiles/@Node2D@118293/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118294" to="Tiles/@Node2D@118294/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118295" to="Tiles/@Node2D@118295/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118296" to="Tiles/@Node2D@118296/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118297" to="Tiles/@Node2D@118297/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118298" to="Tiles/@Node2D@118298/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118299" to="Tiles/@Node2D@118299/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118300" to="Tiles/@Node2D@118300/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118301" to="Tiles/@Node2D@118301/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118302" to="Tiles/@Node2D@118302/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118303" to="Tiles/@Node2D@118303/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118304" to="Tiles/@Node2D@118304/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118305" to="Tiles/@Node2D@118305/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118306" to="Tiles/@Node2D@118306/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118307" to="Tiles/@Node2D@118307/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118308" to="Tiles/@Node2D@118308/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118309" to="Tiles/@Node2D@118309/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118310" to="Tiles/@Node2D@118310/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118311" to="Tiles/@Node2D@118311/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118312" to="Tiles/@Node2D@118312/LevelPersistance" method="set_as_active"]
-[connection signal="collected" from="Tiles/@Node2D@118313" to="Tiles/@Node2D@118313/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33164" to="Tiles/@Node2D@33164/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33165" to="Tiles/@Node2D@33165/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33166" to="Tiles/@Node2D@33166/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33167" to="Tiles/@Node2D@33167/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33168" to="Tiles/@Node2D@33168/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33169" to="Tiles/@Node2D@33169/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33170" to="Tiles/@Node2D@33170/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33171" to="Tiles/@Node2D@33171/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33172" to="Tiles/@Node2D@33172/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33173" to="Tiles/@Node2D@33173/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33174" to="Tiles/@Node2D@33174/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33175" to="Tiles/@Node2D@33175/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33176" to="Tiles/@Node2D@33176/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33177" to="Tiles/@Node2D@33177/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33178" to="Tiles/@Node2D@33178/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33179" to="Tiles/@Node2D@33179/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33180" to="Tiles/@Node2D@33180/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33181" to="Tiles/@Node2D@33181/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33182" to="Tiles/@Node2D@33182/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33183" to="Tiles/@Node2D@33183/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33184" to="Tiles/@Node2D@33184/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33185" to="Tiles/@Node2D@33185/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33186" to="Tiles/@Node2D@33186/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33187" to="Tiles/@Node2D@33187/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33188" to="Tiles/@Node2D@33188/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33189" to="Tiles/@Node2D@33189/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33190" to="Tiles/@Node2D@33190/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33191" to="Tiles/@Node2D@33191/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33192" to="Tiles/@Node2D@33192/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33193" to="Tiles/@Node2D@33193/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33194" to="Tiles/@Node2D@33194/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33195" to="Tiles/@Node2D@33195/LevelPersistance" method="set_as_active"]
+[connection signal="collected" from="Tiles/@Node2D@33196" to="Tiles/@Node2D@33196/LevelPersistance" method="set_as_active"]
--- a/Scenes/Levels/SMBS/World2/2-1.tscn
+++ b/Scenes/Levels/SMBS/World2/2-1.tscn
@@ -236,6 +236,7 @@ position = Vector2(3432, -120)

 [node name="CheckpointFlag" parent="." instance=ExtResource("24_osugw")]
 position = Vector2(2056, -64)
+optional = true

 [node name="BrickBlock" parent="." instance=ExtResource("21_u54v8")]
 position = Vector2(2040, -120)
--- 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/Thwomp.tscn
+++ b/Scenes/Prefabs/Entities/Enemies/Thwomp.tscn
@@ -141,11 +141,14 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t"

 [node name="ScoreNoteSpawner" type="Node" parent="."]
 script = ExtResource("11_jkv5r")
+add_score = true
 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="hammer_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
+[connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [200]]
 [connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]
 [connection signal="block_bounced" from="BlockBouncingDetection" to="." method="die_from_object"]
--- 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/Entities/Objects/TrackPiece.tscn
+++ b/Scenes/Prefabs/Entities/Objects/TrackPiece.tscn
@@ -43,6 +43,7 @@ region_rect = Rect2(0, 16, 32, 16)
 shape = SubResource("RectangleShape2D_4k6gi")

 [node name="PlacePreview" type="Node2D" parent="."]
+visible = false
 z_index = 1

 [node name="NW" type="Sprite2D" parent="PlacePreview"]
--- a/Scenes/Prefabs/LevelObjects/CheepCheepSideGenerator.tscn
+++ b/Scenes/Prefabs/LevelObjects/CheepCheepSideGenerator.tscn
@@ -0,0 +1,24 @@
+[gd_scene load_steps=6 format=3 uid="uid://d3ptkkqrbxti7"]
+
+[ext_resource type="PackedScene" uid="uid://bn1kect7h2dlp" path="res://Scenes/Prefabs/LevelObjects/BulletBillGenerator.tscn" id="1_tqe64"]
+[ext_resource type="PackedScene" uid="uid://d04e1qv3si8j" path="res://Scenes/Prefabs/Entities/Enemies/RedCheepCheep.tscn" id="2_thtyo"]
+[ext_resource type="Texture2D" uid="uid://cd8q0nuveukv1" path="res://Assets/Sprites/Editor/CheepCheepSideGenerator.png" id="3_nd37u"]
+[ext_resource type="Script" uid="uid://bq0pc2vhp35t2" path="res://Scripts/Parts/EntityGenerator.gd" id="4_nd37u"]
+[ext_resource type="PackedScene" uid="uid://bdirphnfabey8" path="res://Scenes/Prefabs/Entities/Enemies/GreenCheepCheep.tscn" id="5_d47d1"]
+
+[node name="EntityGenerator" instance=ExtResource("1_tqe64")]
+threshold = 4.0
+y_pos = 1
+entity_scene = ExtResource("2_thtyo")
+
+[node name="Sprite" parent="LevelEditorVisibleNode" index="0"]
+texture = ExtResource("3_nd37u")
+
+[node name="EntityGenerator" type="Node2D" parent="." index="2"]
+script = ExtResource("4_nd37u")
+threshold = 3.0
+y_pos = 1
+entity_scene = ExtResource("5_d47d1")
+metadata/_custom_type_script = "uid://bq0pc2vhp35t2"
+
+[connection signal="activated" from="." to="EntityGenerator" method="activate"]
--- 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/LevelObjects/TextLabel.tscn
+++ b/Scenes/Prefabs/LevelObjects/TextLabel.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=4 format=3 uid="uid://ccwil8rmgvund"]
+[gd_scene load_steps=3 format=3 uid="uid://ccwil8rmgvund"]

 [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="1_jxnhn"]
-[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="2_fxuqy"]
 [ext_resource type="Script" uid="uid://dt2p68xl462v2" path="res://Scripts/Parts/TextShadowColourChanger.gd" id="3_8hggr"]

 [node name="TextLabel" type="Label"]
@@ -13,7 +12,6 @@ uppercase = true
 [node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")]
 script = ExtResource("1_jxnhn")
 labels = [NodePath("..")]
-resource = ExtResource("2_fxuqy")
 metadata/_custom_type_script = "uid://co6tjg3w6qpd8"

 [node name="TextShadowColourChanger" type="Node" parent="." node_paths=PackedStringArray("labels")]
--- 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/Components/ResourceSetterNew.gd
+++ b/Scripts/Classes/Components/ResourceSetterNew.gd
@@ -163,8 +163,11 @@ func get_resource(json_file: JSON) -> Resource:
 		ResourceMode.RAW:
 			pass
 		ResourceMode.FONT:
+			if source_resource_path.contains(Global.get_config_path()):
 				resource = FontFile.new()
 				resource.load_bitmap_font(source_resource_path)
+			else:
+				resource = load(source_resource_path)
 			resource.set_meta("base_path", source_resource_path)
 	if cache.has(json_file.resource_path) == false and use_cache and not is_random:
 		cache[json_file.resource_path] = resource
@@ -273,7 +276,7 @@ func get_variation_json(json := {}) -> Dictionary:
 	
 	var chara = "Character:" + Player.CHARACTERS[int(Global.player_characters[0])]
 	if json.has(chara) == false:
-		chara = "Character:Mario"
+		chara = "Character:default"
 	if json.has(chara):
 		if json.get(chara).has("link"):
 			json = get_variation_json(json[json.get(chara).get("link")])
--- 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):
+	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)
-	elif has_meta("is_real"):
-		return

 func breathe_fire() -> void:
 	if can_fire == false:
@@ -141,6 +138,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/Objects/CheckpointFlag.gd
+++ b/Scripts/Classes/Entities/Objects/CheckpointFlag.gd
@@ -6,9 +6,6 @@ static var character_save := "Mario"

 func _ready() -> void:
 	activated.get_node("ResourceSetterNew").resource_json = load(get_character_sprite_path(0))
-	if Settings.file.difficulty.checkpoint_style == 0 and (Global.current_game_mode != Global.GameMode.LEVEL_EDITOR and Global.current_game_mode != Global.GameMode.CUSTOM_LEVEL) or Global.current_campaign == "SMBANN":
-		owner.queue_free()
-		return
 	owner.show()
 	if owner.passed:
 		sprite.hide()
--- a/Scripts/Classes/Entities/Player.gd
+++ b/Scripts/Classes/Entities/Player.gd
@@ -161,6 +161,8 @@ const ANIMATION_FALLBACKS := {
 	"CrouchJump": "Crouch", 
 	"CrouchBump": "Bump",
 	"CrouchMove": "Crouch", 
+	"WaterCrouchMove": "CrouchMove",
+	"WingCrouchMove": "WaterCrouchMove",
 	"IdleAttack": "MoveAttack", 
 	"CrouchAttack": "IdleAttack", 
 	"MoveAttack": "Attack", 
@@ -216,7 +218,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 +236,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())
+	
+	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.75)
 		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 +451,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,9 +704,10 @@ 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
+	if give_points:
 		Global.score += 1000
 		DiscoLevel.combo_amount += 1
 		score_note_spawner.spawn_note(1000)
@@ -886,6 +893,7 @@ func do_smoke_effect() -> void:
 func on_timeout() -> void:
 	AudioManager.stop_music_override(AudioManager.MUSIC_OVERRIDES.STAR)
 	await get_tree().create_timer(1, false).timeout
+	if $StarTimer.is_stopped():
 		is_invincible = false


--- 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/Classes/States/Player/Normal.gd
+++ b/Scripts/Classes/States/Player/Normal.gd
@@ -221,8 +221,14 @@ func get_animation_name() -> String:
 				return "CrouchJump"
 		elif player.is_actually_on_floor():
 			if abs(player.velocity.x) >= 5 and not player.is_actually_on_wall():
+				if player.in_water:
+					return "WaterCrouchMove"
+				elif player.flight_meter > 0:
+					return "WingCrouchMove"
+				else:
 					return "CrouchMove"
-			elif player.in_water:
+			else:
+				if player.in_water:
 					return "WaterCrouch"
 				elif player.flight_meter > 0:
 					return "WingCrouch"
--- a/Scripts/Parts/Checkpoint.gd
+++ b/Scripts/Parts/Checkpoint.gd
@@ -27,7 +27,7 @@ func _enter_tree() -> void:
 		LevelPersistance.active_nodes = old_state.duplicate(true)

 func _ready() -> void:
-	if [Global.GameMode.CHALLENGE, Global.GameMode.MARATHON_PRACTICE].has(Global.current_game_mode) or Global.current_campaign == "SMBANN":
+	if [Global.GameMode.CHALLENGE, Global.GameMode.MARATHON_PRACTICE].has(Global.current_game_mode) or Global.current_campaign == "SMBANN" or (Settings.file.difficulty.extra_checkpoints == 0 and optional):
 		queue_free()
 		return
 	if has_meta("is_flag") == false:
@@ -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)

@@ -71,6 +71,3 @@ func get_id() -> String:
 		return str(Global.level_editor.sub_level_id) + "," + str(Vector2i(global_position)) + "," + get_parent().name
 	else:
 		return Global.current_level.scene_file_path + "," + str(Vector2i(global_position)) + "," + get_parent().name
-
-func on_tree_exiting() -> void:
-	pass # Replace with function body.
--- 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)
+			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
@@ -2,21 +2,16 @@ extends Node2D

 const FLAG_POINTS := [100, 400, 800, 2000, 5000]

+const FLAG_POINTS_MODERN := [100, 200, 800, 4000, 8000]
+
 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:
@@ -49,11 +44,13 @@ func player_touch(player: Player) -> void:
 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]
+	if Settings.file.difficulty.flagpole_lives:
+		nearest_value = FLAG_POINTS_MODERN[value]
 	$Score.text = str(nearest_value)
+	if nearest_value == 8000 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")
-
-func on_player_entered(player: Player) -> void:
-	player_touch(player)
-	Global.lives += 1
-	AudioManager.play_sfx("1_up", global_position)
--- a/Scripts/Parts/EntityGenerator.gd
+++ b/Scripts/Parts/EntityGenerator.gd
@@ -8,6 +8,8 @@ var active := false
@export_enum("Right", "Bottom") var direction := 0
@export var entity_scene: PackedScene = null

+signal activated
+
 func _physics_process(delta: float) -> void:
 	if active:
 		spawn_meter += delta
@@ -20,6 +22,7 @@ func activate() -> void:
 		active = true
 		spawn_meter = 0
 		spawn_entity()
+		activated.emit()

 func deactivate_all_generators() -> void:
 	for i in get_tree().get_nodes_in_group("EntityGenerators"):
@@ -39,6 +42,9 @@ func spawn_entity() -> void:
 		if y_pos == 0:
 			node.global_position.y = get_tree().get_first_node_in_group("Players").global_position.y + randi_range(-4, 4)
 		else:
-			node.global_position.y = randf_range(-56, -120)
-		node.global_position.x = get_viewport().get_camera_2d().get_screen_center_position().x + ((get_viewport().get_visible_rect().size.x / 2) + 4)
+			node.global_position.y = randf_range(0, -152)
+		node.global_position.x = get_viewport().get_camera_2d().get_screen_center_position().x + ((get_viewport().get_visible_rect().size.x / 2) + 8)
+	if get_parent() is EntityGenerator:
+		get_parent().add_sibling(node)
+	else:
 		add_sibling(node)
--- 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 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)
-		if old_file != null:
-			var new_file = FileAccess.open(destination, FileAccess.WRITE)
-			new_file.store_buffer(old_file.get_buffer(old_file.get_length()))
+			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)
--- a/Scripts/UI/WindowChanger.gd
+++ b/Scripts/UI/WindowChanger.gd
@@ -60,10 +60,11 @@ func frame_limit_changed(new_value := 0) -> void:
 	Settings.file.video.frame_limit = new_value

 func set_window_size(value := []) -> void:
+	pass
 	# nabbup: Recenter resized window on launch
-	var newpos = get_window().position - Vector2i((value[0]-get_window().size.x), (value[1]-get_window().size.y))/2
-	get_window().size = Vector2(value[0], value[1])
-	get_window().position = newpos
+	#var newpos = get_window().position - Vector2i((value[0]-get_window().size.x), (value[1]-get_window().size.y))/2
+	#get_window().size = Vector2(value[0], value[1])
+	#get_window().position = newpos

 func set_value(value_name := "", value = null) -> void:
 	{
--- a/addons/mod_loader/options/profiles/editor.tres
+++ b/addons/mod_loader/options/profiles/editor.tres
@@ -1,17 +1,7 @@
-[gd_resource type="Resource" load_steps=2 format=2]
+[gd_resource type="Resource" script_class="ModLoaderOptionsProfile" load_steps=2 format=3 uid="uid://4jrko8vmemnn"]

-[ext_resource path="res://addons/mod_loader/resources/options_profile.gd" type="Script" id=1]
+[ext_resource type="Script" uid="uid://f46uvi5y8oqi" path="res://addons/mod_loader/resources/options_profile.gd" id="1"]

 [resource]
-script = ExtResource( 1 )
-enable_mods = true
-locked_mods = [  ]
-log_level = 3
-disabled_mods = [  ]
-allow_modloader_autoloads_anywhere = false
-steam_workshop_enabled = false
-override_path_to_mods = ""
-override_path_to_configs = ""
-override_path_to_workshop = ""
+script = ExtResource("1")
 ignore_deprecated_errors = true
-ignored_mod_names_in_log = [  ]
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -7,7 +7,7 @@ advanced_options=false
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter="*.bgm, *.mp3, *.txt"
+include_filter="*.bgm, *.mp3, *.txt, *.fnt"
 exclude_filter=""
 export_path="../Exports/Windows/SMB1R.exe"
 patches=PackedStringArray()
Author	SHA1	Message	Date
John Cooper McDonald	b5206d4e2d	Fix Thwomp not awarding any points (#653 )	2025-10-22 21:12:34 +01:00
JHDev2006	aa5c50accb	Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public	2025-10-22 21:10:23 +01:00
JHDev2006	a30e359f4e	removed window size saving, not too happy with how it was implemented, and think it would be better off saving it for later, so i can get it right	2025-10-22 21:10:22 +01:00
John Cooper McDonald	f228ea51f6	Match SMM2 points with Flagpole Lives on (#627 ) * Match SMM2 points with Flagpole Lives on * Update EndFlagpole.gd * Update EndFlagpole.gd	2025-10-22 21:08:14 +01:00
SkyanUltra	bc73dc899b	Implement WaterCrouchMove and WingCrouchMove (and fix an incorrect default value on small crouch height) (#643 ) * Add WaterCrouchMove and WingCrouchMove states * Implement WaterCrouchMove and WingCrouchMove * Quick patch for incorrect crouch height im adding this to this branch for this since its literally just a number change lol	2025-10-22 19:51:52 +01:00
John Cooper McDonald	1e2d4d9404	Fix Extra Checkpoint option not doing anything + other checkpoint fixes (#649 ) * Fix Extra Checkpoint option not doing anything + other checkpoint fixes * Remove redundancy	2025-10-22 19:51:22 +01:00
JHDev2006	b54c4b5913	fixed a bug where the invincibility palette would stop after collecting a starman at the last second	2025-10-22 17:24:41 +01:00
Ramona	f9017881e1	Fix Underground BG not animating (#644 ) * Flip death gravity when upside down * Improvements to code per Joe's request * Recenter resized window on launch * Fix Underground BG not animating	2025-10-22 17:09:08 +01:00
John Cooper McDonald	d372ff4840	Fix Bowser not disabling flame generators (#648 )	2025-10-22 16:44:56 +01:00
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
SkyanUltra	1a0173f095	Fixed 2nd -1-1 Peach not loading correctly. (#626 )	2025-10-18 14:23:40 +01:00
JHDev2006	0fd33d6893	fixed fonts not being loaded on export	2025-10-18 13:26:43 +01:00
JHDev2006	e45e7bfce3	added missing infinite spoawning cheep cheeps to LL underwater levels	2025-10-18 13:07:02 +01:00
SkyanUltra	ac41fbf121	Change default character on character variation key from 'Mario' to 'default' (#623 ) A very simple 1 line change that just fixes the character variation key which characters use as a default to use a proper "default" key rather than just Mario's. May require some JSON changes, but I'll check around and make sure to fix what I can find.	2025-10-18 11:59:41 +01:00