From 60e7a76de58e79c78c533dcb162bc908327d1363 Mon Sep 17 00:00:00 2001 From: tfarley Date: Sat, 23 Jul 2016 21:58:38 -0700 Subject: [PATCH] Packet: ReloadMessage * Add ReloadMessage packet * Add ReloadMessage test * Add ReloadMessage handler stub --- .../psforever/packet/GamePacketOpcode.scala | 2 +- .../psforever/packet/game/ReloadMessage.scala | 23 +++++++++++++++++++ common/src/test/scala/GamePacketTest.scala | 22 ++++++++++++++++++ .../src/main/scala/WorldSessionActor.scala | 4 ++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala index d1e43231b..f7de14b05 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -334,7 +334,7 @@ object GamePacketOpcode extends Enumeration { case HitHint => noDecoder(opcode) case DamageMessage => noDecoder(opcode) case DestroyMessage => noDecoder(opcode) - case ReloadMessage => noDecoder(opcode) + case ReloadMessage => game.ReloadMessage.decode case MountVehicleMsg => noDecoder(opcode) case DismountVehicleMsg => noDecoder(opcode) case UseItemMessage => noDecoder(opcode) diff --git a/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala b/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala new file mode 100644 index 000000000..e118bfb95 --- /dev/null +++ b/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala @@ -0,0 +1,23 @@ +// 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 ReloadMessage(item_guid : PlanetSideGUID, + ammo_clip : Long, + unk1 : Int) + extends PlanetSideGamePacket { + type Packet = ReloadMessage + def opcode = GamePacketOpcode.ReloadMessage + def encode = ReloadMessage.encode(this) +} + +object ReloadMessage extends Marshallable[ReloadMessage] { + implicit val codec : Codec[ReloadMessage] = ( + ("item_guid" | PlanetSideGUID.codec) :: + ("ammo_clip" | uint32L) :: + ("unk1" | int32L) + ).as[ReloadMessage] +} diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index a4016aa4f..07bf92d11 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -305,5 +305,27 @@ class GamePacketTest extends Specification { pkt mustEqual string } } + + "ReloadMessage" should { + val string = hex"0D 4C00 7B000000 FFFFFFFF" + + "decode" in { + PacketCoding.DecodePacket(string).require match { + case ReloadMessage(item_guid, ammo_clip, unk1) => + item_guid mustEqual PlanetSideGUID(76) + ammo_clip mustEqual 123 + unk1 mustEqual -1 + case default => + ko + } + } + + "encode" in { + val msg = ReloadMessage(PlanetSideGUID(76), 123, -1) + 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 85aaffb4e..2920e1366 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -170,6 +170,10 @@ class WorldSessionActor extends Actor with MDCContextAware { case msg @ DropItemMessage(item_guid) => log.info("DropItem: " + msg) + case msg @ ReloadMessage(item_guid, ammo_clip, unk1) => + log.info("Reload: " + msg) + sendResponse(PacketCoding.CreateGamePacket(0, ReloadMessage(item_guid, 123, unk1))) + case default => log.debug(s"Unhandled GamePacket ${pkt}") }