Commit Graph

337 Commits

Author SHA1 Message Date
DamianCorazza
eb63086466 Added New Glow for the Combination of items, changed the position of gardener dialogue, changed position of the balls, changed soundbird cameraswitcher, changed hammerbird lurespot sprite order. 2025-11-03 11:43:05 +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
5735bbcfae Made the gardener spatial 2025-10-31 14:35: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
Michal Pikulski
a020e9af04 Update level select menu with icons and scrollable view 2025-10-29 14:37:11 +01:00
Michal Pikulski
c24c5df881 Update minigame switcher to only unlock when all puzzles completed 2025-10-29 11:19:17 +01:00
Michal Pikulski
bda645dcc3 Updates to minigame switching 2025-10-29 09:57:33 +01:00
Michal Pikulski
b56524f1f2 Updates to the level switcher UI menu, making it much larger 2025-10-28 16:04:44 +01:00
Michal Pikulski
43779c560e Cleanup compile warnings, cleanup logs, spruce up level selection menu 2025-10-28 14:31:17 +01:00
7743fbdd8f Merge branch 'main' into DamianCardStyles 2025-10-28 09:51:42 +00:00
2a18489f44 Added A new tiles material and the two levels to the build 2025-10-28 10:49:37 +01:00
Michal Pikulski
a6f37ce8b5 Re-update cucumber smack 2025-10-28 10:34:41 +01:00
3a35024fbf WIP Added New Tiles (not working properly now) 2025-10-27 18:10:38 +01:00
5a85a602bd Revamp game pausing and input handling. Fix minigame tutorial and end sequence. (#39)
- Revamp pausing and centralize management in GameManager
- Switch Pause implementation to be counter-based to solve corner case of multiple pause requests
- Remove duplicated Pause logic from other components
- Add pausing when browsing the card album
- Fully deliver the exclusive UI implementation
- Spruce up the MiniGame tutorial with correct pausing, hiding other UI
- Correctly unpause after showing tutorial
- Fix minigame ending sequence. The cinematic correctly plays only once now
- Replaying the minigame works

Co-authored-by: Michal Adam Pikulski <michal@foolhardyhorizons.com>
Co-authored-by: Michal Pikulski <michal@foolhardyhorizons.com>
Reviewed-on: #39
2025-10-24 11:09:32 +00:00
Michal Adam Pikulski
8591490cb2 Make the score display a UIPage as well 2025-10-22 10:37:59 +02:00
acf3ecec3f Added Highlights to the quarry button and the Bunfflers. 2025-10-22 10:36:56 +02:00
Michal Adam Pikulski
3aed47b183 Fix input issues 2025-10-21 15:58:13 +02:00
Michal Adam Pikulski
00f6d2c6c6 Add a dirty booster pack opening sequence 2025-10-21 15:40:47 +02:00
DamianCorazza
f8f9286ddf SLight modification to Quarry Level
Pulver and Trafalgar spawn down, and Anne Lise dialogue bubble lasts longer.
2025-10-21 12:55:23 +02:00
DamianCorazza
fd88698bee Modified Quarry To make the Sound Area easier to understand. 2025-10-21 12:42:28 +02:00
journaliciouz
d1792014db Added feedback on photography in diving game 2025-10-20 23:18:31 +02:00
journaliciouz
84dd8004d5 Monster Approach and react audio 2025-10-20 22:33:39 +02:00
journaliciouz
e94b692ae4 More gardener shenanigans 2025-10-20 21:32:10 +02:00
journaliciouz
cb3aa515d1 Cucumberattack sound and anne lise shush 2025-10-20 21:23:18 +02:00
journaliciouz
b7d7e5ae35 Scoffed picnic couple audio implementation 2025-10-20 21:01:10 +02:00
1b0a206be7 Wolter sound FX 2025-10-20 17:05:24 +02:00
Michal Adam Pikulski
3e833b8991 Working card system 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
83b5c8994d Kind of working booster packs 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
32f726d229 Second draft of the consolidated card system 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
542dd9a4b7 First draft of the consolidated card system 2025-10-20 16:33:58 +02:00
Michal Adam Pikulski
07750dd5ba Add AlbumViewPage prefab 2025-10-20 16:33:58 +02:00
Michal Pikulski
80005e6b7d Setup more of the card system stuff 2025-10-20 16:33:58 +02:00
Michal Pikulski
b1df36d48c Add prefabs for main menu and album page 2025-10-20 16:33:58 +02:00
Michal Pikulski
6c23d1bcfa Add implementation plan and main UI for the card system 2025-10-20 16:33:58 +02:00
7f3dccf1ea Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction 2025-10-20 16:21:37 +02:00
c07f64ea4f Spatial lawnmower audio implemented 2025-10-20 16:21:32 +02:00
9df43b8f53 Implemented Flash Feedback to the Diving Minigame 2025-10-20 16:19:08 +02:00
b49bb43f79 AnneLise bird counter implemented 2025-10-20 13:57:38 +02:00
6e5a6c049f Underwater rushed audio job 2025-10-17 16:31:23 +02:00
594a9815cc AnneLise guidance 2025-10-17 16:15:43 +02:00
Michal Pikulski
c3c9fd95a4 Add audio to dialogues 2025-10-17 15:20:51 +02: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
246e66a1f6 New Menus And Fixed the headband Glow 2025-10-17 15:08:00 +02:00
d8653762f4 Merge branch 'audio' 2025-10-17 14:38:53 +02:00
512e8cade5 IntroNarration 2025-10-17 14:38:42 +02:00