mirror of
https://github.com/2revoemag/PSF-BotServer.git
synced 2026-07-11 22:44:37 +00:00
introduction of aggravated damage properties and modification of damage pathways such that 'aggravated' is treated as a unique damage type
This commit is contained in:
FateJH
parent
cf9e4ea194
commit
e5d0690c42
20 changed files with 696 additions and 371 deletions
|
|
@ -28,7 +28,7 @@ class DamageCalculationsTests extends Specification {
|
|||
val target = Vehicle(GlobalDefinitions.fury)
|
||||
target.Position = Vector3(10, 0, 0)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -180,7 +180,7 @@ class ResistanceCalculationsTests extends Specification {
|
|||
"ignore all targets" in {
|
||||
val target = Vehicle(GlobalDefinitions.fury)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -192,7 +192,7 @@ class ResistanceCalculationsTests extends Specification {
|
|||
"discern standard infantry targets" in {
|
||||
val target = player
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -208,7 +208,7 @@ class ResistanceCalculationsTests extends Specification {
|
|||
val target = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
target.ExoSuit = ExoSuitType.MAX
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -223,7 +223,7 @@ class ResistanceCalculationsTests extends Specification {
|
|||
"discern ground vehicle targets" in {
|
||||
val target = Vehicle(GlobalDefinitions.fury)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -238,7 +238,7 @@ class ResistanceCalculationsTests extends Specification {
|
|||
"discern flying vehicle targets" in {
|
||||
val target = Vehicle(GlobalDefinitions.mosquito)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -284,7 +284,7 @@ class ResolutionCalculationsTests extends Specification {
|
|||
"calculate no damage" in {
|
||||
val target = player
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -296,7 +296,7 @@ class ResolutionCalculationsTests extends Specification {
|
|||
"calculate no infantry damage for vehicles" in {
|
||||
val target1 = Vehicle(GlobalDefinitions.fury) //!
|
||||
val resprojectile1 = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target1),
|
||||
target1.DamageModel,
|
||||
|
|
@ -306,7 +306,7 @@ class ResolutionCalculationsTests extends Specification {
|
|||
|
||||
val target2 = player
|
||||
val resprojectile2 = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target2),
|
||||
target2.DamageModel,
|
||||
|
|
@ -340,7 +340,7 @@ class ResolutionCalculationsTests extends Specification {
|
|||
"calculate no max damage for vehicles" in {
|
||||
val target1 = Vehicle(GlobalDefinitions.fury) //!
|
||||
val resprojectile1 = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target1),
|
||||
target1.DamageModel,
|
||||
|
|
@ -350,7 +350,7 @@ class ResolutionCalculationsTests extends Specification {
|
|||
|
||||
val target2 = player2
|
||||
val resprojectile2 = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target2),
|
||||
target2.DamageModel,
|
||||
|
|
@ -376,7 +376,7 @@ class ResolutionCalculationsTests extends Specification {
|
|||
"do not care if target is infantry for vehicle calculations" in {
|
||||
val target1 = player
|
||||
val resprojectile1 = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target1),
|
||||
target1.DamageModel,
|
||||
|
|
@ -386,7 +386,7 @@ class ResolutionCalculationsTests extends Specification {
|
|||
|
||||
val target2 = Vehicle(GlobalDefinitions.fury) //!
|
||||
val resprojectile2 = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
SourceEntry(target2),
|
||||
target2.DamageModel,
|
||||
|
|
@ -450,7 +450,6 @@ class DamageModelTests extends Specification {
|
|||
Vector3.Zero
|
||||
)
|
||||
val func: Any => ResolvedProjectile = resprojectile.damage_model.Calculate(resprojectile)
|
||||
|
||||
func(tplayer)
|
||||
tplayer.Health mustEqual 54
|
||||
tplayer.Armor mustEqual 46
|
||||
|
|
@ -471,8 +470,7 @@ class DamageModelTests extends Specification {
|
|||
Vector3.Zero
|
||||
)
|
||||
val func: Any => ResolvedProjectile =
|
||||
resprojectile.damage_model.Calculate(resprojectile, ProjectileResolution.Splash)
|
||||
|
||||
resprojectile.damage_model.Calculate(resprojectile, DamageType.Splash)
|
||||
func(tplayer)
|
||||
tplayer.Health mustEqual 65
|
||||
tplayer.Armor mustEqual 35
|
||||
|
|
@ -572,7 +570,7 @@ class DamageModelTests extends Specification {
|
|||
Vector3.Zero
|
||||
)
|
||||
val func: Any => ResolvedProjectile =
|
||||
resprojectile.damage_model.Calculate(resprojectile, ProjectileResolution.Splash)
|
||||
resprojectile.damage_model.Calculate(resprojectile, DamageType.Splash)
|
||||
|
||||
func(vehicle)
|
||||
vehicle.Health mustEqual 518
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ class DamageableTest extends Specification {
|
|||
"permit damage" in {
|
||||
val target = new SensorDeployable(GlobalDefinitions.motionalarmsensor)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileA, weaponA.Definition, weaponA.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -53,7 +52,6 @@ class DamageableTest extends Specification {
|
|||
"ignore attempts at non-zero damage" in {
|
||||
val target = new SensorDeployable(GlobalDefinitions.motionalarmsensor)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectileA,
|
||||
weaponA.Definition,
|
||||
|
|
@ -78,7 +76,6 @@ class DamageableTest extends Specification {
|
|||
Faction = player1.Faction
|
||||
}
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileA, weaponA.Definition, weaponA.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -101,7 +98,6 @@ class DamageableTest extends Specification {
|
|||
Faction = PlanetSideEmpire.NC
|
||||
}
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileA, weaponA.Definition, weaponA.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -128,7 +124,6 @@ class DamageableTest extends Specification {
|
|||
Faction = player1.Faction
|
||||
}
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileA, weaponA.Definition, weaponA.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -152,7 +147,6 @@ class DamageableTest extends Specification {
|
|||
"permit jamming" in {
|
||||
val target = new SensorDeployable(GlobalDefinitions.motionalarmsensor)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileB, weaponB.Definition, weaponB.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -166,7 +160,6 @@ class DamageableTest extends Specification {
|
|||
"ignore attempts at jamming if the projectile is does not cause the effect" in {
|
||||
val target = new SensorDeployable(GlobalDefinitions.motionalarmsensor)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileA, weaponA.Definition, weaponA.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -181,7 +174,6 @@ class DamageableTest extends Specification {
|
|||
val target = new SensorDeployable(GlobalDefinitions.motionalarmsensor)
|
||||
target.Faction = player1.Faction
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileB, weaponB.Definition, weaponB.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -196,7 +188,6 @@ class DamageableTest extends Specification {
|
|||
"ignore attempts at jamming targets that are not jammable" in {
|
||||
val target = new TrapDeployable(GlobalDefinitions.tank_traps)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileB, weaponB.Definition, weaponB.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -216,7 +207,6 @@ class DamageableTest extends Specification {
|
|||
val target = new SensorDeployable(GlobalDefinitions.motionalarmsensor)
|
||||
target.Faction = player1.Faction
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectileB, weaponB.Definition, weaponB.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
SourceEntry(target),
|
||||
target.DamageModel,
|
||||
|
|
@ -271,7 +261,6 @@ class DamageableEntityDamageTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -342,7 +331,6 @@ class DamageableEntityDestroyedTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -416,7 +404,6 @@ class DamageableEntityNotDestroyTwice extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -487,7 +474,6 @@ class DamageableAmenityTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -580,7 +566,6 @@ class DamageableMountableDamageTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -675,7 +660,6 @@ class DamageableMountableDestroyTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -764,7 +748,6 @@ class DamageableWeaponTurretDamageTest extends ActorTest {
|
|||
val projectile = weapon.Projectile
|
||||
val turretSource = SourceEntry(turret)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -862,7 +845,6 @@ class DamageableWeaponTurretJammerTest extends ActorTest {
|
|||
val projectile = weapon.Projectile
|
||||
val turretSource = SourceEntry(turret)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -964,7 +946,6 @@ class DamageableWeaponTurretDestructionTest extends ActorTest {
|
|||
val weaponA = Tool(GlobalDefinitions.jammer_grenade)
|
||||
val projectileA = weaponA.Projectile
|
||||
val resolvedA = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectileA,
|
||||
weaponA.Definition,
|
||||
|
|
@ -983,7 +964,6 @@ class DamageableWeaponTurretDestructionTest extends ActorTest {
|
|||
val weaponB = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectileB = weaponB.Projectile
|
||||
val resolvedB = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectileB,
|
||||
weaponB.Definition,
|
||||
|
|
@ -1046,8 +1026,8 @@ class DamageableWeaponTurretDestructionTest extends ActorTest {
|
|||
)
|
||||
assert(
|
||||
msg56.head match {
|
||||
case VehicleServiceMessage.TurretUpgrade(SupportActor.ClearSpecific(List(t), _)) if t eq turret => true
|
||||
case _ => false
|
||||
case VehicleServiceMessage.TurretUpgrade(SupportActor.ClearSpecific(List(t), _)) if turret eq t => true
|
||||
case _ => false
|
||||
}
|
||||
)
|
||||
assert(
|
||||
|
|
@ -1105,7 +1085,6 @@ class DamageableVehicleDamageTest extends ActorTest {
|
|||
val projectile = weapon.Projectile
|
||||
val vehicleSource = SourceEntry(atv)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -1237,7 +1216,6 @@ class DamageableVehicleDamageMountedTest extends ActorTest {
|
|||
val projectile = weapon.Projectile
|
||||
val vehicleSource = SourceEntry(lodestar)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -1385,7 +1363,6 @@ class DamageableVehicleJammeringMountedTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.jammer_grenade)
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -1475,7 +1452,6 @@ class DamageableVehicleDestroyTest extends ActorTest {
|
|||
val projectile = weapon.Projectile
|
||||
val vehicleSource = SourceEntry(atv)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -1601,7 +1577,6 @@ class DamageableVehicleDestroyMountedTest extends ActorTest {
|
|||
val weaponA = Tool(GlobalDefinitions.jammer_grenade)
|
||||
val projectileA = weaponA.Projectile
|
||||
val resolvedA = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectileA,
|
||||
weaponA.Definition,
|
||||
|
|
@ -1620,7 +1595,6 @@ class DamageableVehicleDestroyMountedTest extends ActorTest {
|
|||
val weaponB = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectileB = weaponB.Projectile
|
||||
val resolvedB = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectileB,
|
||||
weaponB.Definition,
|
||||
|
|
|
|||
|
|
@ -334,7 +334,6 @@ class ExplosiveDeployableJammerTest extends ActorTest {
|
|||
val pSource = PlayerSource(player1)
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectile, weapon.Definition, weapon.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
jMineSource,
|
||||
j_mine.DamageModel,
|
||||
|
|
@ -432,7 +431,6 @@ class ExplosiveDeployableJammerExplodeTest extends ActorTest {
|
|||
val pSource = PlayerSource(player1)
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectile, weapon.Definition, weapon.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
hMineSource,
|
||||
h_mine.DamageModel,
|
||||
|
|
@ -542,7 +540,6 @@ class ExplosiveDeployableDestructionTest extends ActorTest {
|
|||
val pSource = PlayerSource(player1)
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(projectile, weapon.Definition, weapon.FireMode, pSource, 0, Vector3.Zero, Vector3.Zero),
|
||||
hMineSource,
|
||||
h_mine.DamageModel,
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ class GeneratorControlDamageTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -162,7 +161,6 @@ class GeneratorControlCriticalTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -253,7 +251,6 @@ class GeneratorControlDestroyedTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -384,7 +381,6 @@ class GeneratorControlKillsTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -507,7 +503,6 @@ class GeneratorControlNotDestroyTwice extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -597,7 +592,6 @@ class GeneratorControlNotDamageIfExplodingTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
@ -691,7 +685,6 @@ class GeneratorControlNotRepairIfExplodingTest extends ActorTest {
|
|||
val weapon = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectile = weapon.Projectile
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
Projectile(
|
||||
projectile,
|
||||
weapon.Definition,
|
||||
|
|
|
|||
|
|
@ -378,7 +378,6 @@ class PlayerControlDamageTest extends ActorTest {
|
|||
val projectile = tool.Projectile
|
||||
val playerSource = SourceEntry(player2)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
Projectile(
|
||||
projectile,
|
||||
tool.Definition,
|
||||
|
|
@ -478,7 +477,6 @@ class PlayerControlDeathStandingTest extends ActorTest {
|
|||
val projectile = tool.Projectile
|
||||
val player1Source = SourceEntry(player1)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
Projectile(projectile, tool.Definition, tool.FireMode, player1Source, 0, Vector3(2, 0, 0), Vector3(-1, 0, 0)),
|
||||
SourceEntry(player2),
|
||||
player2.DamageModel,
|
||||
|
|
@ -607,7 +605,6 @@ class PlayerControlDeathSeatedTest extends ActorTest {
|
|||
val projectile = tool.Projectile
|
||||
val player1Source = SourceEntry(player1)
|
||||
val resolved = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
Projectile(projectile, tool.Definition, tool.FireMode, player1Source, 0, Vector3(2, 0, 0), Vector3(-1, 0, 0)),
|
||||
SourceEntry(player2),
|
||||
player2.DamageModel,
|
||||
|
|
|
|||
|
|
@ -352,13 +352,11 @@ class ProjectileTest extends Specification {
|
|||
|
||||
"construct" in {
|
||||
val obj = ResolvedProjectile(
|
||||
ProjectileResolution.Hit,
|
||||
projectile,
|
||||
PlayerSource(player2),
|
||||
fury_dm,
|
||||
Vector3(1.2f, 3.4f, 5.6f)
|
||||
)
|
||||
obj.resolution mustEqual ProjectileResolution.Hit
|
||||
obj.projectile mustEqual projectile
|
||||
obj.target mustEqual p2_source
|
||||
obj.damage_model mustEqual fury.DamageModel
|
||||
|
|
|
|||
|
|
@ -997,7 +997,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest {
|
|||
// val p_source = PlayerSource( Player(Avatar(0, "TestTarget", PlanetSideEmpire.NC, CharacterGender.Female, 1, CharacterVoice.Mute)) )
|
||||
// val projectile = Projectile(beamer_wep.Projectile, GlobalDefinitions.beamer, beamer_wep.FireMode, p_source, GlobalDefinitions.beamer.ObjectId, Vector3.Zero, Vector3.Zero)
|
||||
// val fury_dm = Vehicle(GlobalDefinitions.fury).DamageModel
|
||||
// val obj = ResolvedProjectile(ProjectileResolution.Hit, projectile, p_source, fury_dm, Vector3(1.2f, 3.4f, 5.6f))
|
||||
// val obj = ResolvedProjectile(projectile, p_source, fury_dm, Vector3(1.2f, 3.4f, 5.6f))
|
||||
//
|
||||
// "not charge vehicle shields if recently damaged" in {
|
||||
// assert(vehicle.Shields == 0)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ class VitalityTest extends Specification {
|
|||
val pSource = PlayerSource(player)
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
projectile,
|
||||
SourceEntry(player),
|
||||
player.DamageModel,
|
||||
|
|
@ -69,7 +68,6 @@ class VitalityTest extends Specification {
|
|||
val pSource = PlayerSource(player)
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
projectile,
|
||||
SourceEntry(player),
|
||||
player.DamageModel,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue