mirror of
https://github.com/psforever/PSF-LoginServer.git
synced 2026-04-29 00:05:28 +00:00
Avatar Persistence
* Add AvatarActor: Responsible for managing the session's avatar object * Convert Avatar object to case class * Add persistence for BEP, CEP, implants, certs and cosmetics * Add cosmetic chat commands and handle UI packet * Add /setbr, /setcr, /certadd, /addbep, /addcep GM commands * Convert zone maps to JSON * Update to Scala 2.13.3 and fix warnings * Fix MAX cooldowns not being applied when purchased manually * Normalize database table names to singular * Add docker image build
This commit is contained in:
Jakob Gillich
parent
1efbedcf8e
commit
3bdc681c9d
267 changed files with 476963 additions and 133957 deletions
|
|
@ -1,85 +0,0 @@
|
|||
// Copyright (c) 2019 PSForever
|
||||
import net.psforever.packet.game.objectcreate.{Cosmetics, PersonalStyle}
|
||||
import org.specs2.mutable._
|
||||
|
||||
class CosmeticsTest extends Specification {
|
||||
"Cosmetics" should {
|
||||
"construct" in {
|
||||
Cosmetics()
|
||||
Cosmetics(3)
|
||||
Cosmetics(PersonalStyle.NoHelmet)
|
||||
Cosmetics(Set(PersonalStyle.NoHelmet))
|
||||
Cosmetics(true, false, false, false, false)
|
||||
ok
|
||||
}
|
||||
|
||||
"translate into a numeric value" in {
|
||||
Cosmetics().pstyles mustEqual 0
|
||||
Cosmetics(3).pstyles mustEqual 3
|
||||
Cosmetics(PersonalStyle.NoHelmet).pstyles mustEqual PersonalStyle.NoHelmet.id
|
||||
Cosmetics(
|
||||
Set(PersonalStyle.NoHelmet, PersonalStyle.Earpiece)
|
||||
).pstyles mustEqual PersonalStyle.NoHelmet.id + PersonalStyle.Earpiece.id
|
||||
Cosmetics(true, false, false, false, false).pstyles mustEqual PersonalStyle.NoHelmet.id
|
||||
}
|
||||
|
||||
"translate into a list of cosmetic style tokens" in {
|
||||
Cosmetics().Styles mustEqual Set()
|
||||
Cosmetics(3).Styles mustEqual Set(PersonalStyle.BrimmedCap, PersonalStyle.Earpiece)
|
||||
Cosmetics(PersonalStyle.NoHelmet).Styles mustEqual Set(PersonalStyle.NoHelmet)
|
||||
Cosmetics(Set(PersonalStyle.NoHelmet)).Styles mustEqual Set(PersonalStyle.NoHelmet)
|
||||
Cosmetics(true, false, false, false, false).Styles mustEqual Set(PersonalStyle.NoHelmet)
|
||||
}
|
||||
|
||||
"report containing specific values only" in {
|
||||
val cos = Cosmetics(Set(PersonalStyle.NoHelmet, PersonalStyle.Earpiece))
|
||||
cos.contains(PersonalStyle.NoHelmet) mustEqual true
|
||||
cos.contains(PersonalStyle.Beret) mustEqual false
|
||||
}
|
||||
|
||||
"add values" in {
|
||||
val cos = Cosmetics()
|
||||
cos.Styles mustEqual Set()
|
||||
val cos1 = cos + PersonalStyle.NoHelmet
|
||||
cos1.Styles mustEqual Set(PersonalStyle.NoHelmet)
|
||||
cos1.Styles mustNotEqual cos.Styles
|
||||
val cos2 = cos1 + PersonalStyle.Beret
|
||||
cos2.Styles mustEqual Set(PersonalStyle.NoHelmet, PersonalStyle.Beret)
|
||||
cos2.Styles mustNotEqual cos.Styles
|
||||
cos2.Styles mustNotEqual cos1.Styles
|
||||
}
|
||||
|
||||
"can not add already included values" in {
|
||||
val cos = Cosmetics(Set(PersonalStyle.NoHelmet, PersonalStyle.Beret))
|
||||
cos.Styles mustEqual Set(PersonalStyle.NoHelmet, PersonalStyle.Beret)
|
||||
val cos1 = cos + PersonalStyle.Beret
|
||||
cos1.Styles mustEqual Set(PersonalStyle.NoHelmet, PersonalStyle.Beret)
|
||||
cos ne cos1 mustEqual true
|
||||
}
|
||||
|
||||
"remove values" in {
|
||||
val cos = Cosmetics(Set(PersonalStyle.NoHelmet, PersonalStyle.Beret))
|
||||
cos.Styles mustEqual Set(PersonalStyle.NoHelmet, PersonalStyle.Beret)
|
||||
val cos1 = cos - PersonalStyle.NoHelmet
|
||||
cos1.Styles mustEqual Set(PersonalStyle.Beret)
|
||||
cos1.Styles mustNotEqual cos.Styles
|
||||
val cos2 = cos1 - PersonalStyle.Beret
|
||||
cos2.Styles mustEqual Set()
|
||||
cos2.Styles mustNotEqual cos.Styles
|
||||
cos2.Styles mustNotEqual cos1.Styles
|
||||
}
|
||||
|
||||
"can not remove un-included or already excluded values" in {
|
||||
val cos = Cosmetics(Set(PersonalStyle.NoHelmet, PersonalStyle.Beret))
|
||||
cos.Styles mustEqual Set(PersonalStyle.NoHelmet, PersonalStyle.Beret)
|
||||
val cos1 = cos - PersonalStyle.Beret
|
||||
cos1.Styles mustEqual Set(PersonalStyle.NoHelmet)
|
||||
|
||||
val cos2 = cos - PersonalStyle.Beret //again
|
||||
cos2.Styles mustEqual Set(PersonalStyle.NoHelmet)
|
||||
|
||||
val cos3 = cos1 - PersonalStyle.Earpiece
|
||||
cos3.Styles mustEqual Set(PersonalStyle.NoHelmet)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ abstract class ActorTest(sys: ActorSystem = ActorSystem("system", ConfigFactory.
|
|||
with AnyWordSpecLike
|
||||
with Matchers
|
||||
with BeforeAndAfterAll {
|
||||
override def afterAll: Unit = {
|
||||
override def afterAll(): Unit = {
|
||||
TestKit.shutdownActorSystem(system)
|
||||
}
|
||||
}
|
||||
|
|
@ -71,7 +71,7 @@ object ActorTest {
|
|||
|
||||
def receive: Receive = {
|
||||
case msg =>
|
||||
(if (sender == test) {
|
||||
(if (sender() == test) {
|
||||
sendTo
|
||||
} else {
|
||||
test
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ private class ContextSensitive extends Actor {
|
|||
def receive: Receive = {
|
||||
case _ =>
|
||||
context.become(PassThroughBehavior)
|
||||
output = sender
|
||||
sender ! context
|
||||
output = sender()
|
||||
sender() ! context
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package game
|
||||
|
||||
import net.psforever.objects.avatar.Certification
|
||||
import org.specs2.mutable._
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game._
|
||||
import net.psforever.types.{CertificationType, PlanetSideGUID}
|
||||
import net.psforever.types.PlanetSideGUID
|
||||
import scodec.bits._
|
||||
|
||||
class CharacterKnowledgeMessageTest extends Specification {
|
||||
|
|
@ -17,18 +18,18 @@ class CharacterKnowledgeMessageTest extends Specification {
|
|||
info mustEqual CharacterKnowledgeInfo(
|
||||
"Frankentank",
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.ArmoredAssault1,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.ReinforcedExoSuit,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.Engineering,
|
||||
CertificationType.GroundSupport,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.AIMAX,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AAMAX,
|
||||
CertificationType.ArmoredAssault2
|
||||
Certification.StandardAssault,
|
||||
Certification.ArmoredAssault1,
|
||||
Certification.MediumAssault,
|
||||
Certification.ReinforcedExoSuit,
|
||||
Certification.Harasser,
|
||||
Certification.Engineering,
|
||||
Certification.GroundSupport,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.AIMAX,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AAMAX,
|
||||
Certification.ArmoredAssault2
|
||||
),
|
||||
15,
|
||||
0,
|
||||
|
|
@ -45,18 +46,18 @@ class CharacterKnowledgeMessageTest extends Specification {
|
|||
CharacterKnowledgeInfo(
|
||||
"Frankentank",
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.ArmoredAssault1,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.ReinforcedExoSuit,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.Engineering,
|
||||
CertificationType.GroundSupport,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.AIMAX,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AAMAX,
|
||||
CertificationType.ArmoredAssault2
|
||||
Certification.StandardAssault,
|
||||
Certification.ArmoredAssault1,
|
||||
Certification.MediumAssault,
|
||||
Certification.ReinforcedExoSuit,
|
||||
Certification.Harasser,
|
||||
Certification.Engineering,
|
||||
Certification.GroundSupport,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.AIMAX,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AAMAX,
|
||||
Certification.ArmoredAssault2
|
||||
),
|
||||
15,
|
||||
0,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ package game
|
|||
import org.specs2.mutable._
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game._
|
||||
import net.psforever.types.PlanetSideGUID
|
||||
import net.psforever.types.{ImplantType, PlanetSideGUID}
|
||||
import scodec.bits._
|
||||
|
||||
class CreateShortcutMessageTest extends Specification {
|
||||
|
|
@ -96,27 +96,27 @@ class CreateShortcutMessageTest extends Specification {
|
|||
}
|
||||
|
||||
"presets" in {
|
||||
Shortcut.AudioAmplifier.get.purpose mustEqual 2
|
||||
Shortcut.AudioAmplifier.get.tile mustEqual "audio_amplifier"
|
||||
Shortcut.DartklightVision.get.purpose mustEqual 2
|
||||
Shortcut.DartklightVision.get.tile mustEqual "darklight_vision"
|
||||
Shortcut.EnhancedTargeting.get.purpose mustEqual 2
|
||||
Shortcut.EnhancedTargeting.get.tile mustEqual "targeting"
|
||||
ImplantType.AudioAmplifier.shortcut.purpose mustEqual 2
|
||||
ImplantType.AudioAmplifier.shortcut.tile mustEqual "audio_amplifier"
|
||||
ImplantType.DarklightVision.shortcut.purpose mustEqual 2
|
||||
ImplantType.DarklightVision.shortcut.tile mustEqual "darklight_vision"
|
||||
ImplantType.Targeting.shortcut.purpose mustEqual 2
|
||||
ImplantType.Targeting.shortcut.tile mustEqual "targeting"
|
||||
Shortcut.Medkit.get.purpose mustEqual 0
|
||||
Shortcut.Medkit.get.tile mustEqual "medkit"
|
||||
Shortcut.MeleeBooster.get.purpose mustEqual 2
|
||||
Shortcut.MeleeBooster.get.tile mustEqual "melee_booster"
|
||||
Shortcut.PersonalShield.get.purpose mustEqual 2
|
||||
Shortcut.PersonalShield.get.tile mustEqual "personal_shield"
|
||||
Shortcut.RangeMagnifier.get.purpose mustEqual 2
|
||||
Shortcut.RangeMagnifier.get.tile mustEqual "range_magnifier"
|
||||
Shortcut.Regeneration.get.purpose mustEqual 2
|
||||
Shortcut.Regeneration.get.tile mustEqual "advanced_regen"
|
||||
Shortcut.SecondWind.get.purpose mustEqual 2
|
||||
Shortcut.SecondWind.get.tile mustEqual "second_wind"
|
||||
Shortcut.SensorShield.get.purpose mustEqual 2
|
||||
Shortcut.SensorShield.get.tile mustEqual "silent_run"
|
||||
Shortcut.Surge.get.purpose mustEqual 2
|
||||
Shortcut.Surge.get.tile mustEqual "surge"
|
||||
ImplantType.MeleeBooster.shortcut.purpose mustEqual 2
|
||||
ImplantType.MeleeBooster.shortcut.tile mustEqual "melee_booster"
|
||||
ImplantType.PersonalShield.shortcut.purpose mustEqual 2
|
||||
ImplantType.PersonalShield.shortcut.tile mustEqual "personal_shield"
|
||||
ImplantType.RangeMagnifier.shortcut.purpose mustEqual 2
|
||||
ImplantType.RangeMagnifier.shortcut.tile mustEqual "range_magnifier"
|
||||
ImplantType.AdvancedRegen.shortcut.purpose mustEqual 2
|
||||
ImplantType.AdvancedRegen.shortcut.tile mustEqual "advanced_regen"
|
||||
ImplantType.SecondWind.shortcut.purpose mustEqual 2
|
||||
ImplantType.SecondWind.shortcut.tile mustEqual "second_wind"
|
||||
ImplantType.SilentRun.shortcut.purpose mustEqual 2
|
||||
ImplantType.SilentRun.shortcut.tile mustEqual "silent_run"
|
||||
ImplantType.Surge.shortcut.purpose mustEqual 2
|
||||
ImplantType.Surge.shortcut.tile mustEqual "surge"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package game
|
||||
|
||||
import net.psforever.objects.avatar.Certification
|
||||
import org.specs2.mutable._
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game.SquadAction._
|
||||
import net.psforever.packet.game._
|
||||
import net.psforever.types.{CertificationType, PlanetSideGUID}
|
||||
import net.psforever.types.PlanetSideGUID
|
||||
import scodec.bits._
|
||||
|
||||
class SquadDefinitionActionMessageTest extends Specification {
|
||||
|
|
@ -183,7 +184,7 @@ class SquadDefinitionActionMessageTest extends Specification {
|
|||
unk2 mustEqual 0
|
||||
action mustEqual ChangeSquadMemberRequirementsCertifications(
|
||||
1,
|
||||
Set(CertificationType.AntiVehicular, CertificationType.InfiltrationSuit)
|
||||
Set(Certification.AntiVehicular, Certification.InfiltrationSuit)
|
||||
)
|
||||
case _ =>
|
||||
ko
|
||||
|
|
@ -263,7 +264,7 @@ class SquadDefinitionActionMessageTest extends Specification {
|
|||
unk2 mustEqual 0
|
||||
action mustEqual SearchForSquadsWithParticularRole(
|
||||
"Badass",
|
||||
Set(CertificationType.InfiltrationSuit, CertificationType.AntiVehicular),
|
||||
Set(Certification.InfiltrationSuit, Certification.AntiVehicular),
|
||||
2,
|
||||
SearchMode.SomeCertifications
|
||||
)
|
||||
|
|
@ -279,7 +280,7 @@ class SquadDefinitionActionMessageTest extends Specification {
|
|||
unk2 mustEqual 0
|
||||
action mustEqual SearchForSquadsWithParticularRole(
|
||||
"Badass",
|
||||
Set(CertificationType.InfiltrationSuit, CertificationType.AntiVehicular),
|
||||
Set(Certification.InfiltrationSuit, Certification.AntiVehicular),
|
||||
2,
|
||||
SearchMode.AllCertifications
|
||||
)
|
||||
|
|
@ -430,7 +431,7 @@ class SquadDefinitionActionMessageTest extends Specification {
|
|||
0,
|
||||
ChangeSquadMemberRequirementsCertifications(
|
||||
1,
|
||||
Set(CertificationType.AntiVehicular, CertificationType.InfiltrationSuit)
|
||||
Set(Certification.AntiVehicular, Certification.InfiltrationSuit)
|
||||
)
|
||||
)
|
||||
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
|
||||
|
|
@ -498,7 +499,7 @@ class SquadDefinitionActionMessageTest extends Specification {
|
|||
0,
|
||||
SearchForSquadsWithParticularRole(
|
||||
"Badass",
|
||||
Set(CertificationType.InfiltrationSuit, CertificationType.AntiVehicular),
|
||||
Set(Certification.InfiltrationSuit, Certification.AntiVehicular),
|
||||
2,
|
||||
SearchMode.SomeCertifications
|
||||
)
|
||||
|
|
@ -514,7 +515,7 @@ class SquadDefinitionActionMessageTest extends Specification {
|
|||
0,
|
||||
SearchForSquadsWithParticularRole(
|
||||
"Badass",
|
||||
Set(CertificationType.InfiltrationSuit, CertificationType.AntiVehicular),
|
||||
Set(Certification.InfiltrationSuit, Certification.AntiVehicular),
|
||||
2,
|
||||
SearchMode.AllCertifications
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
// Copyright (c) 2019 PSForever
|
||||
package game
|
||||
|
||||
import net.psforever.objects.avatar.Certification
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game._
|
||||
import net.psforever.types.{CertificationType, PlanetSideGUID}
|
||||
import net.psforever.types.PlanetSideGUID
|
||||
import org.specs2.mutable._
|
||||
import scodec.bits._
|
||||
|
||||
|
|
@ -203,7 +204,7 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
case Some(SquadPositionDetail(None, Some(role), None, Some(req), None, None)) =>
|
||||
role mustEqual "ADV Hacker"
|
||||
req.size mustEqual 1
|
||||
req.contains(CertificationType.AdvancedHacking) mustEqual true
|
||||
req.contains(Certification.AdvancedHacking) mustEqual true
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
|
|
@ -310,9 +311,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(0),
|
||||
|
|
@ -329,9 +330,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(0),
|
||||
|
|
@ -348,9 +349,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(42644970L),
|
||||
|
|
@ -367,9 +368,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(41604210L),
|
||||
|
|
@ -386,9 +387,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(0),
|
||||
|
|
@ -405,9 +406,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(0),
|
||||
|
|
@ -424,9 +425,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(0),
|
||||
|
|
@ -443,9 +444,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(0),
|
||||
|
|
@ -462,9 +463,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(42771010L),
|
||||
|
|
@ -481,9 +482,9 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
Some(""),
|
||||
Some(
|
||||
Set(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit
|
||||
)
|
||||
),
|
||||
Some(0),
|
||||
|
|
@ -779,7 +780,7 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification {
|
|||
6,
|
||||
SquadPositionDetail()
|
||||
.Role("ADV Hacker")
|
||||
.Requirements(Set(CertificationType.AdvancedHacking))
|
||||
.Requirements(Set(Certification.AdvancedHacking))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package game.objectcreate
|
||||
|
||||
import net.psforever.objects.avatar.Cosmetic
|
||||
import net.psforever.packet.PacketCoding
|
||||
import net.psforever.packet.game.ObjectCreateMessage
|
||||
import net.psforever.packet.game.objectcreate._
|
||||
|
|
@ -89,17 +90,10 @@ class CharacterDataTest extends Specification {
|
|||
char.command_rank mustEqual 5
|
||||
char.implant_effects.length mustEqual 1
|
||||
char.implant_effects.head mustEqual ImplantEffects.NoEffects
|
||||
char.cosmetics match {
|
||||
case Some(c: Cosmetics) =>
|
||||
c.Styles mustEqual Set(
|
||||
PersonalStyle.NoHelmet,
|
||||
PersonalStyle.Beret,
|
||||
PersonalStyle.Sunglasses,
|
||||
PersonalStyle.Earpiece
|
||||
)
|
||||
case None =>
|
||||
ko
|
||||
}
|
||||
char.cosmetics must beSome(
|
||||
beEqualTo(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
|
||||
char.unk mustEqual 7
|
||||
//short test of inventory items
|
||||
inv.isDefined mustEqual true
|
||||
|
|
@ -282,17 +276,9 @@ class CharacterDataTest extends Specification {
|
|||
char.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
|
||||
char.command_rank mustEqual 2
|
||||
char.implant_effects.isEmpty mustEqual true
|
||||
char.cosmetics match {
|
||||
case Some(c: Cosmetics) =>
|
||||
c.Styles mustEqual Set(
|
||||
PersonalStyle.NoHelmet,
|
||||
PersonalStyle.Beret,
|
||||
PersonalStyle.Sunglasses,
|
||||
PersonalStyle.Earpiece
|
||||
)
|
||||
case None =>
|
||||
ko
|
||||
}
|
||||
char.cosmetics must beSome(
|
||||
beEqualTo(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
char.unk mustEqual 1
|
||||
|
||||
hand mustEqual DrawnSlot.Pistol1
|
||||
|
|
@ -375,7 +361,7 @@ class CharacterDataTest extends Specification {
|
|||
7,
|
||||
5,
|
||||
List(ImplantEffects.NoEffects),
|
||||
Some(Cosmetics(true, true, true, true, false))
|
||||
Some(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
val inv = InventoryData(
|
||||
InventoryItemData(
|
||||
|
|
@ -482,7 +468,7 @@ class CharacterDataTest extends Specification {
|
|||
UniformStyle.ThirdUpgrade,
|
||||
5,
|
||||
List(ImplantEffects.NoEffects),
|
||||
Some(Cosmetics(true, true, true, true, false))
|
||||
Some(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
val inv = InventoryData(
|
||||
InventoryItemData(
|
||||
|
|
@ -598,7 +584,7 @@ class CharacterDataTest extends Specification {
|
|||
UniformStyle.ThirdUpgrade,
|
||||
1,
|
||||
List(),
|
||||
Some(Cosmetics(true, true, true, true, false))
|
||||
Some(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
val obj = PlayerData(pos, app, char, DrawnSlot.Pistol1)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package game.objectcreatedetailed
|
||||
|
||||
import net.psforever.objects.avatar.{BattleRank, Certification, Cosmetic}
|
||||
import org.specs2.mutable._
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game.ObjectCreateDetailedMessage
|
||||
|
|
@ -124,13 +125,13 @@ class DetailedCharacterDataTest extends Specification {
|
|||
a.stamina mustEqual 100
|
||||
a.max_field.isEmpty mustEqual true
|
||||
a.certs mustEqual List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.ATV,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.ReinforcedExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.ATV,
|
||||
Certification.Harasser,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.ReinforcedExoSuit
|
||||
)
|
||||
a.unk1 mustEqual 0L
|
||||
a.unk2 mustEqual 0L
|
||||
|
|
@ -312,13 +313,13 @@ class DetailedCharacterDataTest extends Specification {
|
|||
a.stamina mustEqual 100
|
||||
a.max_field.isEmpty mustEqual true
|
||||
a.certs mustEqual List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.ATV,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.ReinforcedExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.ATV,
|
||||
Certification.Harasser,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.ReinforcedExoSuit
|
||||
)
|
||||
a.unk1 mustEqual 0L
|
||||
a.unk2 mustEqual 0L
|
||||
|
|
@ -486,7 +487,6 @@ class DetailedCharacterDataTest extends Specification {
|
|||
ko
|
||||
}
|
||||
|
||||
DetailedCharacterData.isBR24(char.a.bep) mustEqual false //br5+
|
||||
char match {
|
||||
case DetailedCharacterData(a, b) =>
|
||||
a.bep mustEqual 15301L
|
||||
|
|
@ -498,11 +498,11 @@ class DetailedCharacterDataTest extends Specification {
|
|||
a.stamina mustEqual 100
|
||||
a.max_field.contains(0) mustEqual true //important!
|
||||
a.certs mustEqual List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.UniMAX
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.UniMAX
|
||||
)
|
||||
a.unk1 mustEqual 0L
|
||||
a.unk2 mustEqual 0L
|
||||
|
|
@ -714,7 +714,7 @@ class DetailedCharacterDataTest extends Specification {
|
|||
ko
|
||||
}
|
||||
|
||||
DetailedCharacterData.isBR24(char.a.bep) mustEqual true
|
||||
(char.a.bep >= BattleRank.BR24.experience) mustEqual true
|
||||
char match {
|
||||
case DetailedCharacterData(a, b) =>
|
||||
a.bep mustEqual 6366766L
|
||||
|
|
@ -726,21 +726,21 @@ class DetailedCharacterDataTest extends Specification {
|
|||
a.stamina mustEqual 46
|
||||
a.max_field.isEmpty mustEqual true
|
||||
a.certs mustEqual List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.HeavyAssault,
|
||||
CertificationType.AntiVehicular,
|
||||
CertificationType.AirCavalryScout,
|
||||
CertificationType.GroundSupport,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.Medical,
|
||||
CertificationType.AdvancedMedical,
|
||||
CertificationType.Hacking,
|
||||
CertificationType.AdvancedHacking,
|
||||
CertificationType.Engineering,
|
||||
CertificationType.CombatEngineering
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.HeavyAssault,
|
||||
Certification.AntiVehicular,
|
||||
Certification.AirCavalryScout,
|
||||
Certification.GroundSupport,
|
||||
Certification.Harasser,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.Medical,
|
||||
Certification.AdvancedMedical,
|
||||
Certification.Hacking,
|
||||
Certification.AdvancedHacking,
|
||||
Certification.Engineering,
|
||||
Certification.CombatEngineering
|
||||
)
|
||||
a.unk1 mustEqual 0L
|
||||
a.unk2 mustEqual 0L
|
||||
|
|
@ -1062,17 +1062,9 @@ class DetailedCharacterDataTest extends Specification {
|
|||
"training_ui",
|
||||
"training_map"
|
||||
)
|
||||
b.cosmetics match {
|
||||
case Some(c: Cosmetics) =>
|
||||
c.Styles mustEqual Set(
|
||||
PersonalStyle.NoHelmet,
|
||||
PersonalStyle.Beret,
|
||||
PersonalStyle.Sunglasses,
|
||||
PersonalStyle.Earpiece
|
||||
)
|
||||
case None =>
|
||||
ko
|
||||
}
|
||||
b.cosmetics must beSome(
|
||||
beEqualTo(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
b.unk1.isEmpty mustEqual true
|
||||
b.unk2 mustEqual Nil
|
||||
b.unk3 mustEqual Nil
|
||||
|
|
@ -1263,19 +1255,19 @@ class DetailedCharacterDataTest extends Specification {
|
|||
a.unk8 mustEqual 3165669L
|
||||
a.unk9 mustEqual List(0, 0, 0, 0, 0, 0)
|
||||
a.certs mustEqual List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.HeavyAssault,
|
||||
CertificationType.AirCavalryScout,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.UniMAX,
|
||||
CertificationType.Medical,
|
||||
CertificationType.AdvancedMedical,
|
||||
CertificationType.Hacking,
|
||||
CertificationType.AdvancedHacking,
|
||||
CertificationType.ExpertHacking,
|
||||
CertificationType.Engineering
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.HeavyAssault,
|
||||
Certification.AirCavalryScout,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.UniMAX,
|
||||
Certification.Medical,
|
||||
Certification.AdvancedMedical,
|
||||
Certification.Hacking,
|
||||
Certification.AdvancedHacking,
|
||||
Certification.ExpertHacking,
|
||||
Certification.Engineering
|
||||
)
|
||||
|
||||
b.unk1.contains(14140) mustEqual true
|
||||
|
|
@ -1313,18 +1305,9 @@ class DetailedCharacterDataTest extends Specification {
|
|||
)
|
||||
b.unkB mustEqual List()
|
||||
b.unkC mustEqual false
|
||||
b.cosmetics match {
|
||||
case Some(c: Cosmetics) =>
|
||||
c.Styles mustEqual Set(
|
||||
PersonalStyle.NoHelmet,
|
||||
PersonalStyle.Sunglasses,
|
||||
PersonalStyle.Earpiece,
|
||||
PersonalStyle.BrimmedCap
|
||||
)
|
||||
case None =>
|
||||
ko
|
||||
}
|
||||
b.cosmetics.contains(Cosmetics(true, false, true, true, true)) mustEqual true
|
||||
b.cosmetics must beSome(
|
||||
beEqualTo(Set(Cosmetic.NoHelmet, Cosmetic.Sunglasses, Cosmetic.Earpiece, Cosmetic.BrimmedCap))
|
||||
)
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
|
|
@ -1399,7 +1382,7 @@ class DetailedCharacterDataTest extends Specification {
|
|||
ko
|
||||
}
|
||||
|
||||
DetailedCharacterData.isBR24(char.a.bep) mustEqual false
|
||||
(char.a.bep >= BattleRank.BR24.experience) mustEqual false
|
||||
char match {
|
||||
case DetailedCharacterData(a, b) =>
|
||||
a.bep mustEqual 1784200L
|
||||
|
|
@ -1420,18 +1403,18 @@ class DetailedCharacterDataTest extends Specification {
|
|||
a.unk8 mustEqual 1184175L
|
||||
a.unk9 mustEqual List(0, 0, 0, 0, 0, 0)
|
||||
a.certs mustEqual List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.HeavyAssault,
|
||||
CertificationType.AntiVehicular,
|
||||
CertificationType.AirCavalryScout,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.Medical,
|
||||
CertificationType.AdvancedMedical,
|
||||
CertificationType.Hacking,
|
||||
CertificationType.AdvancedHacking,
|
||||
CertificationType.Engineering
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.HeavyAssault,
|
||||
Certification.AntiVehicular,
|
||||
Certification.AirCavalryScout,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.Medical,
|
||||
Certification.AdvancedMedical,
|
||||
Certification.Hacking,
|
||||
Certification.AdvancedHacking,
|
||||
Certification.Engineering
|
||||
)
|
||||
|
||||
b.unk1.contains(21236) mustEqual true
|
||||
|
|
@ -1605,13 +1588,13 @@ class DetailedCharacterDataTest extends Specification {
|
|||
0L,
|
||||
List(0, 0, 0, 0, 0, 0),
|
||||
List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.ATV,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.ReinforcedExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.ATV,
|
||||
Certification.Harasser,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.ReinforcedExoSuit
|
||||
)
|
||||
)
|
||||
val bb: (Long, Option[Int]) => DetailedCharacterB = DetailedCharacterB(
|
||||
|
|
@ -1787,13 +1770,13 @@ class DetailedCharacterDataTest extends Specification {
|
|||
0L,
|
||||
List(0, 0, 0, 0, 0, 0),
|
||||
List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.ATV,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.ReinforcedExoSuit
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.ATV,
|
||||
Certification.Harasser,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.ReinforcedExoSuit
|
||||
)
|
||||
)
|
||||
val bb: (Long, Option[Int]) => DetailedCharacterB = DetailedCharacterB(
|
||||
|
|
@ -1971,11 +1954,11 @@ class DetailedCharacterDataTest extends Specification {
|
|||
0L,
|
||||
List(0, 0, 0, 0, 0, 0),
|
||||
List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.UniMAX
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.UniMAX
|
||||
)
|
||||
)
|
||||
val bb: (Long, Option[Int]) => DetailedCharacterB = DetailedCharacterB(
|
||||
|
|
@ -2193,21 +2176,21 @@ class DetailedCharacterDataTest extends Specification {
|
|||
3278759L,
|
||||
List(0, 0, 0, 0, 0, 0),
|
||||
List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.HeavyAssault,
|
||||
CertificationType.AntiVehicular,
|
||||
CertificationType.AirCavalryScout,
|
||||
CertificationType.GroundSupport,
|
||||
CertificationType.Harasser,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.Medical,
|
||||
CertificationType.AdvancedMedical,
|
||||
CertificationType.Hacking,
|
||||
CertificationType.AdvancedHacking,
|
||||
CertificationType.Engineering,
|
||||
CertificationType.CombatEngineering
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.HeavyAssault,
|
||||
Certification.AntiVehicular,
|
||||
Certification.AirCavalryScout,
|
||||
Certification.GroundSupport,
|
||||
Certification.Harasser,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.Medical,
|
||||
Certification.AdvancedMedical,
|
||||
Certification.Hacking,
|
||||
Certification.AdvancedHacking,
|
||||
Certification.Engineering,
|
||||
Certification.CombatEngineering
|
||||
)
|
||||
)
|
||||
val bb: (Long, Option[Int]) => DetailedCharacterB = DetailedCharacterB(
|
||||
|
|
@ -2533,7 +2516,7 @@ class DetailedCharacterDataTest extends Specification {
|
|||
Nil,
|
||||
Nil,
|
||||
false,
|
||||
Some(Cosmetics(true, true, true, true, false))
|
||||
Some(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
val char: Option[Int] => DetailedCharacterData =
|
||||
(pad_length: Option[Int]) => DetailedCharacterData(ba, bb(ba.bep, pad_length))(pad_length)
|
||||
|
|
@ -3678,19 +3661,19 @@ class DetailedCharacterDataTest extends Specification {
|
|||
3165669,
|
||||
List(0, 0, 0, 0, 0, 0),
|
||||
List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.HeavyAssault,
|
||||
CertificationType.AirCavalryScout,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.UniMAX,
|
||||
CertificationType.Medical,
|
||||
CertificationType.AdvancedMedical,
|
||||
CertificationType.Hacking,
|
||||
CertificationType.AdvancedHacking,
|
||||
CertificationType.ExpertHacking,
|
||||
CertificationType.Engineering
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.HeavyAssault,
|
||||
Certification.AirCavalryScout,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.UniMAX,
|
||||
Certification.Medical,
|
||||
Certification.AdvancedMedical,
|
||||
Certification.Hacking,
|
||||
Certification.AdvancedHacking,
|
||||
Certification.ExpertHacking,
|
||||
Certification.Engineering
|
||||
)
|
||||
)
|
||||
val bb: (Long, Option[Int]) => DetailedCharacterB = DetailedCharacterB(
|
||||
|
|
@ -3999,7 +3982,7 @@ class DetailedCharacterDataTest extends Specification {
|
|||
),
|
||||
List(),
|
||||
false,
|
||||
Some(Cosmetics(true, false, true, true, true))
|
||||
Some(Set(Cosmetic.NoHelmet, Cosmetic.Sunglasses, Cosmetic.Earpiece, Cosmetic.BrimmedCap))
|
||||
)
|
||||
val char: Option[Int] => DetailedCharacterData =
|
||||
(pad_length: Option[Int]) => DetailedCharacterData(ba, bb(ba.bep, pad_length))(pad_length)
|
||||
|
|
@ -4604,18 +4587,18 @@ class DetailedCharacterDataTest extends Specification {
|
|||
1184175,
|
||||
List(0, 0, 0, 0, 0, 0),
|
||||
List(
|
||||
CertificationType.StandardAssault,
|
||||
CertificationType.MediumAssault,
|
||||
CertificationType.HeavyAssault,
|
||||
CertificationType.AntiVehicular,
|
||||
CertificationType.AirCavalryScout,
|
||||
CertificationType.StandardExoSuit,
|
||||
CertificationType.AgileExoSuit,
|
||||
CertificationType.Medical,
|
||||
CertificationType.AdvancedMedical,
|
||||
CertificationType.Hacking,
|
||||
CertificationType.AdvancedHacking,
|
||||
CertificationType.Engineering
|
||||
Certification.StandardAssault,
|
||||
Certification.MediumAssault,
|
||||
Certification.HeavyAssault,
|
||||
Certification.AntiVehicular,
|
||||
Certification.AirCavalryScout,
|
||||
Certification.StandardExoSuit,
|
||||
Certification.AgileExoSuit,
|
||||
Certification.Medical,
|
||||
Certification.AdvancedMedical,
|
||||
Certification.Hacking,
|
||||
Certification.AdvancedHacking,
|
||||
Certification.Engineering
|
||||
)
|
||||
)
|
||||
val bb: (Long, Option[Int]) => DetailedCharacterB = DetailedCharacterB(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package game.objectcreatevehicle
|
||||
|
||||
import net.psforever.objects.avatar.Cosmetic
|
||||
import net.psforever.packet._
|
||||
import net.psforever.packet.game.objectcreate._
|
||||
import net.psforever.packet.game.ObjectCreateMessage
|
||||
|
|
@ -105,7 +106,11 @@ class MountedVehiclesTest extends Specification {
|
|||
unk mustEqual 7
|
||||
cr mustEqual 5
|
||||
implants mustEqual Nil
|
||||
cosmetics.contains(Cosmetics(true, true, true, true, false)) mustEqual true
|
||||
cosmetics must beSome(
|
||||
beEqualTo(
|
||||
Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece)
|
||||
)
|
||||
)
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
|
|
@ -202,7 +207,7 @@ class MountedVehiclesTest extends Specification {
|
|||
7,
|
||||
5,
|
||||
Nil,
|
||||
Some(Cosmetics(true, true, true, true, false))
|
||||
Some(Set(Cosmetic.NoHelmet, Cosmetic.Beret, Cosmetic.Sunglasses, Cosmetic.Earpiece))
|
||||
)
|
||||
val inv: InventoryData = InventoryData(
|
||||
List(
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ package objects
|
|||
|
||||
import net.psforever.objects.GlobalDefinitions._
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.loadouts._
|
||||
import net.psforever.objects.avatar.{Avatar, BattleRank, Implant}
|
||||
import net.psforever.objects.definition.ImplantDefinition
|
||||
import net.psforever.types.{CharacterGender, CharacterVoice, ImplantType, PlanetSideEmpire}
|
||||
import org.specs2.mutable._
|
||||
|
||||
class AvatarTest extends Specification {
|
||||
def CreatePlayer(): (Player, Avatar) = {
|
||||
val avatar = Avatar("TestCharacter", PlanetSideEmpire.VS, CharacterGender.Female, 41, CharacterVoice.Voice1)
|
||||
val avatar = Avatar(0, "TestCharacter", PlanetSideEmpire.VS, CharacterGender.Female, 41, CharacterVoice.Voice1)
|
||||
val player = Player(avatar)
|
||||
player.Slot(0).Equipment = Tool(beamer)
|
||||
player.Slot(2).Equipment = Tool(suppressor)
|
||||
|
|
@ -25,376 +25,86 @@ class AvatarTest extends Specification {
|
|||
}
|
||||
|
||||
"construct" in {
|
||||
val av = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val av = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.name mustEqual "Chord"
|
||||
av.faction mustEqual PlanetSideEmpire.TR
|
||||
av.sex mustEqual CharacterGender.Male
|
||||
av.head mustEqual 0
|
||||
av.voice mustEqual CharacterVoice.Voice5
|
||||
av.BEP mustEqual 0
|
||||
av.CEP mustEqual 0
|
||||
av.Certifications mustEqual Set.empty
|
||||
av.Definition.ObjectId mustEqual 121
|
||||
av.bep mustEqual 0
|
||||
av.cep mustEqual 0
|
||||
av.certifications mustEqual Set.empty
|
||||
av.definition.ObjectId mustEqual 121
|
||||
}
|
||||
|
||||
"can maintain cumulative battle experience point values" in {
|
||||
val av = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.BEP mustEqual 0
|
||||
av.BEP = 100
|
||||
av.BEP mustEqual 100
|
||||
av.BEP = 700
|
||||
av.BEP mustEqual 700
|
||||
}
|
||||
|
||||
"can maintain battle experience point values up to a maximum (Long.MaxValue)" in {
|
||||
val av = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.BEP mustEqual 0
|
||||
av.BEP = 4294967295L
|
||||
av.BEP mustEqual 4294967295L
|
||||
}
|
||||
|
||||
"can not maintain battle experience point values below zero" in {
|
||||
val av = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.BEP mustEqual 0
|
||||
av.BEP = -1
|
||||
av.BEP mustEqual 0
|
||||
av.BEP = 100
|
||||
av.BEP mustEqual 100
|
||||
av.BEP = -1
|
||||
av.BEP mustEqual 0
|
||||
}
|
||||
|
||||
"can maintain cumulative command experience point values" in {
|
||||
val av = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.CEP mustEqual 0
|
||||
av.CEP = 100
|
||||
av.CEP mustEqual 100
|
||||
av.CEP = 700
|
||||
av.CEP mustEqual 700
|
||||
}
|
||||
|
||||
"can maintain command experience point values up to a maximum (Long.MaxValue)" in {
|
||||
val av = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.CEP mustEqual 0
|
||||
av.CEP = 4294967295L
|
||||
av.CEP mustEqual 4294967295L
|
||||
}
|
||||
|
||||
"can not maintain command experience point values below zero" in {
|
||||
val av = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.CEP mustEqual 0
|
||||
av.CEP = -1
|
||||
av.CEP mustEqual 0
|
||||
av.CEP = 100
|
||||
av.CEP mustEqual 100
|
||||
av.CEP = -1
|
||||
av.CEP mustEqual 0
|
||||
}
|
||||
|
||||
"can tell the difference between avatars" in {
|
||||
(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)) mustEqual true
|
||||
|
||||
(Avatar("Chord1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
Avatar("Chord2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
Avatar("Chord", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Female, 0, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 1, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice4)) mustEqual false
|
||||
"can not maintain experience point values below zero" in {
|
||||
val av = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
av.bep mustEqual 0
|
||||
av.copy(bep = -1) must throwA[AssertionError]
|
||||
av.copy(cep = -1) must throwA[AssertionError]
|
||||
}
|
||||
|
||||
//refer to ImplantTest.scala for more tests
|
||||
"maximum of three implant slots" in {
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants.length mustEqual 3
|
||||
obj.Implants(0).Unlocked mustEqual false
|
||||
obj.Implants(0).Initialized mustEqual false
|
||||
obj.Implants(0).Active mustEqual false
|
||||
obj.Implants(0).Implant mustEqual ImplantType.None
|
||||
obj.Implant(0) mustEqual ImplantType.None
|
||||
obj.Implants(0).Installed.isEmpty mustEqual true
|
||||
obj.Implants(1).Unlocked mustEqual false
|
||||
obj.Implants(1).Initialized mustEqual false
|
||||
obj.Implants(1).Active mustEqual false
|
||||
obj.Implants(1).Implant mustEqual ImplantType.None
|
||||
obj.Implant(1) mustEqual ImplantType.None
|
||||
obj.Implants(1).Installed.isEmpty mustEqual true
|
||||
obj.Implants(2).Unlocked mustEqual false
|
||||
obj.Implants(2).Initialized mustEqual false
|
||||
obj.Implants(2).Active mustEqual false
|
||||
obj.Implants(2).Implant mustEqual ImplantType.None
|
||||
obj.Implant(2) mustEqual ImplantType.None
|
||||
obj.Implants(2).Installed.isEmpty mustEqual true
|
||||
|
||||
obj.Implant(3) mustEqual ImplantType.None //invalid slots beyond the third always reports as ImplantType.None
|
||||
val obj = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.implants.length mustEqual 3
|
||||
obj.implants(0) must beNone
|
||||
obj.implants(1) must beNone
|
||||
obj.implants(2) must beNone
|
||||
obj.implants.lift(3) must beNone
|
||||
}
|
||||
|
||||
"can install an implant" in {
|
||||
val testplant: ImplantDefinition = ImplantDefinition(1)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.InstallImplant(testplant).contains(0) mustEqual true
|
||||
obj.Implants.find({ p => p.Implant == ImplantType(1) }) match { //find the installed implant
|
||||
val testplant = Implant(new ImplantDefinition(ImplantType.AdvancedRegen))
|
||||
var obj = Avatar(
|
||||
0,
|
||||
"Chord",
|
||||
PlanetSideEmpire.TR,
|
||||
CharacterGender.Male,
|
||||
0,
|
||||
CharacterVoice.Voice5,
|
||||
bep = BattleRank.BR6.experience
|
||||
)
|
||||
obj.implants.nonEmpty must beTrue
|
||||
obj.implants.length mustEqual 3
|
||||
obj = obj.copy(implants = obj.implants.updated(0, Some(testplant)))
|
||||
obj.implants.flatten.find(_.definition.implantType == ImplantType.AdvancedRegen) match {
|
||||
case Some(slot) =>
|
||||
slot.Installed.contains(testplant) mustEqual true
|
||||
slot.definition mustEqual testplant.definition
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
ok
|
||||
}
|
||||
|
||||
"can install implants in sequential slots" in {
|
||||
val testplant1: ImplantDefinition = ImplantDefinition(1)
|
||||
val testplant2: ImplantDefinition = ImplantDefinition(2)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.Implants(1).Unlocked = true
|
||||
|
||||
obj.InstallImplant(testplant1).contains(0) mustEqual true
|
||||
obj.InstallImplant(testplant2).contains(1) mustEqual true
|
||||
}
|
||||
|
||||
"can not install the same type of implant twice" in {
|
||||
val testplant1: ImplantDefinition = ImplantDefinition(1)
|
||||
val testplant2: ImplantDefinition = ImplantDefinition(1)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.Implants(1).Unlocked = true
|
||||
|
||||
obj.InstallImplant(testplant1).contains(0) mustEqual true
|
||||
obj.InstallImplant(testplant2).isEmpty mustEqual true
|
||||
val testplant1 = Implant(new ImplantDefinition(ImplantType.AdvancedRegen))
|
||||
val testplant2 = Implant(new ImplantDefinition(ImplantType.AdvancedRegen))
|
||||
val obj = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.copy(implants = obj.implants.updated(0, Some(testplant1)).updated(1, Some(testplant2))) must throwA[
|
||||
AssertionError
|
||||
]
|
||||
}
|
||||
|
||||
"can not install more implants than slots available (two unlocked)" in {
|
||||
val testplant1: ImplantDefinition = ImplantDefinition(1)
|
||||
val testplant2: ImplantDefinition = ImplantDefinition(2)
|
||||
val testplant3: ImplantDefinition = ImplantDefinition(3)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.Implants(1).Unlocked = true
|
||||
|
||||
obj.InstallImplant(testplant1).contains(0) mustEqual true
|
||||
obj.InstallImplant(testplant2).contains(1) mustEqual true
|
||||
obj.InstallImplant(testplant3).isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"can not install more implants than slots available (four implants)" in {
|
||||
val testplant1: ImplantDefinition = ImplantDefinition(1)
|
||||
val testplant2: ImplantDefinition = ImplantDefinition(2)
|
||||
val testplant3: ImplantDefinition = ImplantDefinition(3)
|
||||
val testplant4: ImplantDefinition = ImplantDefinition(4)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.Implants(1).Unlocked = true
|
||||
obj.Implants(2).Unlocked = true
|
||||
|
||||
obj.InstallImplant(testplant1).contains(0) mustEqual true
|
||||
obj.InstallImplant(testplant2).contains(1) mustEqual true
|
||||
obj.InstallImplant(testplant3).contains(2) mustEqual true
|
||||
obj.InstallImplant(testplant4).isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"can uninstall an implant" in {
|
||||
val testplant: ImplantDefinition = ImplantDefinition(1)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.InstallImplant(testplant).contains(0) mustEqual true
|
||||
obj.Implants(0).Installed.contains(testplant) mustEqual true
|
||||
|
||||
obj.UninstallImplant(testplant.Type).contains(0) mustEqual true
|
||||
obj.Implants(0).Installed.isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"can uninstall just a specific implant" in {
|
||||
val testplant1: ImplantDefinition = ImplantDefinition(1)
|
||||
val testplant2: ImplantDefinition = ImplantDefinition(2)
|
||||
val testplant3: ImplantDefinition = ImplantDefinition(3)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.Implants(1).Unlocked = true
|
||||
obj.Implants(2).Unlocked = true
|
||||
obj.InstallImplant(testplant1).contains(0) mustEqual true
|
||||
obj.InstallImplant(testplant2).contains(1) mustEqual true
|
||||
obj.InstallImplant(testplant3).contains(2) mustEqual true
|
||||
|
||||
obj.Implant(0) mustEqual testplant1.Type
|
||||
obj.Implant(1) mustEqual testplant2.Type
|
||||
obj.Implant(2) mustEqual testplant3.Type
|
||||
obj.UninstallImplant(testplant2.Type).contains(1) mustEqual true
|
||||
obj.Implant(0) mustEqual testplant1.Type
|
||||
obj.Implant(1) mustEqual ImplantType.None
|
||||
obj.Implant(2) mustEqual testplant3.Type
|
||||
}
|
||||
|
||||
"can install implants to any available slot" in {
|
||||
val testplant1: ImplantDefinition = ImplantDefinition(1)
|
||||
val testplant2: ImplantDefinition = ImplantDefinition(2)
|
||||
val testplant3: ImplantDefinition = ImplantDefinition(3)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.Implants(1).Unlocked = true
|
||||
obj.Implants(2).Unlocked = true
|
||||
obj.InstallImplant(testplant1).contains(0) mustEqual true
|
||||
obj.InstallImplant(testplant2).contains(1) mustEqual true
|
||||
obj.InstallImplant(testplant3).contains(2) mustEqual true
|
||||
obj.UninstallImplant(testplant2.Type).contains(1) mustEqual true
|
||||
obj.Implant(0) mustEqual testplant1.Type
|
||||
obj.Implant(1) mustEqual ImplantType.None
|
||||
obj.Implant(2) mustEqual testplant3.Type
|
||||
|
||||
val testplant4: ImplantDefinition = ImplantDefinition(4)
|
||||
obj.InstallImplant(testplant4).contains(1) mustEqual true
|
||||
obj.Implant(0) mustEqual testplant1.Type
|
||||
obj.Implant(1) mustEqual testplant4.Type
|
||||
obj.Implant(2) mustEqual testplant3.Type
|
||||
}
|
||||
|
||||
"can reset implants to uninitialized state" in {
|
||||
val testplant1: ImplantDefinition = ImplantDefinition(1)
|
||||
val testplant2: ImplantDefinition = ImplantDefinition(2)
|
||||
val obj = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Implants(0).Unlocked = true
|
||||
obj.Implants(1).Unlocked = true
|
||||
obj.InstallImplant(testplant1).contains(0) mustEqual true
|
||||
obj.InstallImplant(testplant2).contains(1) mustEqual true
|
||||
obj.Implants(0).Initialized = true
|
||||
obj.Implants(0).Active = true
|
||||
obj.Implants(1).Initialized = true
|
||||
|
||||
obj.Implants(0).Initialized mustEqual true
|
||||
obj.Implants(0).Active mustEqual true
|
||||
obj.Implants(1).Initialized mustEqual true
|
||||
obj.ResetAllImplants()
|
||||
obj.Implants(0).Initialized mustEqual false
|
||||
obj.Implants(0).Active mustEqual false
|
||||
obj.Implants(1).Initialized mustEqual false
|
||||
}
|
||||
|
||||
"does not have any loadout specifications by default" in {
|
||||
val (_, avatar) = CreatePlayer()
|
||||
(0 to 9).foreach { avatar.EquipmentLoadouts.LoadLoadout(_).isEmpty mustEqual true }
|
||||
ok
|
||||
}
|
||||
|
||||
"save player's current inventory as a loadout" in {
|
||||
val (obj, avatar) = CreatePlayer()
|
||||
obj.Slot(0).Equipment.get.asInstanceOf[Tool].Magazine = 1 //non-standard but legal
|
||||
obj.Slot(2).Equipment.get.asInstanceOf[Tool].AmmoSlot.Magazine = 100 //non-standard (and out of range, real=25)
|
||||
avatar.EquipmentLoadouts.SaveLoadout(obj, "test", 0)
|
||||
|
||||
avatar.EquipmentLoadouts.LoadLoadout(0) match {
|
||||
case Some(items: InfantryLoadout) =>
|
||||
items.label mustEqual "test"
|
||||
items.exosuit mustEqual obj.ExoSuit
|
||||
items.subtype mustEqual 0
|
||||
|
||||
items.visible_slots.length mustEqual 3
|
||||
val holsters = items.visible_slots.sortBy(_.index)
|
||||
holsters.head.index mustEqual 0
|
||||
holsters.head.item.asInstanceOf[Loadout.ShorthandTool].definition mustEqual beamer
|
||||
holsters.head.item.asInstanceOf[Loadout.ShorthandTool].ammo.head.ammo.capacity mustEqual 1 //we changed this
|
||||
holsters(1).index mustEqual 2
|
||||
holsters(1).item.asInstanceOf[Loadout.ShorthandTool].definition mustEqual suppressor
|
||||
holsters(1).item.asInstanceOf[Loadout.ShorthandTool].ammo.head.ammo.capacity mustEqual 100 //we changed this
|
||||
holsters(2).index mustEqual 4
|
||||
holsters(2).item.asInstanceOf[Loadout.ShorthandTool].definition mustEqual forceblade
|
||||
|
||||
items.inventory.length mustEqual 6
|
||||
val inventory = items.inventory.sortBy(_.index)
|
||||
inventory.head.index mustEqual 6
|
||||
inventory.head.item.asInstanceOf[Loadout.ShorthandAmmoBox].definition mustEqual bullet_9mm
|
||||
inventory(1).index mustEqual 9
|
||||
inventory(1).item.asInstanceOf[Loadout.ShorthandAmmoBox].definition mustEqual bullet_9mm
|
||||
inventory(2).index mustEqual 12
|
||||
inventory(2).item.asInstanceOf[Loadout.ShorthandAmmoBox].definition mustEqual bullet_9mm
|
||||
inventory(3).index mustEqual 33
|
||||
inventory(3).item.asInstanceOf[Loadout.ShorthandAmmoBox].definition mustEqual bullet_9mm_AP
|
||||
inventory(4).index mustEqual 36
|
||||
inventory(4).item.asInstanceOf[Loadout.ShorthandAmmoBox].definition mustEqual energy_cell
|
||||
inventory(5).index mustEqual 39
|
||||
inventory(5).item.asInstanceOf[Loadout.ShorthandSimpleItem].definition mustEqual remote_electronics_kit
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
}
|
||||
|
||||
"save player's current inventory as a loadout, only found in the called-out slot number" in {
|
||||
val (obj, avatar) = CreatePlayer()
|
||||
avatar.EquipmentLoadouts.SaveLoadout(obj, "test", 0)
|
||||
|
||||
avatar.EquipmentLoadouts.LoadLoadout(1).isDefined mustEqual false
|
||||
avatar.EquipmentLoadouts.LoadLoadout(0).isDefined mustEqual true
|
||||
}
|
||||
|
||||
"try to save player's current inventory as a loadout, but will not save to an invalid slot" in {
|
||||
val (obj, avatar) = CreatePlayer()
|
||||
avatar.EquipmentLoadouts.SaveLoadout(obj, "test", 50)
|
||||
|
||||
avatar.EquipmentLoadouts.LoadLoadout(50).isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"save player's current inventory as a loadout, without inventory contents" in {
|
||||
val (obj, avatar) = CreatePlayer()
|
||||
obj.Inventory.Clear()
|
||||
avatar.EquipmentLoadouts.SaveLoadout(obj, "test", 0)
|
||||
|
||||
avatar.EquipmentLoadouts.LoadLoadout(0) match {
|
||||
case Some(items: InfantryLoadout) =>
|
||||
items.label mustEqual "test"
|
||||
items.exosuit mustEqual obj.ExoSuit
|
||||
items.subtype mustEqual 0
|
||||
items.visible_slots.length mustEqual 3
|
||||
items.inventory.length mustEqual 0 //empty
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
}
|
||||
|
||||
"save player's current inventory as a loadout, without visible slot contents" in {
|
||||
val (obj, avatar) = CreatePlayer()
|
||||
obj.Slot(0).Equipment = None
|
||||
obj.Slot(2).Equipment = None
|
||||
obj.Slot(4).Equipment = None
|
||||
avatar.EquipmentLoadouts.SaveLoadout(obj, "test", 0)
|
||||
|
||||
avatar.EquipmentLoadouts.LoadLoadout(0) match {
|
||||
case Some(items: InfantryLoadout) =>
|
||||
items.label mustEqual "test"
|
||||
items.exosuit mustEqual obj.ExoSuit
|
||||
items.subtype mustEqual 0
|
||||
items.visible_slots.length mustEqual 0 //empty
|
||||
items.inventory.length mustEqual 6
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
}
|
||||
|
||||
"save, load, delete; rapidly" in {
|
||||
val (obj, avatar) = CreatePlayer()
|
||||
avatar.EquipmentLoadouts.SaveLoadout(obj, "test", 0)
|
||||
|
||||
avatar.EquipmentLoadouts.LoadLoadout(0).isDefined mustEqual true
|
||||
avatar.EquipmentLoadouts.DeleteLoadout(0)
|
||||
avatar.EquipmentLoadouts.LoadLoadout(0).isEmpty mustEqual true
|
||||
"can not install more implants than slots available" in {
|
||||
val testplant1 = Implant(new ImplantDefinition(ImplantType.AdvancedRegen))
|
||||
val testplant2 = Implant(new ImplantDefinition(ImplantType.Surge))
|
||||
val testplant3 = Implant(new ImplantDefinition(ImplantType.DarklightVision))
|
||||
val obj = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.copy(
|
||||
bep = BattleRank.BR12.value,
|
||||
implants = Seq(Some(testplant1), Some(testplant2), Some(testplant3))
|
||||
) must throwA[
|
||||
AssertionError
|
||||
]
|
||||
}
|
||||
|
||||
"the fifth slot is the locker wrapped in an EquipmentSlot" in {
|
||||
val (_, avatar) = CreatePlayer()
|
||||
avatar.FifthSlot.Equipment match {
|
||||
case Some(slot: LockerEquipment) => slot.Inventory mustEqual avatar.Locker.Inventory
|
||||
avatar.fifthSlot().Equipment match {
|
||||
case Some(slot: LockerEquipment) => slot.Inventory mustEqual avatar.locker.Inventory
|
||||
case _ => ko
|
||||
}
|
||||
}
|
||||
|
||||
"toString" in {
|
||||
Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5).toString mustEqual "TR Chord"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,162 +0,0 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package objects
|
||||
|
||||
import net.psforever.objects.avatar.Certification
|
||||
import net.psforever.types.CertificationType._
|
||||
import org.specs2.mutable.Specification
|
||||
|
||||
class CertificationTest extends Specification {
|
||||
"Dependencies" should {
|
||||
//From
|
||||
"find any certifications immediately dependent on a given certification (nothing)" in {
|
||||
Certification.Dependencies.From(StandardAssault) mustEqual Set()
|
||||
}
|
||||
|
||||
"find any certifications immediately dependent on a given certification (one)" in {
|
||||
Certification.Dependencies.From(Engineering) mustEqual Set(CombatEngineering)
|
||||
}
|
||||
|
||||
"find any certifications immediately dependent on a given certification (multiple)" in {
|
||||
Certification.Dependencies.From(MediumAssault) mustEqual Set(AntiVehicular, HeavyAssault, Sniping, SpecialAssault)
|
||||
}
|
||||
|
||||
"find any certifications immediately dependent on a given certification (intermediate)" in {
|
||||
Certification.Dependencies.From(ArmoredAssault2) mustEqual Set(BattleFrameRobotics, Flail)
|
||||
}
|
||||
//FromAll
|
||||
"find all certifications dependent on a given certification (nothing)" in {
|
||||
Certification.Dependencies.FromAll(StandardAssault) mustEqual Set()
|
||||
}
|
||||
|
||||
"find all certifications dependent on a given certification (one)" in {
|
||||
Certification.Dependencies.FromAll(ATV) mustEqual Set(Switchblade)
|
||||
}
|
||||
|
||||
"find all certifications dependent on a given certification (multiple)" in {
|
||||
Certification.Dependencies
|
||||
.FromAll(MediumAssault) mustEqual Set(AntiVehicular, HeavyAssault, Sniping, SpecialAssault, EliteAssault)
|
||||
}
|
||||
|
||||
"find all certifications dependent on a given certification (intermediate)" in {
|
||||
Certification.Dependencies
|
||||
.FromAll(ArmoredAssault2) mustEqual Set(BattleFrameRobotics, Flail, BFRAntiInfantry, BFRAntiAircraft)
|
||||
}
|
||||
//For
|
||||
"find any certifications that are immediate dependencies for a given certification (nothing)" in {
|
||||
Certification.Dependencies.For(StandardAssault) mustEqual Set()
|
||||
}
|
||||
|
||||
"find any certifications that are immediate dependencies for a given certification (one)" in {
|
||||
Certification.Dependencies.For(CombatEngineering) mustEqual Set(Engineering)
|
||||
}
|
||||
|
||||
"find any certifications that are immediate dependencies for a given certification (multiple)" in {
|
||||
Certification.Dependencies.For(AirCavalryAssault) mustEqual Set(AirCavalryScout, LightScout)
|
||||
}
|
||||
|
||||
"find any certifications that are immediate dependencies for a given certification (intermediate)" in {
|
||||
Certification.Dependencies.For(BattleFrameRobotics) mustEqual Set(ArmoredAssault2)
|
||||
}
|
||||
//ForAll
|
||||
"find all certifications that are dependencies for a given certification (nothing)" in {
|
||||
Certification.Dependencies.ForAll(StandardAssault) mustEqual Set()
|
||||
}
|
||||
|
||||
"find all certifications that are dependencies for a given certification (one)" in {
|
||||
Certification.Dependencies.ForAll(CombatEngineering) mustEqual Set(Engineering)
|
||||
}
|
||||
|
||||
"find all certifications that are dependencies for a given certification (multiple)" in {
|
||||
Certification.Dependencies.ForAll(AirCavalryAssault) mustEqual Set(AirCavalryScout, LightScout)
|
||||
}
|
||||
|
||||
"find all certifications that are dependencies for a given certification (intermediate)" in {
|
||||
Certification.Dependencies.ForAll(BattleFrameRobotics) mustEqual Set(ArmoredAssault1, ArmoredAssault2)
|
||||
}
|
||||
//Like
|
||||
"find related certifications" in {
|
||||
Certification.Dependencies.Like(AssaultBuggy) mustEqual Set(Harasser)
|
||||
Certification.Dependencies.Like(LightScout) mustEqual Set(AirCavalryScout, AssaultBuggy, Harasser)
|
||||
Certification.Dependencies.Like(UniMAX) mustEqual Set(AIMAX, AVMAX, AAMAX)
|
||||
Certification.Dependencies.Like(StandardAssault) mustEqual Set()
|
||||
}
|
||||
}
|
||||
|
||||
"Cost" should {
|
||||
"calculate the point-value of any certification (no value)" in {
|
||||
Certification.Cost.Of(StandardAssault) mustEqual 0
|
||||
}
|
||||
|
||||
"calculate the point-value of any certification (value)" in {
|
||||
Certification.Cost.Of(MediumAssault) mustEqual 2
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all certifications (no value)" in {
|
||||
Certification.Cost.Of(Set(StandardAssault)) mustEqual 0
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all certifications (value)" in {
|
||||
Certification.Cost.Of(Set(MediumAssault)) mustEqual 2
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all certifications (add)" in {
|
||||
Certification.Cost.Of(Set(StandardAssault, MediumAssault)) mustEqual 2
|
||||
Certification.Cost.Of(Set(HeavyAssault, MediumAssault)) mustEqual 6
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all certifications (large collection)" in {
|
||||
Certification.Cost.Of(
|
||||
Set(StandardAssault, MediumAssault, StandardExoSuit, AgileExoSuit, ReinforcedExoSuit, ATV, Harasser)
|
||||
) mustEqual 7
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all unique certifications (no value)" in {
|
||||
Certification.Cost.Of(List(StandardAssault, StandardAssault)) mustEqual 0
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all unique certifications (value)" in {
|
||||
Certification.Cost.Of(List(MediumAssault, MediumAssault)) mustEqual 2
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all unique certifications (add)" in {
|
||||
Certification.Cost.Of(List(StandardAssault, MediumAssault, MediumAssault)) mustEqual 2
|
||||
Certification.Cost.Of(List(HeavyAssault, MediumAssault, HeavyAssault)) mustEqual 6
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all unique certifications (large collection)" in {
|
||||
Certification.Cost.Of(
|
||||
List(
|
||||
StandardAssault,
|
||||
MediumAssault,
|
||||
StandardExoSuit,
|
||||
AgileExoSuit,
|
||||
ReinforcedExoSuit,
|
||||
ATV,
|
||||
Harasser,
|
||||
MediumAssault,
|
||||
StandardExoSuit,
|
||||
ReinforcedExoSuit,
|
||||
ATV
|
||||
)
|
||||
) mustEqual 7
|
||||
}
|
||||
|
||||
"calculate the sum-point-value of all certifications (count duplicates)" in {
|
||||
Certification.Cost.OfAll(
|
||||
List(
|
||||
StandardAssault,
|
||||
MediumAssault,
|
||||
StandardExoSuit,
|
||||
AgileExoSuit,
|
||||
ReinforcedExoSuit,
|
||||
ATV,
|
||||
Harasser,
|
||||
MediumAssault,
|
||||
StandardExoSuit,
|
||||
ReinforcedExoSuit,
|
||||
ATV
|
||||
)
|
||||
) mustEqual 13
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@ package objects
|
|||
|
||||
import net.psforever.objects.definition.converter.{CharacterSelectConverter, DestroyedVehicleConverter, REKConverter}
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.definition._
|
||||
import net.psforever.objects.equipment._
|
||||
import net.psforever.objects.inventory.InventoryTile
|
||||
|
|
@ -645,7 +646,7 @@ class ConverterTest extends Specification {
|
|||
}
|
||||
|
||||
"Player" should {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
var avatar = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj: Player = {
|
||||
/*
|
||||
Create an AmmoBoxDefinition with which to build two AmmoBoxes
|
||||
|
|
@ -677,7 +678,7 @@ class ConverterTest extends Specification {
|
|||
val converter = new CharacterSelectConverter
|
||||
|
||||
"convert to packet (BR < 24)" in {
|
||||
avatar.BEP = 0
|
||||
avatar = avatar.copy(bep = 0)
|
||||
obj.Definition.Packet.DetailedConstructorData(obj) match {
|
||||
case Success(_) =>
|
||||
ok
|
||||
|
|
@ -693,7 +694,7 @@ class ConverterTest extends Specification {
|
|||
}
|
||||
|
||||
"convert to packet (BR >= 24)" in {
|
||||
avatar.BEP = 10000000
|
||||
avatar = avatar.copy(bep = 10000000)
|
||||
obj.Definition.Packet.DetailedConstructorData(obj) match {
|
||||
case Success(_) =>
|
||||
ok
|
||||
|
|
@ -709,7 +710,7 @@ class ConverterTest extends Specification {
|
|||
}
|
||||
|
||||
"convert to simple packet (BR < 24)" in {
|
||||
avatar.BEP = 0
|
||||
avatar = avatar.copy(bep = 0)
|
||||
converter.DetailedConstructorData(obj) match {
|
||||
case Success(_) =>
|
||||
ok
|
||||
|
|
@ -721,7 +722,7 @@ class ConverterTest extends Specification {
|
|||
}
|
||||
|
||||
"convert to simple packet (BR >= 24)" in {
|
||||
avatar.BEP = 10000000
|
||||
avatar = avatar.copy(bep = 10000000)
|
||||
converter.DetailedConstructorData(obj) match {
|
||||
case Success(_) =>
|
||||
ok
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import net.psforever.objects.vital.{DamageType, Vitality}
|
|||
import net.psforever.packet.game.objectcreate.ObjectClass
|
||||
import net.psforever.types._
|
||||
import org.specs2.mutable.Specification
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
|
||||
class DamageCalculationsTests extends Specification {
|
||||
"DamageCalculations" should {
|
||||
|
|
@ -22,7 +23,7 @@ class DamageCalculationsTests extends Specification {
|
|||
val wep_prof = wep_fmode.Add
|
||||
val proj = DamageModelTests.projectile
|
||||
val proj_prof = proj.asInstanceOf[DamageProfile]
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
val target = Vehicle(GlobalDefinitions.fury)
|
||||
target.Position = Vector3(10, 0, 0)
|
||||
|
|
@ -172,7 +173,7 @@ class ResistanceCalculationsTests extends Specification {
|
|||
val wep = GlobalDefinitions.galaxy_gunship_cannon
|
||||
val wep_fmode = Tool(wep).FireMode
|
||||
val proj = DamageModelTests.projectile
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
|
||||
"ResistanceCalculations" should {
|
||||
|
|
@ -204,7 +205,7 @@ class ResistanceCalculationsTests extends Specification {
|
|||
}
|
||||
|
||||
"discern mechanized infantry targets" in {
|
||||
val target = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val target = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
target.ExoSuit = ExoSuitType.MAX
|
||||
val resprojectile = ResolvedProjectile(
|
||||
ProjectileResolution.Splash,
|
||||
|
|
@ -275,8 +276,8 @@ class ResolutionCalculationsTests extends Specification {
|
|||
val wep = GlobalDefinitions.galaxy_gunship_cannon
|
||||
val wep_fmode = Tool(wep).FireMode
|
||||
val proj = DamageModelTests.projectile
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
player.Spawn
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
player.Spawn()
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
|
||||
"ResolutionCalculations" should {
|
||||
|
|
@ -333,9 +334,9 @@ class ResolutionCalculationsTests extends Specification {
|
|||
InfantryDamageAfterResist(100, 100)(50, 60) mustEqual (0, 50)
|
||||
}
|
||||
|
||||
val player2 = Player(Avatar("TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player2 = Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
player2.ExoSuit = ExoSuitType.MAX
|
||||
player2.Spawn
|
||||
player2.Spawn()
|
||||
"calculate no max damage for vehicles" in {
|
||||
val target1 = Vehicle(GlobalDefinitions.fury) //!
|
||||
val resprojectile1 = ResolvedProjectile(
|
||||
|
|
@ -409,8 +410,8 @@ class DamageModelTests extends Specification {
|
|||
val wep_tool = Tool(wep)
|
||||
val wep_fmode = wep_tool.FireMode
|
||||
val proj = DamageModelTests.projectile
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
player.Spawn
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
player.Spawn()
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
|
||||
"DamageModel" should {
|
||||
|
|
@ -435,8 +436,9 @@ class DamageModelTests extends Specification {
|
|||
}
|
||||
|
||||
"resolve infantry targets" in {
|
||||
val tplayer = Player(Avatar("TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
tplayer.Spawn
|
||||
val tplayer =
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
tplayer.Spawn()
|
||||
tplayer.Health mustEqual 100
|
||||
tplayer.Armor mustEqual 50
|
||||
|
||||
|
|
@ -455,8 +457,9 @@ class DamageModelTests extends Specification {
|
|||
}
|
||||
|
||||
"resolve infantry targets in a specific way" in {
|
||||
val tplayer = Player(Avatar("TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
tplayer.Spawn
|
||||
val tplayer =
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
tplayer.Spawn()
|
||||
tplayer.Health mustEqual 100
|
||||
tplayer.Armor mustEqual 50
|
||||
|
||||
|
|
@ -476,8 +479,9 @@ class DamageModelTests extends Specification {
|
|||
}
|
||||
|
||||
"resolve infantry targets, with damage overflow" in {
|
||||
val tplayer = Player(Avatar("TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
tplayer.Spawn
|
||||
val tplayer =
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
tplayer.Spawn()
|
||||
tplayer.Health mustEqual 100
|
||||
tplayer.Armor mustEqual 50
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ import services.support.SupportActor
|
|||
import services.vehicle.support.TurretUpgrader
|
||||
import services.vehicle.{VehicleAction, VehicleServiceMessage}
|
||||
import org.specs2.mutable.Specification
|
||||
|
||||
import scala.concurrent.duration._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
|
||||
class DamageableTest extends Specification {
|
||||
val player1 = Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player1 = Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val pSource = PlayerSource(player1)
|
||||
val weaponA = Tool(GlobalDefinitions.phoenix) //decimator
|
||||
val projectileA = weaponA.Projectile
|
||||
|
|
@ -114,11 +114,13 @@ class DamageableTest extends Specification {
|
|||
}
|
||||
|
||||
"permit damaging friendly targets, even those not designated for friendly fire, if the target is hacked" in {
|
||||
val player2 = Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player2 =
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
player2.GUID = PlanetSideGUID(1)
|
||||
val target = new Terminal(new TerminalDefinition(0) {
|
||||
Damageable = true
|
||||
DamageableByFriendlyFire = false
|
||||
|
||||
override def Request(player: Player, msg: Any): Terminal.Exchange = null
|
||||
})
|
||||
target.Owner =
|
||||
|
|
@ -208,7 +210,8 @@ class DamageableTest extends Specification {
|
|||
}
|
||||
|
||||
"permit jamming friendly targets if the target is hacked" in {
|
||||
val player2 = Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player2 =
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
player2.GUID = PlanetSideGUID(1)
|
||||
val target = new SensorDeployable(GlobalDefinitions.motionalarmsensor)
|
||||
target.Faction = player1.Faction
|
||||
|
|
@ -242,12 +245,13 @@ class DamageableEntityDamageTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(5))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val gen = Generator(GlobalDefinitions.generator) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
guid.register(building, 1)
|
||||
guid.register(gen, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -312,6 +316,7 @@ class DamageableEntityDestroyedTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(5))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val avatarProbe = TestProbe()
|
||||
|
|
@ -322,9 +327,9 @@ class DamageableEntityDestroyedTest extends ActorTest {
|
|||
mech.Position = Vector3(1, 0, 0)
|
||||
mech.Actor = system.actorOf(Props(classOf[ImplantTerminalMechControl], mech), "mech-control")
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
building.Position = Vector3(1, 0, 0)
|
||||
building.Zone = zone
|
||||
|
|
@ -385,13 +390,14 @@ class DamageableEntityNotDestroyTwice extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val gen = Generator(GlobalDefinitions.generator) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
guid.register(building, 1)
|
||||
guid.register(gen, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -455,13 +461,14 @@ class DamageableAmenityTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val term = Terminal(GlobalDefinitions.order_terminal) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
guid.register(building, 1)
|
||||
guid.register(term, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -542,17 +549,18 @@ class DamageableMountableDamageTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val mech = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
guid.register(building, 1)
|
||||
guid.register(mech, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -633,19 +641,20 @@ class DamageableMountableDestroyTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val mech = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
guid.register(building, 1)
|
||||
|
|
@ -735,14 +744,14 @@ class DamageableWeaponTurretDamageTest extends ActorTest {
|
|||
turret.Zone = zone
|
||||
turret.Position = Vector3(1, 0, 0)
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
guid.register(turret, 2)
|
||||
|
|
@ -830,14 +839,14 @@ class DamageableWeaponTurretJammerTest extends ActorTest {
|
|||
val turretWeapon = turret.Weapons.values.head.Equipment.get.asInstanceOf[Tool]
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
|
||||
|
|
@ -898,6 +907,7 @@ class DamageableWeaponTurretJammerTest extends ActorTest {
|
|||
case _ => false
|
||||
}
|
||||
)
|
||||
expectNoMessage(100 milliseconds) // FIXME this is a hack to make it pass
|
||||
assert(turret.Health == turret.Definition.DefaultHealth)
|
||||
assert(turret.Jammed)
|
||||
}
|
||||
|
|
@ -927,14 +937,14 @@ class DamageableWeaponTurretDestructionTest extends ActorTest {
|
|||
val turretWeapon = turret.Weapons.values.head.Equipment.get.asInstanceOf[Tool]
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(1, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
|
||||
|
|
@ -1073,14 +1083,14 @@ class DamageableVehicleDamageTest extends ActorTest {
|
|||
atv.Position = Vector3(1, 0, 0)
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
|
||||
|
|
@ -1184,19 +1194,19 @@ class DamageableVehicleDamageMountedTest extends ActorTest {
|
|||
atv.Actor = system.actorOf(Props(classOf[VehicleControl], atv), "atv-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
val player3 =
|
||||
Player(Avatar("TestCharacter3", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=10
|
||||
player3.Spawn
|
||||
Player(Avatar(0, "TestCharacter3", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=10
|
||||
player3.Spawn()
|
||||
val player3Probe = TestProbe()
|
||||
player3.Actor = player3Probe.ref
|
||||
|
||||
|
|
@ -1331,19 +1341,19 @@ class DamageableVehicleJammeringMountedTest extends ActorTest {
|
|||
lodestar.Position = Vector3(1, 0, 0)
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=7
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=7
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=8
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=8
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
val player3 =
|
||||
Player(Avatar("TestCharacter3", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=9
|
||||
player3.Spawn
|
||||
Player(Avatar(0, "TestCharacter3", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=9
|
||||
player3.Spawn()
|
||||
val player3Probe = TestProbe()
|
||||
player3.Actor = player3Probe.ref
|
||||
|
||||
|
|
@ -1441,14 +1451,14 @@ class DamageableVehicleDestroyTest extends ActorTest {
|
|||
val atvWeapon = atv.Weapons(1).Equipment.get.asInstanceOf[Tool] //guid=4 & 5
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
|
||||
|
|
@ -1547,19 +1557,19 @@ class DamageableVehicleDestroyMountedTest extends ActorTest {
|
|||
lodestar.Position = Vector3(1, 0, 0)
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=7
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=7
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=8
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=8
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
val player3 =
|
||||
Player(Avatar("TestCharacter3", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=9
|
||||
player3.Spawn
|
||||
Player(Avatar(0, "TestCharacter3", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=9
|
||||
player3.Spawn()
|
||||
val player3Probe = TestProbe()
|
||||
player3.Actor = player3Probe.ref
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import scala.concurrent.duration._
|
|||
class DefaultTest extends Specification {
|
||||
"Default.Cancellable" should {
|
||||
"always act like it can be cancelled successfully" in {
|
||||
Default.Cancellable.cancel mustEqual true
|
||||
Default.Cancellable.cancel() mustEqual true
|
||||
}
|
||||
|
||||
"always act like it was cancelled successfully" in {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import services.{RemoverActor, Service}
|
|||
import services.avatar.{AvatarAction, AvatarServiceMessage}
|
||||
import services.local.{LocalAction, LocalServiceMessage}
|
||||
import services.support.SupportActor
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
|
||||
import scala.concurrent.duration._
|
||||
|
||||
|
|
@ -313,11 +314,11 @@ class ExplosiveDeployableJammerTest extends ActorTest {
|
|||
|
||||
val j_mine = Deployables.Make(DeployedItem.jammer_mine)().asInstanceOf[ExplosiveDeployable] //guid=1
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
val weapon = Tool(GlobalDefinitions.jammer_grenade) //guid=5
|
||||
guid.register(j_mine, 1)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -411,11 +412,11 @@ class ExplosiveDeployableJammerExplodeTest extends ActorTest {
|
|||
|
||||
val h_mine = Deployables.Make(DeployedItem.he_mine)().asInstanceOf[ExplosiveDeployable] //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
val weapon = Tool(GlobalDefinitions.jammer_grenade) //guid=5
|
||||
guid.register(h_mine, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -521,11 +522,11 @@ class ExplosiveDeployableDestructionTest extends ActorTest {
|
|||
|
||||
val h_mine = Deployables.Make(DeployedItem.he_mine)().asInstanceOf[ExplosiveDeployable] //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player2.Spawn()
|
||||
val weapon = Tool(GlobalDefinitions.suppressor) //guid=5
|
||||
guid.register(h_mine, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -661,7 +662,7 @@ class TurretControlMountTest extends ActorTest {
|
|||
obj.Actor = system.actorOf(Props(classOf[TurretControl], obj), s"${obj.Definition.Name}_test")
|
||||
|
||||
assert(obj.Seats(0).Occupant.isEmpty)
|
||||
val player1 = Player(Avatar("test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player1 = Player(Avatar(0, "test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
obj.Actor ! Mountable.TryMount(player1, 0)
|
||||
val reply1a = receiveOne(200 milliseconds)
|
||||
assert(reply1a.isInstanceOf[Mountable.MountMessages])
|
||||
|
|
@ -681,7 +682,7 @@ class TurretControlBlockMountTest extends ActorTest {
|
|||
obj.Actor = system.actorOf(Props(classOf[TurretControl], obj), s"${obj.Definition.Name}_test")
|
||||
|
||||
assert(obj.Seats(0).Occupant.isEmpty)
|
||||
val player1 = Player(Avatar("test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player1 = Player(Avatar(0, "test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
obj.Actor ! Mountable.TryMount(player1, 0)
|
||||
val reply1a = receiveOne(200 milliseconds)
|
||||
assert(reply1a.isInstanceOf[Mountable.MountMessages])
|
||||
|
|
@ -690,7 +691,7 @@ class TurretControlBlockMountTest extends ActorTest {
|
|||
assert(reply1b.response.isInstanceOf[Mountable.CanMount])
|
||||
assert(obj.Seats(0).Occupant.contains(player1))
|
||||
|
||||
val player2 = Player(Avatar("test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player2 = Player(Avatar(1, "test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
obj.Actor ! Mountable.TryMount(player2, 0)
|
||||
val reply2a = receiveOne(200 milliseconds)
|
||||
assert(reply2a.isInstanceOf[Mountable.MountMessages])
|
||||
|
|
@ -709,7 +710,7 @@ class TurretControlBlockBetrayalMountTest extends ActorTest {
|
|||
obj.Actor = system.actorOf(Props(classOf[TurretControl], obj), s"${obj.Definition.Name}_test")
|
||||
|
||||
assert(obj.Seats(0).Occupant.isEmpty)
|
||||
val player = Player(Avatar("test", PlanetSideEmpire.VS, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "test", PlanetSideEmpire.VS, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
obj.Actor ! Mountable.TryMount(player, 0)
|
||||
val reply1a = receiveOne(200 milliseconds)
|
||||
assert(reply1a.isInstanceOf[Mountable.MountMessages])
|
||||
|
|
@ -729,7 +730,7 @@ class TurretControlDismountTest extends ActorTest {
|
|||
obj.Actor = system.actorOf(Props(classOf[TurretControl], obj), s"${obj.Definition.Name}_test")
|
||||
|
||||
assert(obj.Seats(0).Occupant.isEmpty)
|
||||
val player = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
obj.Actor ! Mountable.TryMount(player, 0)
|
||||
val reply1a = receiveOne(200 milliseconds)
|
||||
assert(reply1a.isInstanceOf[Mountable.MountMessages])
|
||||
|
|
@ -759,7 +760,7 @@ class TurretControlBetrayalMountTest extends ActorTest {
|
|||
obj.Actor = system.actorOf(Props(classOf[TurretControl], obj), s"${obj.Definition.Name}_test")
|
||||
|
||||
assert(obj.Seats(0).Occupant.isEmpty)
|
||||
val player = Player(Avatar("test", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "test", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
assert(player.Faction != obj.Faction)
|
||||
obj.Actor ! Mountable.TryMount(player, 0)
|
||||
val reply1a = receiveOne(200 milliseconds)
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ package objects
|
|||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.DeployableToolbox
|
||||
import net.psforever.objects.ce.{DeployableCategory, DeployedItem}
|
||||
import net.psforever.types.CertificationType._
|
||||
import net.psforever.types.PlanetSideGUID
|
||||
import org.specs2.mutable.Specification
|
||||
import net.psforever.objects.avatar.Certification._
|
||||
|
||||
class DeployableToolboxTest extends Specification {
|
||||
"DeployableToolbbox" should {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ package objects
|
|||
|
||||
import akka.actor.{ActorSystem, Props}
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.{Avatar, Default, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.{Default, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.serverobject.doors.{Door, DoorControl}
|
||||
import net.psforever.objects.serverobject.structures.{Building, StructureType}
|
||||
import net.psforever.objects.zones.Zone
|
||||
|
|
@ -14,7 +15,7 @@ import org.specs2.mutable.Specification
|
|||
import scala.concurrent.duration.Duration
|
||||
|
||||
class DoorTest extends Specification {
|
||||
val player = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
|
||||
"Door" should {
|
||||
"construct" in {
|
||||
|
|
@ -134,6 +135,6 @@ object DoorControlTest {
|
|||
GlobalDefinitions.building
|
||||
)
|
||||
door.Owner.Faction = faction
|
||||
(Player(Avatar("test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), door)
|
||||
(Player(Avatar(0, "test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), door)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ import net.psforever.objects._
|
|||
import net.psforever.objects.equipment._
|
||||
import net.psforever.objects.inventory.InventoryTile
|
||||
import net.psforever.objects.GlobalDefinitions._
|
||||
import net.psforever.objects.avatar.Certification
|
||||
import net.psforever.objects.ce.DeployedItem
|
||||
import net.psforever.objects.definition._
|
||||
import net.psforever.types.{CertificationType, PlanetSideGUID}
|
||||
import net.psforever.types.PlanetSideGUID
|
||||
import org.specs2.mutable._
|
||||
|
||||
class EquipmentTest extends Specification {
|
||||
|
|
@ -398,13 +399,13 @@ class EquipmentTest extends Specification {
|
|||
"qualify certifications that must be met before ammo types may be used" in {
|
||||
val obj: ConstructionItem = ConstructionItem(GlobalDefinitions.ace)
|
||||
obj.AmmoType mustEqual DeployedItem.boomer
|
||||
obj.ModePermissions mustEqual Set(CertificationType.CombatEngineering)
|
||||
obj.ModePermissions mustEqual Set(Certification.CombatEngineering)
|
||||
obj.NextFireMode
|
||||
obj.AmmoType mustEqual DeployedItem.he_mine
|
||||
obj.ModePermissions mustEqual Set(CertificationType.CombatEngineering)
|
||||
obj.ModePermissions mustEqual Set(Certification.CombatEngineering)
|
||||
obj.NextAmmoType
|
||||
obj.AmmoType mustEqual DeployedItem.jammer_mine
|
||||
obj.ModePermissions mustEqual Set(CertificationType.AssaultEngineering)
|
||||
obj.ModePermissions mustEqual Set(Certification.AssaultEngineering)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@ package objects
|
|||
import akka.actor.Props
|
||||
import akka.testkit.TestProbe
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.{Avatar, Default, GlobalDefinitions, Player, Tool}
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.{Default, GlobalDefinitions, Player, Tool}
|
||||
import net.psforever.objects.definition.ToolDefinition
|
||||
import net.psforever.objects.guid.NumberPoolHub
|
||||
import net.psforever.objects.guid.source.LimitedNumberSource
|
||||
|
|
@ -100,7 +101,7 @@ class FacilityTurretControl1Test extends ActorTest {
|
|||
}
|
||||
|
||||
class FacilityTurretControl2Test extends ActorTest {
|
||||
val player = Player(Avatar("", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = FacilityTurret(GlobalDefinitions.manned_turret)
|
||||
obj.GUID = PlanetSideGUID(1)
|
||||
obj.Actor = system.actorOf(Props(classOf[FacilityTurretControl], obj), "turret-control")
|
||||
|
|
@ -127,7 +128,7 @@ class FacilityTurretControl2Test extends ActorTest {
|
|||
}
|
||||
|
||||
class FacilityTurretControl3Test extends ActorTest {
|
||||
val player = Player(Avatar("", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = FacilityTurret(GlobalDefinitions.manned_turret)
|
||||
obj.GUID = PlanetSideGUID(1)
|
||||
obj.Actor = system.actorOf(Props(classOf[FacilityTurretControl], obj), "turret-control")
|
||||
|
|
@ -153,7 +154,7 @@ class FacilityTurretControl3Test extends ActorTest {
|
|||
}
|
||||
|
||||
class FacilityTurretControl4Test extends ActorTest {
|
||||
val player = Player(Avatar("", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val objDef = new FacilityTurretDefinition(480)
|
||||
objDef.FactionLocked = false
|
||||
val obj = FacilityTurret(objDef)
|
||||
|
|
@ -203,8 +204,8 @@ class FacilityTurretControlRestorationTest extends ActorTest {
|
|||
val turretWeapon = turret.Weapons.values.head.Equipment.get.asInstanceOf[Tool]
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
|
|
|
|||
|
|
@ -4,8 +4,9 @@ package objects
|
|||
import akka.actor.{ActorRef, Props}
|
||||
import akka.testkit.TestProbe
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.ballistics._
|
||||
import net.psforever.objects.{Avatar, GlobalDefinitions, Player, Tool}
|
||||
import net.psforever.objects.{GlobalDefinitions, Player, Tool}
|
||||
import net.psforever.objects.guid.NumberPoolHub
|
||||
import net.psforever.objects.guid.source.LimitedNumberSource
|
||||
import net.psforever.objects.serverobject.CommonMessages
|
||||
|
|
@ -60,9 +61,9 @@ class GeneratorControlDamageTest extends ActorTest {
|
|||
gen.Actor = system.actorOf(Props(classOf[GeneratorControl], gen), "generator-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
building.Position = Vector3(1, 0, 0)
|
||||
|
|
@ -142,9 +143,9 @@ class GeneratorControlCriticalTest extends ActorTest {
|
|||
gen.Actor = system.actorOf(Props(classOf[GeneratorControl], gen), "generator-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
building.Position = Vector3(1, 0, 0)
|
||||
|
|
@ -232,9 +233,9 @@ class GeneratorControlDestroyedTest extends ActorTest {
|
|||
gen.Actor = system.actorOf(Props(classOf[GeneratorControl], gen), "generator-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
player1.Actor = TestProbe().ref
|
||||
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
|
|
@ -355,15 +356,15 @@ class GeneratorControlKillsTest extends ActorTest {
|
|||
gen.Actor = system.actorOf(Props(classOf[GeneratorControl], gen), "generator-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Female, 1, CharacterVoice.Mute)) //guid=4
|
||||
player2.Position = Vector3(15, 0, 0) //>14m from generator; lives
|
||||
player2.Spawn
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Female, 1, CharacterVoice.Mute)) //guid=4
|
||||
player2.Position = Vector3(15, 0, 0) //>14m from generator; lives
|
||||
player2.Spawn()
|
||||
val player2Probe = TestProbe()
|
||||
player2.Actor = player2Probe.ref
|
||||
|
||||
|
|
@ -480,13 +481,14 @@ class GeneratorControlNotDestroyTwice extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val gen = Generator(GlobalDefinitions.generator) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
guid.register(building, 1)
|
||||
guid.register(gen, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -574,9 +576,9 @@ class GeneratorControlNotDamageIfExplodingTest extends ActorTest {
|
|||
gen.Actor = system.actorOf(Props(classOf[GeneratorControl], gen), "generator-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
|
||||
|
|
@ -668,9 +670,9 @@ class GeneratorControlNotRepairIfExplodingTest extends ActorTest {
|
|||
gen.Actor = system.actorOf(Props(classOf[GeneratorControl], gen), "generator-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
|
||||
|
|
@ -766,9 +768,9 @@ class GeneratorControlRepairPastRestorePoint extends ActorTest {
|
|||
gen.Actor = system.actorOf(Props(classOf[GeneratorControl], gen), "generator-control")
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Position = Vector3(14, 0, 0) //<14m from generator; dies
|
||||
player1.Spawn()
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ package objects
|
|||
|
||||
import akka.actor.{ActorSystem, Props}
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.{Avatar, Default, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.{Default, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.serverobject.CommonMessages
|
||||
import net.psforever.objects.serverobject.locks.{IFFLock, IFFLockControl}
|
||||
import net.psforever.objects.serverobject.structures.{Building, StructureType}
|
||||
|
|
@ -97,6 +98,6 @@ object IFFLockControlTest {
|
|||
GlobalDefinitions.building
|
||||
)
|
||||
lock.Owner.Faction = faction
|
||||
(Player(Avatar("test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), lock)
|
||||
(Player(Avatar(0, "test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), lock)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,131 +0,0 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package objects
|
||||
|
||||
import net.psforever.objects.ImplantSlot
|
||||
import net.psforever.objects.definition.ImplantDefinition
|
||||
import net.psforever.types.{ExoSuitType, ImplantType}
|
||||
import org.specs2.mutable._
|
||||
|
||||
class ImplantTest extends Specification {
|
||||
val sample = new ImplantDefinition(8) //variant of sensor shield/silent run
|
||||
sample.InitializationDuration = 90 //1:30
|
||||
sample.ActivationStaminaCost = 3
|
||||
sample.StaminaCost = 1
|
||||
sample.CostIntervalDefault = 1000
|
||||
sample.CostIntervalByExoSuitHashMap += ExoSuitType.Agile -> 500
|
||||
|
||||
"ImplantDefinition" should {
|
||||
"define" in {
|
||||
sample.InitializationDuration mustEqual 90
|
||||
sample.ActivationStaminaCost mustEqual 3
|
||||
sample.StaminaCost mustEqual 1
|
||||
sample.GetCostIntervalByExoSuit(ExoSuitType.Reinforced) mustEqual 1000 // Default value
|
||||
sample.GetCostIntervalByExoSuit(ExoSuitType.Agile) mustEqual 500 // Overridden value
|
||||
sample.Type mustEqual ImplantType.SilentRun
|
||||
}
|
||||
}
|
||||
|
||||
"ImplantSlot" should {
|
||||
"construct" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked mustEqual false
|
||||
obj.Initialized mustEqual false
|
||||
obj.Active mustEqual false
|
||||
obj.Implant mustEqual ImplantType.None
|
||||
obj.Installed mustEqual None
|
||||
}
|
||||
|
||||
"load an implant when locked" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked mustEqual false
|
||||
obj.Implant mustEqual ImplantType.None
|
||||
|
||||
obj.Implant = sample
|
||||
obj.Implant mustEqual ImplantType.None
|
||||
}
|
||||
|
||||
"load an implant when unlocked" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked mustEqual false
|
||||
obj.Implant mustEqual ImplantType.None
|
||||
sample.Type mustEqual ImplantType.SilentRun
|
||||
|
||||
obj.Unlocked = true
|
||||
obj.Implant = sample
|
||||
obj.Implant mustEqual ImplantType.SilentRun
|
||||
}
|
||||
|
||||
"can not re-lock an unlocked implant slot" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked mustEqual false
|
||||
|
||||
obj.Unlocked = false
|
||||
obj.Unlocked mustEqual false
|
||||
obj.Unlocked = true
|
||||
obj.Unlocked mustEqual true
|
||||
obj.Unlocked = false
|
||||
obj.Unlocked mustEqual true
|
||||
}
|
||||
|
||||
"can not initialize without an implant" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Initialized mustEqual false
|
||||
obj.Initialized = true
|
||||
obj.Initialized mustEqual false
|
||||
}
|
||||
|
||||
"can initialize an implant" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Initialized mustEqual false
|
||||
|
||||
obj.Unlocked = true
|
||||
obj.Implant = sample
|
||||
obj.Initialized = true
|
||||
obj.Initialized mustEqual true
|
||||
}
|
||||
|
||||
"can not activate an uninitialized implant" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked = true
|
||||
obj.Implant = sample
|
||||
obj.Initialized mustEqual false
|
||||
obj.Active mustEqual false
|
||||
|
||||
obj.Active = true
|
||||
obj.Active mustEqual false
|
||||
}
|
||||
|
||||
"can activate an initialized implant" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked = true
|
||||
obj.Implant = sample
|
||||
obj.Initialized mustEqual false
|
||||
obj.Active mustEqual false
|
||||
|
||||
obj.Initialized = true
|
||||
obj.Active = true
|
||||
obj.Active mustEqual true
|
||||
}
|
||||
|
||||
"not cost energy while not active" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked = true
|
||||
obj.Implant = sample
|
||||
obj.Initialized = true
|
||||
obj.Active mustEqual false
|
||||
obj.ActivationCharge mustEqual 0
|
||||
obj.Charge(ExoSuitType.Reinforced) mustEqual 0
|
||||
}
|
||||
|
||||
"cost energy while active" in {
|
||||
val obj = new ImplantSlot
|
||||
obj.Unlocked = true
|
||||
obj.Implant = sample
|
||||
obj.Initialized = true
|
||||
obj.Active = true
|
||||
obj.Active mustEqual true
|
||||
obj.ActivationCharge mustEqual 3
|
||||
obj.Charge(ExoSuitType.Reinforced) mustEqual 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,10 +5,11 @@ import net.psforever.objects._
|
|||
import net.psforever.objects.loadouts._
|
||||
import net.psforever.types.{CharacterGender, CharacterVoice, ExoSuitType, PlanetSideEmpire}
|
||||
import net.psforever.objects.GlobalDefinitions._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import org.specs2.mutable._
|
||||
|
||||
class LoadoutTest extends Specification {
|
||||
val avatar = Avatar("TestCharacter", PlanetSideEmpire.VS, CharacterGender.Female, 41, CharacterVoice.Voice1)
|
||||
val avatar = Avatar(0, "TestCharacter", PlanetSideEmpire.VS, CharacterGender.Female, 41, CharacterVoice.Voice1)
|
||||
|
||||
def CreatePlayer(): Player = {
|
||||
new Player(avatar) {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ package objects
|
|||
|
||||
import akka.actor.{Actor, ActorRef, Props}
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.{Avatar, Player}
|
||||
import net.psforever.objects.Player
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.definition.{ObjectDefinition, SeatDefinition}
|
||||
import net.psforever.objects.serverobject.mount.{Mountable, MountableBehavior}
|
||||
import net.psforever.objects.serverobject.PlanetSideServerObject
|
||||
|
|
@ -25,7 +26,7 @@ class MountableControl1Test extends ActorTest {
|
|||
class MountableControl2Test extends ActorTest {
|
||||
"MountableControl" should {
|
||||
"let a player mount" in {
|
||||
val player = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = new MountableTest.MountableTestObject
|
||||
obj.Actor = system.actorOf(Props(classOf[MountableTest.MountableTestControl], obj), "mountable")
|
||||
val msg = Mountable.TryMount(player, 0)
|
||||
|
|
@ -46,8 +47,8 @@ class MountableControl2Test extends ActorTest {
|
|||
class MountableControl3Test extends ActorTest {
|
||||
"MountableControl" should {
|
||||
"block a player from mounting" in {
|
||||
val player1 = Player(Avatar("test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player2 = Player(Avatar("test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player1 = Player(Avatar(0, "test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player2 = Player(Avatar(1, "test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = new MountableTest.MountableTestObject
|
||||
obj.Actor = system.actorOf(Props(classOf[MountableTest.MountableTestControl], obj), "mountable")
|
||||
obj.Actor ! Mountable.TryMount(player1, 0)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2020 PSForever
|
||||
package objects
|
||||
|
||||
/*
|
||||
import akka.actor.Props
|
||||
import akka.testkit.TestProbe
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.avatar.PlayerControl
|
||||
import net.psforever.objects.avatar.{Avatar, PlayerControl}
|
||||
import net.psforever.objects.ballistics._
|
||||
import net.psforever.objects.guid.NumberPoolHub
|
||||
import net.psforever.objects.guid.source.LimitedNumberSource
|
||||
|
|
@ -29,17 +29,17 @@ class PlayerControlHealTest extends ActorTest {
|
|||
zone.AvatarEvents = avatarProbe.ref
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
player1.Zone = zone
|
||||
player1.Spawn
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
guid.register(player1.Locker, 5)
|
||||
guid.register(player1.avatar.locker, 5)
|
||||
player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1), "player1-control")
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player2.Zone = zone
|
||||
player2.Spawn
|
||||
guid.register(player2.Locker, 6)
|
||||
player2.Spawn()
|
||||
guid.register(player2.avatar.locker, 6)
|
||||
player2.Actor = system.actorOf(Props(classOf[PlayerControl], player2), "player2-control")
|
||||
|
||||
val tool = Tool(GlobalDefinitions.medicalapplicator) //guid=3 & 4
|
||||
|
|
@ -115,11 +115,11 @@ class PlayerControlHealSelfTest extends ActorTest {
|
|||
zone.AvatarEvents = avatarProbe.ref
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
player1.Zone = zone
|
||||
player1.Spawn
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
guid.register(player1.Locker, 5)
|
||||
guid.register(player1.avatar.locker, 5)
|
||||
player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1), "player1-control")
|
||||
|
||||
val tool = Tool(GlobalDefinitions.medicalapplicator) //guid=3 & 4
|
||||
|
|
@ -190,17 +190,17 @@ class PlayerControlRepairTest extends ActorTest {
|
|||
zone.AvatarEvents = avatarProbe.ref
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
player1.Zone = zone
|
||||
player1.Spawn
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
guid.register(player1.Locker, 5)
|
||||
guid.register(player1.avatar.locker, 5)
|
||||
player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1), "player1-control")
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player2.Zone = zone
|
||||
player2.Spawn
|
||||
guid.register(player2.Locker, 6)
|
||||
player2.Spawn()
|
||||
guid.register(player2.avatar.locker, 6)
|
||||
player2.Actor = system.actorOf(Props(classOf[PlayerControl], player2), "player2-control")
|
||||
|
||||
val tool = Tool(GlobalDefinitions.bank) //guid=3 & 4
|
||||
|
|
@ -286,11 +286,11 @@ class PlayerControlRepairSelfTest extends ActorTest {
|
|||
zone.AvatarEvents = avatarProbe.ref
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
player1.Zone = zone
|
||||
player1.Spawn
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
guid.register(player1.Locker, 5)
|
||||
guid.register(player1.avatar.locker, 5)
|
||||
player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1), "player1-control")
|
||||
|
||||
val tool = Tool(GlobalDefinitions.bank) //guid=3 & 4
|
||||
|
|
@ -362,17 +362,17 @@ class PlayerControlDamageTest extends ActorTest {
|
|||
zone.Activity = activityProbe.ref
|
||||
zone.AvatarEvents = avatarProbe.ref
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
player1.Zone = zone
|
||||
player1.Spawn
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
guid.register(player1.Locker, 5)
|
||||
guid.register(player1.avatar.locker, 5)
|
||||
player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1), "player1-control")
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player2.Zone = zone
|
||||
player2.Spawn
|
||||
guid.register(player2.Locker, 6)
|
||||
player2.Spawn()
|
||||
guid.register(player2.avatar.locker, 6)
|
||||
player2.Actor = system.actorOf(Props(classOf[PlayerControl], player2), "player2-control")
|
||||
val tool = Tool(GlobalDefinitions.suppressor) //guid 3 & 4
|
||||
val projectile = tool.Projectile
|
||||
|
|
@ -461,17 +461,17 @@ class PlayerControlDeathStandingTest extends ActorTest {
|
|||
zone.Activity = activityProbe.ref
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
player1.Zone = zone
|
||||
player1.Spawn
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
guid.register(player1.Locker, 5)
|
||||
guid.register(player1.avatar.locker, 5)
|
||||
player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1), "player1-control")
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player2.Zone = zone
|
||||
player2.Spawn
|
||||
guid.register(player2.Locker, 6)
|
||||
player2.Spawn()
|
||||
guid.register(player2.avatar.locker, 6)
|
||||
player2.Actor = system.actorOf(Props(classOf[PlayerControl], player2), "player2-control")
|
||||
|
||||
val tool = Tool(GlobalDefinitions.suppressor) //guid 3 & 4
|
||||
|
|
@ -587,17 +587,17 @@ class PlayerControlDeathSeatedTest extends ActorTest {
|
|||
zone.Activity = activityProbe.ref
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=1
|
||||
player1.Zone = zone
|
||||
player1.Spawn
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 0, 0)
|
||||
guid.register(player1.Locker, 6)
|
||||
guid.register(player1.avatar.locker, 6)
|
||||
player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1), "player1-control")
|
||||
val player2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
Player(Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=2
|
||||
player2.Zone = zone
|
||||
player2.Spawn
|
||||
guid.register(player2.Locker, 7)
|
||||
player2.Spawn()
|
||||
guid.register(player2.avatar.locker, 7)
|
||||
player2.Actor = system.actorOf(Props(classOf[PlayerControl], player2), "player2-control")
|
||||
|
||||
val vehicle = Vehicle(GlobalDefinitions.quadstealth) //guid=5
|
||||
|
|
@ -720,3 +720,6 @@ class PlayerControlDeathSeatedTest extends ActorTest {
|
|||
}
|
||||
|
||||
object PlayerControlTest {}
|
||||
|
||||
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ package objects
|
|||
|
||||
import net.psforever.objects.GlobalDefinitions._
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.definition.{ImplantDefinition, SimpleItemDefinition, SpecialExoSuitDefinition}
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.definition.{SimpleItemDefinition, SpecialExoSuitDefinition}
|
||||
import net.psforever.objects.equipment.EquipmentSize
|
||||
import net.psforever.packet.game.objectcreate.{Cosmetics, PersonalStyle}
|
||||
import net.psforever.types.{PlanetSideGUID, _}
|
||||
import org.specs2.mutable._
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ class PlayerTest extends Specification {
|
|||
head: Int,
|
||||
voice: CharacterVoice.Value
|
||||
): Player = {
|
||||
new Player(Avatar(name, faction, sex, head, voice))
|
||||
new Player(Avatar(0, name, faction, sex, head, voice))
|
||||
}
|
||||
|
||||
"Player" should {
|
||||
|
|
@ -41,45 +41,22 @@ class PlayerTest extends Specification {
|
|||
obj.Cloaked mustEqual true
|
||||
}
|
||||
|
||||
"different players" in {
|
||||
(TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)) mustEqual true
|
||||
|
||||
(TestPlayer("Chord1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
TestPlayer("Chord2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
TestPlayer("Chord", PlanetSideEmpire.NC, CharacterGender.Male, 0, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Female, 0, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 1, CharacterVoice.Voice5)) mustEqual false
|
||||
|
||||
(TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5) ==
|
||||
TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice4)) mustEqual false
|
||||
}
|
||||
|
||||
"(re)spawn" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.isAlive mustEqual false
|
||||
obj.Health mustEqual 0
|
||||
obj.Stamina mustEqual 0
|
||||
obj.Armor mustEqual 0
|
||||
obj.MaxHealth mustEqual 100
|
||||
obj.MaxStamina mustEqual 100
|
||||
obj.MaxArmor mustEqual 50
|
||||
obj.Spawn
|
||||
obj.Spawn()
|
||||
obj.isAlive mustEqual true
|
||||
obj.Health mustEqual 100
|
||||
obj.Stamina mustEqual 100
|
||||
obj.Armor mustEqual 50
|
||||
}
|
||||
|
||||
"will not (re)spawn if not dead" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Spawn
|
||||
obj.Spawn()
|
||||
obj.Health mustEqual 100
|
||||
obj.Armor mustEqual 50
|
||||
obj.isAlive mustEqual true
|
||||
|
|
@ -88,29 +65,27 @@ class PlayerTest extends Specification {
|
|||
obj.Armor = 10
|
||||
obj.Health mustEqual 10
|
||||
obj.Armor mustEqual 10
|
||||
obj.Spawn
|
||||
obj.Spawn()
|
||||
obj.Health mustEqual 10
|
||||
obj.Armor mustEqual 10
|
||||
}
|
||||
|
||||
"can die" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Spawn
|
||||
obj.Spawn()
|
||||
obj.Armor = 35 //50 -> 35
|
||||
obj.isAlive mustEqual true
|
||||
obj.Health mustEqual obj.MaxHealth
|
||||
obj.Stamina mustEqual obj.MaxStamina
|
||||
obj.Armor mustEqual 35
|
||||
obj.Die
|
||||
obj.isAlive mustEqual false
|
||||
obj.Health mustEqual 0
|
||||
obj.Stamina mustEqual 0
|
||||
obj.Armor mustEqual 35
|
||||
}
|
||||
|
||||
"can not become a backpack if alive" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.Spawn
|
||||
obj.Spawn()
|
||||
obj.isAlive mustEqual true
|
||||
obj.isBackpack mustEqual false
|
||||
obj.Release
|
||||
|
|
@ -130,15 +105,11 @@ class PlayerTest extends Specification {
|
|||
"set new maximum values (health, stamina)" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.MaxHealth mustEqual 100
|
||||
obj.MaxStamina mustEqual 100
|
||||
obj.MaxHealth = 123
|
||||
obj.MaxStamina = 456
|
||||
obj.MaxHealth mustEqual 123
|
||||
obj.MaxStamina mustEqual 456
|
||||
obj.MaxHealth = None
|
||||
//MaxStamina has no equivalent
|
||||
obj.MaxHealth mustEqual 100
|
||||
obj.MaxStamina mustEqual 456
|
||||
}
|
||||
|
||||
// "set new values (health, armor, stamina) but only when alive" in {
|
||||
|
|
@ -149,9 +120,9 @@ class PlayerTest extends Specification {
|
|||
// obj.Health mustEqual 0
|
||||
// obj.Armor mustEqual 0
|
||||
// obj.Stamina mustEqual 0
|
||||
//
|
||||
// obj.Spawn
|
||||
// obj.Health mustEqual obj.MaxHealth
|
||||
//
|
||||
// obj.Spawn()
|
||||
// obj.Health mustEqual obj.MaxHealth
|
||||
// obj.Armor mustEqual obj.MaxArmor
|
||||
// obj.Stamina mustEqual obj.MaxStamina
|
||||
// obj.Health = 23
|
||||
|
|
@ -305,7 +276,7 @@ class PlayerTest extends Specification {
|
|||
item.GUID = PlanetSideGUID(3)
|
||||
item
|
||||
}
|
||||
obj.Locker.Slot(6).Equipment = {
|
||||
obj.avatar.locker.Slot(6).Equipment = {
|
||||
val item = Kit(medkit)
|
||||
item.GUID = PlanetSideGUID(4)
|
||||
item
|
||||
|
|
@ -364,85 +335,6 @@ class PlayerTest extends Specification {
|
|||
} //free hand
|
||||
}
|
||||
|
||||
"battle experience point values of the avatar" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
|
||||
player.BEP mustEqual avatar.BEP
|
||||
avatar.BEP = 1002
|
||||
player.BEP mustEqual avatar.BEP
|
||||
}
|
||||
|
||||
"command experience point values of the avatar" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
|
||||
player.CEP mustEqual avatar.CEP
|
||||
avatar.CEP = 1002
|
||||
player.CEP mustEqual avatar.CEP
|
||||
}
|
||||
|
||||
"can get a quick summary of implant slots (default)" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
|
||||
player.Implants mustEqual Array.empty
|
||||
}
|
||||
|
||||
"can get a quick summary of implant slots (two unlocked, one installed)" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
val temp = new ImplantDefinition(1)
|
||||
avatar.Implants(0).Unlocked = true
|
||||
avatar.InstallImplant(new ImplantDefinition(1))
|
||||
avatar.Implants(1).Unlocked = true
|
||||
avatar.InstallImplant(new ImplantDefinition(2))
|
||||
avatar.UninstallImplant(temp.Type)
|
||||
|
||||
val list = player.Implants
|
||||
//slot 0
|
||||
val (implant1, init1, active1) = list(0)
|
||||
implant1 mustEqual ImplantType.None
|
||||
init1 mustEqual -1
|
||||
active1 mustEqual false
|
||||
//slot 1
|
||||
val (implant2, init2, active2) = list(1)
|
||||
implant2 mustEqual ImplantType(2)
|
||||
init2 mustEqual 0
|
||||
active2 mustEqual false
|
||||
}
|
||||
|
||||
"can get a quick summary of implant slots (all unlocked, first two installed)" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
avatar.Implants(0).Unlocked = true
|
||||
avatar.InstallImplant(new ImplantDefinition(1))
|
||||
avatar.Implants(0).Initialized = true
|
||||
avatar.Implants(0).Active = true
|
||||
avatar.Implants(1).Unlocked = true
|
||||
avatar.InstallImplant(new ImplantDefinition(2))
|
||||
avatar.Implants(1).Initialized = true
|
||||
avatar.Implants(1).Active = false
|
||||
avatar.Implants(2).Unlocked = true
|
||||
|
||||
val list = player.Implants
|
||||
//slot 0
|
||||
val (implant1, init1, active1) = list(0)
|
||||
implant1 mustEqual ImplantType(1)
|
||||
init1 mustEqual 0
|
||||
active1 mustEqual true
|
||||
//slot 1
|
||||
val (implant2, init2, active2) = list(1)
|
||||
implant2 mustEqual ImplantType(2)
|
||||
init2 mustEqual 0
|
||||
active2 mustEqual false
|
||||
//slot 2
|
||||
val (implant3, init3, active3) = list(2)
|
||||
implant3 mustEqual ImplantType.None
|
||||
init3 mustEqual -1
|
||||
active3 mustEqual false
|
||||
}
|
||||
|
||||
"seat in a vehicle" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.VehicleSeated.isEmpty mustEqual true
|
||||
|
|
@ -454,11 +346,11 @@ class PlayerTest extends Specification {
|
|||
|
||||
"own in a vehicle" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.VehicleOwned.isEmpty mustEqual true
|
||||
obj.VehicleOwned = PlanetSideGUID(65)
|
||||
obj.VehicleOwned.contains(PlanetSideGUID(65)) mustEqual true
|
||||
obj.VehicleOwned = None
|
||||
obj.VehicleOwned.isEmpty mustEqual true
|
||||
obj.avatar.vehicle.isEmpty mustEqual true
|
||||
obj.avatar.vehicle = Some(PlanetSideGUID(65))
|
||||
obj.avatar.vehicle.contains(PlanetSideGUID(65)) mustEqual true
|
||||
obj.avatar.vehicle = None
|
||||
obj.avatar.vehicle.isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"remember what zone he is in" in {
|
||||
|
|
@ -529,129 +421,5 @@ class PlayerTest extends Specification {
|
|||
obj.ExoSuit = ExoSuitType.MAX
|
||||
obj.UsingSpecial != test mustEqual true
|
||||
}
|
||||
|
||||
"start with a nonexistent cosmetic state" in {
|
||||
TestPlayer(
|
||||
"Chord",
|
||||
PlanetSideEmpire.TR,
|
||||
CharacterGender.Male,
|
||||
0,
|
||||
CharacterVoice.Voice5
|
||||
).PersonalStyleFeatures.isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"will not gain cosmetic state if player does not have a certain amount of BEP" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj = Player(avatar)
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual true
|
||||
val (a1, b1) = obj.AddToPersonalStyle(PersonalStyle.Beret)
|
||||
a1.isEmpty mustEqual true
|
||||
b1.isEmpty mustEqual true
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual true
|
||||
|
||||
avatar.BEP = 2286231 //BR24
|
||||
val (a2, b2) = obj.AddToPersonalStyle(PersonalStyle.Beret)
|
||||
a2.isEmpty mustEqual true
|
||||
b2 match {
|
||||
case Some(c: Cosmetics) =>
|
||||
c.Styles mustEqual Set(PersonalStyle.Beret)
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual false
|
||||
}
|
||||
|
||||
"will lose cosmetic state" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj = Player(avatar)
|
||||
avatar.BEP = 2286231 //BR24
|
||||
obj.AddToPersonalStyle(PersonalStyle.Beret)
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.Beret))) mustEqual true
|
||||
val (a2, b2) = obj.RemoveFromPersonalStyle(PersonalStyle.Beret)
|
||||
a2 match {
|
||||
case Some(c: Cosmetics) =>
|
||||
c.Styles mustEqual Set(PersonalStyle.Beret)
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
b2 match {
|
||||
case Some(c: Cosmetics) =>
|
||||
c.Styles mustEqual Set.empty
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
}
|
||||
|
||||
"will not lose cosmetic state if the player doesn't have any cosmetic state to begin with" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj = Player(avatar)
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual true
|
||||
val (a1, b1) = obj.RemoveFromPersonalStyle(PersonalStyle.Beret)
|
||||
a1.isEmpty mustEqual true
|
||||
b1.isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"toggle helmet" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj = Player(avatar)
|
||||
avatar.BEP = 2286231
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual true
|
||||
obj.ToggleHelmet
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.NoHelmet))) mustEqual true
|
||||
obj.ToggleHelmet
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics()) mustEqual true
|
||||
obj.ToggleHelmet
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.NoHelmet))) mustEqual true
|
||||
}
|
||||
|
||||
"toggle suglasses" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj = Player(avatar)
|
||||
avatar.BEP = 2286231
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual true
|
||||
obj.ToggleShades
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.Sunglasses))) mustEqual true
|
||||
obj.ToggleShades
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics()) mustEqual true
|
||||
obj.ToggleShades
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.Sunglasses))) mustEqual true
|
||||
}
|
||||
|
||||
"toggle earpiece" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj = Player(avatar)
|
||||
avatar.BEP = 2286231
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual true
|
||||
obj.ToggleEarpiece
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.Earpiece))) mustEqual true
|
||||
obj.ToggleEarpiece
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics()) mustEqual true
|
||||
obj.ToggleEarpiece
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.Earpiece))) mustEqual true
|
||||
}
|
||||
|
||||
"toggle between brimmed cap and beret" in {
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val obj = Player(avatar)
|
||||
avatar.BEP = 2286231
|
||||
obj.PersonalStyleFeatures.isEmpty mustEqual true
|
||||
obj.ToggleHat
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.BrimmedCap))) mustEqual true
|
||||
obj.ToggleHat
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.Beret))) mustEqual true
|
||||
obj.ToggleHat
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics()) mustEqual true
|
||||
obj.ToggleHat
|
||||
obj.PersonalStyleFeatures.contains(Cosmetics(Set(PersonalStyle.BrimmedCap))) mustEqual true
|
||||
}
|
||||
|
||||
"toString" in {
|
||||
val obj = TestPlayer("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
obj.toString mustEqual "TR Chord 0/100 0/50"
|
||||
|
||||
obj.GUID = PlanetSideGUID(455)
|
||||
obj.Continent = "z3"
|
||||
obj.toString mustEqual "TR Chord z3-455 0/100 0/50"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
package objects
|
||||
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.ballistics._
|
||||
import net.psforever.objects.definition.ProjectileDefinition
|
||||
import net.psforever.objects.serverobject.mblocker.Locker
|
||||
|
|
@ -10,7 +11,7 @@ import net.psforever.types.{PlanetSideGUID, _}
|
|||
import org.specs2.mutable.Specification
|
||||
|
||||
class ProjectileTest extends Specification {
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val fury = Vehicle(GlobalDefinitions.fury)
|
||||
|
||||
"LocalProjectile" should {
|
||||
|
|
@ -21,7 +22,7 @@ class ProjectileTest extends Specification {
|
|||
}
|
||||
|
||||
"local projectile range" in {
|
||||
Projectile.BaseUID < Projectile.RangeUID mustEqual true
|
||||
Projectile.baseUID < Projectile.rangeUID mustEqual true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -211,7 +212,8 @@ class ProjectileTest extends Specification {
|
|||
}
|
||||
|
||||
"contain timely information" in {
|
||||
val obj = Player(Avatar("TestCharacter-alt", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj =
|
||||
Player(Avatar(0, "TestCharacter-alt", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
obj.VehicleSeated = Some(PlanetSideGUID(1))
|
||||
obj.Position = Vector3(1.2f, 3.4f, 5.6f)
|
||||
obj.Orientation = Vector3(2.1f, 4.3f, 6.5f)
|
||||
|
|
@ -335,7 +337,7 @@ class ProjectileTest extends Specification {
|
|||
"ResolvedProjectile" should {
|
||||
val beamer_wep = Tool(GlobalDefinitions.beamer)
|
||||
val p_source = PlayerSource(player)
|
||||
val player2 = Player(Avatar("TestTarget", PlanetSideEmpire.NC, CharacterGender.Female, 1, CharacterVoice.Mute))
|
||||
val player2 = Player(Avatar(0, "TestTarget", PlanetSideEmpire.NC, CharacterGender.Female, 1, CharacterVoice.Mute))
|
||||
val p2_source = PlayerSource(player2)
|
||||
val projectile = Projectile(
|
||||
beamer_wep.Projectile,
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import akka.actor.Props
|
|||
import akka.testkit.TestProbe
|
||||
import base.ActorTest
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.guid.NumberPoolHub
|
||||
import net.psforever.objects.guid.source.LimitedNumberSource
|
||||
import net.psforever.objects.serverobject.CommonMessages
|
||||
|
|
@ -30,13 +31,14 @@ class RepairableEntityRepairTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val gen = Generator(GlobalDefinitions.generator) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
guid.register(building, 1)
|
||||
guid.register(gen, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -101,13 +103,14 @@ class RepairableEntityNotRepairTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val gen = Generator(GlobalDefinitions.generator) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
guid.register(building, 1)
|
||||
guid.register(gen, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -141,13 +144,14 @@ class RepairableAmenityTest extends ActorTest {
|
|||
val guid = new NumberPoolHub(new LimitedNumberSource(10))
|
||||
val zone = new Zone("test", new ZoneMap("test"), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
|
||||
GUID(guid)
|
||||
}
|
||||
val building = Building("test-building", 1, 1, zone, StructureType.Facility) //guid=1
|
||||
val term = Terminal(GlobalDefinitions.order_terminal) //guid=2
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
guid.register(building, 1)
|
||||
guid.register(term, 2)
|
||||
guid.register(player1, 3)
|
||||
|
|
@ -247,8 +251,8 @@ class RepairableTurretWeapon extends ActorTest {
|
|||
val turretWeapon = turret.Weapons.values.head.Equipment.get.asInstanceOf[Tool]
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=3
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
|
|
@ -333,8 +337,8 @@ class RepairableVehicleRepair extends ActorTest {
|
|||
val atvWeapon = atv.Weapons(1).Equipment.get.asInstanceOf[Tool]
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
|
|
@ -406,8 +410,8 @@ class RepairableVehicleRestoration extends ActorTest {
|
|||
val atvWeapon = atv.Weapons(1).Equipment.get.asInstanceOf[Tool]
|
||||
|
||||
val player1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player1.Spawn
|
||||
Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) //guid=4
|
||||
player1.Spawn()
|
||||
player1.Position = Vector3(2, 2, 2)
|
||||
val player1Probe = TestProbe()
|
||||
player1.Actor = player1Probe.ref
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import net.psforever.actors.zone.{BuildingActor, ZoneActor}
|
|||
import net.psforever.objects.guid.{NumberPoolHub, TaskResolver}
|
||||
import net.psforever.objects.guid.source.LimitedNumberSource
|
||||
import net.psforever.objects.serverobject.CommonMessages
|
||||
import net.psforever.objects.{Avatar, GlobalDefinitions, Ntu, Player, Vehicle}
|
||||
import net.psforever.objects.{GlobalDefinitions, Ntu, Player, Vehicle}
|
||||
import net.psforever.objects.serverobject.resourcesilo.{ResourceSilo, ResourceSiloControl, ResourceSiloDefinition}
|
||||
import net.psforever.objects.serverobject.structures.{Building, StructureType}
|
||||
import net.psforever.objects.serverobject.transfer.TransferBehavior
|
||||
|
|
@ -20,6 +20,7 @@ import org.specs2.mutable.Specification
|
|||
import services.ServiceManager
|
||||
import services.avatar.{AvatarAction, AvatarServiceMessage}
|
||||
import akka.actor.typed.scaladsl.adapter._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
|
||||
import scala.concurrent.duration._
|
||||
|
||||
|
|
@ -77,7 +78,7 @@ class ResourceSiloTest extends Specification {
|
|||
|
||||
class ResourceSiloControlStartupTest extends ActorTest {
|
||||
val serviceManager = ServiceManager.boot(system)
|
||||
serviceManager ! ServiceManager.Register(RandomPool(1).props(Props[TaskResolver]), "taskResolver")
|
||||
serviceManager ! ServiceManager.Register(RandomPool(1).props(Props[TaskResolver]()), "taskResolver")
|
||||
val obj = ResourceSilo()
|
||||
obj.GUID = PlanetSideGUID(1)
|
||||
val probe = TestProbe()
|
||||
|
|
@ -115,7 +116,7 @@ class ResourceSiloControlUseTest extends ActorTest {
|
|||
obj.Actor ! "startup"
|
||||
|
||||
val player = Player(
|
||||
new Avatar(0L, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
new Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
) //guid=3
|
||||
val vehicle = Vehicle(GlobalDefinitions.ant) //guid=4
|
||||
val probe = new TestProbe(system)
|
||||
|
|
@ -367,7 +368,7 @@ class ResourceSiloControlNoUpdateTest extends ActorTest {
|
|||
|
||||
object ResourceSiloTest {
|
||||
val player = Player(
|
||||
new Avatar(0L, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
new Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
)
|
||||
|
||||
class ProbedAvatarService(probe: TestProbe) extends Actor {
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ object ServerObjectBuilderTest {
|
|||
class BuilderTestActor(builder: ServerObjectBuilder[_], hub: NumberPoolHub) extends Actor {
|
||||
def receive: Receive = {
|
||||
case _ =>
|
||||
sender ! builder.Build(context, hub)
|
||||
sender() ! builder.Build(context, hub)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -365,7 +365,7 @@ object ServerObjectBuilderTest {
|
|||
) extends Actor {
|
||||
def receive: Receive = {
|
||||
case _ =>
|
||||
sender ! FoundationBuilder(structure_con).Build(name, building_guid, map_id, zone)(context)
|
||||
sender() ! FoundationBuilder(structure_con).Build(name, building_guid, map_id, zone)(context)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ package objects
|
|||
import akka.actor.{Actor, Props}
|
||||
import base.ActorTest
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.serverobject.terminals.Terminal
|
||||
import net.psforever.objects.serverobject.tube.SpawnTube
|
||||
import net.psforever.objects.vehicles._
|
||||
|
|
@ -59,7 +60,7 @@ class UtilityTest extends Specification {
|
|||
val veh = Vehicle(GlobalDefinitions.quadstealth)
|
||||
veh.Faction = PlanetSideEmpire.TR
|
||||
val obj = Utility(UtilityType.teleportpad_terminal, UtilityTest.vehicle)
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
veh.GUID = PlanetSideGUID(101)
|
||||
obj().Owner = veh //hack
|
||||
obj().GUID = PlanetSideGUID(1)
|
||||
|
|
@ -231,7 +232,7 @@ object UtilityTest {
|
|||
def receive: Receive = {
|
||||
case _ =>
|
||||
obj.Setup(context)
|
||||
sender ! ""
|
||||
sender() ! ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -994,7 +994,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest {
|
|||
// }
|
||||
// //
|
||||
// val beamer_wep = Tool(GlobalDefinitions.beamer)
|
||||
// val p_source = PlayerSource( Player(Avatar("TestTarget", PlanetSideEmpire.NC, CharacterGender.Female, 1, CharacterVoice.Mute)) )
|
||||
// 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))
|
||||
|
|
@ -1014,8 +1014,10 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest {
|
|||
//}
|
||||
|
||||
object VehicleTest {
|
||||
import net.psforever.objects.Avatar
|
||||
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.types.{CharacterGender, PlanetSideEmpire}
|
||||
val avatar1 = Avatar("test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
val avatar2 = Avatar("test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
|
||||
val avatar1 = Avatar(0, "test1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
val avatar2 = Avatar(1, "test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package objects
|
|||
|
||||
import net.psforever.objects.ballistics._
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.vital._
|
||||
import net.psforever.types._
|
||||
import org.specs2.mutable.Specification
|
||||
|
|
@ -16,7 +17,7 @@ class VitalityTest extends Specification {
|
|||
val vSource = VehicleSource(vehicle)
|
||||
|
||||
"accept a variety of events" in {
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val pSource = PlayerSource(player)
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
|
|
@ -40,7 +41,7 @@ class VitalityTest extends Specification {
|
|||
}
|
||||
|
||||
"return and clear the former list of vital activities" in {
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val pSource = PlayerSource(player)
|
||||
|
||||
player.History(HealFromKit(pSource, 10, GlobalDefinitions.medkit))
|
||||
|
|
@ -64,7 +65,7 @@ class VitalityTest extends Specification {
|
|||
}
|
||||
|
||||
"get exactly one entry that was caused by projectile damage" in {
|
||||
val player = Player(Avatar("TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val pSource = PlayerSource(player)
|
||||
val projectile = Projectile(proj, wep, wep_fmode, player, Vector3(2, 2, 0), Vector3.Zero)
|
||||
val resprojectile = ResolvedProjectile(
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
package objects
|
||||
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
|
||||
import akka.actor.ActorContext
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.entity.IdentifiableEntity
|
||||
|
|
@ -19,6 +18,7 @@ import net.psforever.objects.Vehicle
|
|||
import org.specs2.mutable.Specification
|
||||
import akka.actor.typed.scaladsl.adapter._
|
||||
import net.psforever.actors.zone.ZoneActor
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
|
||||
import scala.concurrent.duration._
|
||||
|
||||
|
|
@ -35,62 +35,62 @@ class ZoneTest extends Specification {
|
|||
|
||||
"references bases by a positive building id (defaults to 0)" in {
|
||||
val map = new ZoneMap("map13")
|
||||
map.LocalBuildings mustEqual Map.empty
|
||||
map.LocalBuilding("Building", building_guid = 10, map_id = 0, FoundationBuilder(test))
|
||||
map.LocalBuildings.keySet.contains(("Building", 10, 0)) mustEqual true
|
||||
map.LocalBuilding("Building", building_guid = -1, map_id = 0, FoundationBuilder(test))
|
||||
map.LocalBuildings.keySet.contains(("Building", 10, 0)) mustEqual true
|
||||
map.LocalBuildings.keySet.contains(("Building", -1, 0)) mustEqual false
|
||||
map.localBuildings mustEqual Map.empty
|
||||
map.addLocalBuilding("Building", buildingGuid = 10, mapId = 0, FoundationBuilder(test))
|
||||
map.localBuildings.keySet.contains(("Building", 10, 0)) mustEqual true
|
||||
map.addLocalBuilding("Building", buildingGuid = -1, mapId = 0, FoundationBuilder(test))
|
||||
map.localBuildings.keySet.contains(("Building", 10, 0)) mustEqual true
|
||||
map.localBuildings.keySet.contains(("Building", -1, 0)) mustEqual false
|
||||
}
|
||||
|
||||
"associates objects to bases (doesn't check numbers)" in {
|
||||
val map = new ZoneMap("map13")
|
||||
map.ObjectToBuilding mustEqual Map.empty
|
||||
map.ObjectToBuilding(1, 2)
|
||||
map.ObjectToBuilding mustEqual Map(1 -> 2)
|
||||
map.ObjectToBuilding(3, 4)
|
||||
map.ObjectToBuilding mustEqual Map(1 -> 2, 3 -> 4)
|
||||
map.objectToBuilding mustEqual Map.empty
|
||||
map.linkObjectToBuilding(1, 2)
|
||||
map.objectToBuilding mustEqual Map(1 -> 2)
|
||||
map.linkObjectToBuilding(3, 4)
|
||||
map.objectToBuilding mustEqual Map(1 -> 2, 3 -> 4)
|
||||
}
|
||||
|
||||
"associates doors to door locks (doesn't check numbers)" in {
|
||||
val map = new ZoneMap("map13")
|
||||
map.DoorToLock mustEqual Map.empty
|
||||
map.DoorToLock(1, 2)
|
||||
map.DoorToLock mustEqual Map(1 -> 2)
|
||||
map.DoorToLock(3, 4)
|
||||
map.DoorToLock mustEqual Map(1 -> 2, 3 -> 4)
|
||||
map.doorToLock mustEqual Map.empty
|
||||
map.linkDoorToLock(1, 2)
|
||||
map.doorToLock mustEqual Map(1 -> 2)
|
||||
map.linkDoorToLock(3, 4)
|
||||
map.doorToLock mustEqual Map(1 -> 2, 3 -> 4)
|
||||
}
|
||||
|
||||
"associates terminals to spawn pads (doesn't check numbers)" in {
|
||||
val map = new ZoneMap("map13")
|
||||
map.TerminalToSpawnPad mustEqual Map.empty
|
||||
map.TerminalToSpawnPad(1, 2)
|
||||
map.TerminalToSpawnPad mustEqual Map(1 -> 2)
|
||||
map.TerminalToSpawnPad(3, 4)
|
||||
map.TerminalToSpawnPad mustEqual Map(1 -> 2, 3 -> 4)
|
||||
map.terminalToSpawnPad mustEqual Map.empty
|
||||
map.linkTerminalToSpawnPad(1, 2)
|
||||
map.terminalToSpawnPad mustEqual Map(1 -> 2)
|
||||
map.linkTerminalToSpawnPad(3, 4)
|
||||
map.terminalToSpawnPad mustEqual Map(1 -> 2, 3 -> 4)
|
||||
}
|
||||
|
||||
"associates mechanical components to implant terminals (doesn't check numbers)" in {
|
||||
val map = new ZoneMap("map13")
|
||||
map.TerminalToInterface mustEqual Map.empty
|
||||
map.TerminalToInterface(1, 2)
|
||||
map.TerminalToInterface mustEqual Map(1 -> 2)
|
||||
map.TerminalToInterface(3, 4)
|
||||
map.TerminalToInterface mustEqual Map(1 -> 2, 3 -> 4)
|
||||
map.terminalToInterface mustEqual Map.empty
|
||||
map.linkTerminalToInterface(1, 2)
|
||||
map.terminalToInterface mustEqual Map(1 -> 2)
|
||||
map.linkTerminalToInterface(3, 4)
|
||||
map.terminalToInterface mustEqual Map(1 -> 2, 3 -> 4)
|
||||
}
|
||||
|
||||
"associate turrets to weapons" in {
|
||||
val map = new ZoneMap("map13")
|
||||
map.TurretToWeapon mustEqual Map.empty
|
||||
map.TurretToWeapon(1, 2)
|
||||
map.TurretToWeapon mustEqual Map(1 -> 2)
|
||||
map.TurretToWeapon(3, 4)
|
||||
map.TurretToWeapon mustEqual Map(1 -> 2, 3 -> 4)
|
||||
map.turretToWeapon mustEqual Map.empty
|
||||
map.linkTurretToWeapon(1, 2)
|
||||
map.turretToWeapon mustEqual Map(1 -> 2)
|
||||
map.linkTurretToWeapon(3, 4)
|
||||
map.turretToWeapon mustEqual Map(1 -> 2, 3 -> 4)
|
||||
}
|
||||
}
|
||||
|
||||
val map13 = new ZoneMap("map13")
|
||||
map13.LocalBuilding("Building", building_guid = 0, map_id = 10, FoundationBuilder(test))
|
||||
map13.addLocalBuilding("Building", buildingGuid = 0, mapId = 10, FoundationBuilder(test))
|
||||
class TestObject extends IdentifiableEntity
|
||||
|
||||
"Zone" should {
|
||||
|
|
@ -120,30 +120,6 @@ class ZoneTest extends Specification {
|
|||
|
||||
class ZoneActorTest extends ActorTest {
|
||||
"Zone" should {
|
||||
"create new number pools before the Actor is started" in {
|
||||
val zone = new Zone("test", new ZoneMap("map6"), 1) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
zone.GUID(new NumberPoolHub(new LimitedNumberSource(10)))
|
||||
assert(zone.AddPool("test1", 1 to 2))
|
||||
|
||||
zone.actor = system.spawn(ZoneActor(zone), "test-add-pool-actor") //note: not Init'd yet
|
||||
assert(zone.AddPool("test2", 3 to 4))
|
||||
}
|
||||
|
||||
"remove existing number pools before the Actor is started" in {
|
||||
val zone = new Zone("test", new ZoneMap("map6"), 1) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
zone.GUID(new NumberPoolHub(new LimitedNumberSource(10)))
|
||||
assert(zone.AddPool("test1", 1 to 2))
|
||||
assert(zone.RemovePool("test1"))
|
||||
|
||||
zone.actor = system.spawn(ZoneActor(zone), "test-remove-pool-actor") //note: not Init'd yet
|
||||
assert(zone.AddPool("test2", 3 to 4))
|
||||
assert(zone.RemovePool("test2"))
|
||||
}
|
||||
|
||||
"refuse new number pools after the Actor is started" in {
|
||||
val zone = new Zone("test", new ZoneMap("map6"), 1) { override def SetupNumberPools() = {} }
|
||||
zone.GUID(new NumberPoolHub(new LimitedNumberSource(40150)))
|
||||
|
|
@ -166,40 +142,40 @@ class ZoneActorTest extends ActorTest {
|
|||
|
||||
"set up spawn groups based on buildings" in {
|
||||
val map6 = new ZoneMap("map6") {
|
||||
LocalBuilding(
|
||||
addLocalBuilding(
|
||||
"Building",
|
||||
building_guid = 1,
|
||||
map_id = 1,
|
||||
buildingGuid = 1,
|
||||
mapId = 1,
|
||||
FoundationBuilder(Building.Structure(StructureType.Building, Vector3(1, 1, 1)))
|
||||
)
|
||||
LocalObject(2, SpawnTube.Constructor(Vector3(1, 0, 0), Vector3.Zero))
|
||||
LocalObject(3, Terminal.Constructor(Vector3.Zero, GlobalDefinitions.dropship_vehicle_terminal))
|
||||
LocalObject(4, SpawnTube.Constructor(Vector3(1, 0, 0), Vector3.Zero))
|
||||
ObjectToBuilding(2, 1)
|
||||
ObjectToBuilding(3, 1)
|
||||
ObjectToBuilding(4, 1)
|
||||
addLocalObject(2, SpawnTube.Constructor(Vector3(1, 0, 0), Vector3.Zero))
|
||||
addLocalObject(3, Terminal.Constructor(Vector3.Zero, GlobalDefinitions.dropship_vehicle_terminal))
|
||||
addLocalObject(4, SpawnTube.Constructor(Vector3(1, 0, 0), Vector3.Zero))
|
||||
linkObjectToBuilding(2, 1)
|
||||
linkObjectToBuilding(3, 1)
|
||||
linkObjectToBuilding(4, 1)
|
||||
|
||||
LocalBuilding(
|
||||
addLocalBuilding(
|
||||
"Building",
|
||||
building_guid = 5,
|
||||
map_id = 2,
|
||||
buildingGuid = 5,
|
||||
mapId = 2,
|
||||
FoundationBuilder(Building.Structure(StructureType.Building))
|
||||
)
|
||||
LocalObject(6, SpawnTube.Constructor(Vector3.Zero, Vector3.Zero))
|
||||
ObjectToBuilding(6, 5)
|
||||
addLocalObject(6, SpawnTube.Constructor(Vector3.Zero, Vector3.Zero))
|
||||
linkObjectToBuilding(6, 5)
|
||||
|
||||
LocalBuilding(
|
||||
addLocalBuilding(
|
||||
"Building",
|
||||
building_guid = 7,
|
||||
map_id = 3,
|
||||
buildingGuid = 7,
|
||||
mapId = 3,
|
||||
FoundationBuilder(Building.Structure(StructureType.Building, Vector3(1, 1, 1)))
|
||||
)
|
||||
LocalObject(8, Terminal.Constructor(Vector3.Zero, GlobalDefinitions.dropship_vehicle_terminal))
|
||||
LocalObject(9, SpawnTube.Constructor(Vector3(1, 0, 0), Vector3.Zero))
|
||||
LocalObject(10, Terminal.Constructor(Vector3.Zero, GlobalDefinitions.dropship_vehicle_terminal))
|
||||
ObjectToBuilding(8, 7)
|
||||
ObjectToBuilding(9, 7)
|
||||
ObjectToBuilding(10, 7)
|
||||
addLocalObject(8, Terminal.Constructor(Vector3.Zero, GlobalDefinitions.dropship_vehicle_terminal))
|
||||
addLocalObject(9, SpawnTube.Constructor(Vector3(1, 0, 0), Vector3.Zero))
|
||||
addLocalObject(10, Terminal.Constructor(Vector3.Zero, GlobalDefinitions.dropship_vehicle_terminal))
|
||||
linkObjectToBuilding(8, 7)
|
||||
linkObjectToBuilding(9, 7)
|
||||
linkObjectToBuilding(10, 7)
|
||||
}
|
||||
val zone = new Zone("test", map6, 1) { override def SetupNumberPools() = {} }
|
||||
zone.actor = system.spawn(ZoneActor(zone), "test-init")
|
||||
|
|
@ -234,38 +210,46 @@ class ZoneActorTest extends ActorTest {
|
|||
class ZonePopulationTest extends ActorTest {
|
||||
"ZonePopulationActor" should {
|
||||
"add new user to zones" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
val avatar = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
||||
assert(zone.Players.isEmpty)
|
||||
assert(zone.LivePlayers.isEmpty)
|
||||
zone.Population ! Zone.Population.Join(avatar)
|
||||
expectNoMessage(Duration.create(100, "ms"))
|
||||
zone.Population ! Zone.Population.Spawn(avatar, Player(avatar), null)
|
||||
expectNoMessage(Duration.create(200, "ms"))
|
||||
assert(zone.Players.size == 1)
|
||||
assert(zone.Players.head == avatar)
|
||||
assert(zone.LivePlayers.isEmpty)
|
||||
// assert(zone.LivePlayers.isEmpty)
|
||||
}
|
||||
|
||||
"remove user from zones" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
val avatar = Avatar(1, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
receiveOne(Duration.create(200, "ms")) //consume
|
||||
zone.Population ! Zone.Population.Join(avatar)
|
||||
zone.Population ! Zone.Population.Spawn(avatar, Player(avatar), null)
|
||||
expectNoMessage(Duration.create(100, "ms"))
|
||||
|
||||
assert(zone.Players.size == 1)
|
||||
assert(zone.Players.head == avatar)
|
||||
zone.Population ! Zone.Population.Leave(avatar)
|
||||
expectNoMessage(Duration.create(100, "ms"))
|
||||
val reply = receiveOne(Duration.create(100, "ms"))
|
||||
assert(reply.isInstanceOf[Zone.Population.PlayerHasLeft])
|
||||
assert(zone.Players.isEmpty)
|
||||
}
|
||||
|
||||
/* TODO they need AvatarActor, which has further dependencies
|
||||
"associate user with a character" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val avatar = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
|
@ -285,7 +269,7 @@ class ZonePopulationTest extends ActorTest {
|
|||
|
||||
"disassociate character from a user" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val avatar = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
|
@ -307,7 +291,7 @@ class ZonePopulationTest extends ActorTest {
|
|||
|
||||
"user tries to Leave, but still has an associated character" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val avatar = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
player.GUID = PlanetSideGUID(1)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
|
|
@ -332,7 +316,7 @@ class ZonePopulationTest extends ActorTest {
|
|||
|
||||
"user tries to Spawn a character, but an associated character already exists" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val avatar = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player1 = Player(avatar)
|
||||
val player2 = Player(avatar)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
|
|
@ -358,7 +342,7 @@ class ZonePopulationTest extends ActorTest {
|
|||
|
||||
"user tries to Spawn a character, but did not Join first" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val avatar = Avatar(0, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val player = Player(avatar)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
|
@ -373,31 +357,37 @@ class ZonePopulationTest extends ActorTest {
|
|||
assert(reply.asInstanceOf[Zone.Population.PlayerCanNotSpawn].zone == zone)
|
||||
assert(reply.asInstanceOf[Zone.Population.PlayerCanNotSpawn].player == player)
|
||||
}
|
||||
*/
|
||||
|
||||
"user tries to Release a character, but did not Spawn a character first" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val avatar = Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
val avatar = Avatar(2, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5)
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
zone.Population ! Zone.Population.Join(avatar)
|
||||
zone.Population ! Zone.Population.Spawn(avatar, Player(avatar), null)
|
||||
expectNoMessage(Duration.create(100, "ms"))
|
||||
|
||||
assert(zone.Players.size == 1)
|
||||
assert(zone.Players.head == avatar)
|
||||
assert(zone.LivePlayers.isEmpty)
|
||||
// assert(zone.LivePlayers.isEmpty)
|
||||
zone.Population ! Zone.Population.Release(avatar)
|
||||
val reply = receiveOne(Duration.create(100, "ms"))
|
||||
assert(zone.Players.size == 1)
|
||||
assert(zone.Players.head == avatar)
|
||||
assert(zone.LivePlayers.isEmpty)
|
||||
// assert(zone.Players.size == 1)
|
||||
// assert(zone.Players.head == avatar)
|
||||
// assert(zone.LivePlayers.isEmpty)
|
||||
assert(reply.isInstanceOf[Zone.Population.PlayerHasLeft])
|
||||
assert(reply.asInstanceOf[Zone.Population.PlayerHasLeft].zone == zone)
|
||||
assert(reply.asInstanceOf[Zone.Population.PlayerHasLeft].player.isEmpty)
|
||||
// assert(reply.asInstanceOf[Zone.Population.PlayerHasLeft].player.isEmpty)
|
||||
}
|
||||
|
||||
"user adds character to list of retired characters" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val player = Player(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
val player = Player(Avatar(3, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
player.Release
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
|
@ -410,8 +400,10 @@ class ZonePopulationTest extends ActorTest {
|
|||
}
|
||||
|
||||
"user removes character from the list of retired characters" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val player = Player(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
val player = Player(Avatar(4, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
player.Release
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
|
@ -426,12 +418,14 @@ class ZonePopulationTest extends ActorTest {
|
|||
}
|
||||
|
||||
"user removes THE CORRECT character from the list of retired characters" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val player1 = Player(Avatar("Chord1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
val player1 = Player(Avatar(5, "Chord1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
player1.Release
|
||||
val player2 = Player(Avatar("Chord2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
val player2 = Player(Avatar(6, "Chord2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
player2.Release
|
||||
val player3 = Player(Avatar("Chord3", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
val player3 = Player(Avatar(7, "Chord3", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
player3.Release
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
|
@ -452,8 +446,10 @@ class ZonePopulationTest extends ActorTest {
|
|||
}
|
||||
|
||||
"user tries to add character to list of retired characters, but is not in correct state" in {
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) { override def SetupNumberPools() = {} }
|
||||
val player = Player(Avatar("Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
val zone = new Zone("test", new ZoneMap(""), 0) {
|
||||
override def SetupNumberPools() = {}
|
||||
}
|
||||
val player = Player(Avatar(8, "Chord", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Voice5))
|
||||
//player.Release !!important
|
||||
zone.actor = system.spawn(ZoneActor(zone), ZoneTest.TestName)
|
||||
expectNoMessage(200 milliseconds)
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@ package objects.guidtask
|
|||
|
||||
import base.ActorTest
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.guid.{GUIDTask, TaskResolver}
|
||||
import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire}
|
||||
|
||||
class GUIDTaskRegisterAvatarTest extends ActorTest {
|
||||
"RegisterAvatar" in {
|
||||
val (_, uns, taskResolver, probe) = GUIDTaskTest.CommonTestSetup
|
||||
val obj = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj_wep = Tool(GlobalDefinitions.beamer)
|
||||
obj.Slot(0).Equipment = obj_wep
|
||||
val obj_wep_ammo = AmmoBox(GlobalDefinitions.energy_cell)
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@ package objects.guidtask
|
|||
|
||||
import base.ActorTest
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.guid.{GUIDTask, TaskResolver}
|
||||
import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire}
|
||||
|
||||
class GUIDTaskRegisterPlayerTest extends ActorTest {
|
||||
"RegisterPlayer" in {
|
||||
val (_, uns, taskResolver, probe) = GUIDTaskTest.CommonTestSetup
|
||||
val obj = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj_wep = Tool(GlobalDefinitions.beamer)
|
||||
obj.Slot(0).Equipment = obj_wep
|
||||
val obj_wep_ammo = AmmoBox(GlobalDefinitions.energy_cell)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ object GUIDTaskTest {
|
|||
RandomPool(25).props(Props(classOf[UniqueNumberSystem], guid, GUIDTaskTest.AllocateNumberPoolActors(guid))),
|
||||
"uns"
|
||||
)
|
||||
val taskResolver = system.actorOf(RandomPool(15).props(Props[TaskResolver]), "resolver")
|
||||
val taskResolver = system.actorOf(RandomPool(15).props(Props[TaskResolver]()), "resolver")
|
||||
LogManager.getLogManager.reset() //suppresses any internal loggers created by the above elements
|
||||
(guid, uns, taskResolver, TestProbe())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@ package objects.guidtask
|
|||
|
||||
import base.ActorTest
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.guid.{GUIDTask, TaskResolver}
|
||||
import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire}
|
||||
|
||||
class GUIDTaskUnregisterAvatarTest extends ActorTest {
|
||||
"UnregisterAvatar" in {
|
||||
val (guid, uns, taskResolver, probe) = GUIDTaskTest.CommonTestSetup
|
||||
val obj = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj_wep = Tool(GlobalDefinitions.beamer)
|
||||
obj.Slot(0).Equipment = obj_wep
|
||||
val obj_wep_ammo = AmmoBox(GlobalDefinitions.energy_cell)
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@ package objects.guidtask
|
|||
|
||||
import base.ActorTest
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.guid.{GUIDTask, TaskResolver}
|
||||
import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire}
|
||||
|
||||
class GUIDTaskUnregisterPlayerTest extends ActorTest {
|
||||
"UnregisterPlayer" in {
|
||||
val (guid, uns, taskResolver, probe) = GUIDTaskTest.CommonTestSetup
|
||||
val obj = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj_wep = Tool(GlobalDefinitions.beamer)
|
||||
obj.Slot(0).Equipment = obj_wep
|
||||
val obj_wep_ammo = AmmoBox(GlobalDefinitions.energy_cell)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ package objects.terminal
|
|||
|
||||
import akka.actor.{ActorSystem, Props}
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.{Avatar, Default, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.{Default, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.definition.SeatDefinition
|
||||
import net.psforever.objects.guid.NumberPoolHub
|
||||
import net.psforever.objects.guid.source.LimitedNumberSource
|
||||
|
|
@ -51,7 +52,7 @@ class ImplantTerminalMechTest extends Specification {
|
|||
}
|
||||
|
||||
"get passenger in a seat" in {
|
||||
val player = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val obj = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech)
|
||||
obj.PassengerInSeat(player).isEmpty mustEqual true
|
||||
obj.Seats(0).Occupant = player
|
||||
|
|
@ -96,7 +97,7 @@ class ImplantTerminalMechControl3Test extends ActorTest {
|
|||
"ImplantTerminalMechControl" should {
|
||||
"block a player from mounting" in {
|
||||
val (player1, mech) = ImplantTerminalMechTest.SetUpAgents(PlanetSideEmpire.TR)
|
||||
val player2 = Player(Avatar("test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player2 = Player(Avatar(1, "test2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
|
||||
mech.Actor ! Mountable.TryMount(player1, 0)
|
||||
receiveOne(Duration.create(100, "ms")) //consume reply
|
||||
|
|
@ -185,9 +186,9 @@ object ImplantTerminalMechTest {
|
|||
guid.register(terminal, 1)
|
||||
guid.register(interface, 2)
|
||||
guid.register(building, 3)
|
||||
map.TerminalToInterface(1, 2)
|
||||
map.linkTerminalToInterface(1, 2)
|
||||
terminal.Actor = system.actorOf(Props(classOf[ImplantTerminalMechControl], terminal), "terminal-control")
|
||||
|
||||
(Player(Avatar("test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), terminal)
|
||||
(Player(Avatar(0, "test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), terminal)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package objects.terminal
|
||||
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
import net.psforever.objects.serverobject.terminals.{MatrixTerminalDefinition, Terminal}
|
||||
import net.psforever.objects.{Avatar, GlobalDefinitions, Player, Vehicle}
|
||||
import net.psforever.objects.{GlobalDefinitions, Player, Vehicle}
|
||||
import net.psforever.packet.game.ItemTransactionMessage
|
||||
import net.psforever.types._
|
||||
import org.specs2.mutable.Specification
|
||||
|
|
@ -20,7 +21,7 @@ class MatrixTerminalTest extends Specification {
|
|||
}
|
||||
|
||||
"invalid message" in {
|
||||
val player = Player(Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val player = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
|
||||
val msg = ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Buy, 1, "lite_armor", 0, PlanetSideGUID(0))
|
||||
val terminal = Terminal(new MatrixTerminalDefinition(519))
|
||||
terminal.Owner = Vehicle(GlobalDefinitions.quadstealth)
|
||||
|
|
|
|||
|
|
@ -5,12 +5,13 @@ import net.psforever.objects.serverobject.structures.{Building, StructureType}
|
|||
import net.psforever.objects.serverobject.terminals.Terminal
|
||||
import net.psforever.objects.zones.Zone
|
||||
import net.psforever.objects._
|
||||
import net.psforever.objects.avatar.{Avatar, Certification}
|
||||
import net.psforever.packet.game.ItemTransactionMessage
|
||||
import net.psforever.types._
|
||||
import org.specs2.mutable.Specification
|
||||
|
||||
class OrderTerminalTest extends Specification {
|
||||
val avatar = Avatar("test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
val avatar = Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)
|
||||
val player = Player(avatar)
|
||||
|
||||
val building = new Building(
|
||||
|
|
@ -91,27 +92,6 @@ class OrderTerminalTest extends Specification {
|
|||
infantryTerminal.Request(player, msg) mustEqual Terminal.NoDeal()
|
||||
}
|
||||
|
||||
"player can retrieve an infantry loadout" in {
|
||||
player.ExoSuit = ExoSuitType.Agile
|
||||
player.Slot(0).Equipment = Tool(GlobalDefinitions.beamer)
|
||||
player.Slot(6).Equipment = Tool(GlobalDefinitions.beamer)
|
||||
avatar.EquipmentLoadouts.SaveLoadout(player, "test", 0)
|
||||
|
||||
val msg = infantryTerminal.Request(
|
||||
player,
|
||||
ItemTransactionMessage(PlanetSideGUID(10), TransactionType.Loadout, 4, "", 0, PlanetSideGUID(0))
|
||||
)
|
||||
msg.isInstanceOf[Terminal.InfantryLoadout] mustEqual true
|
||||
val loadout = msg.asInstanceOf[Terminal.InfantryLoadout]
|
||||
loadout.exosuit mustEqual ExoSuitType.Agile
|
||||
loadout.subtype mustEqual 0
|
||||
loadout.holsters.size mustEqual 1
|
||||
loadout.holsters.head.obj.Definition mustEqual GlobalDefinitions.beamer
|
||||
loadout.holsters.head.start mustEqual 0
|
||||
loadout.inventory.head.obj.Definition mustEqual GlobalDefinitions.beamer
|
||||
loadout.inventory.head.start mustEqual 6
|
||||
}
|
||||
|
||||
"player can not retrieve an infantry loadout from the wrong line" in {
|
||||
val msg = infantryTerminal.Request(
|
||||
player,
|
||||
|
|
@ -148,28 +128,6 @@ class OrderTerminalTest extends Specification {
|
|||
val msg = ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Buy, 46769, "harasser", 0, PlanetSideGUID(0))
|
||||
terminal.Request(player, msg) mustEqual Terminal.NoDeal()
|
||||
}
|
||||
|
||||
"player can retrieve a vehicle loadout" in {
|
||||
val fury = Vehicle(GlobalDefinitions.fury)
|
||||
fury.Slot(30).Equipment = AmmoBox(GlobalDefinitions.hellfire_ammo)
|
||||
avatar.EquipmentLoadouts.SaveLoadout(fury, "test", 10)
|
||||
|
||||
val msg = ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Loadout, 4, "test", 0, PlanetSideGUID(0))
|
||||
terminal.Request(player, msg) match {
|
||||
case Terminal.VehicleLoadout(definition, weapons, trunk) =>
|
||||
definition mustEqual GlobalDefinitions.fury
|
||||
|
||||
weapons.size mustEqual 1
|
||||
weapons.head.obj.Definition mustEqual GlobalDefinitions.fury_weapon_systema
|
||||
|
||||
trunk.size mustEqual 1
|
||||
trunk.head.obj.Definition mustEqual GlobalDefinitions.hellfire_ammo
|
||||
case _ =>
|
||||
ko
|
||||
}
|
||||
|
||||
ok
|
||||
}
|
||||
}
|
||||
|
||||
"Certification Terminal" should {
|
||||
|
|
@ -179,7 +137,7 @@ class OrderTerminalTest extends Specification {
|
|||
"player can learn a certification ('medium_assault')" in {
|
||||
val msg =
|
||||
ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Learn, 0, "medium_assault", 0, PlanetSideGUID(0))
|
||||
terminal.Request(player, msg) mustEqual Terminal.LearnCertification(CertificationType.MediumAssault)
|
||||
terminal.Request(player, msg) mustEqual Terminal.LearnCertification(Certification.MediumAssault)
|
||||
}
|
||||
|
||||
"player can not learn a fake certification ('juggling')" in {
|
||||
|
|
@ -190,7 +148,7 @@ class OrderTerminalTest extends Specification {
|
|||
"player can forget a certification ('medium_assault')" in {
|
||||
val msg =
|
||||
ItemTransactionMessage(PlanetSideGUID(1), TransactionType.Sell, 0, "medium_assault", 0, PlanetSideGUID(0))
|
||||
terminal.Request(player, msg) mustEqual Terminal.SellCertification(CertificationType.MediumAssault)
|
||||
terminal.Request(player, msg) mustEqual Terminal.SellCertification(Certification.MediumAssault)
|
||||
}
|
||||
|
||||
"player can not forget a fake certification ('juggling')" in {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
// Copyright (c) 2017 PSForever
|
||||
package objects.terminal
|
||||
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
|
||||
import akka.actor.Props
|
||||
import akka.testkit.TestProbe
|
||||
import base.ActorTest
|
||||
|
|
@ -14,15 +16,18 @@ import net.psforever.objects.serverobject.terminals.{
|
|||
Terminal
|
||||
}
|
||||
import net.psforever.objects.zones.{Zone, ZoneMap}
|
||||
import net.psforever.objects.{Avatar, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.{GlobalDefinitions, Player}
|
||||
import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, PlanetSideGUID}
|
||||
import org.specs2.mutable.Specification
|
||||
import services.Service
|
||||
import services.local.LocalService
|
||||
|
||||
import scala.concurrent.duration._
|
||||
import akka.actor.typed.scaladsl.adapter._
|
||||
import net.psforever.objects.avatar.Avatar
|
||||
|
||||
class ProximityTest extends Specification {
|
||||
|
||||
"ProximityUnit" should {
|
||||
"construct (with a Terminal object)" in {
|
||||
val obj = new ProximityTest.SampleTerminal()
|
||||
|
|
@ -31,12 +36,30 @@ class ProximityTest extends Specification {
|
|||
|
||||
"keep track of users (add)" in {
|
||||
val avatar1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
avatar1.Spawn
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar1.Spawn()
|
||||
avatar1.Health = 50
|
||||
val avatar2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
avatar2.Spawn
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter2",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar2.Spawn()
|
||||
avatar2.Health = 50
|
||||
|
||||
val obj = new ProximityTerminal(GlobalDefinitions.medical_terminal)
|
||||
|
|
@ -49,12 +72,30 @@ class ProximityTest extends Specification {
|
|||
|
||||
"keep track of users (remove)" in {
|
||||
val avatar1 =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
avatar1.Spawn
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar1.Spawn()
|
||||
avatar1.Health = 50
|
||||
val avatar2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
avatar2.Spawn
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter2",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar2.Spawn()
|
||||
avatar2.Health = 50
|
||||
|
||||
val obj = new ProximityTerminal(GlobalDefinitions.medical_terminal)
|
||||
|
|
@ -72,8 +113,17 @@ class ProximityTest extends Specification {
|
|||
|
||||
"can not add a user twice" in {
|
||||
val avatar =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
avatar.Spawn
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar.Spawn()
|
||||
avatar.Health = 50
|
||||
|
||||
val obj = new ProximityTerminal(GlobalDefinitions.medical_terminal)
|
||||
|
|
@ -85,8 +135,17 @@ class ProximityTest extends Specification {
|
|||
|
||||
"can not remove a user that was not added" in {
|
||||
val avatar =
|
||||
Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
avatar.Spawn
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar.Spawn()
|
||||
avatar.Health = 50
|
||||
|
||||
val obj = new ProximityTest.SampleTerminal()
|
||||
|
|
@ -108,6 +167,7 @@ class ProximityTerminalControlStartTest extends ActorTest {
|
|||
//setup
|
||||
val zone: Zone = new Zone("test", new ZoneMap("test-map"), 0) {
|
||||
actor = system.spawn(ZoneActor(this), "test-zone")
|
||||
|
||||
override def SetupNumberPools() = {
|
||||
AddPool("dynamic", 1 to 10)
|
||||
}
|
||||
|
|
@ -118,9 +178,19 @@ class ProximityTerminalControlStartTest extends ActorTest {
|
|||
Amenities = terminal
|
||||
Faction = PlanetSideEmpire.VS
|
||||
}
|
||||
val avatar = Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
val avatar =
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar.Continent = "test"
|
||||
avatar.Spawn
|
||||
avatar.Spawn()
|
||||
avatar.Health = 50
|
||||
|
||||
avatar.GUID = PlanetSideGUID(1)
|
||||
|
|
@ -159,14 +229,33 @@ class ProximityTerminalControlTwoUsersTest extends ActorTest {
|
|||
Faction = PlanetSideEmpire.VS
|
||||
}
|
||||
|
||||
val avatar = Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
val avatar =
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar.Continent = "test"
|
||||
avatar.Spawn
|
||||
avatar.Spawn()
|
||||
avatar.Health = 50
|
||||
val avatar2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter2",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar2.Continent = "test"
|
||||
avatar2.Spawn
|
||||
avatar2.Spawn()
|
||||
avatar2.Health = 50
|
||||
|
||||
avatar.GUID = PlanetSideGUID(1)
|
||||
|
|
@ -201,6 +290,7 @@ class ProximityTerminalControlStopTest extends ActorTest {
|
|||
//setup
|
||||
val zone: Zone = new Zone("test", new ZoneMap("test-map"), 0) {
|
||||
actor = system.spawn(ZoneActor(this), "test-zone")
|
||||
|
||||
override def SetupNumberPools() = {
|
||||
AddPool("dynamic", 1 to 10)
|
||||
}
|
||||
|
|
@ -211,9 +301,19 @@ class ProximityTerminalControlStopTest extends ActorTest {
|
|||
Amenities = terminal
|
||||
Faction = PlanetSideEmpire.VS
|
||||
}
|
||||
val avatar = Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
val avatar =
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar.Continent = "test"
|
||||
avatar.Spawn
|
||||
avatar.Spawn()
|
||||
avatar.Health = 50
|
||||
|
||||
avatar.GUID = PlanetSideGUID(1)
|
||||
|
|
@ -255,14 +355,33 @@ class ProximityTerminalControlNotStopTest extends ActorTest {
|
|||
Faction = PlanetSideEmpire.VS
|
||||
}
|
||||
|
||||
val avatar = Player(Avatar("TestCharacter1", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
val avatar =
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter1",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar.Continent = "test"
|
||||
avatar.Spawn
|
||||
avatar.Spawn()
|
||||
avatar.Health = 50
|
||||
val avatar2 =
|
||||
Player(Avatar("TestCharacter2", PlanetSideEmpire.VS, CharacterGender.Female, 1, CharacterVoice.Voice1))
|
||||
Player(
|
||||
Avatar(
|
||||
ProximityTest.avatarId.getAndIncrement(),
|
||||
"TestCharacter2",
|
||||
PlanetSideEmpire.VS,
|
||||
CharacterGender.Female,
|
||||
1,
|
||||
CharacterVoice.Voice1
|
||||
)
|
||||
)
|
||||
avatar2.Continent = "test"
|
||||
avatar2.Spawn
|
||||
avatar2.Spawn()
|
||||
avatar2.Health = 50
|
||||
|
||||
avatar.GUID = PlanetSideGUID(1)
|
||||
|
|
@ -299,9 +418,12 @@ class ProximityTerminalControlNotStopTest extends ActorTest {
|
|||
}
|
||||
|
||||
object ProximityTest {
|
||||
val avatarId = new AtomicInteger(0)
|
||||
|
||||
class SampleTerminal extends Terminal(GlobalDefinitions.dropship_vehicle_terminal) with ProximityUnit
|
||||
|
||||
class ProbedLocalService(probe: TestProbe, zone: Zone) extends LocalService(zone) {
|
||||
self.tell(Service.Join("test"), probe.ref)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@ package objects.terminal
|
|||
|
||||
import akka.actor.{ActorSystem, Props}
|
||||
import base.ActorTest
|
||||
import net.psforever.objects.avatar.{Avatar, Certification}
|
||||
import net.psforever.objects.serverobject.structures.{Building, StructureType}
|
||||
import net.psforever.objects.serverobject.terminals.{Terminal, TerminalControl, TerminalDefinition}
|
||||
import net.psforever.objects.zones.Zone
|
||||
import net.psforever.objects.{Avatar, GlobalDefinitions, Player}
|
||||
import net.psforever.objects.{GlobalDefinitions, Player}
|
||||
import net.psforever.packet.game.ItemTransactionMessage
|
||||
import net.psforever.types._
|
||||
|
||||
|
|
@ -44,7 +45,7 @@ class CertTerminalControl1Test extends ActorTest {
|
|||
val reply2 = reply.asInstanceOf[Terminal.TerminalMessage]
|
||||
assert(reply2.player == player)
|
||||
assert(reply2.msg == msg)
|
||||
assert(reply2.response == Terminal.LearnCertification(CertificationType.MediumAssault))
|
||||
assert(reply2.response == Terminal.LearnCertification(Certification.MediumAssault))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +75,7 @@ class CertTerminalControl3Test extends ActorTest {
|
|||
val reply2 = reply.asInstanceOf[Terminal.TerminalMessage]
|
||||
assert(reply2.player == player)
|
||||
assert(reply2.msg == msg)
|
||||
assert(reply2.response == Terminal.SellCertification(CertificationType.MediumAssault))
|
||||
assert(reply2.response == Terminal.SellCertification(Certification.MediumAssault))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,6 +143,6 @@ object TerminalControlTest {
|
|||
GlobalDefinitions.building
|
||||
)
|
||||
terminal.Owner.Faction = faction
|
||||
(Player(Avatar("test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), terminal)
|
||||
(Player(Avatar(0, "test", faction, CharacterGender.Male, 0, CharacterVoice.Mute)), terminal)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import scala.concurrent.duration._
|
|||
class RouterTelepadActivationTest extends ActorTest {
|
||||
"RouterTelepadActivation" should {
|
||||
"construct" in {
|
||||
system.actorOf(Props[RouterTelepadActivation], "activation-test-actor")
|
||||
system.actorOf(Props[RouterTelepadActivation](), "activation-test-actor")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ class RouterTelepadActivationSimpleTest extends ActorTest {
|
|||
val telepad = new TelepadDeployable(GlobalDefinitions.router_telepad_deployable)
|
||||
telepad.GUID = PlanetSideGUID(1)
|
||||
val obj = system.actorOf(
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation], self),
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation](), self),
|
||||
"activation-test-actor"
|
||||
)
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ class RouterTelepadActivationComplexTest extends ActorTest {
|
|||
val telepad3 = new TelepadDeployable(GlobalDefinitions.router_telepad_deployable)
|
||||
telepad3.GUID = PlanetSideGUID(3)
|
||||
val obj = system.actorOf(
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation], self),
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation](), self),
|
||||
"activation-test-actor"
|
||||
)
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ class RouterTelepadActivationHurryTest extends ActorTest {
|
|||
val telepad3 = new TelepadDeployable(GlobalDefinitions.router_telepad_deployable)
|
||||
telepad3.GUID = PlanetSideGUID(3)
|
||||
val obj = system.actorOf(
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation], self),
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation](), self),
|
||||
"activation-test-actor"
|
||||
)
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ class RouterTelepadActivationHurryAllTest extends ActorTest {
|
|||
val telepad3 = new TelepadDeployable(GlobalDefinitions.router_telepad_deployable)
|
||||
telepad3.GUID = PlanetSideGUID(3)
|
||||
val obj = system.actorOf(
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation], self),
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation](), self),
|
||||
"activation-test-actor"
|
||||
)
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ class RouterTelepadActivationClearTest extends ActorTest {
|
|||
val telepad3 = new TelepadDeployable(GlobalDefinitions.router_telepad_deployable)
|
||||
telepad3.GUID = PlanetSideGUID(3)
|
||||
val obj = system.actorOf(
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation], self),
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation](), self),
|
||||
"activation-test-actor"
|
||||
)
|
||||
|
||||
|
|
@ -161,7 +161,7 @@ class RouterTelepadActivationClearAllTest extends ActorTest {
|
|||
val telepad3 = new TelepadDeployable(GlobalDefinitions.router_telepad_deployable)
|
||||
telepad3.GUID = PlanetSideGUID(3)
|
||||
val obj = system.actorOf(
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation], self),
|
||||
Props(classOf[ActorTest.SupportActorInterface], Props[RouterTelepadActivation](), self),
|
||||
"activation-test-actor"
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue