From 51b0b6905dce53bef6d4bc26dc4c3bea8bbb6377 Mon Sep 17 00:00:00 2001 From: FateJH Date: Fri, 30 Sep 2016 10:05:46 -0400 Subject: [PATCH] initial AvatarGrenadeStateMessage packet --- .../psforever/packet/GamePacketOpcode.scala | 2 +- .../game/AvatarGrenadeStateMessage.scala | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.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..43a6d436 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -519,7 +519,7 @@ object GamePacketOpcode extends Enumeration { case 0xa7 => noDecoder(GenericActionMessage) // 0xa8 case 0xa8 => game.ContinentalLockUpdateMessage.decode - case 0xa9 => noDecoder(AvatarGrenadeStateMessage) + case 0xa9 => game.AvatarGrenadeStateMessage.decode case 0xaa => noDecoder(UnknownMessage170) case 0xab => noDecoder(UnknownMessage171) case 0xac => noDecoder(ReleaseAvatarRequestMessage) diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala new file mode 100644 index 00000000..652fca18 --- /dev/null +++ b/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala @@ -0,0 +1,40 @@ +// 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._ + +object GrenadeState extends Enumeration { + type Type = Value + val unk0, + PRIMED, + THROWN, + unk3 + = Value + + implicit val codec = PacketHelpers.createEnumerationCodec(this, uintL(1)) +} + +/** + * na + * @param player_guid the player + * @param count the state + */ +//case msg @ AvatarGrenadeStateMessage(player_guid, state) => +//log.info("AvatarGrenadeStateMessage: " + msg) +final case class AvatarGrenadeStateMessage(player_guid : PlanetSideGUID, + count : GrenadeState.Value) + extends PlanetSideGamePacket { + type Packet = AvatarGrenadeStateMessage + def opcode = GamePacketOpcode.AvatarGrenadeStateMessage + def encode = AvatarGrenadeStateMessage.encode(this) +} + +object AvatarGrenadeStateMessage extends Marshallable[AvatarGrenadeStateMessage] { + implicit val codec : Codec[AvatarGrenadeStateMessage] = ( + ("player_guid" | PlanetSideGUID.codec) :: + ("state" | GrenadeState.codec) + ).as[AvatarGrenadeStateMessage] +} +