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

added a quick updating thing to resource extraction + fixed a bug where the timer warnings would play, upon death

Browse Source
This commit is contained in:
JHDev2006
2025-10-15 14:37:05 +01:00
parent 447b6d3ea7
commit 6b598e717d
5 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Scenes/Levels/RomResourceGenerator.tscn
View File

@@ -47,6 +47,7 @@ grow_horizontal = 2
grow_vertical = 0 grow_vertical = 0
text = "EXTRACTING ASSETS..." text = "EXTRACTING ASSETS..."
horizontal_alignment = 1 horizontal_alignment = 1
uppercase = true
[node name="Error" type="Label" parent="MarginContainer"] [node name="Error" type="Label" parent="MarginContainer"]
unique_name_in_owner = true unique_name_in_owner = true

2
Scripts/Classes/Components/TimerSprite.gd
View File

@@ -26,6 +26,8 @@ func _process(_delta: float) -> void:
get_parent().visible = percent < 1 and Settings.file.visuals.visible_timers get_parent().visible = percent < 1 and Settings.file.visuals.visible_timers
frame = lerp(0, 6, percent) frame = lerp(0, 6, percent)
if percent >= warn_threshold and Settings.file.audio.extra_sfx == 1: if percent >= warn_threshold and Settings.file.audio.extra_sfx == 1:
if node is Timer:
if node.is_stopped(): return
if can_warn: if can_warn:
can_warn = false can_warn = false
AudioManager.play_global_sfx("timer_warning") AudioManager.play_global_sfx("timer_warning")

11
Scripts/Classes/Singletons/Global.gd
View File

@@ -34,7 +34,7 @@ var ROM_POINTER_PATH = config_path.path_join("rom_pointer.smb")
var ROM_PATH = config_path.path_join("baserom.nes") var ROM_PATH = config_path.path_join("baserom.nes")
var ROM_ASSETS_PATH = config_path.path_join("resource_packs/BaseAssets") var ROM_ASSETS_PATH = config_path.path_join("resource_packs/BaseAssets")
const ROM_PACK_NAME := "BaseAssets" const ROM_PACK_NAME := "BaseAssets"
const ROM_ASSETS_VERSION := 0 const ROM_ASSETS_VERSION := 1
var server_version := -1 var server_version := -1
var current_version := -1 var current_version := -1
@@ -235,6 +235,7 @@ func check_for_rom() -> void:
if pack_dict.get("version", -1) == ROM_ASSETS_VERSION: if pack_dict.get("version", -1) == ROM_ASSETS_VERSION:
rom_assets_exist = true rom_assets_exist = true
else: else:
ResourceGenerator.updating = true
OS.move_to_trash(ROM_ASSETS_PATH) OS.move_to_trash(ROM_ASSETS_PATH)
func _process(delta: float) -> void: func _process(delta: float) -> void:
@@ -471,3 +472,11 @@ func sanitize_string(string := "") -> String:
if FONT.has_char(string.unicode_at(i)) == false and string[i] != "\n": if FONT.has_char(string.unicode_at(i)) == false and string[i] != "\n":
string = string.replace(string[i], " ") string = string.replace(string[i], " ")
return string return string
func get_base_asset_version() -> int:
var json = JSON.parse_string(FileAccess.open("user://BaseAssets/pack_info.json", FileAccess.READ).get_as_text())
var version = json.version
return get_version_num_int(version)
func get_version_num_int(ver_num := "0.0.0") -> int:
return int(ver_num.replace(".", ""))

1
Scripts/Parts/Disclaimer.gd
View File

@@ -29,6 +29,7 @@ func _process(_delta: float) -> void:
go_to_menu() go_to_menu()
func go_to_menu() -> void: func go_to_menu() -> void:
ResourceGenerator.updating = true
if Global.rom_path == "": if Global.rom_path == "":
Global.transition_to_scene("res://Scenes/Levels/RomVerifier.tscn") Global.transition_to_scene("res://Scenes/Levels/RomVerifier.tscn")
elif not Global.rom_assets_exist: elif not Global.rom_assets_exist:

4
Scripts/UI/RomResourceGenerator.gd
View File

@@ -4,9 +4,11 @@ extends AssetRipper
@onready var progress_bar: ProgressBar = %ProgressBar @onready var progress_bar: ProgressBar = %ProgressBar
@onready var error: Label = %Error @onready var error: Label = %Error
static var updating := false
func _ready() -> void: func _ready() -> void:
Global.get_node("GameHUD").hide() Global.get_node("GameHUD").hide()
if updating: $MarginContainer/ProgressBar/Label.text = "UPDATING ASSETS..."
rom = FileAccess.get_file_as_bytes(Global.rom_path) rom = FileAccess.get_file_as_bytes(Global.rom_path)
prg_rom_size = rom[4] * 16384 prg_rom_size = rom[4] * 16384
chr_rom = rom.slice(16 + prg_rom_size) chr_rom = rom.slice(16 + prg_rom_size)