PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-04-28 07:45:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
PSF-LoginServer/common/src/test/scala/objects/InventoryTest.scala

216 lines
8.3 KiB
Scala
Raw Normal View History

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
// Copyright (c) 2017 PSForever
package objects
import net.psforever.objects.{AmmoBox, SimpleItem}
import net.psforever.objects.definition.SimpleItemDefinition
import net.psforever.objects.inventory.{GridInventory, InventoryItem, InventoryTile}
import net.psforever.objects.GlobalDefinitions._
import net.psforever.packet.game.PlanetSideGUID
import org.specs2.mutable._
import scala.collection.mutable.ListBuffer
import scala.util.Success
class InventoryTest extends Specification {
val bullet9mmBox1 = AmmoBox(PlanetSideGUID(1), bullet_9mm)
val bullet9mmBox2 = AmmoBox(PlanetSideGUID(2), bullet_9mm)
"GridInventory" should {
"construct" in {
val obj : GridInventory = GridInventory()
obj.TotalCapacity mustEqual 1
obj.Capacity mustEqual 1
}
"resize" in {
val obj : GridInventory = GridInventory(9, 6)
obj.TotalCapacity mustEqual 54
obj.Capacity mustEqual 54
obj.Size mustEqual 0
}
"insert item" in {
val obj : GridInventory = GridInventory(9, 6)
obj.CheckCollisions(23, bullet9mmBox1) mustEqual Success(Nil)
obj += 2 -> bullet9mmBox1
obj.TotalCapacity mustEqual 54
obj.Capacity mustEqual 45
obj.Size mustEqual 1
obj.hasItem(PlanetSideGUID(1)) mustEqual Some(bullet9mmBox1)
obj.Clear()
obj.Size mustEqual 0
}
"check for collision with inventory border" in {
val obj : GridInventory = GridInventory(3, 3)
//safe
obj.CheckCollisionsAsList(0, 3, 3) mustEqual Success(Nil)
//right
obj.CheckCollisionsAsList(-1, 3, 3).isFailure mustEqual true
//left
obj.CheckCollisionsAsList(1, 3, 3).isFailure mustEqual true
//bottom
obj.CheckCollisionsAsList(3, 3, 3).isFailure mustEqual true
}
"check for item collision (right insert)" in {
val obj : GridInventory = GridInventory(9, 6)
obj += 0 -> bullet9mmBox1
obj.Capacity mustEqual 45
val w = bullet9mmBox2.Tile.width
val h = bullet9mmBox2.Tile.height
obj.CheckCollisionsAsList(0, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(1, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(2, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(3, w, h) mustEqual Success(Nil)
obj.CheckCollisionsAsGrid(0, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(1, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(2, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(3, w, h) mustEqual Success(Nil)
obj.Clear()
ok
}
"check for item collision (left insert)" in {
val obj : GridInventory = GridInventory(9, 6)
obj += 3 -> bullet9mmBox1
obj.Capacity mustEqual 45
val w = bullet9mmBox2.Tile.width
val h = bullet9mmBox2.Tile.height
obj.CheckCollisionsAsList(3, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(2, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(1, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(0, w, h) mustEqual Success(Nil)
obj.CheckCollisionsAsGrid(3, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(2, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(1, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(0, w, h) mustEqual Success(Nil)
obj.Clear()
ok
}
"check for item collision (below insert)" in {
val obj : GridInventory = GridInventory(9, 6)
obj += 0 -> bullet9mmBox1
obj.Capacity mustEqual 45
val w = bullet9mmBox2.Tile.width
val h = bullet9mmBox2.Tile.height
obj.CheckCollisionsAsList(0, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(9, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(18, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(27, w, h) mustEqual Success(Nil)
obj.CheckCollisionsAsGrid(0, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(9, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(18, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(27, w, h) mustEqual Success(Nil)
obj.Clear()
ok
}
"check for item collision (above insert)" in {
val obj : GridInventory = GridInventory(9, 6)
obj += 27 -> bullet9mmBox1
obj.Capacity mustEqual 45
val w = bullet9mmBox2.Tile.width
val h = bullet9mmBox2.Tile.height
obj.CheckCollisionsAsList(27, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(19, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(9, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsList(0, w, h) mustEqual Success(Nil)
obj.CheckCollisionsAsGrid(27, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(19, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(9, w, h) mustEqual Success(1 :: Nil)
obj.CheckCollisionsAsGrid(0, w, h) mustEqual Success(Nil)
obj.Clear()
ok
}
"block insertion if item collision" in {
val obj : GridInventory = GridInventory(9, 6)
obj += 0 -> bullet9mmBox1
obj.Capacity mustEqual 45
obj.hasItem(PlanetSideGUID(1)) mustEqual Some(bullet9mmBox1)
obj += 2 -> bullet9mmBox2
obj.hasItem(PlanetSideGUID(2)) mustEqual None
obj.Clear()
ok
}
"remove item" in {
val obj : GridInventory = GridInventory(9, 6)
obj += 0 -> bullet9mmBox1
obj.hasItem(PlanetSideGUID(1)) mustEqual Some(bullet9mmBox1)
obj -= PlanetSideGUID(1)
obj.hasItem(PlanetSideGUID(1)) mustEqual None
obj.Clear()
ok
}
"unblock insertion on item removal" in {
val obj : GridInventory = GridInventory(9, 6)
obj.CheckCollisions(23, bullet9mmBox1) mustEqual Success(Nil)
obj += 23 -> bullet9mmBox1
obj.hasItem(PlanetSideGUID(1)) mustEqual Some(bullet9mmBox1)
obj.CheckCollisions(23, bullet9mmBox1) mustEqual Success(1 :: Nil)
obj -= PlanetSideGUID(1)
obj.hasItem(PlanetSideGUID(1)) mustEqual None
obj.CheckCollisions(23, bullet9mmBox1) mustEqual Success(Nil)
obj.Clear()
ok
}
"attempt to fit an item" in {
val sampleDef22 = new SimpleItemDefinition(149)
sampleDef22.Tile = InventoryTile.Tile22
val sampleDef33 = new SimpleItemDefinition(149)
sampleDef33.Tile = InventoryTile.Tile33
val sampleDef63 = new SimpleItemDefinition(149)
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.Fit(InventoryTile.Tile33) match {
case Some(x) =>
x mustEqual 50
case None =>
ko
}
ok
}
"attempt to fit all the items" in {
val sampleDef1 = new SimpleItemDefinition(149)
sampleDef1.Tile = InventoryTile.Tile22
val sampleDef2 = new SimpleItemDefinition(149)
sampleDef2.Tile = InventoryTile.Tile33
val sampleDef3 = new SimpleItemDefinition(149)
sampleDef3.Tile = InventoryTile.Tile42
val sampleDef4 = new SimpleItemDefinition(149)
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)
val obj : GridInventory = GridInventory(9, 9)
val (elements, out) = GridInventory.recoverInventory(list.toList, obj)
elements.length mustEqual 6
out.length mustEqual 2
elements.foreach(item => {
obj.Insert(item.start, item.obj) mustEqual true
})
out.head.Definition.Tile mustEqual InventoryTile.Tile22 //did not fit
out(1).Definition.Tile mustEqual InventoryTile.Tile22 //did not fit
ok
}
}
}
Reference in a new issue Copy permalink