Commit Graph

189 Commits

Author SHA1 Message Date
demenik
2dcf2cd133 test: Add integration tests for trapping prevention 2025-12-10 17:38:38 +01:00
demenik
ccab27b933 feat: Prevent player from being trapped by planting 2025-12-10 17:38:25 +01:00
Dominik Bernroider
4942c28f52 Merge branch '64-audio-feedback-at-phase-end' into 'dev'
Implement audio feedback at phase end

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!38
2025-12-10 15:20:15 +00:00
demenik
5376a38288 feat: Add phase end sound effect (#64) 2025-12-10 16:17:41 +01:00
Dominik Bernroider
27884df815 Merge branch '63-grant-berries-as-focus-reward' into 'dev'
Grant berries as focus reward + Notifications

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!37
2025-12-10 14:54:55 +00:00
demenik
a4f5771d57 feat: Add notification for wonder event (#41) 2025-12-10 15:50:51 +01:00
demenik
110b306194 docs: Add system description comment for berry reward system 2025-12-10 15:48:02 +01:00
demenik
53b10d6c0b chore: Capitalize debug print 2025-12-10 15:46:03 +01:00
demenik
0b9cae2dfa fix: Grant focus reward berries at the end of the focus phase 2025-12-10 15:45:38 +01:00
demenik
3b310ea198 fix: Stop granting berries for minutes passed in pause phase 2025-12-10 15:26:11 +01:00
demenik
3a8e16d085 feat: Add notification feature and display notification for berry reward
(#63)
2025-12-10 15:01:29 +01:00
demenik
a20807ce09 feat: Add focus minute berry reward (#63) 2025-12-10 14:11:02 +01:00
demenik
0362620433 feat: Add berries_per_focus_minute option in GameConfig (#63) 2025-12-10 14:00:47 +01:00
Dominik Bernroider
d0643cc6a6 Merge branch '60-new-game-reset-bug' into 'dev'
Fix New Game Reset Bug

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!36
2025-12-10 12:51:50 +00:00
demenik
2e429605f3 fix: Fix new game reset bug (#60) 2025-12-10 13:47:51 +01:00
demenik
ceeeca7b5b refactor: Format code 2025-12-10 13:36:07 +01:00
Dominik Bernroider
752f24d035 Merge branch '61-show-total-berries-for-save-games' into 'dev'
Show total berries for save games

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!35
2025-12-09 18:32:23 +00:00
demenik
a7aa54c570 feat: track total berries earned in session and savegames (#61) 2025-12-09 19:29:14 +01:00
Dominik Bernroider
28550c1955 Merge branch '15-farm-expansion' into 'dev'
Implement farm expansion

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!34
2025-12-09 17:34:39 +00:00
demenik
50314e6c4e feat: Add HUD text for shovel mode 2025-12-09 18:33:48 +01:00
demenik
eb0b8ca91a feat: Set (1,1) to TileState::Empty on new game 2025-12-09 18:22:40 +01:00
demenik
04eb3d7c2e chore: Update grid size 2025-12-09 18:16:02 +01:00
demenik
ed18fffa43 test: Add grid expansion test (#15) 2025-12-09 18:04:03 +01:00
demenik
9483c0e3b4 feat: Derive Debug for ItemStack 2025-12-09 18:01:00 +01:00
demenik
9437a5400a fix: Derive PartialEq and Eq for TileState and remove trailing
empty line
2025-12-09 17:48:15 +01:00
demenik
4b86f4bb40 chore: Update shovel price rate in config (#15) 2025-12-09 17:31:42 +01:00
demenik
8f01e0bc80 feat: Implement shovel interaction and tile highlighting (#15) 2025-12-09 17:30:55 +01:00
demenik
bde09ec5f2 feat: Enable dynamic shovel pricing calculation (#15) 2025-12-09 17:30:36 +01:00
demenik
a96ad857a6 feat: Add shovel asset and inventory helper (#15) 2025-12-09 17:21:54 +01:00
Dominik Bernroider
51f1f54b7d Merge branch '62-shift-modifier-in-timer-settings' into 'dev'
Shift modifier in timer settings

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!33
2025-12-09 15:35:30 +00:00
demenik
d227e7171e fix: Timer settings change by 10 while pressing shift 2025-12-09 16:32:40 +01:00
Dominik Bernroider
b362253180 Merge branch '41-wonder-event-handling' into 'dev'
Wonder Event Handling

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!32
2025-12-09 15:20:14 +00:00
demenik
f21b44d2e0 fix: Changed wonder event text from Wonder! to Wunder! 2025-12-09 16:18:25 +01:00
demenik
bac4894d8b test: Add wonder event response handling test 2025-12-09 16:14:24 +01:00
demenik
d3414728d4 feat: implement wonder event response handling and visual feedback 2025-12-09 16:12:31 +01:00
Dominik Bernroider
801842d148 Merge branch '40-wonder-event-request' into 'dev'
Wonder Event Request

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!31
2025-12-09 14:26:23 +00:00
demenik
8c1ba2654b test: Added a test for triggering wonder events 2025-12-09 15:22:02 +01:00
demenik
576d9fc311 feat: Implement wonder event request (#40) 2025-12-09 15:21:38 +01:00
demenik
14cd5419ac feat: Add wonder_event_url to GameConfig 2025-12-09 15:20:42 +01:00
Dominik Bernroider
5b734e6567 Merge branch '59-popup-and-context-menu-ui-element' into 'dev'
Popup and Context Menu UI Element

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!30
2025-12-09 12:47:49 +00:00
demenik
11bd858fa8 refactor: Use Node::from_padding helper 2025-12-09 13:46:56 +01:00
demenik
e2b6e6ab0a feat: Use spawn_context_menu in features/pom 2025-12-09 13:34:12 +01:00
demenik
bd89ac7435 feat: Add spawn_context_menu to prelude.rs 2025-12-09 13:30:20 +01:00
demenik
21f3359077 feat: Add context menu UI element 2025-12-09 13:29:18 +01:00
demenik
d9a1c9c2a7 feat: Replace old popup with new UI element 2025-12-09 13:21:51 +01:00
demenik
c50601c23a fix: Make popup child a closure 2025-12-09 13:06:01 +01:00
demenik
667cc127ba feat: Add helper to flexbox 2025-12-08 17:28:05 +01:00
demenik
23abbbfa02 fix: Add flex_direction and row_gap to popup 2025-12-08 17:24:56 +01:00
demenik
70768daf82 fix: Fix popup title type 2025-12-08 17:14:14 +01:00
demenik
81a7a5d76b feat: Add popup helper (#59) 2025-12-08 17:04:58 +01:00