diff --git a/export_presets.cfg b/export_presets.cfg index cd48a7dcb84c41544dfcb3a42eccfbad6cf17ee5..e24eeddeac90dcdad316637baa7c891e6009387d 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../grovekeeper-builds/v0.1/Grovekeeper Elixir-v0.1.exe" +export_path="../grovekeeper-builds/v0.2/Grovekeeper Elixir-v0.2.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -60,3 +60,66 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue Remove-Item -Recurse -Force '{temp_dir}'" + +[preset.1] + +name="Windows Desktop Test" +platform="Windows Desktop" +runnable=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../grovekeeper-builds/v0.2/Grovekeeper Elixir-v0.2.exe" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +binary_format/architecture="x86_64" +codesign/enable=false +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=true +application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 +application/file_version="" +application/product_version="" +application/company_name="" +application/product_name="Grovekeeper Elixir" +application/file_description="" +application/copyright="" +application/trademarks="" +application/export_angle=0 +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}' +$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}' +$trigger = New-ScheduledTaskTrigger -Once -At 00:00 +$settings = New-ScheduledTaskSettingsSet +$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings +Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true +Start-ScheduledTask -TaskName godot_remote_debug +while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 } +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue" +ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue +Remove-Item -Recurse -Force '{temp_dir}'" diff --git a/project.godot b/project.godot index 6d4fa04341cc0d4492f3e49a8dd126ba277d5584..f802d43c52ed832cb43322610ed385287a6d83f4 100644 --- a/project.godot +++ b/project.godot @@ -30,6 +30,10 @@ window/size/window_height_override=720 window/stretch/mode="canvas_items" window/stretch/aspect="keep_width" +[editor] + +export/convert_text_resources_to_binary=false + [editor_plugins] enabled=PackedStringArray("res://addons/Todo_Manager/plugin.cfg", "res://addons/godot_state_charts/plugin.cfg", "res://addons/phantom_camera/plugin.cfg") diff --git a/scripts/resources/ItemDatabase.gd b/scripts/resources/ItemDatabase.gd index 4e3749f7351a48ce042ad1f7209bb9398a12668a..9ffec4b44cbf7660818247f7ba38382ba4c6b8de 100644 --- a/scripts/resources/ItemDatabase.gd +++ b/scripts/resources/ItemDatabase.gd @@ -14,9 +14,10 @@ func _ready() -> void: while file_name != "": if file_name.substr(file_name.length() - 5) == ".tres": var item_id := file_name.substr(0, file_name.length() - 5) - items[item_id] = load(item_folder + "/" + file_name) + items[item_id] = ResourceLoader.load(item_folder + "/" + file_name) file_name = folder.get_next() folder.list_dir_end() + print(items) func get_item(ID: String) -> ItemResource: