Merge branch 'master' into worktree-encounter-status

2026-08-20 10:34:52 +02:00
parent 3c59603efb 624c47e5a6
commit a87a13fad2
82 changed files with 12212 additions and 37 deletions
--- a/apps/web/src/app/features/hunting/hunt-page/hunt-page.component.spec.ts
+++ b/apps/web/src/app/features/hunting/hunt-page/hunt-page.component.spec.ts
@@ -82,6 +82,7 @@ const startedCombat: Combat = {
    artworkPath: '/images/enemies/RoadBandit.png',
  },
  events: [],
+  rewards: null,
 };

 describe('HuntPageComponent', () => {