From 2070f77443246cae351d79543cc529af8b2f95b6 Mon Sep 17 00:00:00 2001 From: tfarley Date: Sun, 24 Jul 2016 00:06:23 -0700 Subject: [PATCH] Packet: ChangeAmmoMessage * Add ChangeAmmoMessage packet * Add ChangeAmmoMessage test * Add ChangeAmmoMessage handler stub --- .../psforever/packet/GamePacketOpcode.scala | 2 +- .../packet/game/ChangeAmmoMessage.scala | 21 +++++++++++++++++++ common/src/test/scala/GamePacketTest.scala | 21 +++++++++++++++++++ .../src/main/scala/WorldSessionActor.scala | 3 +++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala index 719d84eb..4ba34c44 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -404,7 +404,7 @@ object GamePacketOpcode extends Enumeration { // OPCODE 70 case ChangeFireModeMessage => game.ChangeFireModeMessage.decode - case ChangeAmmoMessage => noDecoder(opcode) + case ChangeAmmoMessage => game.ChangeAmmoMessage.decode case TimeOfDayMessage => noDecoder(opcode) case UnknownMessage73 => noDecoder(opcode) case SpawnRequestMessage => noDecoder(opcode) diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala b/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala new file mode 100644 index 00000000..d8f59ff2 --- /dev/null +++ b/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala @@ -0,0 +1,21 @@ +// 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 ChangeAmmoMessage(item_guid : PlanetSideGUID, + unk1 : Long) + extends PlanetSideGamePacket { + type Packet = ChangeAmmoMessage + def opcode = GamePacketOpcode.ChangeAmmoMessage + def encode = ChangeAmmoMessage.encode(this) +} + +object ChangeAmmoMessage extends Marshallable[ChangeAmmoMessage] { + implicit val codec : Codec[ChangeAmmoMessage] = ( + ("item_guid" | PlanetSideGUID.codec) :: + ("unk1" | uint32L) + ).as[ChangeAmmoMessage] +} diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index b66df10a..f8dd850d 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -414,5 +414,26 @@ class GamePacketTest extends Specification { pkt mustEqual string } } + + "ChangeAmmoMessage" should { + val string = hex"47 4E00 00000000" + + "decode" in { + PacketCoding.DecodePacket(string).require match { + case ChangeAmmoMessage(item_guid, unk1) => + item_guid mustEqual PlanetSideGUID(78) + unk1 mustEqual 0 + case default => + ko + } + } + + "encode" in { + val msg = ChangeAmmoMessage(PlanetSideGUID(78), 0) + 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 2c395f8c..88efaa42 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -188,6 +188,9 @@ class WorldSessionActor extends Actor with MDCContextAware { case msg @ MoveItemMessage(item_guid, avatar_guid_1, avatar_guid_2, dest, unk1) => log.info("MoveItem: " + msg) + case msg @ ChangeAmmoMessage(item_guid, unk1) => + log.info("ChangeAmmo: " + msg) + case default => log.debug(s"Unhandled GamePacket ${pkt}") }