Wooooohooo time limits and correcter printing

1 files changed, 56 insertions, 3 deletions

diff --git a/src/scalevalapokalypsi/main.scala b/src/scalevalapokalypsi/main.scala
index 50e89e5..f953751 100644
--- a/src/scalevalapokalypsi/main.scala
+++ b/src/scalevalapokalypsi/main.scala
@@ -1,7 +1,10 @@
 package scalevalapokalypsi
 
-import scalevalapokalypsi.Client.newClient
+import scalevalapokalypsi.Client.{newClient, Client, StdinLineReader, GameEvent}
 import scalevalapokalypsi.Server.Server
+import scalevalapokalypsi.constants.*
+import java.lang.Thread.sleep
+import scala.util.Try
 
 import java.lang.Thread
 import scala.io.StdIn.readLine
@@ -15,11 +18,61 @@ import scala.io.StdIn.readLine
 			println("Server started in background.")
 			print("Choose a name:\n> ")
 			val name = readLine()
-			newClient(name, "127.0.0.1", 2267).foreach(_.startClient())
+			Try(newClient(name, "127.0.0.1", 2267))
+				.toOption
+				.flatten match
+					case Some(client) =>
+						startClient(client)
+					case None =>
+						println("Starting the client failed.")
+
 		case Some(2) =>
 			print("Choose a name:\n> ")
 			val name = readLine()
-			newClient(name, "127.0.0.1", 2267).foreach(_.startClient())
+			Try(newClient(name, "127.0.0.1", 2267))
+				.toOption
+				.flatten match
+					case Some(client) =>
+						startClient(client)
+					case None =>
+						println("Starting the client failed.")
 		case _ => println("Invalid input")
 
+def startClient(client: Client): Unit =
+	var hasQuit = false
+	val stdinReader = StdinLineReader()
+	stdinReader.startReading()
+	val printer = Printer()
+	while !hasQuit do
+		sleep(POLL_INTERVAL)
+		val gameEvent = client.clientStep(stdinReader.newLine())
+		printer.printGameEvent(gameEvent)
+
+
+class Printer:
+	var inputIndicatorAtStartOfLine = false
+	def printGameEvent(gameEvent: GameEvent): Unit =
+		val actions = gameEvent.actions.map(_.mkString("\n"))
+		val roomState = gameEvent.roomState.map(_.toString)
+		val lineToSing = gameEvent.lineToSing
+		if
+			inputIndicatorAtStartOfLine &&
+			(actions.isDefined ||
+			roomState.isDefined ||
+			lineToSing.isDefined)
+		then
+			this.printLn("")
+		actions.foreach(this.printLn(_))
+		roomState.foreach(this.printLn(_))
+		lineToSing.foreach(this.printLn(_))
+		val timeLeft = s"${gameEvent.timeToNextTurn.getOrElse("∞")}"
+		if gameEvent.playerCanAct && !inputIndicatorAtStartOfLine then
+			this.inputIndicatorAtStartOfLine = true
+			print(s"[$timeLeft s]> ")
+		if gameEvent.playerCanAct then
+			print(s"\u001b[s\u001b[0E[$timeLeft s]\u001b[u")
+
+	private def printLn(s: String): Unit =
+		println(s)
+		this.inputIndicatorAtStartOfLine = false