From 4f660c4af8b91204887c68cf4ed5119214ba7812 Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Tue, 16 Dec 2025 15:11:32 +0100 Subject: [PATCH] :bug: fixed rake still activating field outlines bug --- scenes/scene_outside_beets.tscn | 9 +++++++++ scripts/CSharp/Common/Farming/FieldActivator.cs | 2 ++ 2 files changed, 11 insertions(+) diff --git a/scenes/scene_outside_beets.tscn b/scenes/scene_outside_beets.tscn index c823b14..524192a 100644 --- a/scenes/scene_outside_beets.tscn +++ b/scenes/scene_outside_beets.tscn @@ -1778,6 +1778,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1806,6 +1807,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1834,6 +1836,7 @@ _field = NodePath("../..") _daysWatered = 5 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1862,6 +1865,7 @@ _field = NodePath("../..") _daysWatered = 7 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1890,6 +1894,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1918,6 +1923,7 @@ _field = NodePath("../..") _daysWatered = 5 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1946,6 +1952,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1974,6 +1981,7 @@ _field = NodePath("../..") _daysWatered = 6 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldActivator/InteractionArea/Area2D" index="0"] @@ -1996,6 +2004,7 @@ metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c" z_index = 1 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="7"] +process_mode = 4 visible = false [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldActivator/InteractionArea/Area2D" index="0"] diff --git a/scripts/CSharp/Common/Farming/FieldActivator.cs b/scripts/CSharp/Common/Farming/FieldActivator.cs index ef59846..92d704e 100644 --- a/scripts/CSharp/Common/Farming/FieldActivator.cs +++ b/scripts/CSharp/Common/Farming/FieldActivator.cs @@ -43,6 +43,8 @@ public partial class FieldActivator : Node /// public void RakeActivated(bool activated) { + if (_used || ProcessMode == ProcessModeEnum.Disabled) + return; _rakeInHand = activated; ToggleInteractionArea(); }