Merge branch 'worktree-playable-slice-0.5-first-upgrade'

# Conflicts:
#	apps/web/src/app/core/api/game-api.service.ts
#	apps/web/src/app/features/combat/combat-page/combat-page.component.html
#	apps/web/src/app/features/combat/combat-page/combat-page.component.scss
#	apps/web/src/app/features/combat/combat-page/combat-page.component.spec.ts
#	apps/web/src/app/features/combat/combat-page/combat-page.component.ts
This commit is contained in:
Bastian Wagner
2026-08-20 19:42:10 +02:00
46 changed files with 3051 additions and 74 deletions

View File

@@ -129,6 +129,14 @@
>
Zum Ort
</button>
<button
type="button"
class="outcome__button outcome__button--secondary"
data-combat-to-inventory
(click)="goToInventory()"
>
Inventar öffnen
</button>
</div>
</div>
} @else if (combat.status === 'LOST') {