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:
Fate-JH 2023-02-14 00:09:28 -05:00 committed by GitHub
parent 40cf783f18
commit 779054fef9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
153 changed files with 3772 additions and 2100 deletions

View file

@ -1,6 +1,7 @@
// Copyright (c) 2020 PSForever
package objects
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import akka.actor.{ActorRef, Props}
import akka.actor.typed.scaladsl.adapter._
import akka.testkit.TestProbe
@ -11,11 +12,12 @@ import net.psforever.objects.ce.DeployedItem
import net.psforever.objects._
import net.psforever.objects.guid.NumberPoolHub
import net.psforever.objects.guid.source.MaxNumberSource
import net.psforever.objects.serverobject.CommonMessages
import net.psforever.objects.serverobject.environment._
import net.psforever.objects.serverobject.mount.Mountable
import net.psforever.objects.vehicles.VehicleLockState
import net.psforever.objects.vehicles.control.{/*CargoCarrierControl, */VehicleControl}
import net.psforever.objects.vital.{VehicleShieldCharge, Vitality}
import net.psforever.objects.vehicles.control.VehicleControl
import net.psforever.objects.vital.{ShieldCharge, Vitality}
import net.psforever.objects.zones.{Zone, ZoneMap}
import net.psforever.packet.game._
import net.psforever.services.ServiceManager
@ -459,16 +461,16 @@ class VehicleControlShieldsChargingTest extends ActorTest {
"charge vehicle shields" in {
assert(vehicle.Shields == 0)
assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] }))
assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] }))
vehicle.Actor ! Vehicle.ChargeShields(15)
vehicle.Actor ! CommonMessages.ChargeShields(15, None)
val msg = probe.receiveOne(500 milliseconds)
assert(msg match {
case VehicleServiceMessage(_, VehicleAction.PlanetsideAttribute(_, PlanetSideGUID(10), 68, 15)) => true
case _ => false
})
assert(vehicle.Shields == 15)
assert(vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] }))
assert(vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] }))
}
}
@ -486,12 +488,12 @@ class VehicleControlShieldsNotChargingVehicleDeadTest extends ActorTest {
vehicle.Health = 0
assert(vehicle.Health == 0)
assert(vehicle.Shields == 0)
assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] }))
vehicle.Actor.tell(Vehicle.ChargeShields(15), probe.ref)
assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] }))
vehicle.Actor.tell(CommonMessages.ChargeShields(15, None), probe.ref)
probe.expectNoMessage(1 seconds)
assert(vehicle.Shields == 0)
assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] }))
assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] }))
}
}
@ -508,11 +510,11 @@ class VehicleControlShieldsNotChargingVehicleShieldsFullTest extends ActorTest {
assert(vehicle.Shields == 0)
vehicle.Shields = vehicle.MaxShields
assert(vehicle.Shields == vehicle.MaxShields)
assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] }))
vehicle.Actor ! Vehicle.ChargeShields(15)
assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] }))
vehicle.Actor ! CommonMessages.ChargeShields(15, None)
probe.expectNoMessage(1 seconds)
assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] }))
assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] }))
}
}
@ -528,7 +530,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest {
"charge vehicle shields" in {
assert(vehicle.Shields == 0)
vehicle.Actor ! Vehicle.ChargeShields(15)
vehicle.Actor ! CommonMessages.ChargeShields(15, None)
val msg = probe.receiveOne(200 milliseconds)
//assert(msg.isInstanceOf[Vehicle.UpdateShieldsCharge])
assert(msg match {
@ -537,7 +539,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest {
})
assert(vehicle.Shields == 15)
vehicle.Actor ! Vehicle.ChargeShields(15)
vehicle.Actor ! CommonMessages.ChargeShields(15, None)
probe.expectNoMessage(200 milliseconds)
assert(vehicle.Shields == 15)
}
@ -566,7 +568,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest {
// val msg = probe.receiveOne(200 milliseconds)
// assert(msg.isInstanceOf[Vitality.DamageResolution])
// assert(vehicle.Shields == 0)
// vehicle.Actor.tell(Vehicle.ChargeShields(15), probe.ref)
// vehicle.Actor.tell(CommonMessages.ChargeShields(15, None), probe.ref)
//
// probe.expectNoMessage(200 milliseconds)
// assert(vehicle.Shields == 0)
@ -780,6 +782,7 @@ class VehicleControlInteractWithLavaTest extends ActorTest {
},
zoneNumber = 0
) {
actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref
override def SetupNumberPools() = {}
GUID(guid)
override def LivePlayers = List(player1)
@ -841,6 +844,7 @@ class VehicleControlInteractWithDeathTest extends ActorTest {
},
zoneNumber = 0
) {
actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref
override def SetupNumberPools() = {}
GUID(guid)
override def LivePlayers = List(player1)