GitHub/Super-Mario-Bros.-Remastered-Public
1
0
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-10-22 07:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

couple fixes, to do with minus world

Browse Source
This commit is contained in:
JHDev2006
2025-09-26 20:46:39 +01:00
parent 659e9f3ce8
commit 786a81a7b8
5 changed files with 220 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Sprites/Backgrounds/SecondaryMushrooms/Mushrooms.json
View File

@@ -143,4 +143,4 @@
"link": "Underwater" "link": "Underwater"
} }
} }
} }

239
Assets/Sprites/Enemies/Goomba.json
View File

@@ -5,170 +5,335 @@
"animations": { "animations": {
"Walk": { "Walk": {
"frames": [ "frames": [
[0, 0, 16, 16], [
[16, 0, 16, 16] 0.0,
0.0,
16.0,
16.0
],
[
16.0,
0.0,
16.0,
16.0
]
], ],
"speed": 5.0, "speed": 5.0,
"loop": true "loop": true
}, },
"Stomped": { "Stomped": {
"frames": [[32, 0, 16, 16]], "frames": [
[
32.0,
0.0,
16.0,
16.0
]
],
"speed": 5.0, "speed": 5.0,
"loop": true "loop": true
} }
}, },
"variations": {
"variations":
{
"default": { "default": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [0, 0, 48, 16] "rect": [
0.0,
0.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [0, 0, 48, 16] "rect": [
0.0,
0.0,
48.0,
16.0
]
} }
}, },
"Underground": { "Underground": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [48, 0, 48, 16] "rect": [
48.0,
0.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [48, 0, 48, 16] "rect": [
48.0,
0.0,
48.0,
16.0
]
} }
}, },
"GhostHouse": { "GhostHouse": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [48, 0, 48, 16] "rect": [
48.0,
0.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [48, 0, 48, 16] "rect": [
48.0,
0.0,
48.0,
16.0
]
} }
}, },
"Castle": { "Castle": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [96, 0, 48, 16] "rect": [
96.0,
0.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [96, 0, 48, 16] "rect": [
96.0,
0.0,
48.0,
16.0
]
} }
}, },
"Underwater": { "Underwater": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [144, 0, 48, 16] "rect": [
144.0,
0.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [144, 0, 48, 16] "rect": [
144.0,
0.0,
48.0,
16.0
]
} }
}, },
"CastleWater": { "CastleWater": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [144, 0, 48, 16] "rect": [
144.0,
0.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [144, 0, 48, 16] "rect": [
144.0,
0.0,
48.0,
16.0
]
} }
}, },
"Desert": { "Desert": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [0, 16, 48, 16] "rect": [
0.0,
16.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [0, 16, 48, 16] "rect": [
0.0,
16.0,
48.0,
16.0
]
} }
}, },
"Jungle": { "Jungle": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [48, 16, 48, 16] "rect": [
48.0,
16.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [48, 16, 48, 16] "rect": [
48.0,
16.0,
48.0,
16.0
]
} }
}, },
"Snow": { "Snow": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [96, 16, 48, 16] "rect": [
96.0,
16.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [96, 16, 48, 16] "rect": [
96.0,
16.0,
48.0,
16.0
]
} }
}, },
"Volcano": { "Volcano": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [144, 16, 48, 16] "rect": [
144.0,
16.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"Rect": [144, 16, 48, 16] "Rect": [
144.0,
16.0,
48.0,
16.0
]
} }
}, },
"Autumn": { "Autumn": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [0, 32, 48, 16] "rect": [
0.0,
32.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [0, 32, 48, 16] "rect": [
0.0,
32.0,
48.0,
16.0
]
} }
}, },
"Beach": { "Beach": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [48, 32, 48, 16] "rect": [
48.0,
32.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [48, 32, 48, 16] "rect": [
48.0,
32.0,
48.0,
16.0
]
} }
}, },
"Mountain": { "Mountain": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [96, 32, 48, 16] "rect": [
96.0,
32.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [96, 32, 48, 16] "rect": [
96.0,
32.0,
48.0,
16.0
]
} }
}, },
"Space": { "Space": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [144, 32, 48, 16] "rect": [
144.0,
32.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [144, 32, 48, 16] "rect": [
144.0,
32.0,
48.0,
16.0
]
} }
}, },
"Bonus": { "Bonus": {
"SMB1": { "SMB1": {
"source": "Goomba.png", "source": "Goomba.png",
"rect": [0, 48, 48, 16] "rect": [
0.0,
48.0,
48.0,
16.0
]
}, },
"SMBANN": { "SMBANN": {
"source": "DiscoGoomba.png", "source": "DiscoGoomba.png",
"rect": [0, 48, 48, 16] "rect": [
0.0,
48.0,
48.0,
16.0
]
} }
} }
} }
} }

16
Assets/Sprites/Tilesets/CastleFlag.json
View File

@@ -3,14 +3,24 @@
"SMB1": { "SMB1": {
"default": { "default": {
"source": "CastleFlag.png", "source": "CastleFlag.png",
"rect": [0, 0, 16, 16] "rect": [
0.0,
0.0,
16.0,
16.0
]
} }
}, },
"SMBANN": { "SMBANN": {
"default": { "default": {
"source": "CastleFlag.png", "source": "CastleFlag.png",
"rect": [16, 0, 16, 16] "rect": [
16.0,
0.0,
16.0,
16.0
]
} }
} }
} }
} }

2
Scripts/Classes/Singletons/SaveManager.gd
View File

@@ -81,6 +81,8 @@ func write_save(campaign: String = Global.current_campaign, force := false) -> v
save_json = SAVE_TEMPLATE.duplicate(true) save_json = SAVE_TEMPLATE.duplicate(true)
match Global.current_game_mode: match Global.current_game_mode:
Global.GameMode.CAMPAIGN: Global.GameMode.CAMPAIGN:
if Global.world_num < 0:
Global.world_num = 1
if Global.high_score < Global.score: if Global.high_score < Global.score:
Global.high_score = Global.score Global.high_score = Global.score
save_json["World"] = Global.world_num save_json["World"] = Global.world_num

4
Scripts/Parts/TitleScreen.gd
View File

@@ -124,8 +124,6 @@ func get_highscore() -> void:
func clear_stats() -> void: func clear_stats() -> void:
Global.clear_saved_values() Global.clear_saved_values()
Global.world_num = 1
Global.level_num = 1
LevelTransition.level_to_transition_to = Level.get_scene_string(Global.world_num, Global.level_num) LevelTransition.level_to_transition_to = Level.get_scene_string(Global.world_num, Global.level_num)
func start_game() -> void: func start_game() -> void:
@@ -227,6 +225,8 @@ func quit_game() -> void:
get_tree().quit() get_tree().quit()
func new_game_selected() -> void: func new_game_selected() -> void:
Global.world_num = 1
Global.level_num = 1
Global.second_quest = false Global.second_quest = false
Global.current_game_mode = Global.GameMode.CAMPAIGN Global.current_game_mode = Global.GameMode.CAMPAIGN
if Global.game_beaten: if Global.game_beaten: