Commit Graph

34 Commits

Author SHA1 Message Date
DamianCorazza
475f54b704 Modified TrashCan Prefab and Fixed Bunflers hard to grab. 2025-11-03 12:38:53 +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
acf3ecec3f Added Highlights to the quarry button and the Bunfflers. 2025-10-22 10:36:56 +02:00
82fce5c135 Added aglow to the Pickable Items 2025-10-17 12:36:09 +02:00
ddbeb0fca3 Added alerts and modified the rocks in the environment. 2025-10-13 17:10:25 +02:00
a91b776c20 WIP Ended the BallTree 2025-10-07 16:56:52 +02:00
dea470f93f Replaced almost all placeholders with final art
Some animations still need to be added and replaced, but most of the sprites are final now.
2025-10-07 13:04:14 +02:00
7ed258f87a Added Sprites and Changed Placeholders for final art 2025-10-06 17:41:12 +02:00
0627a2aeb7 Replacing with Final Art 2025-10-06 15:13:26 +02:00
c741651b6a Added Ball Tree Animations 2025-10-06 14:42:20 +02:00
b6b2605efb Merge pull request 'DamianBranch' (#15) from DamianBranch into main
Reviewed-on: #15
2025-10-06 10:45:26 +00:00
01189acef1 Added Anne-Lise Hiding Spot plus Kids Hidding spots 2025-10-06 12:38:16 +02:00
e713a580a9 puzzlestep_indicators (#14)
Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com>
Reviewed-on: #14
2025-10-02 05:42:17 +00:00
f686f28cb8 Create a simple dialogue authoring system, tied into our items (#10)
- Editor dialogue graph
- Asset importer for processing the graph into runtime data
- DialogueComponent that steers the dialogue interactions
- DialogueCanbas with a scalable speech bubble to display everything
- Brief README overview of the system

Co-authored-by: AlexanderT <alexander@foolhardyhorizons.com>
Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com>
Reviewed-on: #10
2025-09-29 09:34:15 +00:00
88e630cbe7 Added some Anims for the picnic PPL plus replacing placeholders. 2025-09-26 11:59:03 +02:00
81723a3cdb Anna Lise Moves To the Spot and takes a picture when the bird is there. 2025-09-16 18:14:00 +02:00
DamianCorazza
d62516f0cb Added Bird Spawning and Copied behaviour for the hammer bird 2025-09-12 12:49:07 +02:00
9b590ca6ec Made Changes To slotted items (not fully functional but progressing)
Added Unity events to the Slotting Items, the eyes react fine but sometimes they fuck up. gonna check that out later.
2025-09-11 17:03:56 +02:00
Michal Pikulski
e1ff13db30 Rework interactables into a flatter hierarchy, reenable puzzles as well 2025-09-11 14:07:57 +02:00
e431846cc1 Modified the Prefabs for items 2025-09-10 17:41:01 +02:00
ce9f490ed5 Changed All prefabs to variants of BasePrefab 2025-09-10 16:13:43 +02:00
8d94fad5d9 Puzzle hiccup 2025-09-09 13:04:19 +02:00
Michal Pikulski
5804b170d0 Fix slot items to fully work with the stashing prefab flow 2025-09-09 10:10:21 +02:00
a8d398e097 Added Puzzle Steps and organized the Puzzle Item Data
Created folders for the puzzle and item data files and added Puzzle steps.
2025-09-08 16:22:32 +02:00
Michal Pikulski
32888a6843 [Interactions] Switch interactables to trace on layer configured in game settings 2025-09-08 12:51:33 +02:00
81cd20ceef Created Prefab of BurgerBuns
Pushing to test collisions in quarry level.
2025-09-08 12:31:34 +02:00
045bd7966e PLaceholder Items and organization
Items Placeholder Art Upload
2025-09-05 17:37:21 +02:00
Michal Pikulski
4a098365d0 Setup Universal Render Pipeline 2025-09-05 09:10:19 +02:00
Michal Pikulski
496ef10b8b [Player][Interactions] Items can be switched when picked up now 2025-09-04 13:08:42 +02:00
Michal Pikulski
0c930d09a4 [Player][Interactions] Pulver moves to item and goes back. Item disappears, but in wrong order 2025-09-04 00:00:46 +02:00
Michal Pikulski
39eeb044fd Setup correct sizes and Quarry level switch 2025-09-02 13:59:31 +02:00
Michal Pikulski
e53b5a0034 [Player] Add AI Pathfinding on a 2D grid to the player character 2025-09-02 11:42:25 +02:00
Michal Pikulski
a2b62fc4b1 GO back to a simple ignore file and commit all meta assets 2025-09-01 16:19:19 +02:00
Michal Pikulski
8e1174d4bf [Input][Interaction] Add interactable items 2025-09-01 16:14:21 +02:00