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

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,8 +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"
+				}
 			}
 		},
 		"Desert": {
@@ -45,28 +67,66 @@
 		"Underground": {
 			"SMB1": {
 				"source": "Underground.png",
-				"animations": {"default": {
-					"frames": [[0, 0, 512, 512], [512, 0, 512, 512]],
-					"speed": 5.0,
-					"loop": true
-				}}
+				"animations": {
+					"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]],
-					"speed": 5.0,
-					"loop": true
-				}}
+				"animations": {
+					"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": {
@@ -84,113 +144,194 @@
 				"Night": {
 					"source": "SnowNightLL.png"
 				}
+			},
+			"SMBANN": {
+				"Day": {
+					"source": "SnowANN.png"
+				},
+				"Night": {
+					"source": "SnowNightANN.png"
+				}
 			}
 		},
-		"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"}
+			"Day": {
+				"SMB1": {
+					"source": "Pipeland.png"
+				},
+				"SMBLL": {
+					"source": "PipelandLL.png"
+				}
 			},
 			"Night": {
-				"SMB1": {"source": "PipelandNight.png"},
-				"SMBLL": {"source": "PipelandNightLL.png"}
+				"SMB1": {
+					"source": "PipelandNight.png"
+				},
+				"SMBLL": {
+					"source": "PipelandNightLL.png"
+				}
 			}
 		},
-		"Volcano":
-		{
-			"SMB1": {"source": "Volcano.png"},
-			"SMBLL": {"source": "VolcanoLL.png"}
-		},
-		"Mountain":
-		{
+		"Volcano": {
 			"SMB1": {
-				"Day": {"source": "Mountain.png"},
-				"Night": {"source": "MountainNight.png"}
+				"source": "Volcano.png"
 			},
 			"SMBLL": {
-				"Day": {"source": "MountainLL.png"},
-				"Night": {"source": "MountainNightLL.png"}
+				"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"}
+				"SMB1": {
+					"source": "SkyNight.png"
+				},
+				"SMBLL": {
+					"source": "SkyNightLL.png"
+				}
 			}
 		},
-		"Beach":
-		{
+		"Beach": {
 			"SMB1": {
-				"Day": {"source": "BeachHills.png"},
-				"Night": {"source": "BeachHillsNight.png"}
+				"Day": {
+					"source": "BeachHills.png"
+				},
+				"Night": {
+					"source": "BeachHillsNight.png"
+				}
 			},
 			"SMBLL": {
-				"Day": {"source": "BeachLL.png"},
-				"Night": {"source": "BeachNightLL.png"}
+				"Day": {
+					"source": "BeachLL.png"
+				},
+				"Night": {
+					"source": "BeachNightLL.png"
+				}
 			}
 		},
-		"Underwater":
-		{
+		"Underwater": {
 			"SMB1": {
-				"Day": {"source": "Underwater.png"},
-				"Night": {"source": "UnderwaterNight.png"}
+				"Day": {
+					"source": "Underwater.png"
+				},
+				"Night": {
+					"source": "UnderwaterNight.png"
+				}
 			},
 			"SMBLL": {
-				"Day": {"source": "UnderwaterLL.png"},
-				"Night": {"source": "UnderwaterNightLL.png"}
+				"Day": {
+					"source": "UnderwaterLL.png"
+				},
+				"Night": {
+					"source": "UnderwaterNightLL.png"
+				}
 			}
 		},
 		"Garden": {
 			"SMB1": {
-				"Day": {"source": "GardenHill.png"},
-				"Night": {"source": "GardenNight.png"}
+				"Day": {
+					"source": "GardenHill.png"
+				},
+				"Night": {
+					"source": "GardenNight.png"
+				}
 			},
 			"SMBLL": {
-				"Day": {"source": "GardenHillLL.png"},
-				"Night": {"source": "GardenHillNightLL.png"}
+				"Day": {
+					"source": "GardenHillLL.png"
+				},
+				"Night": {
+					"source": "GardenHillNightLL.png"
+				}
 			}
-			
 		},
-		"CastleWater":
-		{
+		"CastleWater": {
 			"SMB1": {
-				"Day": {"source": "CastleWater.png"},
-				"Night": {"source": "CastleWaterNight.png"}
+				"Day": {
+					"source": "CastleWater.png"
+				},
+				"Night": {
+					"source": "CastleWaterNight.png"
+				}
 			},
 			"SMBLL": {
-				"Day": {"source": "CastleWaterLL.png"},
-				"Night": {"source": "CastleWaterNightLL.png"}
+				"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"
+			}
 		}
 	}
 }

Assets/Sprites/Backgrounds/Hills/OverworldANN.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cs28m2tkqkqpt"
+path="res://.godot/imported/OverworldANN.png-a917c4a1e4c1e40208df341e8af51f42.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Backgrounds/Hills/OverworldANN.png"
+dest_files=["res://.godot/imported/OverworldANN.png-a917c4a1e4c1e40208df341e8af51f42.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

Assets/Sprites/Backgrounds/Hills/OverworldNightANN.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bc1nkboy3fr6k"
+path="res://.godot/imported/OverworldNightANN.png-98a6485e550acd4158fbc7898baf20e0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Backgrounds/Hills/OverworldNightANN.png"
+dest_files=["res://.godot/imported/OverworldNightANN.png-98a6485e550acd4158fbc7898baf20e0.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

Assets/Sprites/Backgrounds/Hills/SnowANN.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://wq4msfwikcwr"
+path="res://.godot/imported/SnowANN.png-547267a957ae04d1a3806374cbacb137.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Backgrounds/Hills/SnowANN.png"
+dest_files=["res://.godot/imported/SnowANN.png-547267a957ae04d1a3806374cbacb137.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

Assets/Sprites/Backgrounds/Hills/SnowNightANN.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cpssr0kuj5iyx"
+path="res://.godot/imported/SnowNightANN.png-880d870cd2c8b88c76dda7d4cf1467bf.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Backgrounds/Hills/SnowNightANN.png"
+dest_files=["res://.godot/imported/SnowNightANN.png-880d870cd2c8b88c76dda7d4cf1467bf.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

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

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": [

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
+			]
 		}
 	}
 }

Assets/Sprites/Tilesets/Platform.json

@@ -6,6 +6,9 @@
 			},
 			"SMBLL": {
 				"source": "LLPlatform.png"
+			},
+			"SMBANN": {
+				"link": "SMBLL"
 			}
 		}
 	}

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

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

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

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

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"

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

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

Assets/Sprites/UI/FontMain.json

@@ -1,6 +1,13 @@
 {
 	"variations": {
-		"SMB1": {"source": "Font.fnt"},
-		"SMBLL": {"source": "FontLL.fnt"}
+		"SMB1": {
+			"source": "Font.fnt"
+		},
+		"SMBLL": {
+			"source": "FontLL.fnt"
+		},
+		"SMBANN": {
+			"link": "SMBLL"
+		}
 	}
 }

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

Assets/Sprites/UI/Title1.json

@@ -31,7 +31,7 @@
 			"Autumn": {"source": "TitleSMBLL.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
 			"Beach": {"source": "TitleSMBLL.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
 			"Mountain": {"source": "TitleSMBLL.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
-			"Space": {"source": "TitleSMBLL.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -0}}
+			"Space": {"source": "TitleSMBLL.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}}
 		},
 		"SMBANN": {
 			"default": {"source": "TitleSMBANN.png", "rect": [0, 0, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
@@ -42,7 +42,7 @@
 			"Autumn": {"source": "TitleSMBANN.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
 			"Beach": {"source": "TitleSMBANN.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
 			"Mountain": {"source": "TitleSMBANN.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
-			"Space": {"source": "TitleSMBANN.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -0}}
+			"Space": {"source": "TitleSMBANN.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}}
 		}
 	}
 }

Resources/AssetRipper/SpriteList.json

@@ -4,9 +4,13 @@
 		
 		"res://Assets/Sprites/Backgrounds/Hills/Overworld.png",
 		"res://Assets/Sprites/Backgrounds/Hills/OverworldAlt.png",
+		"res://Assets/Sprites/Backgrounds/Hills/OverworldANN.png",
 		"res://Assets/Sprites/Backgrounds/Hills/OverworldNight.png",
+		"res://Assets/Sprites/Backgrounds/Hills/OverworldNightANN.png",
 		"res://Assets/Sprites/Backgrounds/Hills/Snow.png",
+		"res://Assets/Sprites/Backgrounds/Hills/SnowANN.png",
 		"res://Assets/Sprites/Backgrounds/Hills/SnowNight.png",
+		"res://Assets/Sprites/Backgrounds/Hills/SnowNightANN.png",
 		
 		"res://Assets/Sprites/Backgrounds/Skies/AutumnSky.png",
 		"res://Assets/Sprites/Backgrounds/Skies/BeachSky.png",

Resources/Locale/locale.csv

@@ -165,6 +165,10 @@ VISUAL_COLOURFUL_PIPES,"Enables multi-coloured pipes (green by default, if turne
 VISUAL_TRANSFORM,"Should the transformation effect on the player, be rainbow, or a simple animation swap?",Transform Style,Style Transfo.,Styl Transformacji,ctиль tpahcфopmaции,Estilo de transformación,Stile trasformazione,ＴＲＡＮＳＦＯＲＭ ＳＴＹＬＥ,Style ng Pagtransform,Power-Up-Animationsstil,Dönüşüm Stİlİ,Transformasi Gaya,Estilo de Transformação,へんしんスタイル
 VISUAL_TEXT_SHADOWS,,Text Shadows,Ombre Textes,Cieniowany Tekstu,tehь tekcta,Sombras en textos,Ombre testo,ＴＥＸＴ ＳＨＡＤＯＷＳ,Anino ng Text,Textschatten,Yazı Gölgelerİ,Bayangan Teks,Sombreamento de Texto,テキストのかげ
 VISUAL_TRANSITION_EFFECT,Do we want transitions to be instant? or smooth?,Transition Style,Style de transition,Styl Tranzycji,ctиль пepexoдob,Estilo de transición,Stile transizione,ＴＲＡＮＳＩＴＩＯＮ ＳＴＹＬＥ,Style ng Transition,Übergangsstil,Geçİş Stİlİ,Gaya Transisi,Estilo de Transição,フェード・スタイル
+VISUAL_SMBS_SCROLL,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling,Special Scrolling
+VISUAL_SMBS_SCROLL_OFF,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off,Off
+VISUAL_SMBS_SCROLL_X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1,Sharp X1
+VISUAL_SMBS_SCROLL_PC8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801,PC-8801
 VISUAL_PARALLAX_NONE,,None,Aucun,Brak,het,Ninguno,No,ＮＯＮＥ,Wala,Kein,Hİç,None,Nenhum,オフ
 VISUAL_PARALLAX_BASIC,,Basic,Basique,Podstawowe,ochobhoй,Básico,Basico,ＢＡＳＩＣ,Basic,Standard,Basİt,Dasar,Básico,ひょうじゅん
 VISUAL_PARALLAX_DETAIL,,Detailed,Détaillé,Detalowane,Дetaлизиpobahhый,Detallado,Dettagliato,ＤＥＴＡＩＬＥＤ,Detalyado,Detailliert,Detaylı,Detailed,Detalhado,しょうさい

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

Resources/SpriteFrames/Player/Mario/Big.tres

@@ -1,7 +1,7 @@
 [gd_resource type="SpriteFrames" load_steps=25 format=3 uid="uid://cjblhx4flkqva"]
 
-[ext_resource type="Texture2D" uid="uid://cf6up03lxcul2" path="res://Assets/Sprites/Players/Mario/Big.png" id="1_akfsq"]
-[ext_resource type="Texture2D" uid="uid://ecig0d3sw5jm" path="res://Assets/Sprites/Players/Mario/Small.png" id="1_dg100"]
+[ext_resource type="Texture2D" uid="uid://b45d7xacnaoxl" path="res://Assets/Sprites/Players/Mario/Big.png" id="1_akfsq"]
+[ext_resource type="Texture2D" uid="uid://d8g0ff0oepgy" path="res://Assets/Sprites/Players/Mario/Small.png" id="1_dg100"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_a6q03"]
 atlas = ExtResource("1_akfsq")

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")

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())

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

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")]

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"]

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"]

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")]

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")]

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")]

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"]

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"
 

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"]

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")
@@ -204,97 +205,100 @@ position = Vector2(2200, -136)
 position = Vector2(1328, 0)
 nodes_to_delete = [NodePath("../Enemies/Blooper6")]
 
+[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"]

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"]

Scenes/Prefabs/Blocks/SpikeBlock.tscn

@@ -5,10 +5,10 @@
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_4g6tc"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Blocks/SpikeBlock.json" id="4_dftxp"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_w3ysb"]
+[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="6_l3otb"]
 [ext_resource type="Script" uid="uid://cqif1li7otvpl" path="res://Scripts/Parts/SpriteFramesToJsonConverter.gd" id="7_4g6tc"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="7_bcd7j"]
 [ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="8_w3ysb"]
-[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="10_6hvsh"]
 [ext_resource type="Script" uid="uid://d4a7yp6e55u8t" path="res://Scripts/Classes/Components/TrackJoint.gd" id="10_xfdnj"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_v0way"]
@@ -154,9 +154,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Collision" type="CollisionShape2D" parent="."]
 shape = SubResource("RectangleShape2D_cgdwi")
 
-[node name="Hitbox" type="Area2D" parent="."]
+[node name="PlayerDetection" type="Area2D" parent="."]
+script = ExtResource("6_l3otb")
+metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
-[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
 shape = SubResource("RectangleShape2D_r7ue2")
 
 [node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."]
@@ -176,10 +178,4 @@ script = ExtResource("10_xfdnj")
 offset = Vector2(0, 0)
 metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 
-[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
-script = ExtResource("10_6hvsh")
-hitbox = NodePath("../Hitbox")
-metadata/_custom_type_script = "uid://chj8hu207lrh"
-
-[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
-[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_entered" from="PlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/Boo.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://bpsrc21amnlgb"]
+[gd_scene load_steps=12 format=3 uid="uid://bpsrc21amnlgb"]
 
 [ext_resource type="Script" uid="uid://bbp3jg7yg1700" path="res://Scripts/Classes/Entities/Enemies/Boo.gd" id="1_ilcde"]
 [ext_resource type="Texture2D" uid="uid://c3l6ynlufxcfp" path="res://Assets/Sprites/Enemies/Boo.png" id="1_mkqqf"]
@@ -6,6 +6,7 @@
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/Boo.json" id="3_xhmhl"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_xhmhl"]
 [ext_resource type="Script" uid="uid://d4a7yp6e55u8t" path="res://Scripts/Classes/Components/TrackJoint.gd" id="6_7u2yg"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="7_wu7y3"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_wu7y3"]
 atlas = ExtResource("1_mkqqf")
@@ -37,12 +38,14 @@ animations = [{
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ilcde"]
 size = Vector2(12, 12)
 
-[node name="Boo" type="Node2D" groups=["Enemies"]]
+[node name="Boo" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_ilcde")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="Sprite" type="AnimatedSprite2D" parent="."]
 position = Vector2(0, -8)
-scale = Vector2(-1, 1)
+rotation = -3.1415927
+scale = Vector2(1, -1)
 sprite_frames = SubResource("SpriteFrames_i46bk")
 animation = &"WhiteIdle"
 flip_h = true
@@ -74,5 +77,14 @@ script = ExtResource("6_7u2yg")
 disable_physics = false
 metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("7_wu7y3")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [connection signal="killed" from="." to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[connection signal="killed" from="." to="." method="summon_smoke_particle" unbinds=1]
+[connection signal="hammer_player_hit" from="EnemyPlayerDetection" to="." method="die_from_hammer"]
+[connection signal="invincible_player_hit" from="EnemyPlayerDetection" to="." method="die_from_object"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Enemies/BooBuddies.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=3 uid="uid://coasuq2vsmlce"]
+[gd_scene load_steps=17 format=3 uid="uid://coasuq2vsmlce"]
 
 [ext_resource type="Texture2D" uid="uid://c3l6ynlufxcfp" path="res://Assets/Sprites/Enemies/Boo.png" id="1_bek6j"]
 [ext_resource type="Script" uid="uid://djdtghrjbpv2i" path="res://Scripts/Classes/Entities/Enemies/BooBuddies.gd" id="1_vavt3"]
@@ -10,6 +10,7 @@
 [ext_resource type="Script" uid="uid://ctfbuoxtnnl0q" path="res://Scripts/Classes/Components/EditorPropertyExposer.gd" id="6_5b8ig"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="8_ifdhg"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/BooBuddy.json" id="9_ifdhg"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="10_al3pe"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_7u2yg"]
 atlas = ExtResource("1_bek6j")
@@ -62,8 +63,9 @@ func _physics_process(delta: float) -> void:
 		idx += 1
 "
 
-[node name="BooBuddies" type="Node2D" groups=["Enemies"]]
+[node name="BooBuddies" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_vavt3")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="RotationJoint" type="Sprite2D" parent="."]
 unique_name_in_owner = true
@@ -106,6 +108,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo1/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo1" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo2" type="Node2D" parent="Boos"]
 visible = false
 
@@ -130,6 +137,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo2/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo2" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo3" type="Node2D" parent="Boos"]
 visible = false
 
@@ -154,6 +166,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo3/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo3" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo4" type="Node2D" parent="Boos"]
 visible = false
 
@@ -178,6 +195,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo4/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo4" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo5" type="Node2D" parent="Boos"]
 visible = false
 
@@ -202,6 +224,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo5/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo5" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo6" type="Node2D" parent="Boos"]
 visible = false
 
@@ -226,6 +253,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo6/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo6" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo7" type="Node2D" parent="Boos"]
 visible = false
 
@@ -250,6 +282,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo7/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo7" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo8" type="Node2D" parent="Boos"]
 visible = false
 
@@ -274,6 +311,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo8/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo8" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo9" type="Node2D" parent="Boos"]
 visible = false
 
@@ -298,6 +340,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo9/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo9" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo10" type="Node2D" parent="Boos"]
 visible = false
 
@@ -322,6 +369,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo10/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo10" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo11" type="Node2D" parent="Boos"]
 visible = false
 
@@ -346,6 +398,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo11/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo11" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="Boo12" type="Node2D" parent="Boos"]
 visible = false
 
@@ -370,6 +427,11 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 [node name="Shape" type="CollisionShape2D" parent="Boos/Boo12/Hitbox"]
 shape = SubResource("RectangleShape2D_1eh5v")
 
+[node name="EnemyPlayerDetection" type="Node" parent="Boos/Boo12" node_paths=PackedStringArray("hitbox")]
+script = ExtResource("10_al3pe")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [node name="BooPositioner" type="Node" parent="."]
 process_mode = 3
 script = SubResource("GDScript_vavt3")
@@ -378,15 +440,27 @@ script = SubResource("GDScript_vavt3")
 script = ExtResource("6_5b8ig")
 properties = Array[String](["length", "direction", "boo_amount", "spread_boos"])
 
-[connection signal="area_entered" from="Boos/Boo1/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo2/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo3/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo4/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo5/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo6/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo7/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo8/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo9/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo10/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo11/Hitbox" to="." method="on_area_entered"]
-[connection signal="area_entered" from="Boos/Boo12/Hitbox" to="." method="on_area_entered"]
+[connection signal="player_hit" from="Boos/Boo1/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo1/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo2/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo2/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo3/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo3/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo4/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo4/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo5/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo5/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo6/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo6/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo7/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo7/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo8/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo8/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo9/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo9/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo10/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo10/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo11/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo11/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_hit" from="Boos/Boo12/EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="Boos/Boo12/EnemyPlayerDetection" to="." method="damage_player"]

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"]

Scenes/Prefabs/Entities/Enemies/BowserFlame.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=10 format=3 uid="uid://blbarreyjem4l"]
+[gd_scene load_steps=11 format=3 uid="uid://blbarreyjem4l"]
 
 [ext_resource type="Texture2D" uid="uid://t5lgshoxlohe" path="res://Assets/Sprites/Items/BowserFlame.png" id="1_4hwux"]
 [ext_resource type="Script" uid="uid://btstbvjk6e6aw" path="res://Scripts/Classes/Entities/Enemies/BowserFlame.gd" id="1_dq7qg"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_ktnk0"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_ktnk0"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/BowserFlame.json" id="5_0e5kh"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="6_0e5kh"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_iikig"]
 atlas = ExtResource("1_4hwux")
@@ -31,11 +32,13 @@ animations = [{
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ohhuu"]
 size = Vector2(12, 4)
 
-[node name="BowserFlame" type="Node2D" groups=["Enemies"]]
+[node name="BowserFlame" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_dq7qg")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="Sprite" type="AnimatedSprite2D" parent="."]
-scale = Vector2(-1, 1)
+rotation = -3.1415927
+scale = Vector2(1, -1)
 sprite_frames = SubResource("SpriteFrames_oy8b6")
 autoplay = "default"
 frame_progress = 0.67141116
@@ -60,6 +63,12 @@ shape = SubResource("RectangleShape2D_ohhuu")
 position = Vector2(-2.38419e-07, 0)
 scale = Vector2(1.6, 1)
 
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("6_0e5kh")
+hitbox = NodePath("../Hitbox")
+metadata/_custom_type_script = "uid://chj8hu207lrh"
+
 [connection signal="screen_entered" from="VisibleOnScreenEnabler2D" to="." method="play_sfx"]
 [connection signal="screen_exited" from="VisibleOnScreenEnabler2D" to="." method="queue_free"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

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")

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")

Scenes/Prefabs/Entities/Explosion.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=24 format=3 uid="uid://clbvyne1cr8gp"]
+[gd_scene load_steps=25 format=3 uid="uid://clbvyne1cr8gp"]
 
 [ext_resource type="Script" uid="uid://ritdlvkpyjd4" path="res://Scripts/Classes/Entities/Objects/Explosion.gd" id="1_aklik"]
 [ext_resource type="Texture2D" uid="uid://brjkrkihadwnj" path="res://Assets/Sprites/Particles/FireballExplosion.png" id="2_4aiuq"]
@@ -7,6 +7,7 @@
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="4_hjivi"]
 [ext_resource type="AudioStream" uid="uid://d12v455mw8uvu" path="res://Assets/Audio/SFX/Cannon.wav" id="5_8imqq"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Particles/FireballExplosion.json" id="5_hjivi"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="8_hjivi"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_vnd2t"]
 atlas = ExtResource("2_4aiuq")
@@ -243,8 +244,9 @@ _data = {
 [sub_resource type="CircleShape2D" id="CircleShape2D_6tdk1"]
 radius = 24.0
 
-[node name="Explosion" type="Node2D"]
+[node name="Explosion" type="CharacterBody2D"]
 script = ExtResource("1_aklik")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 metadata/is_explosion = true
 
 [node name="Sprite" type="AnimatedSprite2D" parent="."]
@@ -317,5 +319,10 @@ collision_mask = 255
 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("CircleShape2D_6tdk1")
 
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("8_hjivi")
+hitbox = NodePath("../Hitbox")
+
 [connection signal="body_entered" from="Hitbox" to="." method="on_body_entered"]
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Items/ClockItem.tscn

@@ -1,14 +1,12 @@
-[gd_scene load_steps=16 format=3 uid="uid://rruc6lnk16rr"]
+[gd_scene load_steps=14 format=3 uid="uid://rruc6lnk16rr"]
 
 [ext_resource type="Script" uid="uid://dryofl8epgget" path="res://Scripts/Classes/Entities/Items/ClockItem.gd" id="1_heiyr"]
 [ext_resource type="Texture2D" uid="uid://dal8md4ms07j2" path="res://Assets/Sprites/Items/Clock.png" id="1_ybxan"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_heiyr"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_ov4xw"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Clock.json" id="4_newwu"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="5_fg0gx"]
 [ext_resource type="Script" uid="uid://dt2p68xl462v2" path="res://Scripts/Parts/TextShadowColourChanger.gd" id="6_ggci8"]
 [ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="7_eol0e"]
-[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="8_34q7a"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_c30tx"]
 atlas = ExtResource("1_ybxan")
@@ -136,8 +134,6 @@ resource_json = ExtResource("4_newwu")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="Sprite"]
-script = ExtResource("5_fg0gx")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite/Hitbox"]
 shape = SubResource("RectangleShape2D_ydslq")
@@ -160,7 +156,6 @@ metadata/_custom_type_script = "uid://dt2p68xl462v2"
 [node name="LabelFontChanger" type="Node" parent="Label" node_paths=PackedStringArray("labels")]
 script = ExtResource("7_eol0e")
 labels = [NodePath("..")]
-resource = ExtResource("8_34q7a")
 metadata/_custom_type_script = "uid://co6tjg3w6qpd8"
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Label"]
@@ -168,4 +163,4 @@ libraries = {
 &"": SubResource("AnimationLibrary_ov4xw")
 }
 
-[connection signal="player_entered" from="Sprite/Hitbox" to="." method="collect_item"]
+[connection signal="area_entered" from="Sprite/Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/Hachisuke.tscn

@@ -1,22 +1,21 @@
-[gd_scene load_steps=10 format=3 uid="uid://dn2rawqxpuywe"]
+[gd_scene load_steps=9 format=3 uid="uid://dn2rawqxpuywe"]
 
 [ext_resource type="Script" uid="uid://bb01xttxcem1c" path="res://Scripts/Classes/Entities/Items/Hachisuke.gd" id="1_d7uck"]
 [ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="2_wdqsg"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_3unjp"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="3_eh4yc"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="4_3unjp"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Hachisuke.json" id="4_db2kr"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_qj4fn"]
 atlas = ExtResource("2_wdqsg")
 region = Rect2(0, 0, 16, 16)
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_kn7db"]
-size = Vector2(12, 12)
-
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_6c253"]
 size = Vector2(16, 16)
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_8f4k7"]
+size = Vector2(12, 12)
+
 [node name="Hachisuke" type="CharacterBody2D"]
 collision_layer = 8
 collision_mask = 6
@@ -40,18 +39,14 @@ script = ExtResource("3_eh4yc")
 add_score = true
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
-[node name="PlayerDetection" type="Area2D" parent="."]
-position = Vector2(0, -8)
-script = ExtResource("4_3unjp")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
-
-[node name="Shape" type="CollisionShape2D" parent="PlayerDetection"]
-shape = SubResource("RectangleShape2D_kn7db")
-
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2(0, -8)
 shape = SubResource("RectangleShape2D_6c253")
 
-[connection signal="player_entered" from="PlayerDetection" to="ScoreNoteSpawner" method="spawn_note" binds= [8000]]
-[connection signal="player_entered" from="PlayerDetection" to="." method="play_sfx" unbinds=1]
-[connection signal="player_entered" from="PlayerDetection" to="." method="queue_free" unbinds=1]
+[node name="Hitbox" type="Area2D" parent="."]
+position = Vector2(0, -8)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+shape = SubResource("RectangleShape2D_8f4k7")
+
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/Hammer.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=10 format=3 uid="uid://deo08vl26nc4b"]
+[gd_scene load_steps=11 format=3 uid="uid://hqrc7ujinbcq"]
 
 [ext_resource type="Script" uid="uid://s1utdly4mtbi" path="res://Scripts/Classes/Entities/Items/Hammer.gd" id="1_3ojke"]
 [ext_resource type="Texture2D" uid="uid://3xmhfi556p3s" path="res://Assets/Sprites/Items/Hammer.png" id="1_o34jf"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_k3c6x"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Hammer.json" id="4_pmlpp"]
+[ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="5_pmlpp"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_2tvg3"]
 atlas = ExtResource("1_o34jf")
@@ -51,17 +52,17 @@ _data = {
 [sub_resource type="CircleShape2D" id="CircleShape2D_pmlpp"]
 radius = 4.0
 
-[node name="Hammer" type="Node2D" groups=["Enemies"]]
+[node name="Hammer" type="CharacterBody2D" groups=["Enemies"]]
 script = ExtResource("1_3ojke")
+metadata/_custom_type_script = "uid://bpydbpyjk1mt4"
 
 [node name="Sprite" type="Sprite2D" parent="."]
 physics_interpolation_mode = 2
 texture = SubResource("AtlasTexture_2tvg3")
 
-[node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect", "property_node")]
+[node name="ResourceSetterNew" type="Node" parent="Sprite" node_paths=PackedStringArray("node_to_affect")]
 script = ExtResource("3_k3c6x")
 node_to_affect = NodePath("..")
-property_node = NodePath("../..")
 property_name = "texture"
 mode = 1
 resource_json = ExtResource("4_pmlpp")
@@ -78,4 +79,9 @@ autoplay = "Rotate"
 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("CircleShape2D_pmlpp")
 
-[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
+[node name="EnemyPlayerDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
+script = ExtResource("5_pmlpp")
+hitbox = NodePath("../Hitbox")
+
+[connection signal="player_hit" from="EnemyPlayerDetection" to="." method="damage_player"]
+[connection signal="player_stomped_on" from="EnemyPlayerDetection" to="." method="damage_player"]

Scenes/Prefabs/Entities/Items/HammerItem.tscn

@@ -1,31 +1,22 @@
-[gd_scene load_steps=8 format=3 uid="uid://bwdwavf4rp1m1"]
+[gd_scene load_steps=7 format=3 uid="uid://bwdwavf4rp1m1"]
 
 [ext_resource type="Script" uid="uid://vhxup1pn2v8q" path="res://Scripts/Classes/Entities/Items/HammerItem.gd" id="1_ws752"]
 [ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="2_c0srl"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_uc7h7"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_uc7h7"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/HammerItem.json" id="5_6qq3q"]
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_ws752"]
-size = Vector2(8, 8)
-
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_uc7h7"]
 size = Vector2(10, 10)
 
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_ws752"]
+size = Vector2(12, 12)
+
 [node name="HammerItem" type="CharacterBody2D"]
 collision_layer = 8
 collision_mask = 2
 script = ExtResource("1_ws752")
 metadata/_custom_type_script = "uid://cjkurwybsaywm"
 
-[node name="Hitbox" type="Area2D" parent="."]
-script = ExtResource("3_uc7h7")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
-
-[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
-position = Vector2(0, -8)
-shape = SubResource("RectangleShape2D_ws752")
-
 [node name="Sprite" type="Sprite2D" parent="."]
 position = Vector2(0, -8)
 texture = ExtResource("2_c0srl")
@@ -44,4 +35,10 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 position = Vector2(0, -5)
 shape = SubResource("RectangleShape2D_uc7h7")
 
-[connection signal="player_entered" from="Hitbox" to="." method="on_player_entered"]
+[node name="Hitbox" type="Area2D" parent="."]
+position = Vector2(0, -8)
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+shape = SubResource("RectangleShape2D_ws752")
+
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/KeyItem.tscn

@@ -1,10 +1,9 @@
-[gd_scene load_steps=18 format=3 uid="uid://ny5glffi0suh"]
+[gd_scene load_steps=17 format=3 uid="uid://ny5glffi0suh"]
 
 [ext_resource type="Texture2D" uid="uid://bagrao4ahra76" path="res://Assets/Sprites/Items/Key.png" id="1_883rn"]
 [ext_resource type="Script" uid="uid://cjgbt7iof66j0" path="res://Scripts/Classes/Entities/Items/KeyItem.gd" id="1_l02ex"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="2_ecusj"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_l02ex"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_m8uts"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/Key.json" id="4_m8uts"]
 [ext_resource type="Texture2D" uid="uid://sgrcmlktp2dk" path="res://Assets/Sprites/Particles/SRankParticles.png" id="7_2yl70"]
 
@@ -146,8 +145,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="."]
 position = Vector2(0, -8)
-script = ExtResource("3_m8uts")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("RectangleShape2D_2u37r")
@@ -165,3 +162,5 @@ amount = 1
 texture = ExtResource("7_2yl70")
 randomness = 0.12
 process_material = SubResource("ParticleProcessMaterial_rls2x")
+
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/LuckyStar.tscn

@@ -1,18 +1,18 @@
-[gd_scene load_steps=11 format=3 uid="uid://dhd0gp2xvl53l"]
+[gd_scene load_steps=10 format=3 uid="uid://dhd0gp2xvl53l"]
 
 [ext_resource type="Script" uid="uid://bafdl3y53ly60" path="res://Scripts/Classes/UI/PackAnimatedSprite2D.gd" id="2_724cb"]
 [ext_resource type="Texture2D" uid="uid://bbdcmhyxmc3pu" path="res://Assets/Sprites/Items/SPItems.png" id="2_wnlnm"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_724cb"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_ke2o5"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/LuckyStar.json" id="4_4cwfa"]
 
 [sub_resource type="GDScript" id="GDScript_y0edb"]
 script/source = "extends PowerUpItem
 
-func player_entered(_player: Player) -> void:
-	queue_free()
-	AudioManager.play_global_sfx(\"lucky_star\")
-	get_tree().call_group(\"Enemies\", \"flag_die\")
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		queue_free()
+		AudioManager.play_global_sfx(\"lucky_star\")
+		get_tree().call_group(\"Enemies\", \"flag_die\")
 "
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_ke2o5"]
@@ -59,12 +59,10 @@ property_name = "sprite_frames"
 resource_json = ExtResource("4_4cwfa")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="PlayerDetection" type="Area2D" parent="."]
+[node name="Hitbox" type="Area2D" parent="."]
 position = Vector2(0, -8)
-script = ExtResource("3_724cb")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 shape = SubResource("RectangleShape2D_7yv5x")
 
-[connection signal="player_entered" from="PlayerDetection" to="." method="player_entered"]
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Items/RedCoin.tscn

@@ -1,10 +1,9 @@
-[gd_scene load_steps=18 format=3 uid="uid://cmbpqnq10arts"]
+[gd_scene load_steps=17 format=3 uid="uid://cmbpqnq10arts"]
 
 [ext_resource type="Script" uid="uid://xwq5ac650e76" path="res://Scripts/Classes/Entities/Items/RedCoin.gd" id="1_c6tmk"]
 [ext_resource type="Texture2D" uid="uid://c8wpxm7b5tgiq" path="res://Assets/Sprites/Items/RedCoin.png" id="2_lwdcj"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="3_0r8d3"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_0xloa"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="3_onh0k"]
 [ext_resource type="Script" uid="uid://cmg61722ktg2m" path="res://Scripts/Classes/Components/BlockBouncingDetection.gd" id="4_lwdcj"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/RedCoin.json" id="5_0fjrw"]
 
@@ -103,8 +102,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="."]
 collision_mask = 5
-script = ExtResource("3_onh0k")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="Shape" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(0, 1.5)
@@ -113,8 +110,8 @@ shape = SubResource("RectangleShape2D_4qu2r")
 [node name="BlockBouncingDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
 script = ExtResource("4_lwdcj")
 detection_type = 1
-hitbox = NodePath("../Hitbox")
+hitbox = NodePath("")
 metadata/_custom_type_script = "uid://cmg61722ktg2m"
 
-[connection signal="player_entered" from="Hitbox" to="." method="on_player_entered"]
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
 [connection signal="block_bounced" from="BlockBouncingDetection" to="." method="summon_bounced_coin" unbinds=1]

Scenes/Prefabs/Entities/Items/WingItem.tscn

@@ -1,8 +1,7 @@
-[gd_scene load_steps=10 format=3 uid="uid://ck0spcws71sg5"]
+[gd_scene load_steps=9 format=3 uid="uid://ck0spcws71sg5"]
 
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="1_fcvyr"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="2_gjj3y"]
-[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="2_neobf"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Items/WingItem.json" id="3_1uenh"]
 [ext_resource type="Script" uid="uid://bx6r8sjar6cwr" path="res://Scripts/Classes/Components/BasicStaticMovement.gd" id="3_143ya"]
 [ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="4_gdso8"]
@@ -10,10 +9,13 @@
 [sub_resource type="GDScript" id="GDScript_gdso8"]
 script/source = "extends PowerUpItem
 
-func player_entered(player: Player) -> void:
-	AudioManager.play_sfx(\"power_up\", global_position)
-	player.wing_get()
-	queue_free()
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		AudioManager.play_sfx(\"power_up\", global_position)
+		Global.score += 1000
+		$ScoreNoteSpawner.spawn_note(1000)
+		area.owner.wing_get()
+		queue_free()
 "
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_fcvyr"]
@@ -42,8 +44,6 @@ resource_json = ExtResource("3_1uenh")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
 [node name="Hitbox" type="Area2D" parent="."]
-script = ExtResource("2_neobf")
-metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2(0, -8)
@@ -62,5 +62,4 @@ script = ExtResource("4_gdso8")
 add_score = true
 metadata/_custom_type_script = "uid://5octqlf4ohel"
 
-[connection signal="player_entered" from="Hitbox" to="." method="player_entered"]
-[connection signal="player_entered" from="Hitbox" to="ScoreNoteSpawner" method="spawn_note" binds= [1000]]
+[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]

Scenes/Prefabs/Entities/Objects/Bumper.tscn

@@ -84,12 +84,12 @@ property_name = "sprite_frames"
 resource_json = ExtResource("5_ix70v")
 metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
 
-[node name="Hitbox" type="Area2D" parent="."]
+[node name="PlayerDetection" type="Area2D" parent="."]
 collision_layer = 255
 script = ExtResource("3_cgc3p")
 metadata/_custom_type_script = "uid://cnheej0sxmoxg"
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
 shape = SubResource("CircleShape2D_tbo6k")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
@@ -107,4 +107,4 @@ metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("RectangleShape2D_tbo6k")
 
-[connection signal="player_entered" from="Hitbox" to="." method="bounce_player"]
+[connection signal="player_entered" from="PlayerDetection" to="." method="bounce_player"]

Scenes/Prefabs/Entities/Objects/LongFirebar.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="Texture2D" uid="uid://pidoncb5gcax" path="res://Assets/Sprites/Items/Fireball.png" id="2_s1hms"]
 
 [sub_resource type="SegmentShape2D" id="SegmentShape2D_s77o2"]
-b = Vector2(0, 80)
+b = Vector2(0, -40)
 
 [sub_resource type="Animation" id="Animation_vag0n"]
 length = 0.001
@@ -47,31 +47,31 @@ _data = {
 
 [node name="Firebar" instance=ExtResource("1_m6o3e")]
 
-[node name="RemoteTransform2D17" type="RemoteTransform2D" parent="RotationJoint" index="6"]
+[node name="RemoteTransform2D19" type="RemoteTransform2D" parent="RotationJoint" index="6"]
 position = Vector2(0, 48)
 remote_path = NodePath("../../Fireballs/Fireball7")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D18" type="RemoteTransform2D" parent="RotationJoint" index="7"]
+[node name="RemoteTransform2D20" type="RemoteTransform2D" parent="RotationJoint" index="7"]
 position = Vector2(0, 56)
 remote_path = NodePath("../../Fireballs/Fireball8")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D19" type="RemoteTransform2D" parent="RotationJoint" index="8"]
+[node name="RemoteTransform2D21" type="RemoteTransform2D" parent="RotationJoint" index="8"]
 position = Vector2(0, 64)
 remote_path = NodePath("../../Fireballs/Fireball9")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D20" type="RemoteTransform2D" parent="RotationJoint" index="9"]
+[node name="RemoteTransform2D22" type="RemoteTransform2D" parent="RotationJoint" index="9"]
 position = Vector2(0, 72)
 remote_path = NodePath("../../Fireballs/Fireball10")
 update_rotation = false
 update_scale = false
 
-[node name="RemoteTransform2D21" type="RemoteTransform2D" parent="RotationJoint" index="10"]
+[node name="RemoteTransform2D23" type="RemoteTransform2D" parent="RotationJoint" index="10"]
 position = Vector2(0, 80)
 remote_path = NodePath("../../Fireballs/Fireball11")
 update_rotation = false
@@ -84,23 +84,28 @@ shape = SubResource("SegmentShape2D_s77o2")
 z_index = 4096
 z_as_relative = false
 
-[node name="Fireball17" type="Sprite2D" parent="Fireballs" index="6"]
+[node name="Fireball19" type="Sprite2D" parent="Fireballs" index="6"]
+visible = false
 position = Vector2(33.9411, 33.9411)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball18" type="Sprite2D" parent="Fireballs" index="7"]
+[node name="Fireball20" type="Sprite2D" parent="Fireballs" index="7"]
+visible = false
 position = Vector2(39.598, 39.598)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball19" type="Sprite2D" parent="Fireballs" index="8"]
+[node name="Fireball21" type="Sprite2D" parent="Fireballs" index="8"]
+visible = false
 position = Vector2(45.2548, 45.2548)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball20" type="Sprite2D" parent="Fireballs" index="9"]
+[node name="Fireball22" type="Sprite2D" parent="Fireballs" index="9"]
+visible = false
 position = Vector2(50.9117, 50.9117)
 texture = ExtResource("2_s1hms")
 
-[node name="Fireball21" type="Sprite2D" parent="Fireballs" index="10"]
+[node name="Fireball23" type="Sprite2D" parent="Fireballs" index="10"]
+visible = false
 position = Vector2(56.5685, 56.5686)
 texture = ExtResource("2_s1hms")
 

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"]

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]

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")]

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("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)

Scripts/Classes/Components/ResourceSetterNew.gd

@@ -163,8 +163,11 @@ func get_resource(json_file: JSON) -> Resource:
 		ResourceMode.RAW:
 			pass
 		ResourceMode.FONT:
-			resource = FontFile.new()
-			resource.load_bitmap_font(source_resource_path)
+			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
@@ -190,11 +193,12 @@ func apply_properties(properties := {}) -> void:
 					obj.set(p, properties[i])
 					continue
 
+
+
 func get_variation_json(json := {}) -> Dictionary:
 	var level_theme = Global.level_theme
 	if force_properties.has("Theme"):
 		level_theme = force_properties.Theme
-	
 	for i in json.keys().filter(func(key): return key.contains("config:")):
 		get_config_file(current_resource_pack)
 		if config_to_use != {}:
@@ -272,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")])

Scripts/Classes/Entities/Enemies/Boo.gd

@@ -1,20 +1,14 @@
-extends Node2D
+extends Enemy
 
 var target_player: Player = null
-
-var velocity := Vector2.ZERO
-
 const MOVE_SPEED := 30
 const SMOKE_PARTICLE = preload("uid://d08nv4qtfouv1")
-var direction := -1
-
-signal killed
 
 func _physics_process(delta: float) -> void:
 	target_player = get_tree().get_first_node_in_group("Players")
 	if $TrackJoint.is_attached == false:
 		handle_movement(delta)
-	$Sprite.scale.x = direction
+	$Sprite.scale.x = -direction
 
 func handle_movement(delta: float) -> void:
 	var target_direction = sign(target_player.global_position.x - global_position.x)
@@ -30,22 +24,6 @@ func handle_movement(delta: float) -> void:
 		velocity = lerp(velocity, Vector2.ZERO, delta * 5)
 	global_position += velocity * delta
 
-
-func on_area_entered(area: Area2D) -> void:
-	if area.owner is Player:
-		if area.owner.is_invincible or area.name == "HammerHitbox":
-			die()
-		else:
-			area.owner.damage()
-
-func die() -> void:
-	summon_smoke_particle()
-	queue_free()
-	killed.emit()
-
-func flag_die() -> void:
-	die()
-
 func summon_smoke_particle() -> void:
 	var particle = SMOKE_PARTICLE.instantiate()
 	particle.global_position = global_position

Scripts/Classes/Entities/Enemies/BooBuddies.gd

@@ -1,7 +1,6 @@
-extends Node2D
+extends Enemy
 
 @export_range(25, 180) var length := 80
-@export_enum("Clockwise", "C-Clockwise") var direction := 0
 @export_range(4, 12) var boo_amount := 10
 @export var spread_boos := false
 
@@ -9,10 +8,3 @@ func _physics_process(delta: float) -> void:
 	%RotationJoint.global_rotation_degrees = wrap(%RotationJoint.global_rotation_degrees + (45 * [1, -1][direction]) * delta, 0, 360)
 	for i in $Boos.get_children():
 		i.get_node("Sprite").scale.x = sign(get_tree().get_first_node_in_group("Players").global_position.x + 1 - i.global_position.x)
-	
-func on_area_entered(area: Area2D) -> void:
-	if area.owner is Player and area.name != "HammerHitbox":
-		area.owner.damage()
-
-func flag_die() -> void:
-	queue_free()

Scripts/Classes/Entities/Enemies/Bowser.gd

@@ -50,15 +50,12 @@ func get_target_y(player: Player) -> float:
 		return player.global_position.y - 8
 
 func show_smoke() -> void:
-	# guzlad: ugly but it'll have to do until we move the metadata stuff to actual variables
-	if (((Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL) or (Global.current_game_mode == Global.GameMode.LEVEL_EDITOR)) and !is_real):
-		var smoke = preload("res://Scenes/Prefabs/Particles/SmokeParticle.tscn").instantiate()
-		smoke.scale = Vector2(2, 2)
-		smoke.global_position =global_position
-		AudioManager.play_sfx("magic", global_position)
-		add_sibling(smoke)
-	elif has_meta("is_real"):
-		return
+	if is_real: return
+	var smoke = preload("res://Scenes/Prefabs/Particles/SmokeParticle.tscn").instantiate()
+	smoke.scale = Vector2(2, 2)
+	smoke.global_position =global_position
+	AudioManager.play_sfx("magic", global_position)
+	add_sibling(smoke)
 
 func breathe_fire() -> void:
 	if can_fire == false:
@@ -133,7 +130,8 @@ func fireball_hit() -> void:
 func play_music() -> void:
 	for i: EntityGenerator in get_tree().get_nodes_in_group("EntityGenerators"):
 		if i.entity_scene != null:
-			if i.entity_scene.resource_path == "res://Scenes/Prefabs/Entities/Enemies/BowserFlame.tscn":
+			if i.entity_scene.resource_path == "res://Scenes/
+			Prefabs/Entities/Enemies/BowserFlame.tscn":
 				i.queue_free()
 	if Settings.file.audio.extra_bgm == 0: return
 	if Global.level_editor != null:
@@ -141,6 +139,14 @@ func play_music() -> void:
 	if music_enabled:
 		AudioManager.set_music_override(AudioManager.MUSIC_OVERRIDES.BOWSER, 5, false)
 
-
 func on_timeout() -> void:
 	move_dir = [-1, 1].pick_random()
+
+func on_gib_about_to_spawn() -> void:
+	if is_real:
+		$FallSFX.play()
+		$FallSFX.finished.connect($FallSFX.queue_free)
+		$FallSFX.reparent(get_parent())
+	# guzlad: ugly but it'll have to do until we move the metadata stuff to actual variables
+	if ((Global.current_game_mode == Global.GameMode.CUSTOM_LEVEL) or (Global.current_game_mode == Global.GameMode.LEVEL_EDITOR)) and !is_real:
+		$SpriteScaleJoint/DeathSprite/ResourceSetterNew.resource_json = load("res://Assets/Sprites/Enemies/Goomba.json")

Scripts/Classes/Entities/Enemies/BowserFlame.gd

@@ -1,10 +1,9 @@
 class_name BowserFlame
-extends Node2D
+extends Enemy
 
 @export_enum("Straight", "Aimed") var mode := 0
 
 var target_y := 0
-var direction := -1
 
 func _ready() -> void:
 	pass
@@ -16,14 +15,7 @@ func movement(delta: float) -> void:
 	if mode == 1:
 		global_position.y = move_toward(global_position.y, target_y, delta * 50)
 	global_position.x += (100 * direction) * delta
-	$Sprite.scale.x = direction
-
-func flag_die() -> void:
-	queue_free()
-
-func on_area_entered(area: Area2D) -> void:
-	if area.owner is Player and area.name != "HammerHitbox":
-		area.owner.damage()
+	$Sprite.scale.x = -direction
 
 func play_sfx() -> void:
 	AudioManager.play_sfx("bowser_flame", global_position)

Scripts/Classes/Entities/Items/ClockItem.gd

@@ -1,7 +1,8 @@
 extends PowerUpItem
 
-func collect_item(_player: Player) -> void:
-	AudioManager.play_sfx("clock_get", global_position)
-	$Label/AnimationPlayer.play("Appear")
-	Global.time = clamp(Global.time + 100, 0, 999)
-	Global.score += 1000
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		AudioManager.play_sfx("clock_get", global_position)
+		$Label/AnimationPlayer.play("Appear")
+		Global.time = clamp(Global.time + 100, 0, 999)
+		Global.score += 1000

Scripts/Classes/Entities/Items/Hachisuke.gd

@@ -1,4 +1,8 @@
 extends PowerUpItem
 
-func play_sfx() -> void:
-	AudioManager.play_sfx("hachisuke", global_position)
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		AudioManager.play_sfx("hachisuke", global_position)
+		Global.score += 8000
+		$ScoreNoteSpawner.spawn_note(8000)
+		queue_free()

Scripts/Classes/Entities/Items/Hammer.gd

@@ -1,11 +1,8 @@
 class_name Hammer
-extends Node2D
-
-var velocity := Vector2(0, -200)
-
-var direction := -1
+extends Enemy
 
 func _ready() -> void:
+	velocity = Vector2(0, -200)
 	$Sprite.flip_h = direction == 1
 	$Animations.speed_scale = -direction
 	velocity.x = 120 * direction
@@ -16,10 +13,3 @@ func _physics_process(delta: float) -> void:
 	global_position += velocity * delta
 	velocity.y += (Global.entity_gravity / delta) * delta
 	velocity.y = clamp(velocity.y, -INF, Global.entity_max_fall_speed)
-	
-func flag_die() -> void:
-	queue_free()
-
-func on_area_entered(area: Area2D) -> void:
-	if area.owner is Player and area.name != "HammerHitbox":
-		area.owner.damage()

Scripts/Classes/Entities/Items/HammerItem.gd

@@ -1,8 +1,6 @@
 extends PowerUpItem
 
-func _physics_process(delta: float) -> void:
-	pass
-
-func on_player_entered(player: Player) -> void:
-	player.hammer_get()
-	queue_free()
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		area.owner.hammer_get()
+		queue_free()

Scripts/Classes/Entities/Items/KeyItem.gd

@@ -6,11 +6,12 @@ const SMOKE_PARTICLE = preload("uid://d08nv4qtfouv1")
 func _ready() -> void:
 	$AnimationPlayer.play("Float")
 
-func collected() -> void:
-	total_collected += 1
-	AudioManager.play_sfx("key_collect", global_position)
-	summon_smoke_particle()
-	queue_free()
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		total_collected += 1
+		AudioManager.play_sfx("key_collect", global_position)
+		summon_smoke_particle()
+		queue_free()
 
 func summon_smoke_particle() -> void:
 	var node = SMOKE_PARTICLE.instantiate()

Scripts/Classes/Entities/Items/RedCoin.gd

@@ -14,8 +14,9 @@ func _ready() -> void:
 		$Sprite.play("Collected")
 		set_visibility_layer_bit(0, false)
 
-func on_player_entered(_player: Player) -> void:
-	collected()
+func on_area_entered(area: Area2D) -> void:
+	if area.owner is Player:
+		collected()
 
 func collected() -> void:
 	if already_collected: