Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

feature/showcase_bugfixing_kathi_partII #16

Merged
Jonathan merged 33 commits from feature/showcase_bugfixing_kathi_partII into develop 2025-10-24 18:31:56 +02:00
Conversation 3 Commits 33 Files Changed 194
+10 -9
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0ba4076b3 - Show all commits
scripts/CSharp/Common/Farming/FieldBehaviour2D.cs
+1 -5
View File
@@ -39,7 +39,7 @@ public partial class FieldBehaviour2D : Sprite2D
case FieldState.Tilled: case FieldState.Tilled:
FieldState = FieldState.Tilled; FieldState = FieldState.Tilled;
_fieldSprite.Texture = Tilled; _fieldSprite.Texture = Tilled;
PlantingInteraction.IsActive = false; PlantingInteraction.IsActive = true;
break; break;
case FieldState.Watered: case FieldState.Watered:
FieldState = FieldState.Watered; FieldState = FieldState.Watered;
@@ -67,15 +67,12 @@ public partial class FieldBehaviour2D : Sprite2D
/// Called when the player enters the field's interaction area and presses <E>. /// Called when the player enters the field's interaction area and presses <E>.
/// </summary> /// </summary>
public void Farm() public void Farm()
{
if (FieldState == FieldState.Watered)
{ {
if (TryPlant()) if (TryPlant())
{ {
UpdateFieldState(FieldState.Planted); UpdateFieldState(FieldState.Planted);
} }
} }
}
private bool TryPlant() private bool TryPlant()
{ {
@@ -100,7 +97,6 @@ public partial class FieldBehaviour2D : Sprite2D
if (plantBehaviour != null) if (plantBehaviour != null)
{ {
plantBehaviour.Field = this; plantBehaviour.Field = this;
plantBehaviour.Grow();
} }
success = true; success = true;
scripts/CSharp/Common/Farming/PlantBehaviour2D.cs
+7 -2
View File
@@ -35,6 +35,13 @@ public partial class PlantBehaviour2D : Node2D
set => _field = value; set => _field = value;
} }
public override void _Ready()
{
_state = PlantState.Planted;
kziolkowski marked this conversation as resolved Outdated
Jonathan commented 2025-08-18 21:37:22 +02:00
Outdated
Review
Copy Link
Copy Source

CallGroup hat ziemlich viel codesmell. Kannst du gerne für jetzt so lassen, aber setz da am besten noch ein To-do hinter, damit wir daran denken, das zu ändern, sobald wir eine event bus implementierung haben.

CallGroup hat ziemlich viel codesmell. Kannst du gerne für jetzt so lassen, aber setz da am besten noch ein To-do hinter, damit wir daran denken, das zu ändern, sobald wir eine event bus implementierung haben.
_currentPlantSprite = GetRandomSprite(_seeds);
_currentPlantSprite.Visible = true;
}
/// <summary> /// <summary>
/// Transitions the plant to its next growth stage. /// Transitions the plant to its next growth stage.
@@ -45,8 +52,6 @@ public partial class PlantBehaviour2D : Node2D
return; return;
GetTree().CallGroup("PlantGrowing", VesnaAnimations.MethodName.PlayFarmingAnimation); GetTree().CallGroup("PlantGrowing", VesnaAnimations.MethodName.PlayFarmingAnimation);
// todo:
// find out why the last plant stage is being skipped the second time around
switch (_state) switch (_state)
{ {
case PlantState.None: case PlantState.None: