Merge branch 'main' into custom-level-loading-rewrite

This commit is contained in:
JHDev2006
2025-10-26 12:33:16 +00:00
158 changed files with 2106 additions and 1148 deletions

View File

@@ -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
}}
"animation_overrides": {
"default": {
"frames": [
[
0.0,
0.0,
512.0,
512.0
],
[
512.0,
0.0,
512.0,
512.0
]
],
"speed": 5.0,
"loop": true
}
}
},
"SMBLL": {
"source": "UndergroundLL.png",
"animations": {"default": {
"frames": [[0, 0, 512, 512], [512, 0, 512, 512]],
"speed": 5.0,
"loop": true
}}
"animation_overrides": {
"default": {
"frames": [
[
0.0,
0.0,
512.0,
512.0
],
[
512.0,
0.0,
512.0,
512.0
]
],
"speed": 5.0,
"loop": true
}
}
}
},
"Castle": {
"SMB1": {"source": "Castle.png"},
"SMBLL": {"source": "CastleLL.png"}
"SMB1": {
"source": "Castle.png"
},
"SMBLL": {
"source": "CastleLL.png"
}
},
"GhostHouse": {
"SMB1": {"source": "GhostHouse.png"},
"SMBLL": {"source": "GhostHouseLL.png"}
"SMB1": {
"source": "GhostHouse.png"
},
"SMBLL": {
"source": "GhostHouseLL.png"
}
},
"Snow": {
"SMB1": {
@@ -82,115 +142,196 @@
"source": "SnowLL.png"
},
"Night": {
"source": "SnowNightLL.png"
"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"
}
}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://qkmv2jmid7qx"
path="res://.godot/imported/OverworldMap.png-347de3a2312bb9d8e5c0d00b7db68ac2.ctex"
uid="uid://cs28m2tkqkqpt"
path="res://.godot/imported/OverworldANN.png-a917c4a1e4c1e40208df341e8af51f42.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Tilesets/OverworldMap.png"
dest_files=["res://.godot/imported/OverworldMap.png-347de3a2312bb9d8e5c0d00b7db68ac2.ctex"]
source_file="res://Assets/Sprites/Backgrounds/Hills/OverworldANN.png"
dest_files=["res://.godot/imported/OverworldANN.png-a917c4a1e4c1e40208df341e8af51f42.ctex"]
[params]

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dnnly1a6umail"
path="res://.godot/imported/TripleQuestionBlock.png-4c9f5a922af16a287ee4123222317885.ctex"
uid="uid://bc1nkboy3fr6k"
path="res://.godot/imported/OverworldNightANN.png-98a6485e550acd4158fbc7898baf20e0.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Blocks/TripleQuestionBlock.png"
dest_files=["res://.godot/imported/TripleQuestionBlock.png-4c9f5a922af16a287ee4123222317885.ctex"]
source_file="res://Assets/Sprites/Backgrounds/Hills/OverworldNightANN.png"
dest_files=["res://.godot/imported/OverworldNightANN.png-98a6485e550acd4158fbc7898baf20e0.ctex"]
[params]

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cxbne173w4h8d"
path="res://.godot/imported/TrueBowser.png-06be2b960df415db1a1f58e9a78fed0d.ctex"
uid="uid://wq4msfwikcwr"
path="res://.godot/imported/SnowANN.png-547267a957ae04d1a3806374cbacb137.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Enemies/TrueBowser.png"
dest_files=["res://.godot/imported/TrueBowser.png-06be2b960df415db1a1f58e9a78fed0d.ctex"]
source_file="res://Assets/Sprites/Backgrounds/Hills/SnowANN.png"
dest_files=["res://.godot/imported/SnowANN.png-547267a957ae04d1a3806374cbacb137.ctex"]
[params]

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c0umucm61jjqs"
path="res://.godot/imported/TransitionTemplate.png-5f5be056a088d0b541306876784af78e.ctex"
uid="uid://cpssr0kuj5iyx"
path="res://.godot/imported/SnowNightANN.png-880d870cd2c8b88c76dda7d4cf1467bf.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/UI/TransitionTemplate.png"
dest_files=["res://.godot/imported/TransitionTemplate.png-5f5be056a088d0b541306876784af78e.ctex"]
source_file="res://Assets/Sprites/Backgrounds/Hills/SnowNightANN.png"
dest_files=["res://.godot/imported/SnowNightANN.png-880d870cd2c8b88c76dda7d4cf1467bf.ctex"]
[params]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 B

View File

@@ -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

View File

@@ -74,15 +74,6 @@
}
},
"variations": {
"Overworld": {
"source": "Bowser.png",
"rect": [
0.0,
0.0,
96.0,
96.0
]
},
"default": {
"source": "Bowser.png",
"rect": [
@@ -93,4 +84,4 @@
]
}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 806 B

After

Width:  |  Height:  |  Size: 697 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://xqpd2y4j43qg"
path="res://.godot/imported/SpecialItems.png-ddf502d2231323d32f3fa5c0e38cd390.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Items/SpecialItems.png"
dest_files=["res://.godot/imported/SpecialItems.png-ddf502d2231323d32f3fa5c0e38cd390.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
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/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

View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cbl8y8j82smws"
path="res://.godot/imported/BarrelDestuctionParticle#.png-ab9d8b22442fb576cd1570678dd83df2.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Particles/BarrelDestuctionParticle#.png"
dest_files=["res://.godot/imported/BarrelDestuctionParticle#.png-ab9d8b22442fb576cd1570678dd83df2.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
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/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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

View File

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

View File

@@ -14,4 +14,4 @@ dest_files=["res://.godot/imported/Font.fnt-6c6685c58d22178166a8720d2c719ea3.fon
fallbacks=[]
compress=true
scaling_mode=2
scaling_mode=0

View File

@@ -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"
@@ -370,4 +370,4 @@ char id=12407 x=48 y=192 width=16 height=16 xoffset=0 yoffset=0
char id=12493 x=64 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
char id=12505 x=80 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
char id=12499 x=96 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
char id=65374 x=112 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0
char id=65374 x=112 y=192 width=16 height=16 xoffset=0 yoffset=0 xadvance=16 page=2 chnl=0

View File

@@ -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

View File

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

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 225 B

View File

@@ -1,3 +1,40 @@
[remap]
importer="skip"
importer="texture"
type="CompressedTexture2D"
uid="uid://c23dqtsno64vk"
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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@@ -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}}
}
}
}