diff --git a/common/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala b/common/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala index bbd14756..77dcc41e 100644 --- a/common/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala @@ -49,13 +49,13 @@ import scodec.codecs._ */ final case class DestroyDisplayMessage(killer : String, killer_unk : Long, - killer_empire : Int, + killer_empire : PlanetSideEmpire.Value, killer_inVehicle : Boolean, - unk : PlanetSideGUID, - method : PlanetSideGUID, + unk : Int, + method : Int, victim : String, victim_unk : Long, - victim_empire : Int, + victim_empire : PlanetSideEmpire.Value, victim_inVehicle : Boolean ) extends PlanetSideGamePacket { @@ -68,13 +68,13 @@ object DestroyDisplayMessage extends Marshallable[DestroyDisplayMessage] { implicit val codec : Codec[DestroyDisplayMessage] = ( ("killer" | PacketHelpers.encodedWideString) :: ("killer_unk" | ulongL(32)) :: - ("killer_empire" | uintL(2)) :: + ("killer_empire" | PlanetSideEmpire.codec) :: ("killer_inVehicle" | bool) :: - ("unk" | PlanetSideGUID.codec) :: - ("method" | PlanetSideGUID.codec) :: + ("unk" | uint16L) :: + ("method" | uint16L) :: ("victim" | PacketHelpers.encodedWideStringAligned(5)) :: ("victim_unk" | ulongL(32)) :: - ("victim_empire" | uintL(2)) :: + ("victim_empire" | PlanetSideEmpire.codec) :: ("victim_inVehicle" | bool) ).as[DestroyDisplayMessage] } diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index 9bcf21bb..6eea405d 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -1332,13 +1332,13 @@ class GamePacketTest extends Specification { case DestroyDisplayMessage(killer, killer_unk, killer_empire, killer_inVehicle, unk, method, victim, victim_unk, victim_empire, victim_inVehicle) => killer mustEqual "Angello" killer_unk mustEqual 30981173 - killer_empire mustEqual 2 + killer_empire mustEqual PlanetSideEmpire.VS killer_inVehicle mustEqual false - unk mustEqual PlanetSideGUID(121) - method mustEqual PlanetSideGUID(969) + unk mustEqual 121 + method mustEqual 969 victim mustEqual "HMFIC" victim_unk mustEqual 31035057 - victim_empire mustEqual 0 + victim_empire mustEqual PlanetSideEmpire.TR victim_inVehicle mustEqual false case default => ko @@ -1346,7 +1346,7 @@ class GamePacketTest extends Specification { } "encode" in { - val msg = DestroyDisplayMessage("Angello", 30981173, 2, false, PlanetSideGUID(121), PlanetSideGUID(969), "HMFIC", 31035057, 0, false) + val msg = DestroyDisplayMessage("Angello", 30981173,PlanetSideEmpire.VS, false, 121, 969, "HMFIC", 31035057, PlanetSideEmpire.TR, false) val pkt = PacketCoding.EncodePacket(msg).require.toByteVector pkt mustEqual string }