2017-03-18 21:04:20 -04:00
|
|
|
// Copyright (c) 2017 PSForever
|
|
|
|
|
package game
|
|
|
|
|
|
|
|
|
|
import org.specs2.mutable._
|
|
|
|
|
import net.psforever.packet._
|
|
|
|
|
import net.psforever.packet.game._
|
|
|
|
|
import net.psforever.packet.game.objectcreate._
|
|
|
|
|
import net.psforever.types._
|
|
|
|
|
import scodec.bits._
|
|
|
|
|
|
|
|
|
|
class ObjectCreateDetailedMessageTest extends Specification {
|
|
|
|
|
val packet = hex"18 CF 13 00 00 BC 87 00 0A F0 16 C3 43 A1 30 90 00 02 C0 40 00 08 70 43 00 68 00 6F 00 72 00 64 00 54 00 52 00 82 65 1F F5 9E 80 80 00 00 00 00 00 3F FF C0 00 00 00 20 00 00 00 20 27 03 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FC CC 10 00 03 20 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 90 01 90 00 00 00 00 01 00 7E C8 00 C8 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 C0 00 42 C5 46 86 C7 00 00 02 A0 00 00 12 60 78 70 65 5F 77 61 72 70 5F 67 61 74 65 5F 75 73 61 67 65 92 78 70 65 5F 69 6E 73 74 61 6E 74 5F 61 63 74 69 6F 6E 92 78 70 65 5F 73 61 6E 63 74 75 61 72 79 5F 68 65 6C 70 91 78 70 65 5F 62 61 74 74 6C 65 5F 72 61 6E 6B 5F 32 8E 78 70 65 5F 66 6F 72 6D 5F 73 71 75 61 64 8E 78 70 65 5F 74 68 5F 6E 6F 6E 73 61 6E 63 8B 78 70 65 5F 74 68 5F 61 6D 6D 6F 90 78 70 65 5F 74 68 5F 66 69 72 65 6D 6F 64 65 73 8F 75 73 65 64 5F 63 68 61 69 6E 62 6C 61 64 65 9A 76 69 73 69 74 65 64 5F 62 72 6F 61 64 63 61 73 74 5F 77 61 72 70 67 61 74 65 8E 76 69 73 69 74 65 64 5F 6C 6F 63 6B 65 72 8D 75 73 65 64 5F 70 75 6E 69 73 68 65 72 88 75 73 65 64 5F 72 65 6B 8D 75 73 65 64 5F 72 65 70 65 61 74 65 72 9F 76 69 73 69 74 65 64 5F 64 65 63 6F 6E 73 74 72 75 63 74 69 6F 6E 5F 74 65 72 6D 69 6E 61 6C 8F 75 73 65 64 5F 73 75 70 70 72 65 73 73 6F 72 96 76 69 73 69 74 65 64 5F 6F 72 64 65 72 5F 74 65 72 6D 69 6E 61 6C 85 6D 61 70 31 35 85 6D 61 70 31 34 85 6D 61 70 31 32 85 6D 61 70 30 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 0A 36 13 88 04 00 40 00 00 10 00 04 00 00 4D 6E 40 10 41 00 00 00 40 00 18 08 38 1C C0 20 32 00 00 07 80 15 E1 D0 02 10 20 00 00 08 00 03 01 07 13 A8 04 06 40 00 00 10 03 20 BB 00 42 E4 00 00 01 00 0E 07 70 08 6C 80 00 06 40 01 C0 F0 01 13 90 00 00 C8 00 38 1E 40 23 32 00 00 19 00 07 03 D0 05 0E 40 00 03 20 00 E8 7B 00 A4 C8 00 00 64 00 DA 4F 80 14 E1 00 00 00 40 00 18 08 38 1F 40 20 32 00 00 0A 00 08 " //fake data?
|
|
|
|
|
val packet2 = hex"18 F8 00 00 00 BC 8C 10 90 3B 45 C6 FA 94 00 9F F0 00 00 40 00 08 C0 44 00 69 00 66 00 66 00 45" //fake data
|
|
|
|
|
//val packet2Rest = packet2.bits.drop(8 + 32 + 1 + 11 + 16)
|
|
|
|
|
var string_inventoryItem = hex"46 04 C0 08 08 80 00 00 20 00 0C 04 10 29 A0 10 19 00 00 04 00 00"
|
|
|
|
|
val string_detonater = hex"18 87000000 6506 EA8 7420 80 8000000200008"
|
|
|
|
|
val string_ace = hex"18 87000000 1006 100 C70B 80 8800000200008"
|
|
|
|
|
val string_9mm = hex"18 7C000000 2580 0E0 0005 A1 C8000064000"
|
|
|
|
|
val string_gauss = hex"18 DC000000 2580 2C9 B905 82 480000020000C04 1C00C0B0190000078000"
|
|
|
|
|
val string_punisher = hex"18 27010000 2580 612 a706 82 080000020000c08 1c13a0d01900000780 13a4701a072000000800"
|
|
|
|
|
val string_rek = hex"18 97000000 2580 6C2 9F05 81 48000002000080000"
|
|
|
|
|
val string_boomer_trigger = hex"18 87000000 6304CA8760B 80 C800000200008"
|
|
|
|
|
val string_testchar = hex"18 570C0000 BC8 4B00 6C2D7 65535 CA16 0 00 01 34 40 00 0970 49006C006C006C004900490049006C006C006C0049006C0049006C006C0049006C006C006C0049006C006C004900 84 52 70 76 1E 80 80 00 00 00 00 00 3FFFC 0 00 00 00 20 00 00 0F F6 A7 03 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FC 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 90 01 90 00 64 00 00 01 00 7E C8 00 C8 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 C0 00 42 C5 46 86 C7 00 00 00 80 00 00 12 40 78 70 65 5F 73 61 6E 63 74 75 61 72 79 5F 68 65 6C 70 90 78 70 65 5F 74 68 5F 66 69 72 65 6D 6F 64 65 73 8B 75 73 65 64 5F 62 65 61 6D 65 72 85 6D 61 70 31 33 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 0A 23 02 60 04 04 40 00 00 10 00 06 02 08 14 D0 08 0C 80 00 02 00 02 6B 4E 00 82 88 00 00 02 00 00 C0 41 C0 9E 01 01 90 00 00 64 00 44 2A 00 10 91 00 00 00 40 00 18 08 38 94 40 20 32 00 00 00 80 19 05 48 02 17 20 00 00 08 00 70 29 80 43 64 00 00 32 00 0E 05 40 08 9C 80 00 06 40 01 C0 AA 01 19 90 00 00 C8 00 3A 15 80 28 72 00 00 19 00 04 0A B8 05 26 40 00 03 20 06 C2 58 00 A7 88 00 00 02 00 00 80 00 00"
|
|
|
|
|
|
|
|
|
|
"decode (2)" in {
|
|
|
|
|
//an invalid bit representation will fail to turn into an object
|
|
|
|
|
PacketCoding.DecodePacket(packet2).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 248
|
|
|
|
|
cls mustEqual ObjectClass.avatar
|
|
|
|
|
guid mustEqual PlanetSideGUID(2497)
|
|
|
|
|
parent mustEqual None
|
|
|
|
|
data.isDefined mustEqual false
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (detonater)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_detonater).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 135
|
|
|
|
|
cls mustEqual ObjectClass.command_detonater
|
|
|
|
|
guid mustEqual PlanetSideGUID(8308)
|
|
|
|
|
parent.isDefined mustEqual true
|
|
|
|
|
parent.get.guid mustEqual PlanetSideGUID(3530)
|
|
|
|
|
parent.get.slot mustEqual 0
|
|
|
|
|
data.isDefined mustEqual true
|
|
|
|
|
data.get.isInstanceOf[DetailedCommandDetonaterData] mustEqual true
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (ace)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_ace).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 135
|
|
|
|
|
cls mustEqual ObjectClass.ace
|
|
|
|
|
guid mustEqual PlanetSideGUID(3015)
|
|
|
|
|
parent.isDefined mustEqual true
|
|
|
|
|
parent.get.guid mustEqual PlanetSideGUID(3104)
|
|
|
|
|
parent.get.slot mustEqual 0
|
|
|
|
|
data.isDefined mustEqual true
|
|
|
|
|
data.get.isInstanceOf[DetailedACEData] mustEqual true
|
|
|
|
|
data.get.asInstanceOf[DetailedACEData].unk mustEqual 8
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (9mm)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_9mm).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 124
|
|
|
|
|
cls mustEqual ObjectClass.bullet_9mm
|
|
|
|
|
guid mustEqual PlanetSideGUID(1280)
|
|
|
|
|
parent.isDefined mustEqual true
|
|
|
|
|
parent.get.guid mustEqual PlanetSideGUID(75)
|
|
|
|
|
parent.get.slot mustEqual 33
|
|
|
|
|
data.isDefined mustEqual true
|
|
|
|
|
data.get.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 50
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (gauss)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_gauss).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 220
|
|
|
|
|
cls mustEqual ObjectClass.gauss
|
|
|
|
|
guid mustEqual PlanetSideGUID(1465)
|
|
|
|
|
parent.isDefined mustEqual true
|
|
|
|
|
parent.get.guid mustEqual PlanetSideGUID(75)
|
|
|
|
|
parent.get.slot mustEqual 2
|
|
|
|
|
data.isDefined mustEqual true
|
|
|
|
|
val obj_wep = data.get.asInstanceOf[DetailedWeaponData]
|
2017-05-09 20:30:58 -04:00
|
|
|
obj_wep.unk1 mustEqual 2
|
|
|
|
|
obj_wep.unk2 mustEqual 8
|
2017-03-18 21:04:20 -04:00
|
|
|
val obj_ammo = obj_wep.ammo
|
2017-05-09 20:30:58 -04:00
|
|
|
obj_ammo.head.objectClass mustEqual 28
|
|
|
|
|
obj_ammo.head.guid mustEqual PlanetSideGUID(1286)
|
|
|
|
|
obj_ammo.head.parentSlot mustEqual 0
|
|
|
|
|
obj_ammo.head.obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 30
|
2017-03-18 21:04:20 -04:00
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (punisher)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_punisher).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 295
|
|
|
|
|
cls mustEqual ObjectClass.punisher
|
|
|
|
|
guid mustEqual PlanetSideGUID(1703)
|
|
|
|
|
parent.isDefined mustEqual true
|
|
|
|
|
parent.get.guid mustEqual PlanetSideGUID(75)
|
|
|
|
|
parent.get.slot mustEqual 2
|
|
|
|
|
data.isDefined mustEqual true
|
2017-05-09 20:30:58 -04:00
|
|
|
val obj_wep = data.get.asInstanceOf[DetailedWeaponData]
|
2017-03-18 21:04:20 -04:00
|
|
|
obj_wep.unk1 mustEqual 0
|
|
|
|
|
obj_wep.unk2 mustEqual 8
|
|
|
|
|
val obj_ammo = obj_wep.ammo
|
|
|
|
|
obj_ammo.size mustEqual 2
|
|
|
|
|
obj_ammo.head.objectClass mustEqual ObjectClass.bullet_9mm
|
|
|
|
|
obj_ammo.head.guid mustEqual PlanetSideGUID(1693)
|
|
|
|
|
obj_ammo.head.parentSlot mustEqual 0
|
|
|
|
|
obj_ammo.head.obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 30
|
|
|
|
|
obj_ammo(1).objectClass mustEqual ObjectClass.jammer_cartridge
|
|
|
|
|
obj_ammo(1).guid mustEqual PlanetSideGUID(1564)
|
|
|
|
|
obj_ammo(1).parentSlot mustEqual 1
|
|
|
|
|
obj_ammo(1).obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 1
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (rek)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_rek).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 151
|
|
|
|
|
cls mustEqual ObjectClass.remote_electronics_kit
|
|
|
|
|
guid mustEqual PlanetSideGUID(1439)
|
|
|
|
|
parent.isDefined mustEqual true
|
|
|
|
|
parent.get.guid mustEqual PlanetSideGUID(75)
|
|
|
|
|
parent.get.slot mustEqual 1
|
|
|
|
|
data.isDefined mustEqual true
|
|
|
|
|
data.get.asInstanceOf[DetailedREKData].unk mustEqual 4
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (boomer trigger)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_boomer_trigger).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 135
|
|
|
|
|
cls mustEqual ObjectClass.boomer_trigger
|
|
|
|
|
guid mustEqual PlanetSideGUID(2934)
|
|
|
|
|
parent.isDefined mustEqual true
|
|
|
|
|
parent.get.guid mustEqual PlanetSideGUID(2502)
|
|
|
|
|
parent.get.slot mustEqual 0
|
|
|
|
|
data.isDefined mustEqual true
|
|
|
|
|
data.get.isInstanceOf[DetailedBoomerTriggerData] mustEqual true
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"decode (character)" in {
|
|
|
|
|
PacketCoding.DecodePacket(string_testchar).require match {
|
|
|
|
|
case ObjectCreateDetailedMessage(len, cls, guid, parent, data) =>
|
|
|
|
|
len mustEqual 3159
|
|
|
|
|
cls mustEqual ObjectClass.avatar
|
|
|
|
|
guid mustEqual PlanetSideGUID(75)
|
|
|
|
|
parent.isDefined mustEqual false
|
|
|
|
|
data.isDefined mustEqual true
|
|
|
|
|
val char = data.get.asInstanceOf[DetailedCharacterData]
|
|
|
|
|
char.appearance.pos.coord.x mustEqual 3674.8438f
|
|
|
|
|
char.appearance.pos.coord.y mustEqual 2726.789f
|
|
|
|
|
char.appearance.pos.coord.z mustEqual 91.15625f
|
2017-07-10 15:19:47 -04:00
|
|
|
char.appearance.pos.orient.x mustEqual 0
|
|
|
|
|
char.appearance.pos.orient.y mustEqual 0f
|
|
|
|
|
char.appearance.pos.orient.z mustEqual 36.5625f
|
2017-03-18 21:04:20 -04:00
|
|
|
char.appearance.basic_appearance.name mustEqual "IlllIIIlllIlIllIlllIllI"
|
|
|
|
|
char.appearance.basic_appearance.faction mustEqual PlanetSideEmpire.VS
|
|
|
|
|
char.appearance.basic_appearance.sex mustEqual CharacterGender.Female
|
|
|
|
|
char.appearance.basic_appearance.head mustEqual 41
|
|
|
|
|
char.appearance.basic_appearance.voice mustEqual 1 //female 1
|
|
|
|
|
char.appearance.voice2 mustEqual 3
|
|
|
|
|
char.appearance.black_ops mustEqual false
|
|
|
|
|
char.appearance.jammered mustEqual false
|
|
|
|
|
char.appearance.exosuit mustEqual ExoSuitType.Standard
|
|
|
|
|
char.appearance.outfit_name mustEqual ""
|
|
|
|
|
char.appearance.outfit_logo mustEqual 0
|
|
|
|
|
char.appearance.backpack mustEqual false
|
2017-07-04 21:44:24 -04:00
|
|
|
char.appearance.facingPitch mustEqual 2.8125f
|
|
|
|
|
char.appearance.facingYawUpper mustEqual 210.9375f
|
2017-03-18 21:04:20 -04:00
|
|
|
char.appearance.lfs mustEqual true
|
|
|
|
|
char.appearance.grenade_state mustEqual GrenadeState.None
|
|
|
|
|
char.appearance.is_cloaking mustEqual false
|
|
|
|
|
char.appearance.charging_pose mustEqual false
|
|
|
|
|
char.appearance.on_zipline mustEqual false
|
2017-05-07 01:34:55 -04:00
|
|
|
char.appearance.ribbons.upper mustEqual MeritCommendation.None
|
|
|
|
|
char.appearance.ribbons.middle mustEqual MeritCommendation.None
|
|
|
|
|
char.appearance.ribbons.lower mustEqual MeritCommendation.None
|
|
|
|
|
char.appearance.ribbons.tos mustEqual MeritCommendation.None
|
2017-03-18 21:04:20 -04:00
|
|
|
char.healthMax mustEqual 100
|
|
|
|
|
char.health mustEqual 100
|
|
|
|
|
char.armor mustEqual 50 //standard exosuit value
|
|
|
|
|
char.unk1 mustEqual 1
|
|
|
|
|
char.unk2 mustEqual 7
|
|
|
|
|
char.unk3 mustEqual 7
|
|
|
|
|
char.staminaMax mustEqual 100
|
|
|
|
|
char.stamina mustEqual 100
|
|
|
|
|
char.unk4 mustEqual 28
|
|
|
|
|
char.unk5 mustEqual 4
|
|
|
|
|
char.unk6 mustEqual 44
|
|
|
|
|
char.unk7 mustEqual 84
|
|
|
|
|
char.unk8 mustEqual 104
|
|
|
|
|
char.unk9 mustEqual 1900
|
|
|
|
|
char.firstTimeEvents.size mustEqual 4
|
|
|
|
|
char.firstTimeEvents.head mustEqual "xpe_sanctuary_help"
|
|
|
|
|
char.firstTimeEvents(1) mustEqual "xpe_th_firemodes"
|
|
|
|
|
char.firstTimeEvents(2) mustEqual "used_beamer"
|
|
|
|
|
char.firstTimeEvents(3) mustEqual "map13"
|
|
|
|
|
char.tutorials.size mustEqual 0
|
|
|
|
|
char.inventory.isDefined mustEqual true
|
|
|
|
|
val inventory = char.inventory.get.contents
|
|
|
|
|
inventory.size mustEqual 10
|
|
|
|
|
//0
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory.head.objectClass mustEqual ObjectClass.beamer
|
|
|
|
|
inventory.head.guid mustEqual PlanetSideGUID(76)
|
|
|
|
|
inventory.head.parentSlot mustEqual 0
|
|
|
|
|
var wep = inventory.head.obj.asInstanceOf[DetailedWeaponData]
|
|
|
|
|
wep.ammo.head.objectClass mustEqual ObjectClass.energy_cell
|
|
|
|
|
wep.ammo.head.guid mustEqual PlanetSideGUID(77)
|
|
|
|
|
wep.ammo.head.parentSlot mustEqual 0
|
|
|
|
|
wep.ammo.head.obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 16
|
2017-03-18 21:04:20 -04:00
|
|
|
//1
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(1).objectClass mustEqual ObjectClass.suppressor
|
|
|
|
|
inventory(1).guid mustEqual PlanetSideGUID(78)
|
|
|
|
|
inventory(1).parentSlot mustEqual 2
|
|
|
|
|
wep = inventory(1).obj.asInstanceOf[DetailedWeaponData]
|
|
|
|
|
wep.ammo.head.objectClass mustEqual ObjectClass.bullet_9mm
|
|
|
|
|
wep.ammo.head.guid mustEqual PlanetSideGUID(79)
|
|
|
|
|
wep.ammo.head.parentSlot mustEqual 0
|
|
|
|
|
wep.ammo.head.obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 25
|
2017-03-18 21:04:20 -04:00
|
|
|
//2
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(2).objectClass mustEqual ObjectClass.forceblade
|
|
|
|
|
inventory(2).guid mustEqual PlanetSideGUID(80)
|
|
|
|
|
inventory(2).parentSlot mustEqual 4
|
|
|
|
|
wep = inventory(2).obj.asInstanceOf[DetailedWeaponData]
|
|
|
|
|
wep.ammo.head.objectClass mustEqual ObjectClass.melee_ammo
|
|
|
|
|
wep.ammo.head.guid mustEqual PlanetSideGUID(81)
|
|
|
|
|
wep.ammo.head.parentSlot mustEqual 0
|
|
|
|
|
wep.ammo.head.obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 1
|
2017-03-18 21:04:20 -04:00
|
|
|
//3
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(3).objectClass mustEqual ObjectClass.locker_container
|
|
|
|
|
inventory(3).guid mustEqual PlanetSideGUID(82)
|
|
|
|
|
inventory(3).parentSlot mustEqual 5
|
2017-08-30 09:35:18 -04:00
|
|
|
inventory(3).obj.isInstanceOf[DetailedLockerContainerData] mustEqual true
|
2017-08-30 09:50:04 -04:00
|
|
|
inventory(3).obj.asInstanceOf[DetailedLockerContainerData].inventory.isDefined mustEqual false
|
2017-03-18 21:04:20 -04:00
|
|
|
//4
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(4).objectClass mustEqual ObjectClass.bullet_9mm
|
|
|
|
|
inventory(4).guid mustEqual PlanetSideGUID(83)
|
|
|
|
|
inventory(4).parentSlot mustEqual 6
|
|
|
|
|
inventory(4).obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 50
|
2017-03-18 21:04:20 -04:00
|
|
|
//5
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(5).objectClass mustEqual ObjectClass.bullet_9mm
|
|
|
|
|
inventory(5).guid mustEqual PlanetSideGUID(84)
|
|
|
|
|
inventory(5).parentSlot mustEqual 9
|
|
|
|
|
inventory(5).obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 50
|
2017-03-18 21:04:20 -04:00
|
|
|
//6
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(6).objectClass mustEqual ObjectClass.bullet_9mm
|
|
|
|
|
inventory(6).guid mustEqual PlanetSideGUID(85)
|
|
|
|
|
inventory(6).parentSlot mustEqual 12
|
|
|
|
|
inventory(6).obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 50
|
2017-03-18 21:04:20 -04:00
|
|
|
//7
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(7).objectClass mustEqual ObjectClass.bullet_9mm_AP
|
|
|
|
|
inventory(7).guid mustEqual PlanetSideGUID(86)
|
|
|
|
|
inventory(7).parentSlot mustEqual 33
|
|
|
|
|
inventory(7).obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 50
|
2017-03-18 21:04:20 -04:00
|
|
|
//8
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(8).objectClass mustEqual ObjectClass.energy_cell
|
|
|
|
|
inventory(8).guid mustEqual PlanetSideGUID(87)
|
|
|
|
|
inventory(8).parentSlot mustEqual 36
|
|
|
|
|
inventory(8).obj.asInstanceOf[DetailedAmmoBoxData].magazine mustEqual 50
|
2017-03-18 21:04:20 -04:00
|
|
|
//9
|
2017-05-09 20:30:58 -04:00
|
|
|
inventory(9).objectClass mustEqual ObjectClass.remote_electronics_kit
|
|
|
|
|
inventory(9).guid mustEqual PlanetSideGUID(88)
|
|
|
|
|
inventory(9).parentSlot mustEqual 39
|
2017-03-18 21:04:20 -04:00
|
|
|
//the rek has data but none worth testing here
|
|
|
|
|
char.drawn_slot mustEqual DrawnSlot.Pistol1
|
|
|
|
|
case _ =>
|
|
|
|
|
ko
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (2)" in {
|
|
|
|
|
//the lack of an object will fail to turn into a bad bitstream
|
|
|
|
|
val msg = ObjectCreateDetailedMessage(0L, ObjectClass.avatar, PlanetSideGUID(2497), None, None)
|
|
|
|
|
PacketCoding.EncodePacket(msg).isFailure mustEqual true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (detonater)" in {
|
|
|
|
|
val obj = DetailedCommandDetonaterData()
|
|
|
|
|
val msg = ObjectCreateDetailedMessage(ObjectClass.command_detonater, PlanetSideGUID(8308), ObjectCreateMessageParent(PlanetSideGUID(3530), 0), obj)
|
|
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
|
|
|
|
|
|
|
|
|
pkt mustEqual string_detonater
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (ace)" in {
|
|
|
|
|
val obj = DetailedACEData(8)
|
|
|
|
|
val msg = ObjectCreateDetailedMessage(ObjectClass.ace, PlanetSideGUID(3015), ObjectCreateMessageParent(PlanetSideGUID(3104), 0), obj)
|
|
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
|
|
|
|
|
|
|
|
|
pkt mustEqual string_ace
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (9mm)" in {
|
|
|
|
|
val obj = DetailedAmmoBoxData(8, 50)
|
|
|
|
|
val msg = ObjectCreateDetailedMessage(ObjectClass.bullet_9mm, PlanetSideGUID(1280), ObjectCreateMessageParent(PlanetSideGUID(75), 33), obj)
|
|
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
|
|
|
|
|
|
|
|
|
pkt mustEqual string_9mm
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (gauss)" in {
|
2017-05-09 20:30:58 -04:00
|
|
|
val obj = DetailedWeaponData(2, 8, ObjectClass.bullet_9mm, PlanetSideGUID(1286), 0, DetailedAmmoBoxData(8, 30))
|
2017-03-18 21:04:20 -04:00
|
|
|
val msg = ObjectCreateDetailedMessage(ObjectClass.gauss, PlanetSideGUID(1465), ObjectCreateMessageParent(PlanetSideGUID(75), 2), obj)
|
|
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
|
|
|
|
|
|
|
|
|
pkt mustEqual string_gauss
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (punisher)" in {
|
2017-05-09 20:30:58 -04:00
|
|
|
val obj = DetailedWeaponData(0, 8,
|
|
|
|
|
DetailedAmmoBoxData(ObjectClass.bullet_9mm, PlanetSideGUID(1693), 0, DetailedAmmoBoxData(8, 30)) ::
|
|
|
|
|
DetailedAmmoBoxData(ObjectClass.jammer_cartridge, PlanetSideGUID(1564), 1, DetailedAmmoBoxData(8, 1)) ::
|
|
|
|
|
Nil
|
|
|
|
|
)(2)
|
2017-03-18 21:04:20 -04:00
|
|
|
val msg = ObjectCreateDetailedMessage(ObjectClass.punisher, PlanetSideGUID(1703), ObjectCreateMessageParent(PlanetSideGUID(75), 2), obj)
|
2017-08-30 09:35:18 -04:00
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
2017-03-18 21:04:20 -04:00
|
|
|
|
|
|
|
|
pkt mustEqual string_punisher
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (rek)" in {
|
|
|
|
|
val obj = DetailedREKData(4)
|
|
|
|
|
val msg = ObjectCreateDetailedMessage(ObjectClass.remote_electronics_kit, PlanetSideGUID(1439), ObjectCreateMessageParent(PlanetSideGUID(75), 1), obj)
|
|
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
|
|
|
|
|
|
|
|
|
pkt mustEqual string_rek
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (boomer trigger)" in {
|
|
|
|
|
val obj = DetailedBoomerTriggerData()
|
|
|
|
|
val msg = ObjectCreateDetailedMessage(ObjectClass.boomer_trigger, PlanetSideGUID(2934), ObjectCreateMessageParent(PlanetSideGUID(2502), 0), obj)
|
|
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
|
|
|
|
|
|
|
|
|
pkt mustEqual string_boomer_trigger
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
"encode (character)" in {
|
|
|
|
|
val app = CharacterAppearanceData(
|
|
|
|
|
PlacementData(
|
|
|
|
|
Vector3(3674.8438f, 2726.789f, 91.15625f),
|
2017-07-10 15:19:47 -04:00
|
|
|
Vector3(0f, 0f, 36.5625f)
|
2017-03-18 21:04:20 -04:00
|
|
|
),
|
|
|
|
|
BasicCharacterData(
|
|
|
|
|
"IlllIIIlllIlIllIlllIllI",
|
|
|
|
|
PlanetSideEmpire.VS,
|
|
|
|
|
CharacterGender.Female,
|
|
|
|
|
41,
|
|
|
|
|
1
|
|
|
|
|
),
|
|
|
|
|
3,
|
|
|
|
|
false,
|
|
|
|
|
false,
|
|
|
|
|
ExoSuitType.Standard,
|
|
|
|
|
"",
|
|
|
|
|
0,
|
|
|
|
|
false,
|
2017-07-04 21:44:24 -04:00
|
|
|
2.8125f, 210.9375f,
|
2017-03-18 21:04:20 -04:00
|
|
|
true,
|
|
|
|
|
GrenadeState.None,
|
|
|
|
|
false,
|
|
|
|
|
false,
|
|
|
|
|
false,
|
|
|
|
|
RibbonBars()
|
|
|
|
|
)
|
new stuff for player server classes; this update is not yet complete
adjusted sample Reload code and added insertion and removal functions for inventory
more work on player classes; moving PacketResolution to another branch
decoupling GUIDs from objects; introduced Ammo enum; minor adjustments to inventory system; different object/class hierarchy
transferring basic files from another branch
converted from get/set to accessor/mutator; resolved conflict from name changes
refactored basic components such as GUID and location/orientation
utilities kludge; more fields are given accessor and mutators; create package for vehicle-specific classes
GUID assurance, now with less object creation
test files; changes to how AmmoBox initializes
sorry, a little bit of everything, so much I forgot to write it all down
switched to a unified fire mode object internal to a Tool
importing a heavily modified version of my GUID manager objects from the laternate branch; not finished or tested yet
created a Trait to make Key private, sources and selectors to allow NumberPools to exist independent of a NumberSource; placed Ascending into a misc folder
swapped the Return methods for selectors so that the more primitive logic is the one that needs to be overriden; renamed a selector to be more common; had to update some copyright messages
fixed major logic issue with NumberPool; added comments to NumberSource files
NumberSource tests
simplified and made more consistent the method naming convention of NumberSources
comments for NumberSelectors
starting on NumberSelector tests
modifications that should better support number pools; added a pool hub that acts on a predefined source
adjustment to how Tools and FireModeDefintion keep track of ammunition and ammunition slots; I don't think this is sufficient
small additions to Tools; filled out simple tests for other three Selectors
added object lookup notation for the pool hub
added more NumberSelector tests; removed the word 'Number' from subclass names
re-named classes, re-packaged classes, re-named packages; created new Selector, split pools to create a fallback for the NumberPoolHub
changes to NumberPool classes; tests on NumberPool classes
changes to NumberPool classes; tests on NumberPool classes2
some robust testing for NumberPoolHub, plus necessary modifications to other files
register and unregister functions now use Success and Failure conditions, save for one true thrown Exception
reduced the flow of certain algorithm chains, mainly by adding match statements and removing Exceptions
error message text
the same thing as the last commit, but with NumberPools rather than NumberPoolHub
various types of freeform registration
added sorting functions to Selectors to allow for hotswapping for number pools, especially to and from SpecificSelector; tests for NumberPoolHub
get numbers from an Array of indices, not the list of Numbers, in SimplePool
added a class to represent the four types of recovery kits
comments on Kit files
created package for supporting equipment classes; renamed /definition/ package
adding class for items that construct deployables, the router telepad included
added SimpleItem, classes for game Equipment that do not have internal state; re-organized ObjectDefinition files and the game objects they create to more naturally move around EquipmentSize and InventoryTile (size)
added SimpleItem tests (what they are...); removed example code that has hogging an import from AmmoBox
auto-sort for loading and fitting former inventory content back into the inventory
method of finding first available position to fit an certain size block in the inventory
changed CheckCollision return type to provide Try[List[Int]; fixed all existing references and tests
wrote comments for GridInventory methods; changed insertion param to be of form 'key -> element'
adding features to Player; created definitions for Player class; re-grouped ConstructionItem enumerations
initial work on implants; shuffled classes to better accommodate the new implant system, I think
wrote some tests for Implants; fixing Implant logic
wrote tests for Player class and made adjustments where necessary
basic initialization during Player creation based on exo-suit type
three wrapper Actors for the normal classes
comments on code
modified tests to improve accountability; added Resolver class to deal with multiple tasks that contribute to a larger task
changed Tools to an internal AmmoBox; don't have to def -= symbol if I def _= symbol
LivePlayerList -> MasterPlayerList, and added a Fit def for Player that checks holsters as well as inventory
example of packet conversion can be found with AmmoBoxDefinition
added conversion for ToolDefinition
added all Equipment packet conversion functionality; started working on Avatar-related conversions
continued effort towards a working Player packet conversion test
subclasses of Equipment apparently do not need to overide the type of the PacketConverter for generics
the logical conclusion: it doesn't matter what generics Packet returns so long as it returns an ObjectCreateConverter[] type
separated converters from definitions into files
changed some configuration information to final; added a bunch of converters, not fully tested though
changed function names in converters
replaced WSA packet-driven OCDM with Player object OCDM; upgrade to Float angular data
added partial support for LockerContainer; changed Equipment defaults to a common value
changes to AvatarConverter to include 5th slot; changes to VehicleConverter to make work; implementation of Fury in Vehicle->packet example in WSA
added a seat definition and renovated how the weapon controlled from a seat can be found
comments to files mainly; non-essential functionality to some classes, mostly access determination
moved converter tests to their own test file
write more of this test
added ServiceManager, as it is useful
pool range changes
added AvatarService, as it is useful
straightened out the GUID actors; added the static method for adding AmmoBoxes (to be converted later)
chnages to task resolution operation
complicated Task and TaskResolver logic is now possible; for example, you can schedule giving an AmmoBox a GUID, before giving a Tool a GUID, before placing the Tool in a player's hand; see Suppressor example in WSA
separated the Task trait and the TaskResolver actor into their own classes, moving the former RegistrationTaskResolver class into the /misc/ folder; deleted old backup copy of HubActor; modifications for PoC and supported tests
added better support and protection against putting things in the wrong hand when using inventories and the Player.Slot(n) function
GlobalDefinitions file; added laze pointer as an SItem, and gave it the command detonater management code; additionally fixed spelling of 'detonat[o]r' in Codec; early Terminal class work
updated tests to GlobalDefinitions entries; Terminal works but I don't like it
played with GUID pooling workflow, though to little avail; modifications to Terminal purchasing workflow, but still very volatile
modified NumberPoolActor and NumberPoolAccessor to make them more straightforward and not use akka ask as a go-between
fixed recovery options so that they do not cause more messages
trailing newline
InventoryItem (packet data) renamed InventoryItemData to remove ambiguity; Terminal functionality improved, allowing for swapping of exo-suits and the restoration of equipment positions
remove yet-unsupported Terminal messaging
made Terminal message more specific; can now put equipment into empty slot on exo-suit change; should report changes better
re-organized function calls to preserved items removed from holster slots on exo-suit change
moved predicate to the end of the list of params for recoverInventory so that repetition can be eliminated and a default value can be assigned
issues with making Tool; committing changes before revert of NumberPoolActor and NumberPoolAccessorActor to see if those broke it
a necessary evil, the reverting of these two Actors; subtask resolution does not work unless I do so, for now
restored the registration portion of tasking back to where it previously was (and better?)
NumberPoolActor and the ...AccessorActor are back to a comfortable place (and better?)
re-draw object in hand when switching exo-suits; build AmmoBoxes for Tool during Terminal-controlled creation, not Tool-controlled creation
order of task cleanup reversed to avoid index mismatch; added itsm to TerminalDefinition
common 5x5 AmmoBox size; added vehicle weapon ammo boxes to terminal
added error catching messages; stopped odd double-registering issue early
resolved issue where multiple subtasks started their main task multiple times; added checks that an object does not register a new GUID when it already has one
wrote unregistration code for Selling items back through the Terminal, repairing logic along the way; also, wrote a top-level GUID find for the Player for use of MoveItem
added framework for starting on Loadouts; managed issue with parent tasks starting before being summoned by child subtasks, often resulting in the complete skip of the execution phase of the parent; refactored registration tasks in WSA
modified Tool structure, exposing the AmmoSlot list a bit more
stuff stuff Tool ammo slot changes to default and comments
basic loadout framework for Infantry; need to integrate
initial work on FavoritesRequest packet
tests for FavoritesRequest packet
increased size of number pool for testing; wrote an algorithm that translates to and from the simplified version of objects stored in loadouts
refactored the tasking for adding Equipment and removing Equipment
updated the inventory so the Map of items does not have to rely on the GUID of an item being set before the item is inserted
untested routine for registering a player character; pushing all changes before making significant changes to the client init code structure
added to comments of BeginZoningMessage; transitioned player through and initial step of a more proper login GUID association
the current avatar is properly registered and there is something of a workflow with the messages and packets
corrected another bit of logic where inventories used to be indexed by object GUID in AvatarConverter; reversed unregister-remove task sequence such that GUID-less object is not allowed to exist in a stable object hierarchy
working Loadout loading
added identification functions to GlobalDefinitions; echo ObjectDelete back to client
accidentally got rid of something in WSA, but now restored; adding extra details to Terminal operations
separated Terminal into separate files and moved files into their own package under \objects\ for now; can delete loadouts now in WSA
better handling of ReloadMessage and MoveItemMessage
framework for better support involving dropping and picking up items
code comments and small modifications, such as the location and structure of the Terminal Equipment definitions
wrote comments in GlobalDefinitions; modified code so that a primitive form of player synchronization now occurs for future testing
added code to display already-dropped Equipment on the ground; limitations are explained; moved TaskResolver to more a global location, though I don't know if that helps
modified avatar unregister logic to ensure vacating player is deleted from other clients 'properly'
more comments; improved checks for MoveItemMessage; squared distances as necessary
subtle changes to login scripting so that test character is always offered
re-organizing the functions in WSA so that only the local objects separate the two message processing blocks
2017-05-30 18:46:01 -04:00
|
|
|
val inv = InventoryItemData(ObjectClass.beamer, PlanetSideGUID(76), 0, DetailedWeaponData(4, 8, ObjectClass.energy_cell, PlanetSideGUID(77), 0, DetailedAmmoBoxData(8, 16))) ::
|
|
|
|
|
InventoryItemData(ObjectClass.suppressor, PlanetSideGUID(78), 2, DetailedWeaponData(4, 8, ObjectClass.bullet_9mm, PlanetSideGUID(79), 0, DetailedAmmoBoxData(8, 25))) ::
|
|
|
|
|
InventoryItemData(ObjectClass.forceblade, PlanetSideGUID(80), 4, DetailedWeaponData(4, 8, ObjectClass.melee_ammo, PlanetSideGUID(81), 0, DetailedAmmoBoxData(8, 1))) ::
|
2017-08-30 09:35:18 -04:00
|
|
|
InventoryItemData(ObjectClass.locker_container, PlanetSideGUID(82), 5, DetailedLockerContainerData(8)) ::
|
new stuff for player server classes; this update is not yet complete
adjusted sample Reload code and added insertion and removal functions for inventory
more work on player classes; moving PacketResolution to another branch
decoupling GUIDs from objects; introduced Ammo enum; minor adjustments to inventory system; different object/class hierarchy
transferring basic files from another branch
converted from get/set to accessor/mutator; resolved conflict from name changes
refactored basic components such as GUID and location/orientation
utilities kludge; more fields are given accessor and mutators; create package for vehicle-specific classes
GUID assurance, now with less object creation
test files; changes to how AmmoBox initializes
sorry, a little bit of everything, so much I forgot to write it all down
switched to a unified fire mode object internal to a Tool
importing a heavily modified version of my GUID manager objects from the laternate branch; not finished or tested yet
created a Trait to make Key private, sources and selectors to allow NumberPools to exist independent of a NumberSource; placed Ascending into a misc folder
swapped the Return methods for selectors so that the more primitive logic is the one that needs to be overriden; renamed a selector to be more common; had to update some copyright messages
fixed major logic issue with NumberPool; added comments to NumberSource files
NumberSource tests
simplified and made more consistent the method naming convention of NumberSources
comments for NumberSelectors
starting on NumberSelector tests
modifications that should better support number pools; added a pool hub that acts on a predefined source
adjustment to how Tools and FireModeDefintion keep track of ammunition and ammunition slots; I don't think this is sufficient
small additions to Tools; filled out simple tests for other three Selectors
added object lookup notation for the pool hub
added more NumberSelector tests; removed the word 'Number' from subclass names
re-named classes, re-packaged classes, re-named packages; created new Selector, split pools to create a fallback for the NumberPoolHub
changes to NumberPool classes; tests on NumberPool classes
changes to NumberPool classes; tests on NumberPool classes2
some robust testing for NumberPoolHub, plus necessary modifications to other files
register and unregister functions now use Success and Failure conditions, save for one true thrown Exception
reduced the flow of certain algorithm chains, mainly by adding match statements and removing Exceptions
error message text
the same thing as the last commit, but with NumberPools rather than NumberPoolHub
various types of freeform registration
added sorting functions to Selectors to allow for hotswapping for number pools, especially to and from SpecificSelector; tests for NumberPoolHub
get numbers from an Array of indices, not the list of Numbers, in SimplePool
added a class to represent the four types of recovery kits
comments on Kit files
created package for supporting equipment classes; renamed /definition/ package
adding class for items that construct deployables, the router telepad included
added SimpleItem, classes for game Equipment that do not have internal state; re-organized ObjectDefinition files and the game objects they create to more naturally move around EquipmentSize and InventoryTile (size)
added SimpleItem tests (what they are...); removed example code that has hogging an import from AmmoBox
auto-sort for loading and fitting former inventory content back into the inventory
method of finding first available position to fit an certain size block in the inventory
changed CheckCollision return type to provide Try[List[Int]; fixed all existing references and tests
wrote comments for GridInventory methods; changed insertion param to be of form 'key -> element'
adding features to Player; created definitions for Player class; re-grouped ConstructionItem enumerations
initial work on implants; shuffled classes to better accommodate the new implant system, I think
wrote some tests for Implants; fixing Implant logic
wrote tests for Player class and made adjustments where necessary
basic initialization during Player creation based on exo-suit type
three wrapper Actors for the normal classes
comments on code
modified tests to improve accountability; added Resolver class to deal with multiple tasks that contribute to a larger task
changed Tools to an internal AmmoBox; don't have to def -= symbol if I def _= symbol
LivePlayerList -> MasterPlayerList, and added a Fit def for Player that checks holsters as well as inventory
example of packet conversion can be found with AmmoBoxDefinition
added conversion for ToolDefinition
added all Equipment packet conversion functionality; started working on Avatar-related conversions
continued effort towards a working Player packet conversion test
subclasses of Equipment apparently do not need to overide the type of the PacketConverter for generics
the logical conclusion: it doesn't matter what generics Packet returns so long as it returns an ObjectCreateConverter[] type
separated converters from definitions into files
changed some configuration information to final; added a bunch of converters, not fully tested though
changed function names in converters
replaced WSA packet-driven OCDM with Player object OCDM; upgrade to Float angular data
added partial support for LockerContainer; changed Equipment defaults to a common value
changes to AvatarConverter to include 5th slot; changes to VehicleConverter to make work; implementation of Fury in Vehicle->packet example in WSA
added a seat definition and renovated how the weapon controlled from a seat can be found
comments to files mainly; non-essential functionality to some classes, mostly access determination
moved converter tests to their own test file
write more of this test
added ServiceManager, as it is useful
pool range changes
added AvatarService, as it is useful
straightened out the GUID actors; added the static method for adding AmmoBoxes (to be converted later)
chnages to task resolution operation
complicated Task and TaskResolver logic is now possible; for example, you can schedule giving an AmmoBox a GUID, before giving a Tool a GUID, before placing the Tool in a player's hand; see Suppressor example in WSA
separated the Task trait and the TaskResolver actor into their own classes, moving the former RegistrationTaskResolver class into the /misc/ folder; deleted old backup copy of HubActor; modifications for PoC and supported tests
added better support and protection against putting things in the wrong hand when using inventories and the Player.Slot(n) function
GlobalDefinitions file; added laze pointer as an SItem, and gave it the command detonater management code; additionally fixed spelling of 'detonat[o]r' in Codec; early Terminal class work
updated tests to GlobalDefinitions entries; Terminal works but I don't like it
played with GUID pooling workflow, though to little avail; modifications to Terminal purchasing workflow, but still very volatile
modified NumberPoolActor and NumberPoolAccessor to make them more straightforward and not use akka ask as a go-between
fixed recovery options so that they do not cause more messages
trailing newline
InventoryItem (packet data) renamed InventoryItemData to remove ambiguity; Terminal functionality improved, allowing for swapping of exo-suits and the restoration of equipment positions
remove yet-unsupported Terminal messaging
made Terminal message more specific; can now put equipment into empty slot on exo-suit change; should report changes better
re-organized function calls to preserved items removed from holster slots on exo-suit change
moved predicate to the end of the list of params for recoverInventory so that repetition can be eliminated and a default value can be assigned
issues with making Tool; committing changes before revert of NumberPoolActor and NumberPoolAccessorActor to see if those broke it
a necessary evil, the reverting of these two Actors; subtask resolution does not work unless I do so, for now
restored the registration portion of tasking back to where it previously was (and better?)
NumberPoolActor and the ...AccessorActor are back to a comfortable place (and better?)
re-draw object in hand when switching exo-suits; build AmmoBoxes for Tool during Terminal-controlled creation, not Tool-controlled creation
order of task cleanup reversed to avoid index mismatch; added itsm to TerminalDefinition
common 5x5 AmmoBox size; added vehicle weapon ammo boxes to terminal
added error catching messages; stopped odd double-registering issue early
resolved issue where multiple subtasks started their main task multiple times; added checks that an object does not register a new GUID when it already has one
wrote unregistration code for Selling items back through the Terminal, repairing logic along the way; also, wrote a top-level GUID find for the Player for use of MoveItem
added framework for starting on Loadouts; managed issue with parent tasks starting before being summoned by child subtasks, often resulting in the complete skip of the execution phase of the parent; refactored registration tasks in WSA
modified Tool structure, exposing the AmmoSlot list a bit more
stuff stuff Tool ammo slot changes to default and comments
basic loadout framework for Infantry; need to integrate
initial work on FavoritesRequest packet
tests for FavoritesRequest packet
increased size of number pool for testing; wrote an algorithm that translates to and from the simplified version of objects stored in loadouts
refactored the tasking for adding Equipment and removing Equipment
updated the inventory so the Map of items does not have to rely on the GUID of an item being set before the item is inserted
untested routine for registering a player character; pushing all changes before making significant changes to the client init code structure
added to comments of BeginZoningMessage; transitioned player through and initial step of a more proper login GUID association
the current avatar is properly registered and there is something of a workflow with the messages and packets
corrected another bit of logic where inventories used to be indexed by object GUID in AvatarConverter; reversed unregister-remove task sequence such that GUID-less object is not allowed to exist in a stable object hierarchy
working Loadout loading
added identification functions to GlobalDefinitions; echo ObjectDelete back to client
accidentally got rid of something in WSA, but now restored; adding extra details to Terminal operations
separated Terminal into separate files and moved files into their own package under \objects\ for now; can delete loadouts now in WSA
better handling of ReloadMessage and MoveItemMessage
framework for better support involving dropping and picking up items
code comments and small modifications, such as the location and structure of the Terminal Equipment definitions
wrote comments in GlobalDefinitions; modified code so that a primitive form of player synchronization now occurs for future testing
added code to display already-dropped Equipment on the ground; limitations are explained; moved TaskResolver to more a global location, though I don't know if that helps
modified avatar unregister logic to ensure vacating player is deleted from other clients 'properly'
more comments; improved checks for MoveItemMessage; squared distances as necessary
subtle changes to login scripting so that test character is always offered
re-organizing the functions in WSA so that only the local objects separate the two message processing blocks
2017-05-30 18:46:01 -04:00
|
|
|
InventoryItemData(ObjectClass.bullet_9mm, PlanetSideGUID(83), 6, DetailedAmmoBoxData(8, 50)) ::
|
|
|
|
|
InventoryItemData(ObjectClass.bullet_9mm, PlanetSideGUID(84), 9, DetailedAmmoBoxData(8, 50)) ::
|
|
|
|
|
InventoryItemData(ObjectClass.bullet_9mm, PlanetSideGUID(85), 12, DetailedAmmoBoxData(8, 50)) ::
|
|
|
|
|
InventoryItemData(ObjectClass.bullet_9mm_AP, PlanetSideGUID(86), 33, DetailedAmmoBoxData(8, 50)) ::
|
|
|
|
|
InventoryItemData(ObjectClass.energy_cell, PlanetSideGUID(87), 36, DetailedAmmoBoxData(8, 50)) ::
|
|
|
|
|
InventoryItemData(ObjectClass.remote_electronics_kit, PlanetSideGUID(88), 39, DetailedREKData(8)) ::
|
2017-03-18 21:04:20 -04:00
|
|
|
Nil
|
|
|
|
|
val obj = DetailedCharacterData(
|
|
|
|
|
app,
|
|
|
|
|
100, 100,
|
|
|
|
|
50,
|
|
|
|
|
1, 7, 7,
|
|
|
|
|
100, 100,
|
|
|
|
|
28, 4, 44, 84, 104, 1900,
|
|
|
|
|
"xpe_sanctuary_help" :: "xpe_th_firemodes" :: "used_beamer" :: "map13" :: Nil,
|
|
|
|
|
List.empty,
|
|
|
|
|
InventoryData(inv),
|
|
|
|
|
DrawnSlot.Pistol1
|
|
|
|
|
)
|
|
|
|
|
val msg = ObjectCreateDetailedMessage(0x79, PlanetSideGUID(75), obj)
|
|
|
|
|
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
|
|
|
|
|
|
|
|
|
val pkt_bitv = pkt.toBitVector
|
|
|
|
|
val ori_bitv = string_testchar.toBitVector
|
|
|
|
|
pkt_bitv.take(153) mustEqual ori_bitv.take(153) //skip 1
|
|
|
|
|
pkt_bitv.drop(154).take(422) mustEqual ori_bitv.drop(154).take(422) //skip 126
|
2017-07-04 21:44:24 -04:00
|
|
|
pkt_bitv.drop(702).take(29) mustEqual ori_bitv.drop(702).take(29) //skip 1
|
|
|
|
|
pkt_bitv.drop(732) mustEqual ori_bitv.drop(732)
|
2017-03-18 21:04:20 -04:00
|
|
|
//TODO work on DetailedCharacterData to make this pass as a single stream
|
|
|
|
|
}
|
|
|
|
|
}
|