James/TowerDefense
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix level 1 orphans sub resource + export issues

Browse source
This commit is contained in:
Varylios 2025-11-30 14:48:22 +01:00
parent fddec6b963
commit a587ffd82e
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Globals/Helper.gd
View file

@ -5,9 +5,9 @@ class_name Helper
const CONFIRM_POPUP : PackedScene = preload("uid://cxn3x8dq8vawa") const CONFIRM_POPUP : PackedScene = preload("uid://cxn3x8dq8vawa")
const SCENE_DIR_PATTERN : String = "res://\\w+/(Scenes|Map \\d+)/(.remap)?$" const SCENE_DIR_PATTERN : String = "res://\\w+/(Scenes|Map \\d+)/$"
const SCENE_FILE_PATTERN : String = "([^/]*)\\.t?scn(.remap)?$" const SCENE_FILE_PATTERN : String = "([^/]*)\\.t?scn(\\.remap)?$"
const RESOURCE_FILE_PATTERN : String = "([^/]*)\\.t?res(.remap)?$" const RESOURCE_FILE_PATTERN : String = "([^/]*)\\.t?res(\\.remap)?$"
const TOWER_DIR : String = "res://Towers/Scenes/" const TOWER_DIR : String = "res://Towers/Scenes/"
const ENEMY_DIR : String = "res://Enemies/Scenes/" const ENEMY_DIR : String = "res://Enemies/Scenes/"
@ -25,7 +25,7 @@ static func preloadSceneInGlobal(property: Dictionary, type: RESOURCE_TYPE) -> v
var files : Array[String] = getPackedScenesPaths(type) var files : Array[String] = getPackedScenesPaths(type)
for file in files: for file in files:
var scene = load(file) var scene = load(file.trim_suffix(".remap"))
if scene: if scene:
property.set(EnhancedResource.getPackedSceneProperty(scene, "type"), scene) property.set(EnhancedResource.getPackedSceneProperty(scene, "type"), scene)
@ -56,7 +56,7 @@ static func getFileFromDir(path : String, regexPattern : String, pathRegexPatter
var regex : RegEx = RegEx.create_from_string(regexPattern) var regex : RegEx = RegEx.create_from_string(regexPattern)
var pathRegex : RegEx = RegEx.create_from_string(pathRegexPattern) var pathRegex : RegEx = RegEx.create_from_string(pathRegexPattern)
var dir : DirAccess = DirAccess.open(path) var dir : DirAccess = DirAccess.open(path)
print(path, " ", dir, " ", dir.get_files())
if pathRegexPattern: if pathRegexPattern:
for subDir in dir.get_directories(): for subDir in dir.get_directories():
subDir = path + subDir + "/" subDir = path + subDir + "/"
@ -64,10 +64,9 @@ static func getFileFromDir(path : String, regexPattern : String, pathRegexPatter
files.append_array(getFileFromDir(subDir, regexPattern, pathRegexPattern)) files.append_array(getFileFromDir(subDir, regexPattern, pathRegexPattern))
for file in dir.get_files(): for file in dir.get_files():
print("regex : ", regex.search(file) && pathRegex.search(path))
if regex.search(file) && pathRegex.search(path): if regex.search(file) && pathRegex.search(path):
files.append(path + file) files.append(path + file)
print(files)
return files return files

4
Globals/transition.gd
View file

@ -30,11 +30,11 @@ func goto(scene_path : String, _loadState : LOAD_STATE = LOAD_STATE.BASIC_LOAD):
func gotoLevel(mapSceneToLoad : String) -> void : func gotoLevel(mapSceneToLoad : String) -> void :
goto(mapSceneToLoad, LOAD_STATE.MAP_LOAD) goto(mapSceneToLoad.trim_suffix(".remap"), LOAD_STATE.MAP_LOAD)
func load_scene() -> void: func load_scene() -> void:
ResourceLoader.load_threaded_request(target_scene_path) #Fetch loading status and loading scene ResourceLoader.load_threaded_request(target_scene_path.trim_suffix(".remap")) #Fetch loading status and loading scene
func animate() -> void: func animate() -> void:

10
Levels/Map 1/level_1.tres
View file

@ -34,7 +34,7 @@ spawn_delay = 5.0
[sub_resource type="Resource" id="Resource_jsvwv"] [sub_resource type="Resource" id="Resource_jsvwv"]
script = ExtResource("2_457yt") script = ExtResource("2_457yt")
troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_qfjse"), SubResource("Resource_tjxk4"), SubResource("Resource_ftl6b"), SubResource("Resource_rgvv8")]) troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_qfjse"), SubResource("Resource_ftl6b"), SubResource("Resource_rgvv8")])
[sub_resource type="Resource" id="Resource_hlwog"] [sub_resource type="Resource" id="Resource_hlwog"]
script = ExtResource("3_ub8wd") script = ExtResource("3_ub8wd")
@ -71,7 +71,7 @@ enemy = "uid://r6tj7jprdqib"
[sub_resource type="Resource" id="Resource_46oi2"] [sub_resource type="Resource" id="Resource_46oi2"]
script = ExtResource("2_457yt") script = ExtResource("2_457yt")
troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_fhv1k"), SubResource("Resource_qfjse"), SubResource("Resource_e6yyc"), SubResource("Resource_ftl6b"), SubResource("Resource_qh8jg")]) troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_fhv1k"), SubResource("Resource_qfjse"), SubResource("Resource_ftl6b")])
[sub_resource type="Resource" id="Resource_7vcps"] [sub_resource type="Resource" id="Resource_7vcps"]
script = ExtResource("3_ub8wd") script = ExtResource("3_ub8wd")
@ -118,7 +118,7 @@ pack_delay = 0.5
[sub_resource type="Resource" id="Resource_p2jl5"] [sub_resource type="Resource" id="Resource_p2jl5"]
script = ExtResource("2_457yt") script = ExtResource("2_457yt")
troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_7vcps"), SubResource("Resource_3kmde"), SubResource("Resource_xfp51"), SubResource("Resource_q3d8d"), SubResource("Resource_ubc0h"), SubResource("Resource_lvuiw"), SubResource("Resource_1514p")]) troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_7vcps"), SubResource("Resource_3kmde"), SubResource("Resource_xfp51"), SubResource("Resource_q3d8d"), SubResource("Resource_lvuiw"), SubResource("Resource_1514p")])
[sub_resource type="Resource" id="Resource_1nx3f"] [sub_resource type="Resource" id="Resource_1nx3f"]
script = ExtResource("3_ub8wd") script = ExtResource("3_ub8wd")
@ -126,11 +126,11 @@ enemy = "uid://dyl4wiga2goi"
[sub_resource type="Resource" id="Resource_0nx55"] [sub_resource type="Resource" id="Resource_0nx55"]
script = ExtResource("2_457yt") script = ExtResource("2_457yt")
troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_1nx3f"), SubResource("Resource_yuuld"), SubResource("Resource_w06di"), SubResource("Resource_nj5d2"), SubResource("Resource_1nx3f"), SubResource("Resource_yuuld"), SubResource("Resource_w06di"), SubResource("Resource_nj5d2"), SubResource("Resource_1nx3f"), SubResource("Resource_yuuld"), SubResource("Resource_yuuld"), SubResource("Resource_w06di"), SubResource("Resource_nj5d2"), SubResource("Resource_1nx3f"), SubResource("Resource_yuuld"), SubResource("Resource_yuuld"), SubResource("Resource_w06di"), SubResource("Resource_nj5d2"), SubResource("Resource_1nx3f"), SubResource("Resource_yuuld"), SubResource("Resource_lcpc0"), SubResource("Resource_f1smx"), SubResource("Resource_2okew"), SubResource("Resource_tvv02"), SubResource("Resource_lcpc0"), SubResource("Resource_f1smx"), SubResource("Resource_2okew"), SubResource("Resource_tvv02"), SubResource("Resource_lcpc0"), SubResource("Resource_f1smx"), SubResource("Resource_2okew"), SubResource("Resource_tvv02"), SubResource("Resource_lcpc0"), SubResource("Resource_f1smx"), SubResource("Resource_2okew"), SubResource("Resource_tvv02"), SubResource("Resource_lcpc0"), SubResource("Resource_f1smx"), SubResource("Resource_2okew")]) troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_1nx3f"), SubResource("Resource_1nx3f"), SubResource("Resource_1nx3f"), SubResource("Resource_1nx3f"), SubResource("Resource_1nx3f")])
[resource] [resource]
script = ExtResource("1_ftl6b") script = ExtResource("1_ftl6b")
allowedTowers = Array[int]([1, 2, 3]) allowedTowers = Array[int]([1, 2, 3])
startingMoney = 110 startingMoney = 110
waves = Array[ExtResource("2_457yt")]([SubResource("Resource_457yt"), SubResource("Resource_jsvwv"), SubResource("Resource_3sv5g"), SubResource("Resource_46oi2"), SubResource("Resource_p2jl5"), SubResource("Resource_0nx55")]) waves = Array[ExtResource("2_457yt")]([SubResource("Resource_jsvwv"), SubResource("Resource_3sv5g"), SubResource("Resource_46oi2"), SubResource("Resource_p2jl5"), SubResource("Resource_0nx55")])
metadata/_custom_type_script = "uid://cuhq6u67cbbqm" metadata/_custom_type_script = "uid://cuhq6u67cbbqm"