PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed empire code to established Enumeration; downgraded fields from PlanetSideGUID to Int (no evidence of former)

Browse source
This commit is contained in:
FateJH 2017-02-27 08:22:19 -05:00
parent b4d87bac54
commit 5d92e1111f
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala
View file

@ -49,13 +49,13 @@ import scodec.codecs._
*/ */
final case class DestroyDisplayMessage(killer : String, final case class DestroyDisplayMessage(killer : String,
killer_unk : Long, killer_unk : Long,
killer_empire : Int, killer_empire : PlanetSideEmpire.Value,
killer_inVehicle : Boolean, killer_inVehicle : Boolean,
unk : PlanetSideGUID, unk : Int,
method : PlanetSideGUID, method : Int,
victim : String, victim : String,
victim_unk : Long, victim_unk : Long,
victim_empire : Int, victim_empire : PlanetSideEmpire.Value,
victim_inVehicle : Boolean victim_inVehicle : Boolean
) )
extends PlanetSideGamePacket { extends PlanetSideGamePacket {
@ -68,13 +68,13 @@ object DestroyDisplayMessage extends Marshallable[DestroyDisplayMessage] {
implicit val codec : Codec[DestroyDisplayMessage] = ( implicit val codec : Codec[DestroyDisplayMessage] = (
("killer" | PacketHelpers.encodedWideString) :: ("killer" | PacketHelpers.encodedWideString) ::
("killer_unk" | ulongL(32)) :: ("killer_unk" | ulongL(32)) ::
("killer_empire" | uintL(2)) :: ("killer_empire" | PlanetSideEmpire.codec) ::
("killer_inVehicle" | bool) :: ("killer_inVehicle" | bool) ::
("unk" | PlanetSideGUID.codec) :: ("unk" | uint16L) ::
("method" | PlanetSideGUID.codec) :: ("method" | uint16L) ::
("victim" | PacketHelpers.encodedWideStringAligned(5)) :: ("victim" | PacketHelpers.encodedWideStringAligned(5)) ::
("victim_unk" | ulongL(32)) :: ("victim_unk" | ulongL(32)) ::
("victim_empire" | uintL(2)) :: ("victim_empire" | PlanetSideEmpire.codec) ::
("victim_inVehicle" | bool) ("victim_inVehicle" | bool)
).as[DestroyDisplayMessage] ).as[DestroyDisplayMessage]
} }

10
common/src/test/scala/GamePacketTest.scala
View file

@ -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) => case DestroyDisplayMessage(killer, killer_unk, killer_empire, killer_inVehicle, unk, method, victim, victim_unk, victim_empire, victim_inVehicle) =>
killer mustEqual "Angello" killer mustEqual "Angello"
killer_unk mustEqual 30981173 killer_unk mustEqual 30981173
killer_empire mustEqual 2 killer_empire mustEqual PlanetSideEmpire.VS
killer_inVehicle mustEqual false killer_inVehicle mustEqual false
unk mustEqual PlanetSideGUID(121) unk mustEqual 121
method mustEqual PlanetSideGUID(969) method mustEqual 969
victim mustEqual "HMFIC" victim mustEqual "HMFIC"
victim_unk mustEqual 31035057 victim_unk mustEqual 31035057
victim_empire mustEqual 0 victim_empire mustEqual PlanetSideEmpire.TR
victim_inVehicle mustEqual false victim_inVehicle mustEqual false
case default => case default =>
ko ko
@ -1346,7 +1346,7 @@ class GamePacketTest extends Specification {
} }
"encode" in { "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 val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string pkt mustEqual string
} }