KnockOutWhist/KnockOutWhist-Web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 72 Wiki Activity

feat(ui): FRO-26 Nice Tie UI #115

Merged
lq64 merged 2 commits from feat/FRO-26 into main 2026-01-22 01:11:18 +01:00
Conversation 0 Commits 2 Files Changed 1 +7 -3
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0eee546ef1 - Show all commits

10
knockoutwhistweb/app/dto/TieInfoDTO.scala
View File

@@ -1,12 +1,13 @@
package dto package dto
import dto.subDTO.PlayerDTO import de.knockoutwhist.cards.Card
import dto.subDTO.{CardDTO, PlayerDTO}
import logic.game.GameLobby import logic.game.GameLobby
import model.users.User import model.users.User
import scala.util.Try import scala.util.Try
case class TieInfoDTO(gameId: String, currentPlayer: Option[PlayerDTO], self: Option[PlayerDTO], tiedPlayers: Seq[PlayerDTO], highestAmount: Int) case class TieInfoDTO(gameId: String, currentPlayer: Option[PlayerDTO], self: Option[PlayerDTO], tiedPlayers: Seq[PlayerDTO], highestAmount: Int, selectedCards: Map[String, CardDTO])
object TieInfoDTO { object TieInfoDTO {
@@ -20,7 +21,10 @@ object TieInfoDTO {
currentPlayer = lobby.logic.playerTieLogic.currentTiePlayer().map(PlayerDTO.apply), currentPlayer = lobby.logic.playerTieLogic.currentTiePlayer().map(PlayerDTO.apply),
self = selfPlayer.map(PlayerDTO.apply), self = selfPlayer.map(PlayerDTO.apply),
tiedPlayers = lobby.logic.playerTieLogic.getTiedPlayers.map(PlayerDTO.apply), tiedPlayers = lobby.logic.playerTieLogic.getTiedPlayers.map(PlayerDTO.apply),
highestAmount = lobby.logic.playerTieLogic.highestAllowedNumber() highestAmount = lobby.logic.playerTieLogic.highestAllowedNumber(),
selectedCards = lobby.logic.playerTieLogic.getSelectedCard.map {
case (player, card) => player.id.toString -> CardDTO(card)
}
) )
} }