PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-03 04:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved object name exposure for log messages; removed 'init with GUID' constructors that were no longer necessary

Browse source
This commit is contained in:
FateJH 2018-05-10 23:03:34 -04:00
parent 65c8de0790
commit 1d956c834c
12 changed files with 228 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/src/test/scala/objects/ConverterTest.scala
View file

@ -90,7 +90,8 @@ class ConverterTest extends Specification {
"Kit" should {
"convert to packet" in {
val kdef = KitDefinition(Kits.medkit)
val obj = Kit(PlanetSideGUID(90), kdef)
val obj = Kit(kdef)
obj.GUID = PlanetSideGUID(90)
obj.Definition.Packet.DetailedConstructorData(obj) match {
case Success(pkt) =>
pkt mustEqual DetailedAmmoBoxData(0, 1)
@ -113,7 +114,8 @@ class ConverterTest extends Specification {
cdef.Modes += DeployedItem.deployable_shield_generator
cdef.Tile = InventoryTile.Tile63
cdef.Packet = new ACEConverter()
val obj = ConstructionItem(PlanetSideGUID(90), cdef)
val obj = ConstructionItem(cdef)
obj.GUID = PlanetSideGUID(90)
obj.Definition.Packet.DetailedConstructorData(obj) match {
case Success(pkt) =>
pkt mustEqual DetailedACEData(0)
@ -134,7 +136,8 @@ class ConverterTest extends Specification {
"convert to packet" in {
val sdef = SimpleItemDefinition(SItem.remote_electronics_kit)
sdef.Packet = new REKConverter()
val obj = SimpleItem(PlanetSideGUID(90), sdef)
val obj = SimpleItem(sdef)
obj.GUID = PlanetSideGUID(90)
obj.Definition.Packet.DetailedConstructorData(obj) match {
case Success(pkt) =>
pkt mustEqual DetailedREKData(8)

22
common/src/test/scala/objects/InventoryTest.scala
View file

@ -306,9 +306,9 @@ class InventoryTest extends Specification {
sampleDef63.Tile = InventoryTile.Tile63
val obj : GridInventory = GridInventory(9, 9)
obj += 0 -> SimpleItem(PlanetSideGUID(0), sampleDef22)
obj += 20 -> SimpleItem(PlanetSideGUID(1), sampleDef63)
obj += 56 -> SimpleItem(PlanetSideGUID(2), sampleDef33)
obj += 0 -> SimpleItem(sampleDef22)
obj += 20 -> SimpleItem(sampleDef63)
obj += 56 -> SimpleItem(sampleDef33)
obj.Fit(InventoryTile.Tile33) match {
case Some(x) =>
x mustEqual 50
@ -329,14 +329,14 @@ class InventoryTest extends Specification {
sampleDef4.Tile = InventoryTile.Tile63
val list : ListBuffer[InventoryItem] = ListBuffer()
list += new InventoryItem(SimpleItem(PlanetSideGUID(0), sampleDef2), -1)
list += new InventoryItem(SimpleItem(PlanetSideGUID(1), sampleDef3), -1)
list += new InventoryItem(SimpleItem(PlanetSideGUID(2), sampleDef1), -1)
list += new InventoryItem(SimpleItem(PlanetSideGUID(3), sampleDef4), -1)
list += new InventoryItem(SimpleItem(PlanetSideGUID(4), sampleDef1), -1)
list += new InventoryItem(SimpleItem(PlanetSideGUID(5), sampleDef4), -1)
list += new InventoryItem(SimpleItem(PlanetSideGUID(6), sampleDef2), -1)
list += new InventoryItem(SimpleItem(PlanetSideGUID(7), sampleDef3), -1)
list += new InventoryItem(SimpleItem(sampleDef2), -1)
list += new InventoryItem(SimpleItem(sampleDef3), -1)
list += new InventoryItem(SimpleItem(sampleDef1), -1)
list += new InventoryItem(SimpleItem(sampleDef4), -1)
list += new InventoryItem(SimpleItem(sampleDef1), -1)
list += new InventoryItem(SimpleItem(sampleDef4), -1)
list += new InventoryItem(SimpleItem(sampleDef2), -1)
list += new InventoryItem(SimpleItem(sampleDef3), -1)
val obj : GridInventory = GridInventory(9, 9)
val (elements, out) = GridInventory.recoverInventory(list.toList, obj)