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

feature/farming_bugfixes_and_magic_word #30

Merged
Jonathan merged 31 commits from feature/farming_bugfixes_and_magic_word into develop 2025-11-18 17:26:00 +01:00
Conversation 1 Commits 31 Files Changed 65
+1286 -352
kziolkowski commented 2025-11-18 15:37:11 +01:00
Owner
Copy Link
Copy Source

I did basically everything this branch is calling for, but bugfixing and implementing the magic word :D.
BUT! I....

  • reworked the farming system (fields are now pre-created in the scene and no longer instantiated at runtime)
  • I migrated the InteractionAreas to work with arrays now and ditched the old code
  • fields have outlines now (whooohooo)
  • you can't water fields with an empty watering can (any more)
  • Created InventoryListener that lets you react when a certain item is selected in the inventory
  • wrote basic save and load system that auto-triggers on scenechange and as of right now, only saves the field and plant state
I did basically everything this branch is calling for, but bugfixing and implementing the magic word :D. BUT! I.... - reworked the farming system (fields are now pre-created in the scene and no longer instantiated at runtime) - I migrated the InteractionAreas to work with arrays now and ditched the old code - fields have outlines now (whooohooo) - you can't water fields with an empty watering can (any more) - Created InventoryListener that lets you react when a certain item is selected in the inventory - wrote basic save and load system that auto-triggers on scenechange and as of right now, only saves the field and plant state
kziolkowski added 28 commits 2025-11-18 15:37:12 +01:00
🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event. 6194988bf0
🎨 Replaced pickup animation group call with event b54f784d51
🔥 removed no longer needed scene call group 63fd81e54d
🚧 reworking Fieldservice 6ba26c360d
Merge branch 'develop' into feature/farming_bugfixes_and_magic_word 66848af8bf
🚚 moved Animationfix script 8d616735f4
♻️ migrated the InteractionAreas currently used to the new format and removed the old code 8b77ca9bc5
🐛 field creation at the same spot no longer possible, also watering works now. f1b980cdb6
🔥 removed print statements used for debugging 1c5b585b3d
🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why. 1d7f656ec4
🐛 fixed never more than 10 fields bug 6a2355cf97
🐛 adjusted field positions c7c6e184d6
✨ plants no longer grow when just interacting with them 58c2be1db8
🐛 fixed field outline c52bfc8017
✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory 6e833a0735
✨ Added inventorylistener for watering can fe1dd2bcc1
✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter. 97dcadf07a
🚧 reworked farming system to work with indices instead of positions 55f0d2a77e
🚧 made preplaced fields show plants d51cc461f7
🚧 watering fields kinda works now b00b466045
🐛 can no longer water fields when watering can is empty 4705d1ee2f
🚧 farming rework part 2: you can now kinda "create" fields 554a319428
🐛 added preset fields to main outdoor scene and made them farmable 443741f5f1
🔧 filled up main outdoor scene with fields 5cc65bc3f4
🚧 saving of field parameters as json implemented 3fcb34c04d
✨ Implemented Loading function on fields and plants 6613e54658
📝 added documentation comments c9f97c2571
Merge branch 'develop' into feature/farming_bugfixes_and_magic_word 093546f3e4 
# Conflicts:
#	scenes/Babushka_scene_farm_outside_2d.tscn
#	scenes/Babushka_scene_indoor_vesnas_room.tscn
#	scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
kziolkowski requested review from Jonathan 2025-11-18 15:37:19 +01:00
kziolkowski added 1 commit 2025-11-18 15:55:36 +01:00
🐛 changed savegame location to user-space instead of project-space c5f8b157ad
kziolkowski added 1 commit 2025-11-18 16:42:02 +01:00
reverted changed start scene in project godot 02cbc761bc
kziolkowski added 1 commit 2025-11-18 17:17:47 +01:00
🐛 removed stub code and unused signal from FarmingControls2D d17e58bcd3
Jonathan approved these changes 2025-11-18 17:25:26 +01:00
Jonathan merged commit b205e45096 into develop 2025-11-18 17:26:00 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
Jonathan
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ascheck (Anna Scheck) jlink kziolkowski (Katharina Ziolkowski) lkrause Nao Palurdas saderako Sanelschnitte Jonathan
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Jonathan/Babushka#30
Delete Branch "feature/farming_bugfixes_and_magic_word"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?