diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala index 0ed57903..2eb6d77f 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -411,7 +411,7 @@ object GamePacketOpcode extends Enumeration { case 0x4c => noDecoder(UnknownMessage76) case 0x4d => game.RepairMessage.decode case 0x4e => noDecoder(ServerVehicleOverrideMsg) - case 0x4f => noDecoder(LashMessage) + case 0x4f => game.LashMessage.decode // OPCODES 0x50-5f case 0x50 => noDecoder(TargetingInfoMessage) diff --git a/common/src/main/scala/net/psforever/packet/game/LashMessage.scala b/common/src/main/scala/net/psforever/packet/game/LashMessage.scala new file mode 100644 index 00000000..b04781d0 --- /dev/null +++ b/common/src/main/scala/net/psforever/packet/game/LashMessage.scala @@ -0,0 +1,39 @@ +// Copyright (c) 2017 PSForever +package net.psforever.packet.game + +import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.Vector3 +import scodec.Codec +import scodec.codecs._ + +/** + * na + * @param seq_time na + * @param player na + * @param victim na + * @param bullet na + * @param pos na + * @param unk1 na + */ +final case class LashMessage(seq_time : Int, + player : PlanetSideGUID, + victim : PlanetSideGUID, + bullet : PlanetSideGUID, + pos : Vector3, + unk1 : Int) + extends PlanetSideGamePacket { + type Packet = LashMessage + def opcode = GamePacketOpcode.LashMessage + def encode = LashMessage.encode(this) +} + +object LashMessage extends Marshallable[LashMessage] { + implicit val codec : Codec[LashMessage] = ( + ("seq_time" | uintL(10)) :: + ("player" | PlanetSideGUID.codec) :: + ("victim" | PlanetSideGUID.codec) :: + ("bullet" | PlanetSideGUID.codec) :: + ("pos" | Vector3.codec_pos) :: + ("unk1" | uintL(3)) + ).as[LashMessage] +} diff --git a/common/src/test/scala/game/LashMessageTest.scala b/common/src/test/scala/game/LashMessageTest.scala new file mode 100644 index 00000000..f8bb6ac4 --- /dev/null +++ b/common/src/test/scala/game/LashMessageTest.scala @@ -0,0 +1,33 @@ +// Copyright (c) 2017 PSForever +package game + +import org.specs2.mutable._ +import net.psforever.packet._ +import net.psforever.packet.game._ +import net.psforever.types.Vector3 +import scodec.bits._ + +class LashMessageTest extends Specification { + val string = hex"4f644a82e2c297a738a1ed0b01b886c0" + + "decode" in { + PacketCoding.DecodePacket(string).require match { + case LashMessage(seq_time,player,victim,bullet,pos,unk1) => + seq_time mustEqual 356 + player mustEqual PlanetSideGUID(2858) + victim mustEqual PlanetSideGUID(2699) + bullet mustEqual PlanetSideGUID(40030) + pos mustEqual Vector3(5903.7656f,3456.5156f,111.53125f) + unk1 mustEqual 0 + case _ => + ko + } + } + + "encode" in { + val msg = LashMessage(356, PlanetSideGUID(2858), PlanetSideGUID(2699), PlanetSideGUID(40030), Vector3(5903.7656f,3456.5156f,111.53125f), 0) + val pkt = PacketCoding.EncodePacket(msg).require.toByteVector + + pkt mustEqual string + } +}