fix(base)!: Fixed gamelogic, but it breaks current UI - required more attention (CORE-2). (#56)

Reviewed-on: #56
Co-authored-by: Janis <janis.e.20@gmx.de>
Co-committed-by: Janis <janis.e.20@gmx.de>

src/main/scala/de/knockoutwhist/control/controllerBaseImpl/BaseGameLogic.scala

@@ -69,6 +69,9 @@ final class BaseGameLogic(val config: Configuration) extends EventHandler with G
 
     persistenceManager.update(ControlMatch)
 
+    if (state != InGame)
+      invoke(GameStateChangeEvent(state, InGame))
+
     if (matchImpl.isOver) {
       //Winner is the last person in the playersIn list
       val winner = matchImpl.playersIn.head
@@ -199,7 +202,10 @@ final class BaseGameLogic(val config: Configuration) extends EventHandler with G
     invoke(DelayEvent(2000))
 
     if (roundResult.notTricked.nonEmpty && !resultingRound.firstRound) {
-      if (matchImpl.dogLife) {
+      // When the number of cards is less than 2, dog life ends automatically
+      val cantDogLife = (matchImpl.numberofcards - 1) < 2
+      
+      if (matchImpl.dogLife && !cantDogLife) {
         invoke(ShowPlayersOutEvent(roundResult.notTricked))
         invoke(DelayEvent(2000))
         matchImpl = matchImpl.updatePlayersIn(matchImpl.playersIn.filterNot(roundResult.notTricked.contains(_)))

src/main/scala/de/knockoutwhist/events/global/GameStateChangeEvent.scala

@@ -4,5 +4,5 @@ import de.knockoutwhist.control.GameState
 import de.knockoutwhist.utils.events.SimpleEvent
 
 case class GameStateChangeEvent(oldState: GameState, newState: GameState) extends SimpleEvent {
-  override def id: String = s"GameStateChangeEvent(from=$oldState,to=$newState)"
+  override def id: String = s"GameStateChangeEvent"
 }