From 47bef6e83b66550f9f4b71172c94c656e398099a Mon Sep 17 00:00:00 2001 From: tfarley Date: Sat, 23 Jul 2016 18:40:59 -0700 Subject: [PATCH] Packet: DropItemMessage * Add DropItemMessage packet * Add DropItemMessage test * Add DropItemMessage handler stub --- .../psforever/packet/GamePacketOpcode.scala | 2 +- .../packet/game/DropItemMessage.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/DropItemMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala index 6415a36e..d1e43231 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -384,7 +384,7 @@ object GamePacketOpcode extends Enumeration { case WeaponFireMessage => noDecoder(opcode) case AvatarJumpMessage => noDecoder(opcode) case PickupItemMessage => noDecoder(opcode) - case DropItemMessage => noDecoder(opcode) + case DropItemMessage => game.DropItemMessage.decode case InventoryStateMessage => noDecoder(opcode) case ChangeFireStateMessage_Start => game.ChangeFireStateMessage_Start.decode case ChangeFireStateMessage_Stop => game.ChangeFireStateMessage_Stop.decode diff --git a/common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala new file mode 100644 index 00000000..083fb2de --- /dev/null +++ b/common/src/main/scala/net/psforever/packet/game/DropItemMessage.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 DropItemMessage(item_guid : PlanetSideGUID) + extends PlanetSideGamePacket { + type Packet = DropItemMessage + def opcode = GamePacketOpcode.DropItemMessage + def encode = DropItemMessage.encode(this) +} + +object DropItemMessage extends Marshallable[DropItemMessage] { + implicit val codec : Codec[DropItemMessage] = ( + ("item_guid" | PlanetSideGUID.codec) + ).as[DropItemMessage] +} diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index dab495c5..a4016aa4 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -285,5 +285,25 @@ class GamePacketTest extends Specification { pkt mustEqual string } } + + "DropItemMessage" should { + val string = hex"37 4C00" + + "decode" in { + PacketCoding.DecodePacket(string).require match { + case DropItemMessage(item_guid) => + item_guid mustEqual PlanetSideGUID(76) + case default => + ko + } + } + + "encode" in { + val msg = DropItemMessage(PlanetSideGUID(76)) + 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 fe6d334e..85aaffb4 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -167,6 +167,9 @@ class WorldSessionActor extends Actor with MDCContextAware { log.info("Emote: " + msg) sendResponse(PacketCoding.CreateGamePacket(0, EmoteMsg(avatar_guid, emote_id))) + case msg @ DropItemMessage(item_guid) => + log.info("DropItem: " + msg) + case default => log.debug(s"Unhandled GamePacket ${pkt}") }