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 +8 -3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be4784c866 - Show all commits

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

@@ -7,7 +7,7 @@ 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, selectedCards: Map[String, CardDTO]) case class TieInfoDTO(gameId: String, currentPlayer: Option[PlayerDTO], self: Option[PlayerDTO], tiedPlayers: Seq[PlayerDTO], highestAmount: Int, selectedCards: Map[String, CardDTO], winners: Option[Seq[PlayerDTO]])
object TieInfoDTO { object TieInfoDTO {
@@ -24,7 +24,8 @@ object TieInfoDTO {
highestAmount = lobby.logic.playerTieLogic.highestAllowedNumber(), highestAmount = lobby.logic.playerTieLogic.highestAllowedNumber(),
selectedCards = lobby.logic.playerTieLogic.getSelectedCard.map { selectedCards = lobby.logic.playerTieLogic.getSelectedCard.map {
case (player, card) => player.id.toString -> CardDTO(card) case (player, card) => player.id.toString -> CardDTO(card)
} },
winners = Some(lobby.logic.playerTieLogic.getSelectedCard.filter((_,card) => card == lobby.logic.playerTieLogic.getSelectedCard.values.maxBy(_.cardValue.ordinal)).keySet.toList.map(PlayerDTO.apply))
) )
} }