From 7a8f034f6e625eec56797ad866d1c7f8865ef759 Mon Sep 17 00:00:00 2001 From: Sage The DM Date: Thu, 17 Apr 2025 20:04:51 +0200 Subject: [PATCH] god damnit --- the-scavanger/.godot/editor/editor_layout.cfg | 2 +- .../.godot/editor/filesystem_cache10 | 19 +-- .../.godot/editor/filesystem_update4 | 4 +- ...state-a2d9d4e2619cfe9f508a7ce437bf36bc.cfg | 2 +- ...state-b73a784f178a47915fc66b3add4a1dff.cfg | 2 +- .../.godot/editor/project_metadata.cfg | 3 +- .../.godot/editor/script_editor_cache.cfg | 12 +- ...state-1d5fdaa6118f033b4cb4a73d58a8d8b8.cfg | 2 +- the-scavanger/.godot/export_credentials.cfg | 13 +++ the-scavanger/export_presets.cfg | 108 ++++++++++++++++++ the-scavanger/scenes/player-npc/player.tscn | 2 +- the-scavanger/scripts/player.gd | 2 +- 12 files changed, 149 insertions(+), 22 deletions(-) create mode 100644 the-scavanger/.godot/export_credentials.cfg create mode 100644 the-scavanger/export_presets.cfg diff --git a/the-scavanger/.godot/editor/editor_layout.cfg b/the-scavanger/.godot/editor/editor_layout.cfg index b0f3030..9aceaa1 100644 --- a/the-scavanger/.godot/editor/editor_layout.cfg +++ b/the-scavanger/.godot/editor/editor_layout.cfg @@ -53,7 +53,7 @@ zoom_factor=0.928575 [GameView] -floating_window_rect=Rect2i(2053, 94, 1164, 695) +floating_window_rect=Rect2i(1920, 23, 1920, 1009) floating_window_screen=2 [ShaderEditor] diff --git a/the-scavanger/.godot/editor/filesystem_cache10 b/the-scavanger/.godot/editor/filesystem_cache10 index cad9dda..0770359 100644 --- a/the-scavanger/.godot/editor/filesystem_cache10 +++ b/the-scavanger/.godot/editor/filesystem_cache10 @@ -1,5 +1,6 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1744911067 +::res://::1744912823 +export_presets.cfg::TextFile::-1::1744911786::0::1::::<><><>0<>0<><>:: README.md::TextFile/TextFile::-1::1744816260::0::1::::<><><>0<>0<><>:: ::res://addons/::1744816286 ::res://addons/dialogic/::1744816286 @@ -638,15 +639,15 @@ impactWood_light_003.ogg::AudioStreamOggVorbis/AudioStreamOggVorbis::39778551762 dungeon_tilemap.png::CompressedTexture2D/CompressedTexture2D::8061865866911565813::1744792307::1744795216::1::::<><><>0<>0<>f72357e1a5fc8e72e24e704a7ba19886<>res://.godot/imported/dungeon_tilemap.png-68df297cfdb861c9d71310f03207f420.ctex:: town_tilemap.png::CompressedTexture2D/CompressedTexture2D::9087710348786756863::1744792307::1744795216::1::::<><><>0<>0<>3bfeccc788daeaf3e35efcb3add29f22<>res://.godot/imported/town_tilemap.png-2998e8eb9fc51ed5db3b69c6ee26a142.ctex:: ::res://scenes/::1744816287 -::res://scenes/enemies/::1744910723 -slime.tscn::PackedScene::2402754897815220369::1744910723::0::1::::<><><>0<>0<><>::uid://bnpn02r7cngft::::res://scripts/slime.gd<>uid://ijn3ut4pdyam::::res://sprites/characters/slime.png -::res://scenes/maps/::1744910722 -map.tscn::PackedScene::3973745883842296891::1744910722::0::1::::<><><>0<>0<><>::uid://d2qfi5sncf72b::::res://assets/terrain/town_tilemap.png<>uid://dm4h0uo6gjp22::::res://assets/terrain/dungeon_tilemap.png<>uid://bah6a0tn6u066::::res://scenes/enemies/slime.tscn<>uid://d2xgp0scnb5s3::::res://scenes/player-npc/player.tscn -::res://scenes/player-npc/::1744910723 -player.tscn::PackedScene::9102233947513275536::1744910723::0::1::::<><><>0<>0<><>::uid://cxcuos53tbyxg::::res://scripts/player.gd<>uid://bsbojappb6j6v::::res://sprites/characters/player.png -::res://scripts/::1744910719 +::res://scenes/enemies/::1744911107 +slime.tscn::PackedScene::2402754897815220369::1744911107::0::1::::<><><>0<>0<><>::uid://bnpn02r7cngft::::res://scripts/slime.gd<>uid://ijn3ut4pdyam::::res://sprites/characters/slime.png +::res://scenes/maps/::1744911107 +map.tscn::PackedScene::3973745883842296891::1744911107::0::1::::<><><>0<>0<><>::uid://d2qfi5sncf72b::::res://assets/terrain/town_tilemap.png<>uid://dm4h0uo6gjp22::::res://assets/terrain/dungeon_tilemap.png<>uid://bah6a0tn6u066::::res://scenes/enemies/slime.tscn<>uid://d2xgp0scnb5s3::::res://scenes/player-npc/player.tscn +::res://scenes/player-npc/::1744911553 +player.tscn::PackedScene::9102233947513275536::1744911553::0::1::::<><><>0<>0<><>::uid://cxcuos53tbyxg::::res://scripts/player.gd<>uid://bsbojappb6j6v::::res://sprites/characters/player.png +::res://scripts/::1744911553 global.gd::GDScript/GDScript::5883560734693615925::1744823557::0::1::::<>Node<><>0<>0<><>:: -player.gd::GDScript::6392553860601149484::1744910719::0::1::::<>CharacterBody2D<><>0<>0<><>:: +player.gd::GDScript::6392553860601149484::1744911553::0::1::::<>CharacterBody2D<><>0<>0<><>:: slime.gd::GDScript/GDScript::3330676728901258397::1744823524::0::1::::<>CharacterBody2D<><>0<>0<><>:: ::res://sprites/::1744816287 icon.svg::CompressedTexture2D/CompressedTexture2D::7419309778608950522::1744795028::1744795062::1::::<><><>0<>0<>34e689a90ac55dc880b59a651c559a89<>res://.godot/imported/icon.svg-964d8c66fbd3bda40c44ca195472a8e1.ctex:: diff --git a/the-scavanger/.godot/editor/filesystem_update4 b/the-scavanger/.godot/editor/filesystem_update4 index e2d6150..1e15b20 100644 --- a/the-scavanger/.godot/editor/filesystem_update4 +++ b/the-scavanger/.godot/editor/filesystem_update4 @@ -1,4 +1,4 @@ -res://scenes/player-npc/player.tscn -res://scripts/player.gd res://scenes/maps/map.tscn +res://scenes/player-npc/player.tscn res://scenes/enemies/slime.tscn +res://scripts/player.gd diff --git a/the-scavanger/.godot/editor/map.tscn-editstate-a2d9d4e2619cfe9f508a7ce437bf36bc.cfg b/the-scavanger/.godot/editor/map.tscn-editstate-a2d9d4e2619cfe9f508a7ce437bf36bc.cfg index cf94d49..2d51c11 100644 --- a/the-scavanger/.godot/editor/map.tscn-editstate-a2d9d4e2619cfe9f508a7ce437bf36bc.cfg +++ b/the-scavanger/.godot/editor/map.tscn-editstate-a2d9d4e2619cfe9f508a7ce437bf36bc.cfg @@ -192,4 +192,4 @@ Game={ "hide_selection": true, "select_mode": 1 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player/Camera2D")]) diff --git a/the-scavanger/.godot/editor/player.tscn-editstate-b73a784f178a47915fc66b3add4a1dff.cfg b/the-scavanger/.godot/editor/player.tscn-editstate-b73a784f178a47915fc66b3add4a1dff.cfg index b94295e..e9bc6d7 100644 --- a/the-scavanger/.godot/editor/player.tscn-editstate-b73a784f178a47915fc66b3add4a1dff.cfg +++ b/the-scavanger/.godot/editor/player.tscn-editstate-b73a784f178a47915fc66b3add4a1dff.cfg @@ -192,4 +192,4 @@ Game={ "hide_selection": false, "select_mode": 0 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player/Camera2D")]) diff --git a/the-scavanger/.godot/editor/project_metadata.cfg b/the-scavanger/.godot/editor/project_metadata.cfg index ac17797..b5d69f9 100644 --- a/the-scavanger/.godot/editor/project_metadata.cfg +++ b/the-scavanger/.godot/editor/project_metadata.cfg @@ -18,6 +18,7 @@ resave_paths=PackedStringArray() create_new_node=Rect2(2430, 190, 900, 700) project_settings=Rect2(2280, 190, 1200, 700) search_help=Rect2(2400, 270, 960, 540) +export=Rect2(2430, 290, 900, 574) [project_settings] @@ -37,7 +38,7 @@ snap_mode=2 [game_view] -embed_size_mode=0 +embed_size_mode=1 [quick_open_dialog] diff --git a/the-scavanger/.godot/editor/script_editor_cache.cfg b/the-scavanger/.godot/editor/script_editor_cache.cfg index a934e84..ca7296d 100644 --- a/the-scavanger/.godot/editor/script_editor_cache.cfg +++ b/the-scavanger/.godot/editor/script_editor_cache.cfg @@ -3,11 +3,11 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 43, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 72, -"scroll_position": 50.0, +"row": 53, +"scroll_position": 41.3209, "selection": false, "syntax_highlighter": "GDScript" } @@ -36,6 +36,10 @@ state={ "h_scroll_position": 0, "row": 5, "scroll_position": 0.0, -"selection": false, +"selection": true, +"selection_from_column": 0, +"selection_from_line": 0, +"selection_to_column": 0, +"selection_to_line": 5, "syntax_highlighter": "GDScript" } diff --git a/the-scavanger/.godot/editor/slime.tscn-editstate-1d5fdaa6118f033b4cb4a73d58a8d8b8.cfg b/the-scavanger/.godot/editor/slime.tscn-editstate-1d5fdaa6118f033b4cb4a73d58a8d8b8.cfg index d58849d..ea1c421 100644 --- a/the-scavanger/.godot/editor/slime.tscn-editstate-1d5fdaa6118f033b4cb4a73d58a8d8b8.cfg +++ b/the-scavanger/.godot/editor/slime.tscn-editstate-1d5fdaa6118f033b4cb4a73d58a8d8b8.cfg @@ -192,4 +192,4 @@ Game={ "hide_selection": false, "select_mode": 0 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Player/Camera2D")]) diff --git a/the-scavanger/.godot/export_credentials.cfg b/the-scavanger/.godot/export_credentials.cfg new file mode 100644 index 0000000..7feb7d3 --- /dev/null +++ b/the-scavanger/.godot/export_credentials.cfg @@ -0,0 +1,13 @@ +[preset.0] + +script_encryption_key="" + +[preset.1] + +script_encryption_key="" + +[preset.1.options] + +codesign/identity_type=0 +codesign/identity="" +codesign/password="" diff --git a/the-scavanger/export_presets.cfg b/the-scavanger/export_presets.cfg new file mode 100644 index 0000000..0bc020a --- /dev/null +++ b/the-scavanger/export_presets.cfg @@ -0,0 +1,108 @@ +[preset.0] + +name="Linux" +platform="Linux" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.0.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_64" +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="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" + +[preset.1] + +name="Windows Desktop" +platform="Windows Desktop" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=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="" +application/file_description="" +application/copyright="" +application/trademarks="" +application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true +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 -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries +$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/the-scavanger/scenes/player-npc/player.tscn b/the-scavanger/scenes/player-npc/player.tscn index 9955d96..f1a5838 100644 --- a/the-scavanger/scenes/player-npc/player.tscn +++ b/the-scavanger/scenes/player-npc/player.tscn @@ -475,7 +475,7 @@ max_value = 3.0 show_percentage = false [node name="Camera2D" type="Camera2D" parent="."] -zoom = Vector2(3.9, 3.9) +zoom = Vector2(5, 5) [node name="RichTextLabel2" type="RichTextLabel" parent="."] offset_left = -137.0 diff --git a/the-scavanger/scripts/player.gd b/the-scavanger/scripts/player.gd index 000f430..116bfde 100644 --- a/the-scavanger/scripts/player.gd +++ b/the-scavanger/scripts/player.gd @@ -51,7 +51,7 @@ func tokenize_text(text: String) -> Array: # Called every frame, listens for just-pressed input to show next chunk func _process(_delta): - if Input.is_action_just_pressed("ui_accept_text"): + if Input.is_action_just_pressed("ui_accept"): if current_chunk_index * 7 < word_chunks.size(): _display_next_chunk() elif $"TextEdit".visible: