From 1f17cca62d0b73f2f80c5dde3ddb8ba242114c6e Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Wed, 28 May 2025 15:37:04 +0200 Subject: [PATCH] changes from build process --- export_presets.cfg | 49 +++++++++++++++++++++++- prefabs/farm/base_field_2d.tscn | 12 ++++-- scripts/CSharp/Common/SceneTransition.cs | 1 - 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 79dd15e..9c4aaec 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -2,14 +2,14 @@ name="Windows Desktop" platform="Windows Desktop" -runnable=true +runnable=false advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="builds/Babushka.exe" +export_path="builds/Babushka_win_0_1/Babushka.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -67,3 +67,48 @@ Remove-Item -Recurse -Force '{temp_dir}'" dotnet/include_scripts_content=false dotnet/include_debug_symbols=true dotnet/embed_build_outputs=false + +[preset.1] + +name="Linux" +platform="Linux" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="builds/Babushka_linux_0_1/Babushka.x86_64" +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" +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}\"" +dotnet/include_scripts_content=false +dotnet/include_debug_symbols=true +dotnet/embed_build_outputs=false diff --git a/prefabs/farm/base_field_2d.tscn b/prefabs/farm/base_field_2d.tscn index 0e7b005..9059f10 100644 --- a/prefabs/farm/base_field_2d.tscn +++ b/prefabs/farm/base_field_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://b1d2e7ely6hyw"] +[gd_scene load_steps=7 format=3 uid="uid://b1d2e7ely6hyw"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="1_femni"] [ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="2_femni"] @@ -6,6 +6,10 @@ [ext_resource type="Texture2D" uid="uid://ctvdxwgmfaj5c" path="res://art/farm/tilable grounds/böden/nasse farming erde.png" id="4_cus02"] [ext_resource type="PackedScene" uid="uid://c3hwbwo423nbm" path="res://prefabs/farm/base_plant_2d.tscn" id="5_femni"] +[sub_resource type="CircleShape2D" id="CircleShape2D_femni"] +resource_local_to_scene = true +radius = 300.0 + [node name="BaseField" type="Node2D"] [node name="InteractionArea2" parent="." instance=ExtResource("1_femni")] @@ -26,9 +30,11 @@ _field = NodePath("..") [node name="BigPlant" parent="FieldBehaviour/BasePlant" index="2"] position = Vector2(6, -161) -[node name="ReadyPlant" parent="FieldBehaviour/BasePlant" index="3"] -position = Vector2(0, -204) +[node name="CollisionShape3D" parent="FieldBehaviour/BasePlant/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"] +shape = SubResource("CircleShape2D_femni") [connection signal="Interacted" from="InteractionArea2" to="FieldBehaviour/BasePlant" method="Grow"] [editable path="FieldBehaviour/BasePlant"] +[editable path="FieldBehaviour/BasePlant/ReadyPlantInventoryItem"] +[editable path="FieldBehaviour/BasePlant/ReadyPlantInventoryItem/InteractionArea2"] diff --git a/scripts/CSharp/Common/SceneTransition.cs b/scripts/CSharp/Common/SceneTransition.cs index 8b20bee..9b986ce 100644 --- a/scripts/CSharp/Common/SceneTransition.cs +++ b/scripts/CSharp/Common/SceneTransition.cs @@ -17,7 +17,6 @@ public partial class SceneTransition : Node { QueueFree(); } - } } \ No newline at end of file