client: zone to z1 after login

This commit is contained in:
Jakob Gillich 2023-04-14 14:10:06 +00:00
parent 743afd1b5f
commit 77263833fa
No known key found for this signature in database
GPG key ID: FD8BF52DB8452C91

View file

@ -48,11 +48,8 @@ import scala.collection.mutable
import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.concurrent.duration.{DurationInt, FiniteDuration}
import scala.reflect.ClassTag import scala.reflect.ClassTag
import java.util.concurrent.{Executors, TimeUnit} import java.util.concurrent.{Executors, TimeUnit}
import net.psforever.packet.game.CharacterCreateRequestMessage import net.psforever.packet.game._
import net.psforever.types.CharacterSex import net.psforever.types._
import net.psforever.types.PlanetSideEmpire
import net.psforever.types.CharacterVoice
import net.psforever.packet.game.ActionResultMessage
import scala.concurrent.Future import scala.concurrent.Future
import scala.concurrent.Await import scala.concurrent.Await
import scala.concurrent.duration.Duration import scala.concurrent.duration.Duration
@ -81,6 +78,9 @@ object Client {
client.selectCharacter(client.state.characters.head.charId) client.selectCharacter(client.state.characters.head.charId)
client.startTasks() client.startTasks()
client.send(ChatMsg(ChatMessageType.CMT_ZONE, wideContents = false, "", "z1", None))
while (true) { while (true) {
client.updateAvatar(client.state.avatar.copy(crouching = !client.state.avatar.crouching)) client.updateAvatar(client.state.avatar.copy(crouching = !client.state.avatar.crouching))
Thread.sleep(2000) Thread.sleep(2000)
@ -328,13 +328,11 @@ class Client(username: String, password: String) {
private def _process(packet: PlanetSidePacket): Unit = { private def _process(packet: PlanetSidePacket): Unit = {
packet match { packet match {
case _: KeepAliveMessage => () case _: KeepAliveMessage => ()
case _: LoadMapMessage => case _: LoadMapMessage =>
log.info(s"process: ${packet}")
send(BeginZoningMessage()).require send(BeginZoningMessage()).require
_state = state.update(packet) _state = state.update(packet)
case packet: PlanetSideGamePacket => case packet: PlanetSideGamePacket =>
_state = state.update(packet) _state = state.update(packet)
log.info(s"process: ${packet}")
() ()
case _ => () case _ => ()
} }
@ -381,10 +379,6 @@ class Client(username: String, password: String) {
sequence: Option[Int], sequence: Option[Int],
crypto: Option[CryptoCoding] crypto: Option[CryptoCoding]
): Attempt[BitVector] = { ): Attempt[BitVector] = {
packet match {
case _: KeepAliveMessage => ()
case _ => log.info(s"send: ${packet}")
}
PacketCoding.marshalPacket(packet, sequence, crypto) match { PacketCoding.marshalPacket(packet, sequence, crypto) match {
case Successful(payload) => case Successful(payload) =>
send(payload.toByteArray) send(payload.toByteArray)