Merge branch 'packet-updates'

This commit is contained in:
FateJH 2017-01-11 15:21:59 -05:00
commit dc008c3e4b
7 changed files with 71 additions and 63 deletions

View file

@ -644,20 +644,16 @@ class GamePacketTest extends Specification {
"decode" in {
PacketCoding.DecodePacket(string).require match {
case TimeOfDayMessage(unk1, time, unk2, unk3, unk4, unk5) =>
unk1 mustEqual 0
time mustEqual 4653056
unk2 mustEqual 0
unk3 mustEqual 0
unk4 mustEqual 32
unk5 mustEqual 65
case TimeOfDayMessage(time, unk) =>
time mustEqual 1191182336
unk mustEqual 1092616192
case default =>
ko
}
}
"encode" in {
val msg = TimeOfDayMessage(0, 4653056, 0, 0, 32, 65)
val msg = TimeOfDayMessage(1191182336)
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string
@ -669,7 +665,7 @@ class GamePacketTest extends Specification {
"decode" in {
PacketCoding.DecodePacket(string).require match {
case PlayerStateMessageUpstream(avatar_guid, pos, vel, unk1, aim_pitch, unk2, seq_time, unk3, is_crouching, unk4, unk5, unk6, unk7, unk8) =>
case PlayerStateMessageUpstream(avatar_guid, pos, vel, unk1, aim_pitch, unk2, seq_time, unk3, is_crouching, unk4, unk5, is_cloaking, unk6, unk7) =>
avatar_guid mustEqual PlanetSideGUID(75)
pos mustEqual Vector3(3694.1094f, 2735.4531f, 90.84375f)
vel mustEqual Some(Vector3(4.375f, 2.59375f, 0.0f))
@ -681,9 +677,9 @@ class GamePacketTest extends Specification {
is_crouching mustEqual false
unk4 mustEqual false
unk5 mustEqual false
unk6 mustEqual false
unk7 mustEqual 112
unk8 mustEqual 0
is_cloaking mustEqual false
unk6 mustEqual 112
unk7 mustEqual 0
case default =>
ko
}