From 26502f2d372003d6f56f959224e4bfbf3eabb4df Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Sun, 6 Apr 2025 20:50:55 +0200 Subject: [PATCH] old style farming works again --- prefabs/Player3D.tscn | 13 ++++----- prefabs/farming/base_field.tscn | 23 +++++++++++---- prefabs/farming/base_plant.tscn | 42 +++++++++++++-------------- prefabs/interaction_area.tscn | 6 ++-- scenes/Babushka_scene_farm_vesna.tscn | 9 +++--- 5 files changed, 53 insertions(+), 40 deletions(-) diff --git a/prefabs/Player3D.tscn b/prefabs/Player3D.tscn index 2b206c2..7e4fb5a 100644 --- a/prefabs/Player3D.tscn +++ b/prefabs/Player3D.tscn @@ -5,8 +5,7 @@ [ext_resource type="Script" uid="uid://r5tahuqvbucy" path="res://scripts/CSharp/Common/Camera/CameraPivot.cs" id="3_3trg2"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1vdrh"] -radius = 0.0478421 -height = 0.234557 +height = 1.5 [node name="Player3d" type="Node3D"] @@ -21,7 +20,7 @@ _frontSprite = NodePath("FrontSprite") _sideSprite = NodePath("SideSprite") [node name="FrontSprite" type="Sprite3D" parent="CharacterBody3D"] -transform = Transform3D(0.04, 0, 0, 0, 0.04, 0, 0, 0, 0.04, 0, 0.110813, 0) +transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0, 0) billboard = 1 shaded = true render_priority = 100 @@ -30,7 +29,7 @@ region_enabled = true region_rect = Rect2(52, 20, 648, 1175) [node name="SideSprite" type="Sprite3D" parent="CharacterBody3D"] -transform = Transform3D(0.04, 0, 0, 0, 0.04, 0, 0, 0, 0.04, 0, 0.110813, 0) +transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0, 0) visible = false billboard = 1 shaded = true @@ -44,14 +43,14 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.119886, 0) shape = SubResource("CapsuleShape3D_1vdrh") [node name="CameraPivot2" type="Node3D" parent="CharacterBody3D" node_paths=PackedStringArray("_subPivot")] -transform = Transform3D(1, 0, 0, 0, 0.93358, 0.358368, 0, -0.358368, 0.93358, 0, 0.159723, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.159723, 0) script = ExtResource("3_3trg2") _subPivot = NodePath("SubPivot") [node name="SubPivot" type="Node3D" parent="CharacterBody3D/CameraPivot2"] [node name="Camera3D" type="Camera3D" parent="CharacterBody3D/CameraPivot2/SubPivot"] -transform = Transform3D(1, 0, 0, 0, 0.933581, 0.358368, 0, -0.358368, 0.933581, 0, 0.638658, 1.73382) -fov = 24.0844 +transform = Transform3D(1, 0, 0, 0, 0.933581, 0.358368, 0, -0.358368, 0.933581, 0, 1, 1.734) +fov = 70.0 [node name="FarmingMechanic" type="Node3D" parent="CharacterBody3D"] diff --git a/prefabs/farming/base_field.tscn b/prefabs/farming/base_field.tscn index 0e74e99..49115ce 100644 --- a/prefabs/farming/base_field.tscn +++ b/prefabs/farming/base_field.tscn @@ -1,20 +1,33 @@ -[gd_scene load_steps=5 format=3 uid="uid://biwd3jj65qrlh"] +[gd_scene load_steps=6 format=3 uid="uid://biwd3jj65qrlh"] [ext_resource type="Texture2D" uid="uid://c2pirgay3jfnn" path="res://art/farm/tilable grounds/böden/trockene farming erde.png" id="1_2cisk"] [ext_resource type="Script" uid="uid://histmmyi1wr" path="res://scripts/CSharp/Common/Farming/FieldBehaviour.cs" id="2_u7egi"] [ext_resource type="Texture2D" uid="uid://lvhbicmwqab5" path="res://art/farm/tilable grounds/böden/fruchtbarer wilder trockender boden.png" id="3_0rx5h"] [ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="4_xc4m0"] +[sub_resource type="SphereShape3D" id="SphereShape3D_u7egi"] +resource_local_to_scene = true +radius = 2.0 + [node name="BaseField" type="Sprite3D"] -transform = Transform3D(0.5, 0, 0, 0, -2.18557e-08, -0.5, 0, 0.5, -2.18557e-08, 0, 0, 0) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0) modulate = Color(0.690196, 0.690196, 0.690196, 1) +pixel_size = 0.004 texture = ExtResource("1_2cisk") script = ExtResource("2_u7egi") Untilled = ExtResource("3_0rx5h") Tilled = ExtResource("1_2cisk") -[node name="Area51" parent="." instance=ExtResource("4_xc4m0")] -transform = Transform3D(2, 0, 0, 0, -8.74228e-08, 2, 0, -2, -8.74228e-08, 0.00334358, -0.3811, -0.120426) +[node name="InteractionArea" parent="." instance=ExtResource("4_xc4m0")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.00334358, -0.3811, -0.120426) _showLabel = false -[connection signal="Interacted" from="Area51" to="." method="Farm"] +[node name="Area3D" parent="InteractionArea" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.381738) + +[node name="CollisionShape3D" parent="InteractionArea/Area3D" index="0"] +shape = SubResource("SphereShape3D_u7egi") + +[connection signal="Interacted" from="InteractionArea" to="." method="Farm"] + +[editable path="InteractionArea"] diff --git a/prefabs/farming/base_plant.tscn b/prefabs/farming/base_plant.tscn index b42ddfb..a33fae5 100644 --- a/prefabs/farming/base_plant.tscn +++ b/prefabs/farming/base_plant.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://bjhj1wa5olwcu"] +[gd_scene load_steps=7 format=3 uid="uid://bjhj1wa5olwcu"] [ext_resource type="Script" uid="uid://yfnjmuuxs3oq" path="res://scripts/CSharp/Common/Farming/PlantBehaviour.cs" id="1_l3nrf"] [ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_7tw6v"] @@ -6,19 +6,21 @@ [ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="4_1pcfs"] [ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="5_6kt4q"] +[sub_resource type="SphereShape3D" id="SphereShape3D_l3nrf"] +resource_local_to_scene = true +radius = 2.0 + [node name="BasePlant" type="Node3D" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants")] script = ExtResource("1_l3nrf") _seeds = [NodePath("Seeds/TomatoSeed"), NodePath("Seeds/TomatoSeed2"), NodePath("Seeds/TomatoSeed3")] _smallPlants = [NodePath("SmallPlant/01"), NodePath("SmallPlant/02"), NodePath("SmallPlant/03"), NodePath("SmallPlant/04")] _bigPlants = [NodePath("BigPlant/01"), NodePath("BigPlant/02"), NodePath("BigPlant/03"), NodePath("BigPlant/04")] _readyPlants = [NodePath("ReadyPlant/01"), NodePath("ReadyPlant/02"), NodePath("ReadyPlant/03"), NodePath("ReadyPlant/04")] -_state = 1 [node name="Seeds" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.216614, 1.20629, -0.992401) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) [node name="TomatoSeed" type="Sprite3D" parent="Seeds"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) visible = false flip_v = true billboard = 1 @@ -28,7 +30,6 @@ region_enabled = true region_rect = Rect2(-2, 15, 85, 81) [node name="TomatoSeed2" type="Sprite3D" parent="Seeds"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) visible = false flip_v = true billboard = 1 @@ -38,7 +39,6 @@ region_enabled = true region_rect = Rect2(15, 177, 84, 108) [node name="TomatoSeed3" type="Sprite3D" parent="Seeds"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) visible = false flip_v = true billboard = 1 @@ -48,10 +48,9 @@ region_enabled = true region_rect = Rect2(3, 337, 85, 82) [node name="SmallPlant" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.844819, 1.20629, -1.44874) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) [node name="01" type="Sprite3D" parent="SmallPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.188503) visible = false billboard = 1 render_priority = 3 @@ -60,7 +59,6 @@ region_enabled = true region_rect = Rect2(203, 1, 128, 164) [node name="02" type="Sprite3D" parent="SmallPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.206227) visible = false billboard = 1 render_priority = 3 @@ -69,7 +67,6 @@ region_enabled = true region_rect = Rect2(218, 204, 112, 130) [node name="03" type="Sprite3D" parent="SmallPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.188503) visible = false billboard = 1 render_priority = 3 @@ -78,7 +75,6 @@ region_enabled = true region_rect = Rect2(224, 399, 105, 105) [node name="04" type="Sprite3D" parent="SmallPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.188503) visible = false billboard = 1 render_priority = 3 @@ -87,11 +83,11 @@ region_enabled = true region_rect = Rect2(228, 600, 85, 92) [node name="BigPlant" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.844819, 1.20629, -1.44874) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) [node name="01" type="Sprite3D" parent="BigPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.188503) visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("3_6u2og") @@ -99,8 +95,8 @@ region_enabled = true region_rect = Rect2(-8, 1, 498, 682) [node name="02" type="Sprite3D" parent="BigPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.206227) visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("3_6u2og") @@ -108,8 +104,8 @@ region_enabled = true region_rect = Rect2(575, 82, 516, 591) [node name="03" type="Sprite3D" parent="BigPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.188503) visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("3_6u2og") @@ -117,8 +113,8 @@ region_enabled = true region_rect = Rect2(-25, 694, 521, 687) [node name="04" type="Sprite3D" parent="BigPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.211124, -0.20353, 0.188503) visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("3_6u2og") @@ -126,10 +122,11 @@ region_enabled = true region_rect = Rect2(546, 697, 535, 687) [node name="ReadyPlant" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3.967) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.3, 0) [node name="01" type="Sprite3D" parent="ReadyPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) +visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("4_1pcfs") @@ -137,8 +134,8 @@ region_enabled = true region_rect = Rect2(399, 3, 679, 808) [node name="02" type="Sprite3D" parent="ReadyPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("4_1pcfs") @@ -146,8 +143,8 @@ region_enabled = true region_rect = Rect2(1077, 109, 633, 695) [node name="03" type="Sprite3D" parent="ReadyPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("4_1pcfs") @@ -155,8 +152,8 @@ region_enabled = true region_rect = Rect2(415, 838, 639, 817) [node name="04" type="Sprite3D" parent="ReadyPlant"] -transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) visible = false +pixel_size = 0.007 billboard = 1 render_priority = 3 texture = ExtResource("4_1pcfs") @@ -165,6 +162,9 @@ region_rect = Rect2(1167, 863, 528, 785) [node name="InteractionArea" parent="." instance=ExtResource("5_6kt4q")] +[node name="CollisionShape3D" parent="InteractionArea/Area3D" index="0"] +shape = SubResource("SphereShape3D_l3nrf") + [connection signal="Interacted" from="InteractionArea" to="." method="Grow"] [editable path="InteractionArea"] diff --git a/prefabs/interaction_area.tscn b/prefabs/interaction_area.tscn index e82f8ec..91c34d4 100644 --- a/prefabs/interaction_area.tscn +++ b/prefabs/interaction_area.tscn @@ -19,12 +19,12 @@ shape = SubResource("SphereShape3D_i8sim") [node name="Label3D" type="Label3D" parent="."] visible = false sorting_offset = 100.0 -pixel_size = 0.001 +pixel_size = 0.01 billboard = 1 no_depth_test = true fixed_size = true -text = "" -font_size = 46 +text = "[E]" +font_size = 60 outline_size = 10 [connection signal="body_entered" from="Area3D" to="." method="OnPlayerEntered"] diff --git a/scenes/Babushka_scene_farm_vesna.tscn b/scenes/Babushka_scene_farm_vesna.tscn index 598cc2c..6f42cc2 100644 --- a/scenes/Babushka_scene_farm_vesna.tscn +++ b/scenes/Babushka_scene_farm_vesna.tscn @@ -31,20 +31,21 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000976563, -0.0739136, -0. shape = SubResource("BoxShape3D_t58di") [node name="Player3d" parent="." instance=ExtResource("1_b1ibi")] -transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, -4.80632, 0.0702609, 3.57249) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.80632, 0.725631, 3.57249) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.618408, 0.785857, 0, -0.785857, 0.618408, -0.802612, 0, 4.73262) [node name="BaseField" parent="." instance=ExtResource("2_72r8y")] -transform = Transform3D(0.5, 0, 0, 0, -2.18557e-08, -0.5, 0, 0.5, -2.18557e-08, -2.26145, 0.0702609, 4.04213) +transform = Transform3D(0.5, 0, 0, 0, -2.18557e-08, -0.5, 0, 0.5, -2.18557e-08, 0, 0.001, 0) texture = ExtResource("3_0ptl4") [node name="BasePlant" parent="BaseField" instance=ExtResource("3_oyw0x")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0481086, -0.424278, 0.0145219) +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +top_level = true [node name="HoePickup" parent="." instance=ExtResource("4_r4sre")] -transform = Transform3D(0.5, 0, 0, 0, 0.5, -5.32907e-15, 0, 5.32907e-15, 0.5, -4.32699, 2.53562, -3.4472) +transform = Transform3D(0.5, 0, 0, 0, 0.5, -5.32907e-15, 0, 5.32907e-15, 0.5, -4.32699, 1.8523, -3.4472) [node name="Hoe on" type="Sprite3D" parent="HoePickup"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.138896, 0)