Commit Graph

242 Commits

Author SHA1 Message Date
kziolkowski f32033cb5f Merge pull request 'Made the fight world completable' (#33) from feature/night_to_day into develop
Reviewed-on: #33
2025-11-26 15:11:13 +01:00
kziolkowski 1ad463ccb0 🔥 removed unused code 2025-11-26 14:43:55 +01:00
jonathan 3f4dfccbc6 🐛Make the FightWorld reset when sleeping in the bed 2025-11-25 18:43:48 +01:00
jonathan 3c370e30a0 Added end of night scene 2025-11-25 18:07:21 +01:00
jonathan 073a74bb22 🚸Rebalanded fight to make it more likely to win 2025-11-25 17:32:27 +01:00
kziolkowski 75e4bdd7fd ♻️ removed Print statements 2025-11-25 17:20:58 +01:00
kziolkowski f37f7c7ceb added saving and loading support to collectable inventory items 2025-11-25 17:14:30 +01:00
kziolkowski 70383fc16e Implemented load check for unique inventory items 2025-11-25 17:00:50 +01:00
kziolkowski 88f3c90eec ♻️ inventory works 2025-11-25 16:13:17 +01:00
kziolkowski 9d818e5079 ♻️ refactored field code to work with the new id system 2025-11-25 15:29:36 +01:00
kziolkowski e9cd4ce276 ♻️ reworked and debugged the SaveSystem. Removed unnecessary scene reference. 2025-11-25 14:39:31 +01:00
kziolkowski 638ebaff46 📝 Added documentation 2025-11-25 13:46:46 +01:00
kziolkowski b4013b1ff2 :feature: made GetComponent nullable in NodeExtension 2025-11-25 13:34:22 +01:00
kziolkowski c695115a4a :feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea 2025-11-25 13:33:53 +01:00
kziolkowski c68727aebe 🚧 intermediate state with homework 2025-11-23 22:50:32 +01:00
kziolkowski bee6249c6f 🚧 implemented interaction area loading 2025-11-23 22:25:59 +01:00
kziolkowski fda2b95b38 Savesystem rework 2025-11-23 21:02:40 +01:00
kziolkowski 4bbaab1a2a Created ISaveable interface and made existing saveable classes inherit from it. 2025-11-23 20:10:42 +01:00
kziolkowski 4ed6f4e7d9 Reworked existing save system for user data: Made path steam-compatible, added Versioning and try/catch to save 2025-11-21 21:04:37 +01:00
kziolkowski ce29711614 ❇️ Added Settings classes to save and load local configurations 2025-11-21 20:33:52 +01:00
kziolkowski 2947011a1a working intermediate state of the save system 2025-11-21 17:27:46 +01:00
kziolkowski 2a4425b9db Added Save and load support to the inventory 2025-11-19 15:18:33 +01:00
kziolkowski 72079044bd 🚧 WIP implementing save and load for the inventory 2025-11-18 18:30:17 +01:00
Jonathan b205e45096 Merge pull request 'feature/farming_bugfixes_and_magic_word' (#30) from feature/farming_bugfixes_and_magic_word into develop
Reviewed-on: #30
2025-11-18 17:25:59 +01:00
kziolkowski d17e58bcd3 🐛 removed stub code and unused signal from FarmingControls2D 2025-11-18 17:17:42 +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 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
jonathan 3bb4fcd129 Added damage fly number 2025-11-11 15:55:41 +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
Jonathan 0507f1ee3d Merge pull request 'Sleeping in bed now loads the new fight world scene' (#27) from feature/integrate_new_fight into develop
Reviewed-on: #27
2025-11-11 14:49:31 +01:00
kziolkowski d51cc461f7 🚧 made preplaced fields show plants 2025-11-11 14:27:56 +01:00
jonathan 54bfc3c021 🐛 Fixed enemy groups show in different spots and even when all enemies are dead 2025-11-11 14:06:58 +01:00
kziolkowski 55f0d2a77e 🚧 reworked farming system to work with indices instead of positions 2025-11-11 14:02:03 +01:00
jonathan 74096f2c71 🐛Fixed sprite outline fallback 2025-11-11 12:44:36 +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
Jonathan e1a61fb1e2 Merge pull request 'made dead fighters shrink to telegraph to the player that they are dead' (#25) from feature/dead_squash into develop
Reviewed-on: #25
2025-11-11 10:20:44 +01:00
jonathan edbd4a182b 🎨Removed comment 2025-11-11 10:19:37 +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 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