Commit Graph

294 Commits

Author SHA1 Message Date
Michal Pikulski
8c940f4444 WOrking card save loads 2025-11-07 15:06:22 +01:00
Michal Pikulski
ba55daa3a7 REbase changes, update issues with BootCompletionService 2025-11-07 13:54:41 +01:00
Michal Pikulski
cd12c344a9 The forgotten push 2025-11-07 13:54:41 +01:00
Michal Pikulski
0204c11560 Minor reset fixes 2025-11-07 13:54:41 +01:00
Michal Pikulski
717deee0cd Fix issues with puzzle loading order and add saving state when using Menu 2025-11-07 13:54:40 +01:00
Michal Pikulski
c527ba334d Last improvements on the save front 2025-11-07 13:54:40 +01:00
Michal Pikulski
210823344a Further updates to state machines 2025-11-07 13:54:38 +01:00
Michal Pikulski
15fe4bdce6 Work on state machines 2025-11-07 13:54:19 +01:00
Michal Pikulski
b932be2232 SaveLoad using managed lifecycle 2025-11-07 13:53:52 +01:00
Michal Pikulski
3e835ed3b8 Cleanup branch work 2025-11-07 13:53:16 +01:00
Michal Pikulski
f88bd0e2c9 Rework of base interactables and managed behaviors 2025-11-07 13:53:11 +01:00
Michal Pikulski
5b70042005 Update minigames to start unlocked 2025-11-07 13:31:49 +01:00
Michal Pikulski
32a477b843 WOrking card dragging, slotting, previewing 2025-11-07 12:51:45 +01:00
Michal Pikulski
77f7d1ee97 Working card dragging into album slots, persistent slots 2025-11-07 11:24:19 +01:00
Michal Pikulski
3e607f3857 Slotting cards in album after revealing 2025-11-07 01:51:03 +01:00
Michal Pikulski
debe70c9b1 Hammer out some last flows of the booster opening page 2025-11-06 23:52:02 +01:00
Michal Pikulski
a705b3a829 Semi-working rarity upgrades 2025-11-06 23:18:02 +01:00
Michal Pikulski
d23c000347 Working flipping cards 2025-11-06 23:17:55 +01:00
Michal Pikulski
774f27410a Working drag, tap, open sequence, looking pretty OK 2025-11-06 23:17:46 +01:00
Michal Pikulski
1b1ea65744 Fire off impulses on booster taps 2025-11-06 23:17:36 +01:00
Michal Pikulski
d01859cec0 More snappy tap animation 2025-11-06 23:17:35 +01:00
journaliciouz
f576dad677 New and crispy apple map 2025-11-06 22:28:38 +01:00
Michal Pikulski
1c9d0333ea Fix editor compilation issue 2025-11-06 18:23:21 +01:00
7fb0b14337 Merge branch 'ui-animation' 2025-11-06 17:49:57 +01:00
eba2befc5f Good-enough-for-now appswitcher 2025-11-06 17:49:44 +01:00
0eb1e0efd5 Merge branch 'main' into DamianBranch 2025-11-06 17:11:57 +01:00
5e4de3ebef Added the Eagle Eye button, It's a standalone prefab that can be added to other canvases. 2025-11-06 17:11:30 +01:00
78d0bf6441 AppSwitcher work 2025-11-06 15:36:02 +01:00
Michal Pikulski
2d10d92bf5 Add a semi-finished booster opening sequence 2025-11-06 15:27:08 +01:00
Michal Pikulski
4e0c9cb4c4 Working visual part 2025-11-06 15:27:08 +01:00
Michal Pikulski
95daea8d34 Code up the card part 2025-11-06 15:27:08 +01:00
Michal Pikulski
b6d8586eab Setup booster page opening 2025-11-06 15:27:08 +01:00
e7ff137d57 Implemented new Lottie plugin, added AppSwitcher icon 2025-11-06 14:27:44 +01:00
Michal Pikulski
b17ba7bd98 Finish setting up the basic album layout 2025-11-06 01:25:13 +01:00
Michal Pikulski
50c0a12391 New card UI, new visual config, new card definitions, new working editor window for authoring! 2025-11-05 23:50:15 +01:00
0dc3f3e803 Added New Menu Background Textures 2025-11-05 17:25:26 +01:00
journaliciouz
949bd6d32b You can close the card album again 2025-11-05 16:36:00 +01:00
journaliciouz
041159a02a Implemented scrapbook assets into book plugin 2025-11-05 14:48:10 +01:00
be22d09e39 Fixed SoundBird Bug 2025-11-04 16:26:33 +01:00
journaliciouz
ae840a4b2f Changed Awake/Start to OnAwake 2025-11-03 14:44:15 +01:00
011901eb8f Refactoring of the interaction system and preliminary integration of save/load functionality across the game. (#44)
### Interactables Architecture Refactor
- Converted composition to inheritance, moved from component-based to class-based interactables. No more requirement for chain of "Interactable -> Item" etc.
- Created `InteractableBase` abstract base class with common functionality that replaces the old component
- Specialized child classes: `Pickup`, `ItemSlot`, `LevelSwitch`, `MinigameSwitch`, `CombinationItem`, `OneClickInteraction` are now children classes
- Light updates to the interactable inspector, moved some things arround, added collapsible inspector sections in the  UI for better editor experience

### State Machine Integration
- Custom `AppleMachine` inheritong from Pixelplacement's StateMachine which implements our own interface for saving, easy place for future improvements
- Replaced all previous StateMachines by `AppleMachine`
- Custom `AppleState`  extends from default `State`. Added serialization, split state logic into "EnterState", "RestoreState", "ExitState" allowing for separate logic when triggering in-game vs loading game
- Restores directly to target state without triggering transitional logic
- Migration tool converts existing instances

### Prefab Organization
- Saved changes from scenes into prefabs
- Cleaned up duplicated components, confusing prefabs hierarchies
- Created prefab variants where possible
- Consolidated Environment prefabs and moved them out of Placeholders subfolder into main Environment folder
- Organized item prefabs from PrefabsPLACEHOLDER into proper Items folder
- Updated prefab references - All scene references updated to new locations
- Removed placeholder files from Characters, Levels, UI, and Minigames folders

### Scene Updates
- Quarry scene with major updates
- Saved multiple working versions (Quarry, Quarry_Fixed, Quarry_OLD)
- Added proper lighting data
- Updated all interactable components to new architecture

### Minor editor tools
- New tool for testing cards from an editor window (no in-scene object required)
- Updated Interactable Inspector
- New debug option to opt in-and-out of the save/load system
- Tooling for easier migration

Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com>
Reviewed-on: #44
2025-11-03 10:12:51 +00:00
journaliciouz
d317fffad7 Added audio data to the item pickups 2025-10-31 16:22:48 +01:00
journaliciouz
cdbb2e0d3f Added audio of Pulver combining stuff 2025-10-31 15:45:28 +01:00
journaliciouz
d0da5d76cd Fixed a bug where state machines and auto play audio on awake fucked me 2025-10-31 11:19:47 +01:00
journaliciouz
d48b459fea Audio refactor almost done 2025-10-30 16:31:01 +01:00
journaliciouz
2b41a9f200 Gardener audio refactor 2025-10-30 15:25:07 +01:00
journaliciouz
e81879959e Properly queue critical VO clips 2025-10-30 14:17:47 +01:00
journaliciouz
64da60dadd Merge branch 'main' into audio-overhaul 2025-10-30 11:08:16 +01:00
Michal Pikulski
f6ebadf21e Update Pause menu and MinigameSelection menu to icon-based with no text 2025-10-30 10:47:34 +01:00
988bc53ec8 Finally, priority VO 2025-10-29 17:01:02 +01:00