From 71ded682bbb0c79f3644a7a1e064c3b4a83ecbaa Mon Sep 17 00:00:00 2001 From: Janis Date: Sun, 3 Nov 2024 20:10:31 +0100 Subject: [PATCH] =?UTF-8?q?Reset=20test=20changes=20=F0=9F=A4=A6?= =?UTF-8?q?=F0=9F=8F=BB=E2=80=8D=E2=99=82=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/scala/de/knockoutwhist/rounds/Match.scala | 2 +- src/main/scala/de/knockoutwhist/rounds/Round.scala | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/scala/de/knockoutwhist/rounds/Match.scala b/src/main/scala/de/knockoutwhist/rounds/Match.scala index 67cec55..954af59 100644 --- a/src/main/scala/de/knockoutwhist/rounds/Match.scala +++ b/src/main/scala/de/knockoutwhist/rounds/Match.scala @@ -10,7 +10,7 @@ case class Match(totalplayers: List[Player], private[rounds] var number_of_cards private[rounds] val roundlist: ListBuffer[Round] = ListBuffer[Round]() private var current_round: Option[Round] = None - private[rounds] var dogLife = true + private[rounds] var dogLife = false def create_round(): Round = { val remainingPlayer = roundlist.isEmpty ? totalplayers |: roundlist.last.remainingPlayers() diff --git a/src/main/scala/de/knockoutwhist/rounds/Round.scala b/src/main/scala/de/knockoutwhist/rounds/Round.scala index 759db84..265d991 100644 --- a/src/main/scala/de/knockoutwhist/rounds/Round.scala +++ b/src/main/scala/de/knockoutwhist/rounds/Round.scala @@ -44,10 +44,9 @@ case class Round private(trumpSuit: Suit, matchImpl: Match, private[rounds] val .filter((p, i) => i == tricksMapped.values.max) .keys - /*var playersOut = firstRound + var playersOut = firstRound ? List() - |: players_in.filter(!tricksMapped.contains(_))*/ - var playersOut = players_in.filter(!tricksMapped.contains(_)) + |: players_in.filter(!tricksMapped.contains(_)) if(playersOut.nonEmpty && !matchImpl.dogLife) { matchImpl.dogLife = true