Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6ca898602 |
@@ -459,7 +459,3 @@
|
|||||||
|
|
||||||
* Update CORS allowed origins to use production URL ([66b5594](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/66b55945eb8f095c08a8f859955d31f7fc32ce0e))
|
* Update CORS allowed origins to use production URL ([66b5594](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/66b55945eb8f095c08a8f859955d31f7fc32ce0e))
|
||||||
## (2026-01-22)
|
## (2026-01-22)
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* **ui:** FRO-26 Nice Tie UI ([#115](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/115)) ([30c05c3](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/30c05c3014e9198e87706518bfa8d070f33242dc))
|
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
package dto
|
package dto
|
||||||
|
|
||||||
import de.knockoutwhist.cards.Card
|
import dto.subDTO.PlayerDTO
|
||||||
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, selectedCards: Map[String, CardDTO], winners: Option[Seq[PlayerDTO]])
|
case class TieInfoDTO(gameId: String, currentPlayer: Option[PlayerDTO], self: Option[PlayerDTO], tiedPlayers: Seq[PlayerDTO], highestAmount: Int)
|
||||||
|
|
||||||
object TieInfoDTO {
|
object TieInfoDTO {
|
||||||
|
|
||||||
@@ -21,11 +20,7 @@ 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)
|
|
||||||
},
|
|
||||||
winners = Some(lobby.logic.playerTieLogic.getSelectedCard.filter((_,card) => card == lobby.logic.playerTieLogic.getSelectedCard.values.maxBy(_.cardValue.ordinal)).keySet.toList.map(PlayerDTO.apply))
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=4
|
MAJOR=4
|
||||||
MINOR=54
|
MINOR=53
|
||||||
PATCH=0
|
PATCH=1
|
||||||
|
|||||||
Reference in New Issue
Block a user