Commit Graph

22 Commits

Author SHA1 Message Date
7de0e1776e MVP for Dump Puzzle 2025-12-08 08:48:35 +01:00
49f563dbd1 Merge branch 'main' into DamianBranch 2025-12-04 17:04:11 +01:00
bd093b8696 Added some placeholder elements 2025-12-04 17:02:49 +01:00
1c64c67cf8 Worker barely working 2025-12-04 14:38:32 +01:00
1b8c180425 Added anim placeholders for the worker belt animation 2025-12-03 04:22:26 +01:00
c210b47644 Cement factory level and prefab making 2025-12-02 18:47:11 +01:00
2589e56bda Finished secretary 2025-12-02 14:49:55 +01:00
516430c813 Changed the cabinets for the cookie cabinet 2025-12-02 04:25:34 +01:00
e9ba3b7431 Added cementmachine with animated states 2025-12-01 18:36:17 +01:00
5f842e50d3 Almost fully implemented card machine 2025-12-01 17:53:26 +01:00
d3f619ce25 Cement machine asset 2025-11-27 15:06:50 +01:00
1c23a75e16 Added kitchen cabinets 2025-11-26 15:24:22 +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
Michal Pikulski
bda645dcc3 Updates to minigame switching 2025-10-29 09:57:33 +01:00
6c0e1acdd6 Modified the Quarry Level Switcher in the Overworld and moved the area to move around. 2025-10-17 15:14:41 +02:00
Michal Pikulski
32888a6843 [Interactions] Switch interactables to trace on layer configured in game settings 2025-09-08 12:51:33 +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
a03b70a1ca Implement SceneManager with asynchronous load/unload routines ready for bootstrapper scene. Implement simple level switching 2025-09-01 22:51:52 +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
f8d80aac62 Push out Folder Structure and touch control player controller 2025-09-01 11:51:01 +02:00