Commit graph

1060 commits

Author SHA1 Message Date
Jakob Gillich 170549982c
Use packed files to build docker image 2020-06-09 23:21:46 +02:00
Jakob Gillich 8424fcfe68
Ignore more project crap 2020-06-09 19:59:31 +02:00
Mazo d658f22f71
Merge pull request #484 from Mazo/cavern-guid-fix
Fix some cavern entities having the wrong GUIDs which was causing crash to desktop on zoning out of caves
2020-06-07 21:41:47 +01:00
Mazo e3fd5ff854
Merge pull request #483 from Mazo/xtoolsv2
XToolsV2
2020-06-07 21:41:22 +01:00
Mazo 73f4c45f93
Merge pull request #481 from Mazo/property-overrides
Zone specific property override config files
2020-06-07 21:41:02 +01:00
Mazo 87efa3acf9 Fix some cavern entities having the wrong GUIDs which was causing crash to desktop on zoning out of caves 2020-06-06 20:11:57 +01:00
Mazo e56f4dfd3b Remove unnecessary dependency 2020-06-05 21:51:47 +01:00
Mazo d58550dc3b Add missing dependency on common package 2020-06-05 21:12:08 +01:00
Mazo 46bd2aca50 Include a copy of the old xtoolspar for historical reference 2020-06-05 21:08:57 +01:00
Mazo 094cb3046f Move XToolsV2 into a new tools/decode-packets project 2020-06-05 21:08:54 +01:00
Mazo 663616ddf1 XTools V2 2020-06-05 21:08:23 +01:00
NickPSF 7ecce515c2
Update game_objects0.adb.lst
revert spiker test
2020-06-04 18:19:55 -05:00
NickPSF b6612699e8
Update game_objects0.adb.lst
spiker test pt2
2020-06-04 18:15:19 -05:00
NickPSF bab1af344e
Update game_objects0.adb.lst
spiker requirement test
2020-06-04 18:14:47 -05:00
NickPSF d11a53207d
Update game_objects31.adb.lst
purchase module fix
2020-06-04 18:02:56 -05:00
NickPSF f18318795e
Update game_objects29.adb.lst
Flail purchase module fix
2020-06-04 18:00:58 -05:00
NickPSF f4c8a46ed7
Update game_objects0.adb.lst
Removed waiving purchase module requirement, as they were non-functional.
Disallowed CUD.
2020-06-04 18:00:04 -05:00
NickPSF d11c05ace9
Update game_objects30.adb.lst
Fixed typo that allowed Wraiths to be spawned
2020-06-04 17:30:00 -05:00
NickPSF 5cb9a95af0
Update game_objects32.adb.lst
Added additional lines to properly disable MAXs
2020-06-04 17:27:06 -05:00
Mazo 64ba54b34f Add missing ObjectClass entries for property overrides 2020-06-04 22:56:33 +01:00
Mazo 3a750c1771 Property overrides from Nick 2020-06-04 22:32:45 +01:00
Fate-JH bd82d332fa
Let's Move Item, Together, Again (#445)
* mix-in code for akka messaging move item, currently testing on infantry only

* adjusted structure of COntainable so callbacks are separate from message-producing functions, are separate from message-sending functionality; massaged LockerContainer until it could support control agency and created a wrapper for its Equipment interfacing; the control structure starts and stops when PlayerControl starts and stops, and it converts whenever necessary

* added failsafe conditions to Containable, such as blocking certain messages while completing a MoveItem call, or blocking all messages to reset disruptive MoveItem calls; depiction message callbacks for Player, Locker, and Vehicle, to properly depict the manipulation of items; eliminated the old code from WSA

* added useful comments to Containable; moved functionality for deployables, and for container'ing, and dropping logic out from WSA and distributed it appropriately

* handling terminal operations - buying an exosuit and selecting an infantry loadout; starting work on support for more persistent equipment timers local to the avatar (that were removed in this update; see wsa changes)

* linked terminal page/message with routing policy

* tuning vehicle loadout management and display

* separated use time from purchase time and applied a system that limits either if that same event would recur too soon; tuning exosuit and loadout changes

* some ask timeout handling and comments

* normalizing item on ground interactions

* rearranging the project structure

* merged with master; commas removed

* fixing tests

* added description strings to Tasks; adjusted the completion conditions for some Tasks

* a failed purchase will not block future purchases; increased timeout on move-item tasks

* corpses, even one's own, should have properly moveable inventories

* for better persistence, until GlobalDefinitions is renovated, moved the object id->name map onto the avatar object, for the purpose of timers; replaced a use of values in GridInventory for a map conversion

* max loadouts and max exosuit switch use same cooldown now; hopefully better clarifcation regarding held arm position

* manual merge-rebase of master with hand reconstruction of WorldSessionActor and PlayerControl, and variations for other files necessary to maintain both inventory operations and login reliability

* test fixes; MAX exo-suit cooldown is now five minutes again
2020-06-04 16:39:08 -04:00
Mazo 69e63827fa Added functionality to allow zone specific property override config files 2020-05-30 21:40:45 +01:00
Fate-JH d6397d54a1
Interim 2 (#477)
* changed DefaultCancellable.obj with Default.Cancellable and deleted the former (as unnecessary)

* changed ActorRef.noSender with Default.Actor for PlanetSideServerObject entities

* Actor.noSender -> ActorRef.noSender, for consistency

* player name in log messages; zoneLoaded and zoneReload flags; upstream message count

* Default object tests; expanded the set current avatar loop

* fallback cases for unsuccessful zone/avatar load process

* completing the trials of the god Travis

* forgot to reactivate kamon
2020-05-30 12:28:10 -04:00
Fate-JH 765816a4d2
original squad leader did not have health or armor properly scaled to the field; squad vehicle stats no longer override individual squad member stats in ui (#479) 2020-05-30 12:03:25 -04:00
Fate-JH 4da6f9d618
added away from keyboard field to player and ways to flag it (#480) 2020-05-30 12:02:46 -04:00
Mazo 634d57628a
Merge pull request #478 from Fate-JH/unidocs
SBT-Unidocs Plugin
2020-05-30 00:33:29 +01:00
FateJH 7162aa9c17 reactivating sbt-unidocs plugin 2020-05-29 19:12:07 -04:00
Mazo 6cdd44f119
Merge pull request #471 from Fate-JH/warnings
Warnings
2020-05-27 09:08:55 +01:00
FateJH e4d18c9c93 commented out an unenforceable test 2020-05-26 20:25:03 -04:00
FateJH 838493e4bb turning kamon back on 2020-05-26 19:52:14 -04:00
FateJH 6f4eac9e43 changes to quiet the warnings since the 2.13.2 update 2020-05-26 19:50:54 -04:00
Jakob Gillich 222697aee8
Refactor MultiPacketCollector#Bundle (#467)
Bundle was never called in any place other than BundleOption.
This refactors BundleOption into Bundle and removes BundleOption.
Besides being more efficient, it no longer has the possibility of
swallowing unrelated exceptions.
2020-05-26 16:21:49 -04:00
Jakob Gillich 6ca72ecb41
Add docker-compose file (#466) 2020-05-26 16:19:44 -04:00
Mazo 341d7d413c
Slow down ANT discharge/charge rate based on video evidence from live (#463) 2020-05-26 16:19:03 -04:00
Mazo 210ce0605c
Add personal shield to damage resolution calculations (#465) 2020-05-26 16:17:39 -04:00
Mazo 11a01b038f
Add some logging for suspicious HitMessages (#459)
* Add some logging for suspicious HitMessages

* Add HitPositionDiscrepancyThreshold config settings

* Add hit position discrepancy check to LashMessage & SplashHitMessage

* Whitespace
2020-05-26 16:17:19 -04:00
Jakob Gillich e51e970e51
Update to Scala 2.13 & Akka 2.6.5 (#461)
* update scala to 2.13 & update dependencies

* fix test

* import scodec-akka

* scala 2.13 fixes

* Work around futures not completing when awaited within object constructor

Co-authored-by: Mazo <mazo2@hotmail.com>
2020-05-26 16:16:22 -04:00
Mazo 270485fa4d
Merge pull request #447 from Mazo/vehicle-actor-safeguard
Safeguard against trying to send messages to a vehicle actor that no longer exists
2020-05-19 15:01:17 +01:00
Mazo d806e2448d Another Actor ref safeguard 2020-05-17 22:08:24 +01:00
Mazo 1092e76348 Safeguard against trying to send messages to a vehicle actor that no longer exists 2020-05-17 22:04:26 +01:00
Mazo 0ada64fd44
Merge pull request #444 from Mazo/revert-move-item
Revert "Let's Move Item, Together (#429)"
2020-05-16 19:28:10 +01:00
Mazo 896fa7bf07 Revert "Let's Move Item, Together (#429)"
This reverts commit 3f2240947b.
2020-05-16 19:10:06 +01:00
Mazo 4fa2be151b
Merge pull request #443 from Fate-JH/turret-kick2
Kick Occupants From Amenities When Facility Is Hacked (properly)
2020-05-16 18:56:49 +01:00
FateJH c439701cca seat number (despite it not really mattering right now) 2020-05-16 12:57:44 -04:00
FateJH 73965d13b6 properly kick mountable occupants from amenities when the base is hacked 2020-05-16 12:48:35 -04:00
Mazo f008b6c79d
Merge pull request #442 from Mazo/event-property-overrides
Temporary property overrides for event
2020-05-16 17:36:57 +01:00
Mazo 49fc029c51
Replace mutable HashMap with concurrent TrieMap to hopefully improve thread safety for inventory item operations (#441) 2020-05-16 12:18:31 -04:00
Fate-JH 3f2240947b
Let's Move Item, Together (#429)
* mix-in code for akka messaging move item, currently testing on infantry only

* adjusted structure of COntainable so callbacks are separate from message-producing functions, are separate from message-sending functionality; massaged LockerContainer until it could support control agency and created a wrapper for its Equipment interfacing; the control structure starts and stops when PlayerControl starts and stops, and it converts whenever necessary

* added failsafe conditions to Containable, such as blocking certain messages while completing a MoveItem call, or blocking all messages to reset disruptive MoveItem calls; depiction message callbacks for Player, Locker, and Vehicle, to properly depict the manipulation of items; eliminated the old code from WSA

* added useful comments to Containable; moved functionality for deployables, and for container'ing, and dropping logic out from WSA and distributed it appropriately

* handling terminal operations - buying an exosuit and selecting an infantry loadout; starting work on support for more persistent equipment timers local to the avatar (that were removed in this update; see wsa changes)

* linked terminal page/message with routing policy

* tuning vehicle loadout management and display

* separated use time from purchase time and applied a system that limits either if that same event would recur too soon; tuning exosuit and loadout changes

* some ask timeout handling and comments

* normalizing item on ground interactions

* rearranging the project structure

* merged with master; commas removed

* fixing tests

* added description strings to Tasks; adjusted the completion conditions for some Tasks

* a failed purchase will not block future purchases; increased timeout on move-item tasks

* corpses, even one's own, should have properly moveable inventories

* for better persistence, until GlobalDefinitions is renovated, moved the object id->name map onto the avatar object, for the purpose of timers; replaced a use of values in GridInventory for a map conversion

* max loadouts and max exosuit switch use same cooldown now; hopefully better clarifcation regarding held arm position
2020-05-16 12:18:08 -04:00
Mazo 05b87e77d3 Temporary property overrides for event 2020-05-16 15:53:16 +01:00