KnockOutWhist/KnockOutWhist
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'reduced smelly code' (#36) from lastsmellfix into development
All checks were successful
Build and Test (KnockOutWhist) TeamCity build finished
Details

Browse Source 
Reviewed-on: #36
This commit is contained in:
LQ63
2024-11-21 22:10:44 +01:00
parent 9191012aaf d75c2cf62a
commit 777e4c2d6b
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/de/knockoutwhist/control/TrickControl.scala
View File

@@ -1,6 +1,5 @@
package de.knockoutwhist.control package de.knockoutwhist.control
import de.knockoutwhist.KnockOutWhist
import de.knockoutwhist.cards.Card import de.knockoutwhist.cards.Card
import de.knockoutwhist.control.MatchControl.playerQueue import de.knockoutwhist.control.MatchControl.playerQueue
import de.knockoutwhist.events.ERROR_STATUS.WRONG_CARD import de.knockoutwhist.events.ERROR_STATUS.WRONG_CARD
@@ -21,10 +20,7 @@ object TrickControl {
trick.setfirstcard(card) trick.setfirstcard(card)
trick.cards += (card -> player) trick.cards += (card -> player)
true true
} else if (card.suit == trick.getfirstcard().getOrElse(card).suit) { // Wert aus Option extrahieren } else if ((card.suit == trick.getfirstcard().getOrElse(card).suit) || (card.suit == round.trumpSuit)) { // Wert aus Option extrahieren
trick.cards += (card -> player)
true
} else if (card.suit == round.trumpSuit) {
trick.cards += (card -> player) trick.cards += (card -> player)
true true
} else { } else {