PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-24 06:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added tests for: VoiceHost*, CharacterInfoMessage, CharacterCreateRequestMessage, CharacterRequestMessage, and KeepAliveMessage; modified test for ObjectDetectedMessage

Browse source
This commit is contained in:
FateJH 2017-05-03 19:48:23 -04:00
parent 461a4f9507
commit 939e0ed688
12 changed files with 257 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala
View file

@ -26,7 +26,8 @@ object PlanetSideGUID {
*
* @param finished True when there are no more characters to give info on
*/
final case class CharacterInfoMessage(zoneId : PlanetSideZoneID,
final case class CharacterInfoMessage(unk : Long,
zoneId : PlanetSideZoneID,
charId : Long,
guid : PlanetSideGUID,
finished : Boolean,
@ -39,8 +40,8 @@ final case class CharacterInfoMessage(zoneId : PlanetSideZoneID,
object CharacterInfoMessage extends Marshallable[CharacterInfoMessage] {
implicit val codec : Codec[CharacterInfoMessage] = (
("unknown" | uint32L).unit(0) :: // this type is set to unit as we dont know what it is yet
("zoneId" | PlanetSideZoneID.codec) ::
("unk" | uint32L) ::
("zoneId" | PlanetSideZoneID.codec) ::
("charId" | uint32L) ::
("charGUID" | PlanetSideGUID.codec) ::
("finished" | bool) ::

4
common/src/main/scala/net/psforever/packet/game/KeepAliveMessage.scala
View file

@ -1,11 +1,11 @@
// Copyright (c) 2017 PSForever
package net.psforever.packet.game
import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket}
import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket}
import scodec.Codec
import scodec.codecs._
final case class KeepAliveMessage(code : Int) extends PlanetSideGamePacket {
final case class KeepAliveMessage(code : Int = 0) extends PlanetSideGamePacket {
type Packet = KeepAliveMessage
def opcode = GamePacketOpcode.KeepAliveMessage
def encode = KeepAliveMessage.encode(this)

40
common/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala
View file

@ -7,18 +7,18 @@ import scodec.{Attempt, Codec, Err}
import shapeless.{::, HNil}
/**
* na
* @param guid1 na
* @param guid2 na;
* often matches with `guid1`
* @param unk1 na
* @param unk2 na;
* Update a list of (new) objects that have been detected by this client in one way or another.
* @param player_guid1 the player
* @param player_guid2 the player(?);
* often matches with `player_guid1`
* @param unk na
* @param list list of detected objects;
* normally contains at least one element
*/
final case class ObjectDetectedMessage(guid1 : PlanetSideGUID,
guid2 : PlanetSideGUID,
unk1 : Int,
unk2 : List[Int])
final case class ObjectDetectedMessage(player_guid1 : PlanetSideGUID,
player_guid2 : PlanetSideGUID,
unk : Int,
list : List[PlanetSideGUID])
extends PlanetSideGamePacket {
type Packet = ObjectDetectedMessage
def opcode = GamePacketOpcode.ObjectDetectedMessage
@ -27,22 +27,22 @@ final case class ObjectDetectedMessage(guid1 : PlanetSideGUID,
object ObjectDetectedMessage extends Marshallable[ObjectDetectedMessage] {
implicit val codec : Codec[ObjectDetectedMessage] = (
("guid1" | PlanetSideGUID.codec) ::
("guid2" | PlanetSideGUID.codec) ::
("unk1" | uint8L) ::
("unk2" | listOfN(uintL(6), uint16L)) //TODO are these uids?
("player_guid1" | PlanetSideGUID.codec) ::
("player_guid2" | PlanetSideGUID.codec) ::
("unk" | uint8L) ::
("list" | listOfN(uintL(6), PlanetSideGUID.codec))
).exmap[ObjectDetectedMessage] (
{
case g1 :: g2 :: u1 :: u2 :: HNil =>
Attempt.successful(ObjectDetectedMessage(g1, g2, u1, u2))
case g1 :: g2 :: u :: lst :: HNil =>
Attempt.successful(ObjectDetectedMessage(g1, g2, u, lst))
},
{
case ObjectDetectedMessage(g1, g2, u1, u2) =>
if(u2.size > 63) {
Attempt.failure(Err(s"too many list elements (max: 63, actual: ${u2.size})"))
case ObjectDetectedMessage(g1, g2, u, lst) =>
if(lst.size > 63) {
Attempt.failure(Err(s"too many list elements (max: 63, actual: ${lst.size})"))
}
else {
Attempt.successful(g1 :: g2 :: u1 :: u2 :: HNil)
Attempt.successful(g1 :: g2 :: u :: lst :: HNil)
}
}
)