Commit graph

427 commits

Author SHA1 Message Date
FateJH e6646c2352 deleted unnecessary intermediary class; modified current Actor tests to operate under akka-testkit, which required changing the dependencies 2017-08-16 18:23:09 -04:00
FateJH 478de8e0ef swicthing to nanoTime() for Travis CI 2017-08-16 00:10:27 -04:00
FateJH 404d083578 fixing tests 2017-08-15 23:29:10 -04:00
FateJH 4bcef8ce98 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-08-15 23:10:59 -04:00
Fate-JH 9a8e1e8f95 Merge pull request #154 from Fate-JH/angles
Float Angles
2017-07-10 19:26:55 -04:00
FateJH e071f6ea56 changing three FLoat values for orientation into a Vector3; all tests updated 2017-07-10 15:19:47 -04:00
FateJH 9095564e68 changed Codecs so that all known 8-bit angle data is now read as a 0-360 Float value; added a mreaure of testing to CodecTests 2017-07-06 17:33:06 -04:00
Fate-JH 74f283f447 Merge pull request #152 from Fate-JH/packet-split
Refactor: Packet Split?  Nope.
2017-06-03 14:02:16 -04:00
Fate-JH 986594de87 Merge pull request #151 from Fate-JH/object-create-updates
Object Create Message Update #2.5
2017-06-03 13:44:14 -04:00
FateJH ec51823bb1 finished work in PacketCoding 2017-05-24 21:50:26 -04:00
FateJH c117f05165 tidied up the first part of PacketCoding; made certain basic client-server communication still works 2017-05-24 09:58:15 -04:00
FateJH aac5e0a7ce testing code; doesn't work, but I like where it's going 2017-05-23 20:56:47 -04:00
FateJH bf91dd8333 corrections to OrtibalShuttleData Codec and testing 2017-05-22 08:33:46 -04:00
FateJH 41acd32914 set the MAX arms to ignore the ammunition checks because I have conflicted expectations for them right now 2017-05-22 00:26:38 -04:00
FateJH 434171bcc4 This is a combination of 32 commits for object-create logic. 2017-05-21 23:31:09 -04:00
Fate-JH 072676c9ce Merge pull request #150 from Fate-JH/inventory-state
Packet: InventoryStateMessage
2017-05-18 23:17:24 -04:00
FateJH 71e729cf2b overloaded constructor 2017-05-17 21:10:21 -04:00
FateJH 92c126759a clarified fields and purpose; updated comments; working tests 2017-05-17 20:45:46 -04:00
FateJH fbe671e577 initial work on InventoryStateMessage packet 2017-05-17 20:45:46 -04:00
Fate-JH 861a611707 Merge pull request #149 from Fate-JH/deploy-request
Packet: DeployRequestMessage
2017-05-14 14:10:01 -04:00
Fate-JH 9c68a419ce Merge pull request #142 from Fate-JH/minor-updates
Implementing Missing Tests
2017-05-13 11:57:24 -04:00
Fate-JH f87edd7057 Merge branch 'master' into minor-updates 2017-05-13 11:45:11 -04:00
FateJH f316aa95c5 clarified fields in constructor; added working tests; added match case statement in WSA 2017-05-12 14:57:29 -04:00
Fate-JH 41a381a212 Merge pull request #148 from Fate-JH/oxygen
Packet: OxygenStateMessage
2017-05-11 21:38:04 -04:00
FateJH a1d9ad7ee4 updated field name to more appropriately match status 2017-05-10 13:21:54 -04:00
Fate-JH 7d3b10da48 Merge pull request #147 from Fate-JH/displayed-award
Packet: DisplayedAwardMessage
2017-05-10 08:32:19 -04:00
Fate-JH 73983b26b3 Merge pull request #143 from SouNourS/FireHintMessage
Packet: FireHintMessage
2017-05-08 19:28:40 -04:00
Fate-JH 32c094b86d Merge pull request #145 from Fate-JH/trigger-effect
Packet: TriggerEffectMessage
2017-05-08 09:00:17 -04:00
FateJH 17cfc1d626 changed Double values into Float values; wrote packet comments 2017-05-08 08:34:59 -04:00
FateJH 729b36eba1 initial work on OxygenStateMessage packet and tests 2017-05-08 00:50:36 -04:00
FateJH fff0a6071a removed unused import statements from packet class 2017-05-07 22:35:41 -04:00
Fate-JH 7a93501d38 Merge pull request #144 from SouNourS/DelayedPathMountMsg
Packet: DelayedPathMountMsg
2017-05-07 13:58:38 -04:00
Fate-JH 9a1a4a1dd1 Merge pull request #141 from Fate-JH/projectile-state
Packet: ProjectileStateMessage
2017-05-07 13:33:49 -04:00
FateJH 2110797790 created a MeritCommendation Enumeration to use with the ribbon awards 2017-05-07 01:34:55 -04:00
FateJH 684c64679b initial work on DisplayedAwardMessage packet and tests 2017-05-06 00:45:42 -04:00
Fate-JH e092ad6980 Merge pull request #139 from Fate-JH/unuse-item
Packet: UnuseItemMessage
2017-05-05 08:51:43 -04:00
FateJH 1b789154bf added compiler flag '-language:postFixOps' to stop warnings about time post-fix notation ('100 milliseconds') 2017-05-05 08:22:17 -04:00
FateJH 30b5ad49bd initial work on TriggerEffectMessage packet and tests 2017-05-04 23:20:31 -04:00
FateJH 32caddb43a initial work on DeployRequestMessage packet 2017-05-04 19:26:12 -04:00
Fate-JH 9a1c1338e4 Merge pull request #138 from Fate-JH/targeting-request
Packet: TargetingImplantRequestMessage
2017-05-04 19:17:53 -04:00
SouNourS dd743e592d DelayedPathMountMsg 2017-05-04 16:25:14 +02:00
SouNourS 4bc05579cc Update FireHintMessageTest.scala 2017-05-04 13:40:10 +02:00
SouNourS 59c7419565 FireHintMessage 2017-05-04 13:36:59 +02:00
FateJH 8434d17910 modified DeployObjectMessage to reflect new data found by SouNourS; changed DOM tests; added match case in WSA 2017-05-03 23:22:19 -04:00
FateJH 939e0ed688 added tests for: VoiceHost*, CharacterInfoMessage, CharacterCreateRequestMessage, CharacterRequestMessage, and KeepAliveMessage; modified test for ObjectDetectedMessage 2017-05-03 23:20:20 -04:00
Fate-JH 461a4f9507 Merge pull request #137 from Fate-JH/targeting-info
Packet: TargetingInfoMessage
2017-05-03 09:25:01 -04:00
Fate-JH 6168f8533c Merge pull request #140 from SouNourS/AvatarVehicleTimerMessage
Packet: AvatarVehicleTimerMessage
2017-05-02 22:55:48 -04:00
Fate-JH 29ff804db6 added trailing newline to test file 2017-05-02 22:34:04 -04:00
Fate-JH 4c821267bb added a trailing newline to packet file 2017-05-02 22:33:41 -04:00
Fate-JH 3978b4de02 Merge pull request #127 from SouNourS/Updates
Update: Some little mod
2017-05-02 22:30:59 -04:00