From 707c6d03de83bdcf2bb3ee19807455b081d29939 Mon Sep 17 00:00:00 2001 From: Christoph Hagen Date: Sun, 26 Dec 2021 16:38:16 +0100 Subject: [PATCH] Clean up code Update WeddingPlayer.swift --- Public/elements.js | 10 +--------- Sources/App/Infos/PlayerInfo.swift | 3 --- Sources/App/Model/Players/WeddingPlayer.swift | 6 ------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Public/elements.js b/Public/elements.js index 8c0dbe6..8cb7267 100644 --- a/Public/elements.js +++ b/Public/elements.js @@ -293,21 +293,13 @@ function setInfoForPlayer(player, position, game) { const layer = player.position setTableCard(position, card, layer) setTablePlayerName(position, player.name, player.active) - // if (!player.connected) { - // showPlayerDisconnected(position) - // return - // } + var state = player.state if (game != null && state.indexOf("selects") > -1) { const i = state.indexOf("selects") state[i] = game } - // const double = doubleText(player.doubles) - // if (double) { - // state.push(double) - // } - const text = state.map(x => convertStateToString(x)).join("
") showPlayerState(position, text) } diff --git a/Sources/App/Infos/PlayerInfo.swift b/Sources/App/Infos/PlayerInfo.swift index e9fc826..8cdfcf3 100644 --- a/Sources/App/Infos/PlayerInfo.swift +++ b/Sources/App/Infos/PlayerInfo.swift @@ -22,8 +22,6 @@ struct PlayerInfo: Codable, Equatable { /// The number of times the player doubled the game cost (initial double and raises) var numberOfDoubles = 0 - var leadsGame = false - var state: [PlayerStateId] = [] init(name: PlayerName) { @@ -39,7 +37,6 @@ struct PlayerInfo: Codable, Equatable { case playedCard = "card" case positionInTrick = "position" case numberOfDoubles = "doubles" - case leadsGame = "leads" case state = "state" } } diff --git a/Sources/App/Model/Players/WeddingPlayer.swift b/Sources/App/Model/Players/WeddingPlayer.swift index 535576a..c626d5a 100644 --- a/Sources/App/Model/Players/WeddingPlayer.swift +++ b/Sources/App/Model/Players/WeddingPlayer.swift @@ -84,10 +84,4 @@ final class WeddingPlayer: CardHoldingPlayer { func replace(_ card: Card, with trumpCard: Card) { cards = (cards.filter { $0 != card } + [trumpCard]).sortedCards(forGame: .hochzeit) } - - override var info: PlayerInfo { - var info = super.info - info.leadsGame = offersWedding || selectsGame - return info - } }