From baf83fdeae17311080d775e84654b855122dc864 Mon Sep 17 00:00:00 2001 From: FateJH Date: Sat, 8 Oct 2016 18:16:15 -0400 Subject: [PATCH] initial FriendsRequest packet and tests; must track how server responds for more applicable testing --- .../psforever/packet/GamePacketOpcode.scala | 2 +- .../packet/game/FriendsRequest.scala | 22 +++++++++++++++++++ common/src/test/scala/GamePacketTest.scala | 22 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 common/src/main/scala/net/psforever/packet/game/FriendsRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala index 6e9984e5..432fdd51 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -454,7 +454,7 @@ object GamePacketOpcode extends Enumeration { // OPCODES 0x70-7f case 0x70 => noDecoder(SquadMemberEvent) case 0x71 => noDecoder(PlatoonEvent) - case 0x72 => noDecoder(FriendsRequest) + case 0x72 => game.FriendsRequest.decode case 0x73 => noDecoder(FriendsResponse) case 0x74 => noDecoder(TriggerEnvironmentalDamageMessage) case 0x75 => noDecoder(TrainingZoneMessage) diff --git a/common/src/main/scala/net/psforever/packet/game/FriendsRequest.scala b/common/src/main/scala/net/psforever/packet/game/FriendsRequest.scala new file mode 100644 index 00000000..64ee35cf --- /dev/null +++ b/common/src/main/scala/net/psforever/packet/game/FriendsRequest.scala @@ -0,0 +1,22 @@ +// Copyright (c) 2016 PSForever.net to present +package net.psforever.packet.game + +import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import scodec.Codec +import scodec.codecs._ + +final case class FriendsRequest(unk : Int, + friend : String) + extends PlanetSideGamePacket { + type Packet = FriendsRequest + def opcode = GamePacketOpcode.FriendsRequest + def encode = FriendsRequest.encode(this) +} + +object FriendsRequest extends Marshallable[FriendsRequest] { + implicit val codec : Codec[FriendsRequest] = ( + ("unk" | uintL(3)) :: + ("friend" | PacketHelpers.encodedWideStringAligned(5)) + ).as[FriendsRequest] +} + diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index 2f7e8a11..e5de267c 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -830,6 +830,28 @@ class GamePacketTest extends Specification { } } + "FriendsRequest" should { + val string = hex"72 3 0a0 46004a0048004e004300" + + "decode" in { + PacketCoding.DecodePacket(string).require match { + case FriendsRequest(unk, friend) => + unk mustEqual 1 + friend.length mustEqual 5 + friend mustEqual "FJHNC" + case default => + ko + } + } + + "encode" in { + val msg = FriendsRequest(1, "FJHNC") + val pkt = PacketCoding.EncodePacket(msg).require.toByteVector + + pkt mustEqual string + } + } + "WeaponDryFireMessage" should { val string = hex"52 4C00"