KnockOutWhist/KnockOutWhist-Web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Janis
2025-10-22 08:16:22 +02:00
parent f8c337fad1
commit 7458464dd6
3 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
knockoutwhist

Submodule knockoutwhist updated: 786204dfaf...e17ab6a552

48
knockoutwhistweb/app/controllers/WebUI.scala
View File

@@ -2,16 +2,10 @@ package controllers
import controllers.sessions.SimpleSession import controllers.sessions.SimpleSession
import de.knockoutwhist.cards.{Card, CardValue, Hand, Suit} import de.knockoutwhist.cards.{Card, CardValue, Hand, Suit}
import de.knockoutwhist.control.GameState.MainMenu
import de.knockoutwhist.events.* import de.knockoutwhist.events.*
import de.knockoutwhist.events.old.ERROR_STATUS.* import de.knockoutwhist.events.global.GameStateChangeEvent
import de.knockoutwhist.events.old.GLOBAL_STATUS.* import de.knockoutwhist.events.player.PlayerEvent
import de.knockoutwhist.events.old.PLAYER_STATUS.*
import de.knockoutwhist.events.old.ROUND_STATUS.{PLAYERS_OUT, SHOW_START_ROUND, WON_ROUND}
import de.knockoutwhist.events.old.{ShowErrorStatus, ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
import de.knockoutwhist.events.old.cards.{RenderHandEvent, ShowTieCardsEvent}
import de.knockoutwhist.events.old.round.ShowCurrentTrickEvent
import de.knockoutwhist.events.old.ui.{GameState, GameStateUpdateEvent}
import de.knockoutwhist.events.old.ui.GameState.{INGAME, MAIN_MENU}
import de.knockoutwhist.player.AbstractPlayer import de.knockoutwhist.player.AbstractPlayer
import de.knockoutwhist.rounds.Match import de.knockoutwhist.rounds.Match
import de.knockoutwhist.ui.UI import de.knockoutwhist.ui.UI
@@ -23,7 +17,6 @@ object WebUI extends CustomThread with EventListener with UI {
setName("WebUI") setName("WebUI")
var init = false var init = false
private var internState: GameState = GameState.NO_SET
var latestOutput: String = "" var latestOutput: String = ""
@@ -32,36 +25,15 @@ object WebUI extends CustomThread with EventListener with UI {
override def listen(event: SimpleEvent): Unit = { override def listen(event: SimpleEvent): Unit = {
runLater { runLater {
event match { event match {
case event: RenderHandEvent => case event: PlayerEvent =>
PodGameManager.transmit(event.player.id, event) PodGameManager.transmit(event.playerId, event)
case event: ShowTieCardsEvent => case event: GameStateChangeEvent =>
PodGameManager.transmitAll(event) if (event.newState == MainMenu) {
case event: ShowGlobalStatus => PodGameManager.clearSessions()
if (event.status == TECHNICAL_MATCH_STARTED) {
val matchImpl = event.objects.head.asInstanceOf[Match]
for (player <- matchImpl.totalplayers) {
PodGameManager.addSession(SimpleSession(player.id, List()))
}
} else {
PodGameManager.transmitAll(event)
} }
case event: ShowPlayerStatus => Some(true)
PodGameManager.transmit(event.player.id, event) case _ =>
case event: ShowRoundStatus =>
PodGameManager.transmitAll(event) PodGameManager.transmitAll(event)
case event: ShowErrorStatus =>
PodGameManager.transmitAll(event)
case event: ShowCurrentTrickEvent =>
PodGameManager.transmitAll(event)
case event: GameStateUpdateEvent =>
if (internState != event.gameState) {
internState = event.gameState
if (event.gameState == MAIN_MENU) {
PodGameManager.clearSessions()
}
Some(true)
}
case _ => None
} }
} }
} }

7
knockoutwhistweb/app/controllers/sessions/SimpleSession.scala
View File

@@ -1,13 +1,6 @@
package controllers.sessions package controllers.sessions
import de.knockoutwhist.cards.{Card, CardValue, Hand} import de.knockoutwhist.cards.{Card, CardValue, Hand}
import de.knockoutwhist.events.old.ERROR_STATUS.*
import de.knockoutwhist.events.old.GLOBAL_STATUS.*
import de.knockoutwhist.events.old.PLAYER_STATUS.*
import de.knockoutwhist.events.old.ROUND_STATUS.*
import de.knockoutwhist.events.old.{ShowErrorStatus, ShowGlobalStatus, ShowPlayerStatus, ShowRoundStatus}
import de.knockoutwhist.events.old.cards.{RenderHandEvent, ShowTieCardsEvent}
import de.knockoutwhist.events.old.round.ShowCurrentTrickEvent
import de.knockoutwhist.player.AbstractPlayer import de.knockoutwhist.player.AbstractPlayer
import de.knockoutwhist.utils.events.SimpleEvent import de.knockoutwhist.utils.events.SimpleEvent
import play.twirl.api.Html import play.twirl.api.Html