From 427429b34cf94bcc8c770574d670d99d80940e85 Mon Sep 17 00:00:00 2001 From: tfarley Date: Sat, 23 Jul 2016 23:00:46 -0700 Subject: [PATCH] Packet: RequestDestroyMessage * Add RequestDestroyMessage packet * Add RequestDestroyMessage test * Add RequestDestroyMessage handler stub --- .../psforever/packet/GamePacketOpcode.scala | 2 +- .../packet/game/RequestDestroyMessage.scala | 19 ++++++++++++++++++ common/src/test/scala/GamePacketTest.scala | 20 +++++++++++++++++++ .../src/main/scala/WorldSessionActor.scala | 3 +++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala index 0c0437e7e..84f03437b 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -372,7 +372,7 @@ object GamePacketOpcode extends Enumeration { case ObjectAttachMessage => noDecoder(opcode) case UnknownMessage43 => noDecoder(opcode) case PlanetsideAttributeMessage => noDecoder(opcode) - case RequestDestroyMessage => noDecoder(opcode) + case RequestDestroyMessage => game.RequestDestroyMessage.decode case UnknownMessage46 => noDecoder(opcode) case CharacterCreateRequestMessage => game.CharacterCreateRequestMessage.decode case CharacterRequestMessage => game.CharacterRequestMessage.decode diff --git a/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala b/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala new file mode 100644 index 000000000..5eda52122 --- /dev/null +++ b/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala @@ -0,0 +1,19 @@ +// 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 RequestDestroyMessage(object_guid : PlanetSideGUID) + extends PlanetSideGamePacket { + type Packet = RequestDestroyMessage + def opcode = GamePacketOpcode.RequestDestroyMessage + def encode = RequestDestroyMessage.encode(this) +} + +object RequestDestroyMessage extends Marshallable[RequestDestroyMessage] { + implicit val codec : Codec[RequestDestroyMessage] = ( + ("object_guid" | PlanetSideGUID.codec) + ).as[RequestDestroyMessage] +} diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index 552008899..ddb3cbecc 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -349,5 +349,25 @@ class GamePacketTest extends Specification { pkt mustEqual string } } + + "RequestDestroyMessage" should { + val string = hex"2D A49C" + + "decode" in { + PacketCoding.DecodePacket(string).require match { + case RequestDestroyMessage(object_guid) => + object_guid mustEqual PlanetSideGUID(40100) + case default => + ko + } + } + + "encode" in { + val msg = RequestDestroyMessage(PlanetSideGUID(40100)) + val pkt = PacketCoding.EncodePacket(msg).require.toByteVector + + pkt mustEqual string + } + } } } diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index 2db1361e7..ff586196c 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -177,6 +177,9 @@ class WorldSessionActor extends Actor with MDCContextAware { case msg @ ObjectHeldMessage(avatar_guid, held_holsters, unk1) => log.info("ObjectHeld: " + msg) + case msg @ RequestDestroyMessage(object_guid) => + log.info("RequestDestroy: " + msg) + case default => log.debug(s"Unhandled GamePacket ${pkt}") }