diff --git a/addons/save_load_system/autoloads/save_game_manager.gd b/addons/save_load_system/autoloads/save_game_manager.gd index 37602f1..6514985 100644 --- a/addons/save_load_system/autoloads/save_game_manager.gd +++ b/addons/save_load_system/autoloads/save_game_manager.gd @@ -114,9 +114,9 @@ func _generate_save_game_resource() -> SaveGameDataResource: func _generate_save_icon_texture(save_icon: String) -> Texture2D: var _icon_texture: Texture2D = ImageTexture.new() if save_icon != null and !FileAccess.file_exists(save_icon): - _icon_texture = _save_level_data_component.default_save_icon_resource + _icon_texture = _save_level_data_component.settings.default_save_icon_resource elif save_icon == null: - _icon_texture = _save_level_data_component.default_save_icon_resource + _icon_texture = _save_level_data_component.settings.default_save_icon_resource else: var _icon_image: Image = Image.new() _icon_image.load(save_icon) diff --git a/addons/save_load_system/components/save_level_data_component.gd b/addons/save_load_system/components/save_level_data_component.gd index d5fbc1b..f4f8e78 100644 --- a/addons/save_load_system/components/save_level_data_component.gd +++ b/addons/save_load_system/components/save_level_data_component.gd @@ -4,7 +4,6 @@ class_name SaveLevelDataComponent extends Node -@export var default_save_icon_resource: CompressedTexture2D @export var settings: SaveGameSettings ## The SaveGameSettings resource @export var ui_node: CanvasLayer ## The UI to Show/Hide when taking screenshot (e.g. save icon generation) diff --git a/addons/save_load_system/components/save_level_data_component.tscn b/addons/save_load_system/components/save_level_data_component.tscn index dc4237b..09d3906 100644 --- a/addons/save_load_system/components/save_level_data_component.tscn +++ b/addons/save_load_system/components/save_level_data_component.tscn @@ -1,10 +1,8 @@ -[gd_scene load_steps=4 format=3 uid="uid://c3pqilb6yh5kc"] +[gd_scene load_steps=3 format=3 uid="uid://c3pqilb6yh5kc"] [ext_resource type="Script" uid="uid://c7x2qvyu62230" path="res://addons/save_load_system/components/save_level_data_component.gd" id="1_exguq"] -[ext_resource type="Texture2D" uid="uid://b4lam0dwtv8fq" path="res://addons/save_load_system/default_icon.svg" id="2_hd7aa"] [ext_resource type="Resource" uid="uid://o32fooj1lxg7" path="res://addons/save_load_system/resources/save_game_settings_resource.tres" id="2_rkr1f"] [node name="SaveLevelDataComponent" type="Node"] script = ExtResource("1_exguq") -default_save_icon_resource = ExtResource("2_hd7aa") settings = ExtResource("2_rkr1f") diff --git a/addons/save_load_system/resources/save_game_settings_resource.gd b/addons/save_load_system/resources/save_game_settings_resource.gd index 2621f37..c08344a 100644 --- a/addons/save_load_system/resources/save_game_settings_resource.gd +++ b/addons/save_load_system/resources/save_game_settings_resource.gd @@ -13,3 +13,5 @@ extends Resource @export var save_file_name_prepend: String = "save_" @export var quicksave_file_name_prepend: String = "quicksave_" @export var autosave_file_name_prepend: String = "autosave_" + +@export var default_save_icon_resource: CompressedTexture2D diff --git a/addons/save_load_system/resources/save_game_settings_resource.tres b/addons/save_load_system/resources/save_game_settings_resource.tres index 74ca31e..e0b8b51 100644 --- a/addons/save_load_system/resources/save_game_settings_resource.tres +++ b/addons/save_load_system/resources/save_game_settings_resource.tres @@ -1,12 +1,14 @@ -[gd_resource type="Resource" script_class="SaveGameSettings" load_steps=2 format=3 uid="uid://o32fooj1lxg7"] +[gd_resource type="Resource" script_class="SaveGameSettings" load_steps=3 format=3 uid="uid://o32fooj1lxg7"] +[ext_resource type="Texture2D" uid="uid://b4lam0dwtv8fq" path="res://addons/save_load_system/default_icon.svg" id="1_fm0fk"] [ext_resource type="Script" uid="uid://d0iptf06t7f47" path="res://addons/save_load_system/resources/save_game_settings_resource.gd" id="1_o1tpj"] [resource] script = ExtResource("1_o1tpj") save_game_data_path = "user://game_data/" max_auto_saves = 5 -save_file_name = "save_%s_game_data.tres" -quicksave_file_name = "quicksave_game_data.tres" -autosave_file_name = "autosave_%s_game_data.tres" +save_file_name_prepend = "save_" +quicksave_file_name_prepend = "quicksave_" +autosave_file_name_prepend = "autosave_" +default_save_icon_resource = ExtResource("1_fm0fk") metadata/_custom_type_script = "uid://d0iptf06t7f47"