diff options
| author | Joel Kronqvist <joel.kronqvist@iki.fi> | 2024-11-27 17:19:46 +0200 |
|---|---|---|
| committer | Joel Kronqvist <joel.kronqvist@iki.fi> | 2024-11-27 17:19:46 +0200 |
| commit | 302455bac062080bf197b44e07ed53a3454be4c5 (patch) | |
| tree | 8b189ba41699c9a095d27bf00d1114a65aaa420a /src/scalevalapokalypsi/Server | |
| parent | 98407b35ff477f372baa92bf582b90a961d4ad16 (diff) | |
| download | scalevalapokalypsi-302455bac062080bf197b44e07ed53a3454be4c5.tar.gz scalevalapokalypsi-302455bac062080bf197b44e07ed53a3454be4c5.zip | |
Finishing almost the adventure
Diffstat (limited to 'src/scalevalapokalypsi/Server')
| -rw-r--r-- | src/scalevalapokalypsi/Server/Client.scala | 5 | ||||
| -rw-r--r-- | src/scalevalapokalypsi/Server/Server.scala | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/scalevalapokalypsi/Server/Client.scala b/src/scalevalapokalypsi/Server/Client.scala index 940888b..becca32 100644 --- a/src/scalevalapokalypsi/Server/Client.scala +++ b/src/scalevalapokalypsi/Server/Client.scala @@ -204,7 +204,7 @@ class Client(val socket: Socket): if this.verseIndex == this.versesToSing.length then val timeQuality = 5.0*this.versesToSing.length / - max(5.0, currentTimeMillis()/1000 - t) + max(5, currentTimeMillis()/1000 - t).toDouble val songToSing = this.versesToSing.mkString("") .toLowerCase @@ -217,8 +217,9 @@ class Client(val socket: Socket): ) this.player.foreach(_.applySingEffect(quality.toFloat)) - + this.singStartTime = None + else this.versesSung += line this.startVerse() diff --git a/src/scalevalapokalypsi/Server/Server.scala b/src/scalevalapokalypsi/Server/Server.scala index 6bf21d4..d0bb402 100644 --- a/src/scalevalapokalypsi/Server/Server.scala +++ b/src/scalevalapokalypsi/Server/Server.scala @@ -102,7 +102,7 @@ class Server( val joinEvent = c.player.map(p => Event( Map.from(Vector((p, ""))), - s"${p.name} joins the game." + s"${p.name} liittyy peliin." )) joinEvent.foreach(ev => this.clients.foreach(cl => if cl != c then |