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

31 Commits

Author SHA1 Message Date
kziolkowski d17e58bcd3 🐛 removed stub code and unused signal from FarmingControls2D 2025-11-18 17:17:42 +01:00
kziolkowski 02cbc761bc reverted changed start scene in project godot 2025-11-18 16:41:55 +01:00
kziolkowski c5f8b157ad 🐛 changed savegame location to user-space instead of project-space 2025-11-18 15:55:31 +01:00
kziolkowski 093546f3e4 Merge branch 'develop' into feature/farming_bugfixes_and_magic_word
# Conflicts:
#	scenes/Babushka_scene_farm_outside_2d.tscn
#	scenes/Babushka_scene_indoor_vesnas_room.tscn
#	scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs
2025-11-18 15:24:45 +01:00
kziolkowski c9f97c2571 📝 added documentation comments 2025-11-15 22:27:26 +01:00
kziolkowski 6613e54658 Implemented Loading function on fields and plants 2025-11-15 22:15:10 +01:00
kziolkowski 3fcb34c04d 🚧 saving of field parameters as json implemented 2025-11-12 18:46:30 +01:00
kziolkowski 5cc65bc3f4 🔧 filled up main outdoor scene with fields 2025-11-12 15:20:21 +01:00
kziolkowski 443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable 2025-11-12 15:14:10 +01:00
kziolkowski 554a319428 🚧 farming rework part 2: you can now kinda "create" fields 2025-11-11 16:39:47 +01:00
kziolkowski 4705d1ee2f 🐛 can no longer water fields when watering can is empty 2025-11-11 15:54:09 +01:00
kziolkowski b00b466045 🚧 watering fields kinda works now 2025-11-11 15:51:15 +01:00
kziolkowski d51cc461f7 🚧 made preplaced fields show plants 2025-11-11 14:27:56 +01:00
kziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions 2025-11-11 14:02:03 +01:00
kziolkowski 97dcadf07a Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter. 2025-11-11 12:15:30 +01:00
kziolkowski fe1dd2bcc1 Added inventorylistener for watering can 2025-11-07 20:37:59 +01:00
kziolkowski 6e833a0735 added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory 2025-11-07 20:29:05 +01:00
kziolkowski c52bfc8017 🐛 fixed field outline 2025-11-07 19:47:23 +01:00
kziolkowski 58c2be1db8 plants no longer grow when just interacting with them 2025-11-07 18:27:21 +01:00
kziolkowski c7c6e184d6 🐛 adjusted field positions 2025-11-07 18:24:52 +01:00
kziolkowski 6a2355cf97 🐛 fixed never more than 10 fields bug 2025-11-07 18:18:05 +01:00
kziolkowski 1d7f656ec4 🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why. 2025-11-05 19:25:46 +01:00
kziolkowski 1c5b585b3d 🔥 removed print statements used for debugging 2025-11-05 16:50:41 +01:00
kziolkowski f1b980cdb6 🐛 field creation at the same spot no longer possible, also watering works now. 2025-11-05 16:48:45 +01:00
kziolkowski 8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code 2025-11-04 17:20:15 +01:00
kziolkowski 8d616735f4 🚚 moved Animationfix script 2025-11-04 16:40:19 +01:00
kziolkowski 66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word 2025-11-04 11:24:51 +01:00
kziolkowski 6ba26c360d 🚧 reworking Fieldservice 2025-10-31 14:08:55 +01:00
kziolkowski 63fd81e54d 🔥 removed no longer needed scene call group 2025-10-31 12:38:48 +01:00
kziolkowski b54f784d51 🎨 Replaced pickup animation group call with event 2025-10-31 12:36:08 +01:00
kziolkowski 6194988bf0 🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event. 2025-10-31 12:07:05 +01:00