feature/farming_bugfixes_and_magic_word #30

Merged

Jonathan merged 31 commits from feature/farming_bugfixes_and_magic_word into develop

kziolkowski commented

Owner

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

6194988bf0 🎨 removed plant growing call group and replaced it with an event call. Made FarmingAnimation play on event.

b54f784d51 🎨 Replaced pickup animation group call with event

63fd81e54d 🔥 removed no longer needed scene call group

6ba26c360d 🚧 reworking Fieldservice

66848af8bf Merge branch 'develop' into feature/farming_bugfixes_and_magic_word

8d616735f4 🚚 moved Animationfix script

8b77ca9bc5 ♻️ migrated the InteractionAreas currently used to the new format and removed the old code

f1b980cdb6 🐛 field creation at the same spot no longer possible, also watering works now.

1c5b585b3d 🔥 removed print statements used for debugging

1d7f656ec4 🚧 WIP trying to fix a bug that won't let me have more than 9 fields. Dont ask me why.

6a2355cf97 🐛 fixed never more than 10 fields bug

c7c6e184d6 🐛 adjusted field positions

58c2be1db8 ✨ plants no longer grow when just interacting with them

c52bfc8017 🐛 fixed field outline

6e833a0735 ✨ added InventoryListener and made field interaction area activate only when the right item (seed) is in the inventory

fe1dd2bcc1 ✨ Added inventorylistener for watering can

97dcadf07a ✨ Added sceneprovider reference to field scripts and made them register on ready. Also added VariableSetter.

55f0d2a77e 🚧 reworked farming system to work with indices instead of positions

d51cc461f7 🚧 made preplaced fields show plants

b00b466045 🚧 watering fields kinda works now

4705d1ee2f 🐛 can no longer water fields when watering can is empty

554a319428 🚧 farming rework part 2: you can now kinda "create" fields

443741f5f1 🐛 added preset fields to main outdoor scene and made them farmable

5cc65bc3f4 🔧 filled up main outdoor scene with fields

3fcb34c04d 🚧 saving of field parameters as json implemented

6613e54658 ✨ Implemented Loading function on fields and plants

c9f97c2571 📝 added documentation comments

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

kziolkowski requested review from Jonathan

kziolkowski added 1 commit