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 15:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into pulls/resource-pack-expansion

Browse Source
This commit is contained in:
KirbyKidJ
2025-09-18 19:19:22 -07:00
parent 7fdbdbf826 864d38258f
commit 88a97597ae
29 changed files with 2239 additions and 2238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Scripts/Parts/CoinHeavenWarpPoint.gd
View File

@@ -5,8 +5,8 @@ extends Node2D
func _ready() -> void:
Level.vine_warp_level = heaven_scene
Level.in_vine_level = false
if Level.in_vine_level and PipeArea.exiting_pipe_id == -1:
Level.in_vine_level = false
for i in get_tree().get_nodes_in_group("Players"):
i.global_position = global_position
i.reset_physics_interpolation()

23
Scripts/Parts/ResourcePackTemplateCreator.gd
View File

@@ -10,16 +10,27 @@ const base_info_json := {
}
func create_template() -> void:
get_directories("res://Assets/", files, directories)
get_directories("res://Assets", files, directories)
for i in directories:
DirAccess.make_dir_recursive_absolute(i.replace("res://Assets", "user://resource_packs/new_pack/"))
DirAccess.make_dir_recursive_absolute(i.replace("res://Assets", "user://resource_packs/new_pack"))
for i in files:
var destination = i
if destination.contains("res://"):
destination = i.replace("res://Assets", "user://resource_packs/new_pack/")
destination = i.replace("res://Assets", "user://resource_packs/new_pack")
else:
destination = i.replace("user://resource_packs/BaseAssets", "user://resource_packs/new_pack")
DirAccess.copy_absolute(i, destination)
print("Copying '" + i + "' to: '" + destination)
if i.contains(".bgm") or i.contains(".json") or i.contains("user://"):
DirAccess.copy_absolute(i, destination)
else:
var resource = load(i)
if resource is Texture:
resource.get_image().save_png(destination)
elif resource is AudioStream:
var file = FileAccess.open(destination, FileAccess.WRITE)
file.store_buffer(resource.data)
file.close()
var file = FileAccess.open("user://resource_packs/new_pack/pack_info.json", FileAccess.WRITE)
file.store_string(JSON.stringify(base_info_json, "\t"))
file.close()
@@ -34,7 +45,9 @@ func get_directories(base_dir := "", files := [], directories := []) -> void:
func get_files(base_dir := "", files := []) -> void:
for i in DirAccess.get_files_at(base_dir):
if i.contains(".import") == false and base_dir.contains("LevelGuides") == false:
if base_dir.contains("LevelGuides") == false:
i = i.replace(".import", "")
print(i)
var target_path = base_dir + "/" + i
var rom_assets_path = target_path.replace("res://Assets", "user://resource_packs/BaseAssets")
if FileAccess.file_exists(rom_assets_path):

1
Scripts/Parts/WarpZone.gd
View File

@@ -18,7 +18,6 @@ func _ready() -> void:
idx += 1
func activate() -> void:
CameraHandler.cam_locked = true
for i in get_tree().get_nodes_in_group("Labels"):
i.show()
for i in get_tree().get_nodes_in_group("Plants"):