mirror of
https://github.com/psforever/PSF-LoginServer.git
synced 2026-04-21 04:15:23 +00:00
Experience for KDA [Prep-work] (#1024)
* extensive modifications to source entry shorthand * moving 11 files changes 55 other files * added score card classes; upgraded packet classes * I decided to import over everything * proliferation of in-game activity messages, especially for spawning activity; removed defaults for activities; fixed (most?) building tests * upkeep on the LLU's managing service, as well as the facility hack management service, in response to a potential bug * a facility that changes faction affiliation while it is the destination of an LLU delivery will cancel that LLU delivery * fixed crash due to boomer trigger overriding position of ace, without the ace being properly cleaned up on the client of the bomber; fixed issue with the boomer trigger going missing * flipped the first two FDU deployable settings so they match the correct fire modes; corrected a stack overflow situation with the sourcing entities * action, but no response * condensed parameters on avatar class * as always, fixing tests * quickly, loose ends tied
This commit is contained in:
parent
40cf783f18
commit
779054fef9
153 changed files with 3772 additions and 2100 deletions
|
|
@ -6,7 +6,7 @@ import akka.testkit.TestProbe
|
|||
import base.ActorTest
|
||||
import net.psforever.actors.zone.ZoneActor
|
||||
import net.psforever.objects.ballistics._
|
||||
import net.psforever.objects.ce.DeployedItem
|
||||
import net.psforever.objects.ce.{Deployable, DeployedItem}
|
||||
import net.psforever.objects.guid.NumberPoolHub
|
||||
import net.psforever.objects.guid.source.MaxNumberSource
|
||||
import net.psforever.objects.serverobject.mount.{MountInfo, Mountable}
|
||||
|
|
@ -23,10 +23,10 @@ import net.psforever.objects.avatar.Avatar
|
|||
import net.psforever.objects.vital.base.DamageResolution
|
||||
import net.psforever.objects.vital.interaction.DamageInteraction
|
||||
import net.psforever.objects.vital.projectile.ProjectileReason
|
||||
|
||||
import akka.actor.typed.scaladsl.adapter._
|
||||
import net.psforever.objects.sourcing.{PlayerSource, SourceEntry}
|
||||
|
||||
import scala.collection.mutable.ListBuffer
|
||||
import scala.collection.mutable
|
||||
import scala.concurrent.duration._
|
||||
|
||||
class DeployableTest extends Specification {
|
||||
|
|
@ -318,9 +318,9 @@ class ExplosiveDeployableJammerTest extends ActorTest {
|
|||
val avatar2 = Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute)
|
||||
val player2 = Player(avatar2) //guid=4
|
||||
val weapon = Tool(GlobalDefinitions.jammer_grenade) //guid=5
|
||||
val deployableList = new ListBuffer()
|
||||
val deployableList = new mutable.ListBuffer[Deployable]()
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables")
|
||||
private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables")
|
||||
|
||||
override def SetupNumberPools() = {}
|
||||
GUID(guid)
|
||||
|
|
@ -395,9 +395,9 @@ class ExplosiveDeployableJammerExplodeTest extends ActorTest {
|
|||
val avatar2 = Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute)
|
||||
val player2 = Player(avatar2) //guid=4
|
||||
val weapon = Tool(GlobalDefinitions.jammer_grenade) //guid=5
|
||||
val deployableList = new ListBuffer()
|
||||
val deployableList = new mutable.ListBuffer[Deployable]()
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables")
|
||||
private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables")
|
||||
|
||||
override def SetupNumberPools() = {}
|
||||
GUID(guid)
|
||||
|
|
@ -504,9 +504,9 @@ class ExplosiveDeployableDestructionTest extends ActorTest {
|
|||
val avatar2 = Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute)
|
||||
val player2 = Player(avatar2) //guid=4
|
||||
val weapon = Tool(GlobalDefinitions.suppressor) //guid=5
|
||||
val deployableList = new ListBuffer()
|
||||
val deployableList = new mutable.ListBuffer[Deployable]()
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables")
|
||||
private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables")
|
||||
|
||||
override def SetupNumberPools() = {}
|
||||
GUID(guid)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue