From 8c1822557c16af6e359dc0497812cbe24aab5bff Mon Sep 17 00:00:00 2001 From: cblech Date: Mon, 7 Apr 2025 19:59:55 +0200 Subject: [PATCH] Added Inventory into babushka farming scene --- .gitignore | 1 + .../3d/best_house_blender.blend.import | 3 +- .../textures/house_prototypelayout.png.import | 14 ++-- export_presets.cfg | 69 ++++++++++++++++++ ...hka_ui_tmp_inventory_select.afdesign~lock~ | Bin 104 -> 104 bytes graphics/ui/untitled.afdesign~lock~ | Bin 104 -> 104 bytes prefabs/UI/Inventory/Inventory.tscn | 4 + scenes/Babushka_scene_farm_vesna.tscn | 6 +- 8 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 export_presets.cfg diff --git a/.gitignore b/.gitignore index ad1ae33..152722f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Godot 4+ specific ignores .godot/ /android/ +/builds/ # temporary files **/*.tmp diff --git a/art/mockups/3d/best_house_blender.blend.import b/art/mockups/3d/best_house_blender.blend.import index 2f414a6..7031f50 100644 --- a/art/mockups/3d/best_house_blender.blend.import +++ b/art/mockups/3d/best_house_blender.blend.import @@ -4,11 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://b3kyrsoobmkhp" -valid=false +path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn" [deps] source_file="res://art/mockups/3d/best_house_blender.blend" +dest_files=["res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"] [params] diff --git a/art/mockups/3d/textures/house_prototypelayout.png.import b/art/mockups/3d/textures/house_prototypelayout.png.import index 7135c1f..d838395 100644 --- a/art/mockups/3d/textures/house_prototypelayout.png.import +++ b/art/mockups/3d/textures/house_prototypelayout.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://c3gm7cog1gjrf" -path="res://.godot/imported/house_prototypelayout.png-3dc0e35913507541b740c33ed9c45e44.ctex" +path.s3tc="res://.godot/imported/house_prototypelayout.png-3dc0e35913507541b740c33ed9c45e44.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } +generator_parameters={} [deps] source_file="res://art/mockups/3d/textures/house_prototypelayout.png" -dest_files=["res://.godot/imported/house_prototypelayout.png-3dc0e35913507541b740c33ed9c45e44.ctex"] +dest_files=["res://.godot/imported/house_prototypelayout.png-3dc0e35913507541b740c33ed9c45e44.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +33,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/export_presets.cfg b/export_presets.cfg new file mode 100644 index 0000000..79dd15e --- /dev/null +++ b/export_presets.cfg @@ -0,0 +1,69 @@ +[preset.0] + +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="builds/Babushka.exe" +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" +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}'" +dotnet/include_scripts_content=false +dotnet/include_debug_symbols=true +dotnet/embed_build_outputs=false diff --git a/graphics/ui/babushka_ui_tmp_inventory_select.afdesign~lock~ b/graphics/ui/babushka_ui_tmp_inventory_select.afdesign~lock~ index 3a7fcfa0c8bab54af55e741925953f4de21393ee..fbb809a29f1b5c3c25f3275b4083c51a916dcefe 100644 GIT binary patch delta 20 acmd1E;Pc5(&gOsfIh_Fr>V+oqMF9Xu!3IYF delta 20 acmd1E;Pc5(&gOsfIh_Fr)-z1xivj>hX$EBg diff --git a/graphics/ui/untitled.afdesign~lock~ b/graphics/ui/untitled.afdesign~lock~ index 2a748b6b04e5069ab6a7e4c551774732961d55be..2ddb3454cacc3fc051415f221f1a3b3de645d734 100644 GIT binary patch delta 20 acmd1E;Pc5(&VKs(b2q!3OdG delta 20 acmd1E;Pc5(&VKs(b2rX$KGh diff --git a/prefabs/UI/Inventory/Inventory.tscn b/prefabs/UI/Inventory/Inventory.tscn index 8912fac..7f3f516 100644 --- a/prefabs/UI/Inventory/Inventory.tscn +++ b/prefabs/UI/Inventory/Inventory.tscn @@ -61,3 +61,7 @@ expand_mode = 1 [node name="InventoryTester" type="Node" parent="."] script = ExtResource("3_exrk4") _testItemToCreate = ExtResource("4_5fdxq") + +[node name="BabushkaUiTmpInventorySelect" type="Sprite2D" parent="."] +position = Vector2(-648, 1020) +texture = ExtResource("4_tiss4") diff --git a/scenes/Babushka_scene_farm_vesna.tscn b/scenes/Babushka_scene_farm_vesna.tscn index a4d558e..4a3b2e3 100644 --- a/scenes/Babushka_scene_farm_vesna.tscn +++ b/scenes/Babushka_scene_farm_vesna.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=9 format=3 uid="uid://br7yq757cawts"] +[gd_scene load_steps=10 format=3 uid="uid://br7yq757cawts"] [ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="1_b1ibi"] [ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farming/base_field.tscn" id="2_72r8y"] [ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="4_r4sre"] +[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="5_obfp0"] [ext_resource type="PackedScene" uid="uid://cf0jpuio8tgim" path="res://prefabs/interactions/sprite_switcher.tscn" id="6_r4sre"] [sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"] @@ -51,7 +52,6 @@ shape = SubResource("SphereShape3D_0ptl4") [node name="FieldParent" type="Node3D" parent="."] -[connection signal="Interacted" from="HoePickup" to="HoePickup/SpriteSwitcher Hoe" method="SwitchState"] -[connection signal="Switch" from="HoePickup/SpriteSwitcher Hoe" to="Player3d" method="ActivateHoe"] +[node name="Inventory" parent="." instance=ExtResource("5_obfp0")] [editable path="HoePickup"]