diff --git a/build.sbt b/build.sbt index b382d8ed..66c6a8fb 100644 --- a/build.sbt +++ b/build.sbt @@ -46,6 +46,7 @@ lazy val psforeverSettings = Seq( "com.typesafe.akka" %% "akka-stream" % "2.6.17", "com.typesafe.akka" %% "akka-testkit" % "2.6.17" % "test", "com.typesafe.akka" %% "akka-actor-typed" % "2.6.17", + "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.17" % "test", "com.typesafe.akka" %% "akka-slf4j" % "2.6.17", "com.typesafe.akka" %% "akka-cluster-typed" % "2.6.17", "com.typesafe.akka" %% "akka-coordination" % "2.6.17", diff --git a/server/src/test/scala/actor/objects/AutoRepairIntegrationTest.scala b/server/src/test/scala/actor/objects/AutoRepairIntegrationTest.scala index 1f646d95..7742079e 100644 --- a/server/src/test/scala/actor/objects/AutoRepairIntegrationTest.scala +++ b/server/src/test/scala/actor/objects/AutoRepairIntegrationTest.scala @@ -6,7 +6,7 @@ import akka.testkit.TestProbe import base.FreedContextActorTest import net.psforever.actors.zone.BuildingActor import net.psforever.objects.avatar.Avatar -import net.psforever.objects.ballistics.{Projectile, SourceEntry} +import net.psforever.objects.ballistics.Projectile import net.psforever.objects.guid.NumberPoolHub import net.psforever.objects.guid.source.MaxNumberSource import net.psforever.objects.serverobject.CommonMessages @@ -14,6 +14,7 @@ import net.psforever.objects.serverobject.deploy.Deployment import net.psforever.objects.serverobject.resourcesilo.{ResourceSilo, ResourceSiloControl} import net.psforever.objects.serverobject.structures.{AutoRepairStats, Building, StructureType} import net.psforever.objects.serverobject.terminals.{OrderTerminalDefinition, Terminal, TerminalControl} +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.damage.DamageProfile diff --git a/server/src/test/scala/actor/objects/AutoRepairTest.scala b/server/src/test/scala/actor/objects/AutoRepairTest.scala index ef61ecbf..5ea527b6 100644 --- a/server/src/test/scala/actor/objects/AutoRepairTest.scala +++ b/server/src/test/scala/actor/objects/AutoRepairTest.scala @@ -7,11 +7,12 @@ import base.FreedContextActorTest import net.psforever.actors.commands.NtuCommand import net.psforever.actors.zone.BuildingActor import net.psforever.objects.avatar.Avatar -import net.psforever.objects.ballistics.{Projectile, SourceEntry} +import net.psforever.objects.ballistics.Projectile import net.psforever.objects.guid.NumberPoolHub import net.psforever.objects.guid.source.MaxNumberSource import net.psforever.objects.serverobject.structures.{AutoRepairStats, Building, StructureType} import net.psforever.objects.serverobject.terminals.{OrderTerminalDefinition, Terminal, TerminalControl} +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.damage.DamageProfile diff --git a/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala b/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala index 043acb13..791df21f 100644 --- a/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala +++ b/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala @@ -297,7 +297,7 @@ class MiddlewareActor( send(ServerStart(nonce, serverNonce), None, None) cryptoSetup() - case (Unknown30(nonce), _) => + case (Unknown30(_), _) => /* Unknown30 is used to reuse an existing crypto session when switching from login to world When not handling it, it appears that the client will fall back to using ClientStart diff --git a/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala index c9db6a2f..5709aa60 100644 --- a/src/main/scala/net/psforever/actors/session/AvatarActor.scala +++ b/src/main/scala/net/psforever/actors/session/AvatarActor.scala @@ -5,8 +5,15 @@ import java.util.concurrent.atomic.AtomicInteger import akka.actor.Cancellable import akka.actor.typed.scaladsl.{ActorContext, Behaviors, StashBuffer} import akka.actor.typed.{ActorRef, Behavior, PostStop, SupervisorStrategy} -import net.psforever.objects.vital.{DamagingActivity, HealingActivity} +import net.psforever.objects.avatar.{ProgressDecoration, SpecialCarry} +import net.psforever.objects.avatar.scoring.{Death, EquipmentStat, KDAStat, Kill} +import net.psforever.objects.sourcing.SourceWithHealthEntry +import net.psforever.objects.vital.projectile.ProjectileReason +import net.psforever.objects.vital.{DamagingActivity, HealingActivity, SpawningActivity, Vitality} +import net.psforever.packet.game.objectcreate.BasicCharacterData +import net.psforever.types.ExperienceType import org.joda.time.{LocalDateTime, Seconds} + import scala.collection.mutable import scala.concurrent.{ExecutionContextExecutor, Future, Promise} import scala.util.{Failure, Success} @@ -32,8 +39,8 @@ import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.inventory.InventoryItem import net.psforever.objects.loadouts.{InfantryLoadout, Loadout, VehicleLoadout} import net.psforever.objects._ -import net.psforever.objects.ballistics.PlayerSource import net.psforever.objects.locker.LockerContainer +import net.psforever.objects.sourcing.PlayerSource import net.psforever.objects.vital.HealFromImplant import net.psforever.packet.game.objectcreate.{ObjectClass, RibbonBars} import net.psforever.packet.game.{Friend => GameFriend, _} @@ -188,7 +195,7 @@ object AvatarActor { final case class SuspendStaminaRegeneration(duration: FiniteDuration) extends Command /** Award battle experience points */ - final case class AwardBep(bep: Long) extends Command + final case class AwardBep(bep: Long, modifier: ExperienceType) extends Command /** Set total battle experience points */ final case class SetBep(bep: Long) extends Command @@ -214,6 +221,8 @@ object AvatarActor { final case class RemoveShortcut(slot: Int) extends Command + final case class UpdateToolDischarge(stat: EquipmentStat) extends Command + final case class AvatarResponse(avatar: Avatar) final case class AvatarLoginResponse(avatar: Avatar) @@ -618,22 +627,28 @@ object AvatarActor { */ def finalSavePlayerData(player: Player): Future[Int] = { val health = ( - player.History.find(_.isInstanceOf[DamagingActivity]), - player.History.find(_.isInstanceOf[HealingActivity]) + player.History.findLast(_.isInstanceOf[DamagingActivity]), + player.History.collect { case h: HealingActivity => h } ) match { - case (Some(damage), Some(heal)) => + case (Some(damage: DamagingActivity), heals) if heals.nonEmpty => + val health = damage.data.targetAfter.asInstanceOf[PlayerSource].health //between damage and potential healing, which came last? - if (damage.time < heal.time) { - heal.asInstanceOf[HealingActivity].amount % player.MaxHealth + if (damage.time < heals.last.time) { + health + heals.map { _.amount }.sum } else { - damage.asInstanceOf[DamagingActivity].data.targetAfter.asInstanceOf[PlayerSource].health + health + } + case (Some(damage: DamagingActivity), _) => + damage.data.targetAfter.asInstanceOf[PlayerSource].health + case (None, heals) if heals.nonEmpty => + player.History.headOption match { + case Some(es: SpawningActivity) => + es.src.asInstanceOf[SourceWithHealthEntry].health + heals.map { _.amount }.sum + case _ => + player.Health } - case (Some(damage), None) => - damage.asInstanceOf[DamagingActivity].data.targetAfter.asInstanceOf[PlayerSource].health - case (None, Some(heal)) => - heal.asInstanceOf[HealingActivity].amount % player.MaxHealth case _ => - player.MaxHealth + player.Health } savePlayerData(player, health) } @@ -772,6 +787,21 @@ object AvatarActor { } out.future } + + def toAvatar(avatar: persistence.Avatar): Avatar = + Avatar( + avatar.id, + BasicCharacterData( + avatar.name, + PlanetSideEmpire(avatar.factionId), + CharacterSex.valuesToEntriesMap(avatar.genderId), + avatar.headId, + CharacterVoice(avatar.voiceId) + ), + avatar.bep, + avatar.cep, + decoration = ProgressDecoration(cosmetics = avatar.cosmetics.map(c => Cosmetic.valuesFromObjectCreateValue(c))) + ) } class AvatarActor( @@ -937,7 +967,7 @@ class AvatarActor( case Success(characters) => characters.headOption match { case Some(character) => - avatar = character.toAvatar + avatar = AvatarActor.toAvatar(character) replyTo ! AvatarResponse(avatar) case None => log.error(s"selected character $charId not found") @@ -1497,7 +1527,7 @@ class AvatarActor( val events = zone.AvatarEvents val guid = player.GUID val newHealth = player.Health = originalHealth + 1 - player.History(HealFromImplant(PlayerSource(player), 1, implantType)) + player.LogActivity(HealFromImplant(implantType, 1)) events ! AvatarServiceMessage( zone.id, AvatarAction.PlanetsideAttributeToAll(guid, 0, newHealth) @@ -1595,67 +1625,24 @@ class AvatarActor( initializeImplants() Behaviors.same - case AwardBep(bep) => - context.self ! SetBep(avatar.bep + bep) + case UpdateToolDischarge(stats) => + updateToolDischarge(stats) + Behaviors.same + + case AwardBep(bep, modifier) => + setBep(avatar.bep + bep, modifier) Behaviors.same case SetBep(bep) => - import ctx._ - val result = for { - _ <- - if (BattleRank.withExperience(bep).value < BattleRank.BR24.value) setCosmetics(Set()) - else Future.successful(()) - r <- ctx.run(query[persistence.Avatar].filter(_.id == lift(avatar.id)).update(_.bep -> lift(bep))) - } yield r - result.onComplete { - case Success(_) => - sessionActor ! SessionActor.SendResponse(BattleExperienceMessage(session.get.player.GUID, bep, 0)) - session.get.zone.AvatarEvents ! AvatarServiceMessage( - session.get.zone.id, - AvatarAction.PlanetsideAttributeToAll(session.get.player.GUID, 17, bep) - ) - // when the level is reduced, take away any implants over the implant slot limit - val implants = avatar.implants.zipWithIndex.map { - case (implant, index) => - if (index >= BattleRank.withExperience(bep).implantSlots && implant.isDefined) { - ctx.run( - query[persistence.Implant] - .filter(_.name == lift(implant.get.definition.Name)) - .filter(_.avatarId == lift(avatar.id)) - .delete - ) - .onComplete { - case Success(_) => - sessionActor ! SessionActor.SendResponse( - AvatarImplantMessage(session.get.player.GUID, ImplantAction.Remove, index, 0) - ) - case Failure(exception) => log.error(exception)("db failure") - } - None - } else { - implant - } - } - avatar = avatar.copy(bep = bep, implants = implants) - case Failure(exception) => log.error(exception)("db failure") - } + setBep(bep, ExperienceType.Normal) Behaviors.same case AwardCep(cep) => - context.self ! SetCep(avatar.cep + cep) + setCep(avatar.cep + cep) Behaviors.same case SetCep(cep) => - import ctx._ - ctx.run(query[persistence.Avatar].filter(_.id == lift(avatar.id)).update(_.cep -> lift(cep))).onComplete { - case Success(_) => - avatar = avatar.copy(cep = cep) - session.get.zone.AvatarEvents ! AvatarServiceMessage( - session.get.zone.id, - AvatarAction.PlanetsideAttributeToAll(session.get.player.GUID, 18, cep) - ) - case Failure(exception) => log.error(exception)("db failure") - } + setCep(cep) Behaviors.same case SetCosmetics(cosmetics) => @@ -1690,8 +1677,8 @@ class AvatarActor( //short-circuit if the shortcut already exists at the given location val isMacroShortcut = shortcut.isInstanceOf[Shortcut.Macro] val isDifferentShortcut = !(targetShortcut match { - case Some(target) => AvatarShortcut.equals(shortcut, target) - case _ => false + case Some(target: AvatarShortcut) => AvatarShortcut.equals(shortcut, target) + case _ => false }) if (isDifferentShortcut) { if (!isMacroShortcut && avatar.shortcuts.flatten.exists { @@ -1701,7 +1688,7 @@ class AvatarActor( if (shortcut.isInstanceOf[Shortcut.Implant]) { //duplicate implant targetShortcut match { - case Some(existingShortcut) => + case Some(existingShortcut: AvatarShortcut) => //redraw redundant shortcut slot with existing shortcut sessionActor ! SessionActor.SendResponse( CreateShortcutMessage(session.get.player.GUID, slot + 1, Some(AvatarShortcut.convert(existingShortcut))) @@ -2116,7 +2103,7 @@ class AvatarActor( avatars.filter(!_.deleted) foreach { a => val secondsSinceLastLogin = Seconds.secondsBetween(a.lastLogin, LocalDateTime.now()).getSeconds - val avatar = a.toAvatar + val avatar = AvatarActor.toAvatar(a) val player = new Player(avatar) player.ExoSuit = ExoSuitType.Reinforced @@ -2356,11 +2343,12 @@ class AvatarActor( } def refreshLoadouts(loadouts: Iterable[(Option[Loadout], Int)]): Unit = { + val guid = session.get.player.GUID loadouts .map { case (Some(loadout: InfantryLoadout), index) => FavoritesMessage.Infantry( - session.get.player.GUID, + guid, index, loadout.label, InfantryLoadout.DetermineSubtypeB(loadout.exosuit, loadout.subtype) @@ -2368,14 +2356,14 @@ class AvatarActor( case (Some(loadout: VehicleLoadout), index) if GlobalDefinitions.isBattleFrameVehicle(loadout.vehicle_definition) => FavoritesMessage.Battleframe( - session.get.player.GUID, + guid, index - 15, loadout.label, VehicleLoadout.DetermineBattleframeSubtype(loadout.vehicle_definition) ) case (Some(loadout: VehicleLoadout), index) => FavoritesMessage.Vehicle( - session.get.player.GUID, + guid, index - 10, loadout.label ) @@ -2389,7 +2377,7 @@ class AvatarActor( } FavoritesMessage( mtype, - session.get.player.GUID, + guid, lineNo, "", 0 @@ -2812,4 +2800,110 @@ class AvatarActor( sessionActor ! SessionActor.UpdateIgnoredPlayers(FriendsResponse(MemberAction.RemoveIgnoredPlayer, GameFriend(name))) sessionActor ! SessionActor.CharSaved } + + def setBep(bep: Long, modifier: ExperienceType): Unit = { + import ctx._ + val result = for { + _ <- + if (BattleRank.withExperience(bep).value < BattleRank.BR24.value) setCosmetics(Set()) + else Future.successful(()) + r <- ctx.run(query[persistence.Avatar].filter(_.id == lift(avatar.id)).update(_.bep -> lift(bep))) + } yield r + result.onComplete { + case Success(_) => + val sess = session.get + val zone = sess.zone + val pguid = sess.player.GUID + val localModifier = modifier + sessionActor ! SessionActor.SendResponse(BattleExperienceMessage(pguid, bep, localModifier)) + zone.AvatarEvents ! AvatarServiceMessage( + zone.id, + AvatarAction.PlanetsideAttributeToAll(pguid, 17, bep) + ) + // when the level is reduced, take away any implants over the implant slot limit + val implants = avatar.implants.zipWithIndex.map { + case (implant, index) => + if (index >= BattleRank.withExperience(bep).implantSlots && implant.isDefined) { + ctx.run( + query[persistence.Implant] + .filter(_.name == lift(implant.get.definition.Name)) + .filter(_.avatarId == lift(avatar.id)) + .delete + ) + .onComplete { + case Success(_) => + sessionActor ! SessionActor.SendResponse( + AvatarImplantMessage(pguid, ImplantAction.Remove, index, 0) + ) + case Failure(exception) => + log.error(exception)("db failure") + } + None + } else { + implant + } + } + avatar = avatar.copy(bep = bep, implants = implants) + case Failure(exception) => + log.error(exception)("db failure") + } + } + + def setCep(cep: Long): Unit = { + import ctx._ + ctx.run(query[persistence.Avatar].filter(_.id == lift(avatar.id)).update(_.cep -> lift(cep))).onComplete { + case Success(_) => + val sess = session.get + val zone = sess.zone + avatar = avatar.copy(cep = cep) + zone.AvatarEvents ! AvatarServiceMessage( + zone.id, + AvatarAction.PlanetsideAttributeToAll(sess.player.GUID, 18, cep) + ) + case Failure(exception) => + log.error(exception)("db failure") + } + } + + def updateKillsDeathsAssists(kdaStat: KDAStat): Unit = { + avatar.scorecard.rate(kdaStat) + val exp = kdaStat.experienceEarned + val _session = session.get + val zone = _session.zone + val player = _session.player + kdaStat match { + case kill: Kill => + val _ = PlayerSource(player) + (kill.info.interaction.cause match { + case pr: ProjectileReason => pr.projectile.mounted_in.map { a => zone.GUID(a._1) } + case _ => None + }) match { + case Some(Some(_: Vitality)) => + //zone.actor ! ZoneActor.RewardOurSupporters(playerSource, obj.History, kill, exp) + case _ => ; + } + //zone.actor ! ZoneActor.RewardOurSupporters(playerSource, player.History, kill, exp) + case _: Death => + player.Zone.AvatarEvents ! AvatarServiceMessage( + player.Name, + AvatarAction.SendResponse( + Service.defaultPlayerGUID, + AvatarStatisticsMessage(DeathStatistic(avatar.scorecard.Lives.size)) + ) + ) + } + if (exp > 0L) { + val gameOpts = Config.app.game + val (msg, modifier): (ExperienceType, Float) = if (player.Carrying.contains(SpecialCarry.RabbitBall)) { + (ExperienceType.RabbitBall, 1.25f) + } else { + (ExperienceType.Normal, 1f) + } + setBep(avatar.bep + (exp * modifier * gameOpts.bepRate).toLong, msg) + } + } + + def updateToolDischarge(stats: EquipmentStat): Unit = { + avatar.scorecard.rate(stats) + } } diff --git a/src/main/scala/net/psforever/actors/session/ChatActor.scala b/src/main/scala/net/psforever/actors/session/ChatActor.scala index 4eaf5f77..d209d398 100644 --- a/src/main/scala/net/psforever/actors/session/ChatActor.scala +++ b/src/main/scala/net/psforever/actors/session/ChatActor.scala @@ -10,7 +10,7 @@ import net.psforever.objects.definition.ImplantDefinition import net.psforever.packet.game.{CreateShortcutMessage, Shortcut} import net.psforever.packet.game.objectcreate.DrawnSlot import net.psforever.types.ChatMessageType.{CMT_GMOPEN, UNK_227} -import net.psforever.types.ImplantType +import net.psforever.types.{ExperienceType, ImplantType} import scala.collection.mutable import scala.concurrent.ExecutionContextExecutor @@ -820,7 +820,7 @@ class ChatActor( case (CMT_ADDBATTLEEXPERIENCE, _, contents) if gmCommandAllowed => contents.toIntOption match { - case Some(bep) => avatarActor ! AvatarActor.AwardBep(bep) + case Some(bep) => avatarActor ! AvatarActor.AwardBep(bep, ExperienceType.Normal) case None => sessionActor ! SessionActor.SendResponse( message.copy(messageType = UNK_229, contents = "@CMT_ADDBATTLEEXPERIENCE_usage") diff --git a/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala b/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala index 0ec03be1..2c6d534c 100644 --- a/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala +++ b/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala @@ -29,6 +29,8 @@ class SessionAvatarHandlers( chatActor: typed.ActorRef[ChatActor.Command], implicit val context: ActorContext ) extends CommonSessionInterfacingFunctionality { + private[support] var lastSeenStreamMessage: Array[Long] = Array.fill[Long](65535)(elem=0L) + /** * na * @@ -117,7 +119,7 @@ class SessionAvatarHandlers( sendResponse(sessionData.destroyDisplayMessage(killer, victim, method, unk)) // TODO Temporary thing that should go somewhere else and use proper xp values if (killer.CharId == avatar.id && killer.Faction != victim.Faction) { - avatarActor ! AvatarActor.AwardBep((1000 * Config.app.game.bepRate).toLong) + avatarActor ! AvatarActor.AwardBep((1000 * Config.app.game.bepRate).toLong, ExperienceType.Normal) avatarActor ! AvatarActor.AwardCep((100 * Config.app.game.cepRate).toLong) } @@ -287,7 +289,7 @@ class SessionAvatarHandlers( val r2 = 2 + r.nextInt(4000).toFloat (Vector3(r2, r2, r1), 0L, 0f) } else { - val before = player.lastSeenStreamMessage(guid.guid) + val before = lastSeenStreamMessage(guid.guid) val dist = Vector3.DistanceSquared(player.Position, pos) (pos, now - before, dist) } @@ -307,7 +309,7 @@ class SessionAvatarHandlers( is_cloaking ) ) - player.lastSeenStreamMessage(guid.guid) = now + lastSeenStreamMessage(guid.guid) = now } } diff --git a/src/main/scala/net/psforever/actors/session/support/SessionData.scala b/src/main/scala/net/psforever/actors/session/support/SessionData.scala index 359f1f0c..c0fdaf8a 100644 --- a/src/main/scala/net/psforever/actors/session/support/SessionData.scala +++ b/src/main/scala/net/psforever/actors/session/support/SessionData.scala @@ -3,6 +3,8 @@ package net.psforever.actors.session.support import akka.actor.typed.scaladsl.adapter._ import akka.actor.{ActorContext, ActorRef, Cancellable, OneForOneStrategy, SupervisorStrategy, typed} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} + import scala.collection.mutable import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future @@ -940,18 +942,22 @@ class SessionData( def handleFacilityBenefitShieldChargeRequest(pkt: FacilityBenefitShieldChargeRequestMessage): Unit = { val FacilityBenefitShieldChargeRequestMessage(_) = pkt - continent.GUID(player.VehicleSeated) match { - case Some(obj) if obj.Destroyed => () //vehicle will try to charge even if destroyed - case Some(obj: Vehicle) => - obj.Actor ! Vehicle.ChargeShields(15) - case Some(_: TurretDeployable) => () //TODO the turret will charge a shield in some circumstances - case None if player.VehicleSeated.nonEmpty => - log.error( - s"FacilityBenefitShieldChargeRequest: ${player.Name} is seated in a vehicle that can not be found in zone ${continent.id}" - ) - case _ => - log.warn(s"FacilityBenefitShieldChargeRequest: ${player.Name} is seated in an imaginary vehicle") - } + val vehicleGuid = player.VehicleSeated + continent + .GUID(vehicleGuid) + .foreach { + case obj: Vehicle if !obj.Destroyed => //vehicle will try to charge even if destroyed + obj.Actor ! CommonMessages.ChargeShields( + 15, + Some(continent.blockMap.sector(obj).buildingList.maxBy(_.Definition.SOIRadius)) + ) + case _ if vehicleGuid.nonEmpty => + log.warn( + s"FacilityBenefitShieldChargeRequest: ${player.Name} can not find vehicle ${vehicleGuid.get.guid} in zone ${continent.id}" + ) + case _ => + log.warn(s"FacilityBenefitShieldChargeRequest: ${player.Name} is not seated in a vehicle") + } } def handleBattleplan(pkt: BattleplanMessage): Unit = { @@ -2284,7 +2290,7 @@ class SessionData( * @param tplayer the player to be killed */ def suicide(tplayer: Player): Unit = { - tplayer.History(PlayerSuicide(PlayerSource(tplayer))) + tplayer.LogActivity(PlayerSuicide(PlayerSource(tplayer))) tplayer.Actor ! Player.Die() } diff --git a/src/main/scala/net/psforever/actors/session/support/SessionLocalHandlers.scala b/src/main/scala/net/psforever/actors/session/support/SessionLocalHandlers.scala index fb9f72a0..f42254d0 100644 --- a/src/main/scala/net/psforever/actors/session/support/SessionLocalHandlers.scala +++ b/src/main/scala/net/psforever/actors/session/support/SessionLocalHandlers.scala @@ -128,20 +128,17 @@ class SessionLocalHandlers( llu.Definition.Packet.ConstructorData(llu).get ) ) - sendResponse(TriggerSoundMessage(TriggeredSound.LLUMaterialize, llu.Position, unk = 20, 0.8000001f)) - case LocalResponse.LluDespawned(llu) => - sendResponse(TriggerSoundMessage(TriggeredSound.LLUDeconstruct, llu.Position, unk = 20, 0.8000001f)) - sendResponse(ObjectDeleteMessage(llu.GUID, 0)) + case LocalResponse.LluDespawned(lluGuid, position) => + sendResponse(TriggerSoundMessage(TriggeredSound.LLUDeconstruct, position, unk = 20, 0.8000001f)) + sendResponse(ObjectDeleteMessage(lluGuid, 0)) // If the player was holding the LLU, remove it from their tracked special item slot sessionData.specialItemSlotGuid match { - case Some(guid) => - if (guid == llu.GUID) { - sessionData.specialItemSlotGuid = None - player.Carrying = None - } - case _ => ; + case Some(guid) if guid == lluGuid => + sessionData.specialItemSlotGuid = None + player.Carrying = None + case _ => () } case LocalResponse.ObjectDelete(object_guid, unk) => diff --git a/src/main/scala/net/psforever/actors/session/support/SessionVehicleHandlers.scala b/src/main/scala/net/psforever/actors/session/support/SessionVehicleHandlers.scala index df296388..f60a156e 100644 --- a/src/main/scala/net/psforever/actors/session/support/SessionVehicleHandlers.scala +++ b/src/main/scala/net/psforever/actors/session/support/SessionVehicleHandlers.scala @@ -132,6 +132,11 @@ class SessionVehicleHandlers( sendResponse(ObjectAttachMessage(vehicle_guid, guid, seat)) } + case VehicleResponse.ObjectDelete(itemGuid) => + if (tplayer_guid != guid) { + sendResponse(ObjectDeleteMessage(itemGuid, 0)) + } + case VehicleResponse.Ownership(vehicleGuid) => if (tplayer_guid == guid) { // Only the player that owns this vehicle needs the ownership packet avatarActor ! AvatarActor.SetVehicle(Some(vehicleGuid)) diff --git a/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala b/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala index 329b2d67..c6ab4b24 100644 --- a/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala @@ -2,6 +2,8 @@ package net.psforever.actors.session.support import akka.actor.{ActorContext, typed} +import net.psforever.objects.avatar.scoring.EquipmentStat + import scala.collection.mutable import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future @@ -9,7 +11,7 @@ import scala.concurrent.duration._ // import net.psforever.actors.session.{AvatarActor, ChatActor, SessionActor} import net.psforever.login.WorldSession.{CountAmmunition, CountGrenades, FindAmmoBoxThatUses, FindEquipmentStock, FindToolThatUses, PutEquipmentInInventoryOrDrop, PutNewEquipmentInInventoryOrDrop, RemoveOldEquipmentFromInventory} -import net.psforever.objects.ballistics.{PlayerSource, Projectile, ProjectileQuality, SourceEntry} +import net.psforever.objects.ballistics.{Projectile, ProjectileQuality} import net.psforever.objects.entity.SimpleWorldEntity import net.psforever.objects.equipment.{ChargeFireModeDefinition, Equipment, EquipmentSize, FireModeSwitch} import net.psforever.objects.guid.{GUIDTask, TaskBundle, TaskWorkflow} @@ -24,7 +26,8 @@ import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.projectile.ProjectileReason import net.psforever.objects.zones.{Zone, ZoneProjectile} import net.psforever.objects._ -import net.psforever.packet.game.{AvatarGrenadeStateMessage, ChangeAmmoMessage, ChangeFireModeMessage, ChangeFireStateMessage_Start, ChangeFireStateMessage_Stop, LashMessage, LongRangeProjectileInfoMessage, ProjectileStateMessage, ReloadMessage, WeaponDelayFireMessage, WeaponDryFireMessage, WeaponLazeTargetPositionMessage, _} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} +import net.psforever.packet.game._ import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import net.psforever.types.{ExoSuitType, PlanetSideGUID, Vector3} @@ -40,6 +43,7 @@ private[support] class WeaponAndProjectileOperations( var prefire: mutable.Set[PlanetSideGUID] = mutable.Set.empty //if WeaponFireMessage precedes ChangeFireStateMessage_Start private[support] var shootingStart: mutable.HashMap[PlanetSideGUID, Long] = mutable.HashMap[PlanetSideGUID, Long]() private[support] var shootingStop: mutable.HashMap[PlanetSideGUID, Long] = mutable.HashMap[PlanetSideGUID, Long]() + private var ongoingShotsFired: Int = 0 private[support] var shotsWhileDead: Int = 0 private val projectiles: Array[Option[Projectile]] = Array.fill[Option[Projectile]](Projectile.rangeUID - Projectile.baseUID)(None) @@ -112,6 +116,7 @@ private[support] class WeaponAndProjectileOperations( prefire -= item_guid shooting += item_guid shootingStart += item_guid -> System.currentTimeMillis() + ongoingShotsFired = 0 //special case - suppress the decimator's alternate fire mode, by projectile if (tool.Projectile != GlobalDefinitions.phoenix_missile_guided_projectile) { continent.AvatarEvents ! AvatarServiceMessage( @@ -140,6 +145,7 @@ private[support] class WeaponAndProjectileOperations( prefire -= item_guid shooting += item_guid shootingStart += item_guid -> System.currentTimeMillis() + ongoingShotsFired = 0 continent.AvatarEvents ! AvatarServiceMessage( continent.id, AvatarAction.ChangeFireState_Start(player.GUID, item_guid) @@ -168,8 +174,10 @@ private[support] class WeaponAndProjectileOperations( continent.id, AvatarAction.ChangeFireState_Start(pguid, item_guid) ) + ongoingShotsFired = ongoingShotsFired + tool.Discharge() shootingStart += item_guid -> (System.currentTimeMillis() - 1L) } + avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(tool.Definition.ObjectId,ongoingShotsFired,0,0)) tool.FireMode match { case _: ChargeFireModeDefinition => sendResponse(QuantityUpdateMessage(tool.AmmoSlot.Box.GUID, tool.Magazine)) @@ -410,6 +418,7 @@ private[support] class WeaponAndProjectileOperations( ) => ResolveProjectileInteraction(proj, DamageResolution.Hit, target, hitPos) match { case Some(resprojectile) => + avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(resprojectile.cause.attribution,0,1,0)) sessionData.handleDealingDamage(target, resprojectile) case None => ; } @@ -447,8 +456,9 @@ private[support] class WeaponAndProjectileOperations( case Some(target: PlanetSideGameObject with FactionAffinity with Vitality) => CheckForHitPositionDiscrepancy(projectile_guid, target.Position, target) ResolveProjectileInteraction(projectile, resolution1, target, target.Position) match { - case Some(_projectile) => - sessionData.handleDealingDamage(target, _projectile) + case Some(resprojectile) => + avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(resprojectile.cause.attribution,0,1,0)) + sessionData.handleDealingDamage(target, resprojectile) case None => ; } case _ => ; @@ -459,8 +469,9 @@ private[support] class WeaponAndProjectileOperations( case Some(target: PlanetSideGameObject with FactionAffinity with Vitality) => CheckForHitPositionDiscrepancy(projectile_guid, explosion_pos, target) ResolveProjectileInteraction(projectile, resolution2, target, explosion_pos) match { - case Some(_projectile) => - sessionData.handleDealingDamage(target, _projectile) + case Some(resprojectile) => + avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(resprojectile.cause.attribution,0,1,0)) + sessionData.handleDealingDamage(target, resprojectile) case None => ; } case _ => ; @@ -499,8 +510,9 @@ private[support] class WeaponAndProjectileOperations( case Some(target: PlanetSideGameObject with FactionAffinity with Vitality) => CheckForHitPositionDiscrepancy(projectile_guid, hit_pos, target) ResolveProjectileInteraction(projectile_guid, DamageResolution.Lash, target, hit_pos) match { - case Some(projectile) => - sessionData.handleDealingDamage(target, projectile) + case Some(resprojectile) => + avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(resprojectile.cause.attribution,0,1,0)) + sessionData.handleDealingDamage(target, resprojectile) case None => ; } case _ => ; @@ -554,17 +566,29 @@ private[support] class WeaponAndProjectileOperations( val distanceToOwner = Vector3.DistanceSquared(shotOrigin, player.Position) if (distanceToOwner <= acceptableDistanceToOwner) { val projectile_info = tool.Projectile - val projectile = - Projectile( - projectile_info, - tool.Definition, - tool.FireMode, - PlayerSource(player), - attribution, - shotOrigin, - angle, - shotVelocity - ) + val wguid = weaponGUID.guid + val mountedIn = (continent.turretToWeapon + .find { case (guid, _) => guid == wguid } match { + case Some((_, turretGuid)) => Some(( + turretGuid, + continent.GUID(turretGuid).collect { case o: PlanetSideGameObject with FactionAffinity => SourceEntry(o) } + )) + case _ => None + }) match { + case Some((guid, Some(entity))) => Some((guid, entity)) + case _ => None + } + val projectile = new Projectile( + projectile_info, + tool.Definition, + tool.FireMode, + mountedIn, + PlayerSource(player), + attribution, + shotOrigin, + angle, + shotVelocity + ) val initialQuality = tool.FireMode match { case mode: ChargeFireModeDefinition => ProjectileQuality.Modified( @@ -641,7 +665,7 @@ private[support] class WeaponAndProjectileOperations( } avatarActor ! AvatarActor.SuspendStaminaRegeneration(3.seconds) prefire += weaponGUID - tool.Discharge() + ongoingShotsFired = ongoingShotsFired + tool.Discharge() } (o, Some(tool)) } diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala index 601801b5..989f7f93 100644 --- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala @@ -6,6 +6,10 @@ import akka.actor.typed.scaladsl.adapter._ import akka.actor.{ActorContext, ActorRef, Cancellable, typed} import akka.pattern.ask import akka.util.Timeout +import net.psforever.objects.serverobject.tube.SpawnTube +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry, VehicleSource} +import net.psforever.objects.vital.{InGameHistory, ReconstructionActivity, SpawningActivity} + import scala.collection.mutable import scala.concurrent.duration._ import scala.concurrent.ExecutionContext.Implicits.global @@ -37,11 +41,12 @@ import net.psforever.objects.serverobject.turret.FacilityTurret import net.psforever.objects.vehicles._ import net.psforever.objects.zones.{Zone, ZoneHotSpotProjector, Zoning} import net.psforever.objects._ -import net.psforever.packet.game.objectcreate.ObjectClass -import net.psforever.packet.game.objectcreate.{DroppedItemData, ObjectCreateMessageParent, PlacementData} -import net.psforever.packet.game.{BeginZoningMessage, DroppodLaunchRequestMessage, ReleaseAvatarRequestMessage, SpawnRequestMessage, WarpgateRequest} -import net.psforever.packet.game.{AvatarAwardMessage, AvatarSearchCriteriaMessage, AvatarStatisticsMessage, AwardCompletion, BindPlayerMessage, BindStatus, CargoMountPointStatusMessage, ChangeShortcutBankMessage, ChatChannel, CreateShortcutMessage, DroppodFreefallingMessage, LoadMapMessage, ObjectCreateDetailedMessage, ObjectDeleteMessage, PlanetsideStringAttributeMessage, PlayerStateShiftMessage, SetChatFilterMessage, SetCurrentAvatarMessage, ShiftState, Statistics} +import net.psforever.packet.game.{AvatarAwardMessage, AvatarSearchCriteriaMessage, AvatarStatisticsMessage, AwardCompletion, BindPlayerMessage, BindStatus, CargoMountPointStatusMessage, ChangeShortcutBankMessage, ChatChannel, CreateShortcutMessage, DroppodFreefallingMessage, LoadMapMessage, ObjectCreateDetailedMessage, ObjectDeleteMessage, PlanetsideStringAttributeMessage, PlayerStateShiftMessage, SetChatFilterMessage, SetCurrentAvatarMessage, ShiftState} import net.psforever.packet.game.{AvatarDeadStateMessage, BroadcastWarpgateUpdateMessage, ChatMsg, ContinentalLockUpdateMessage, DeadState, DensityLevelUpdateMessage, DeployRequestMessage, DeployableInfo, DeployableObjectsInfoMessage, DeploymentAction, DisconnectMessage, DroppodError, DroppodLaunchResponseMessage, FriendsResponse, GenericObjectActionMessage, GenericObjectStateMsg, HotSpotUpdateMessage, ObjectAttachMessage, ObjectCreateMessage, PlanetsideAttributeEnum, PlanetsideAttributeMessage, PropertyOverrideMessage, ReplicationStreamMessage, SetEmpireMessage, TimeOfDayMessage, TriggerEffectMessage, ZoneForcedCavernConnectionsMessage, ZoneInfoMessage, ZoneLockInfoMessage, ZonePopulationUpdateMessage, HotSpotInfo => PacketHotSpotInfo} +import net.psforever.packet.game.{BeginZoningMessage, DroppodLaunchRequestMessage, ReleaseAvatarRequestMessage, SpawnRequestMessage, WarpgateRequest} +import net.psforever.packet.game.DeathStatistic +import net.psforever.packet.game.objectcreate.{DroppedItemData, ObjectCreateMessageParent, PlacementData} +import net.psforever.packet.game.objectcreate.ObjectClass import net.psforever.packet.{PlanetSideGamePacket, game} import net.psforever.persistence.Savedplayer import net.psforever.services.RemoverActor @@ -828,6 +833,10 @@ class ZoningOperations( spawn.LoadZonePhysicalSpawnPoint(zoneId, position, Vector3.Zero, 0 seconds, None) case _ => // not seated as the driver, in which case we can't move } + case _ if !player.isAlive => + Player.Respawn(player) + player.Health = 1 + spawn.LoadZonePhysicalSpawnPoint(continent.id, position, Vector3.z(player.Orientation.z), 0.seconds, None) case None => spawn.deadState = DeadState.Release // cancel movement updates player.Position = position @@ -1162,7 +1171,7 @@ class ZoningOperations( */ def LoadZoneAsPlayer(targetPlayer: Player, zoneId: String): Unit = { log.debug(s"LoadZoneAsPlayer: ${targetPlayer.avatar.name} loading into $zoneId") - if (!zoneReload && zoneId == continent.id) { + if (!zoneReload && zoneId.equals(continent.id)) { if (player.isBackpack) { // important! test the actor-wide player ref, not the parameter // respawning from unregistered player TaskWorkflow.execute(sessionData.registerAvatar(targetPlayer)) @@ -1436,6 +1445,10 @@ class ZoningOperations( Deployables.Disown(continent, avatar, context.self) spawn.drawDeloyableIcon = spawn.RedrawDeployableIcons //important for when SetCurrentAvatar initializes the UI next zone sessionData.squad.squadSetup = sessionData.squad.ZoneChangeSquadSetup + val lastSeen = sessionData.avatarResponse.lastSeenStreamMessage + lastSeen.indices.foreach { index => + lastSeen(index) = 0 + } } /** @@ -2542,17 +2555,26 @@ class ZoningOperations( nextSpawnPoint = physSpawnPoint shiftPosition = Some(pos) shiftOrientation = Some(ori) + val toZoneNumber = if (continent.id.equals(zoneId)) { + continent.Number + } else { + Zones.zones.find { _.id.equals(zoneId) }.orElse(Some(Zone.Nowhere)).get.Number + } + val toSpawnPoint = physSpawnPoint.collect { case o: PlanetSideGameObject with FactionAffinity => SourceEntry(o) } respawnTimer = context.system.scheduler.scheduleOnce(respawnTime) { if (player.isBackpack) { // if the player is dead, he is handled as dead infantry, even if he died in a vehicle // new player is spawning val newPlayer = RespawnClone(player) newPlayer.Position = pos newPlayer.Orientation = ori + newPlayer.LogActivity(SpawningActivity(PlayerSource(newPlayer), toZoneNumber, toSpawnPoint)) LoadZoneAsPlayer(newPlayer, zoneId) } else { avatarActor ! AvatarActor.DeactivateActiveImplants() interstellarFerry.orElse(continent.GUID(player.VehicleSeated)) match { case Some(vehicle: Vehicle) => // driver or passenger in vehicle using a warp gate, or a droppod + InGameHistory.SpawnReconstructionActivity(vehicle, toZoneNumber, toSpawnPoint) + InGameHistory.SpawnReconstructionActivity(player, toZoneNumber, toSpawnPoint) LoadZoneInVehicle(vehicle, pos, ori, zoneId) case _ if player.HasGUID => // player is deconstructing self or instant action @@ -2564,11 +2586,13 @@ class ZoningOperations( ) player.Position = pos player.Orientation = ori + InGameHistory.SpawnReconstructionActivity(player, toZoneNumber, toSpawnPoint) LoadZoneAsPlayer(player, zoneId) case _ => //player is logging in player.Position = pos player.Orientation = ori + InGameHistory.SpawnReconstructionActivity(player, toZoneNumber, toSpawnPoint) LoadZoneAsPlayer(player, zoneId) } } @@ -2698,7 +2722,6 @@ class ZoningOperations( } sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 82, 0)) - //TODO if Medkit does not have shortcut, add to a free slot or write over slot 64 avatar.shortcuts .zipWithIndex .collect { case (Some(shortcut), index) => @@ -2739,7 +2762,7 @@ class ZoningOperations( } (0 to 30).foreach(_ => { //TODO 30 for a new character only? - sendResponse(AvatarStatisticsMessage(2, Statistics(0L))) + sendResponse(AvatarStatisticsMessage(DeathStatistic(0L))) }) if (tplayer.ExoSuit == ExoSuitType.MAX) { sendResponse(PlanetsideAttributeMessage(guid, 7, tplayer.Capacitor.toLong)) @@ -2787,13 +2810,13 @@ class ZoningOperations( ) ) case (Some(vehicle), Some(0)) => - //driver; summon any passengers and cargo vehicles left behind on previous continent + //driver of vehicle if (vehicle.Jammed) { //TODO something better than just canceling? vehicle.Actor ! JammableUnit.ClearJammeredStatus() vehicle.Actor ! JammableUnit.ClearJammeredSound() } - //positive shield strength + // positive shield strength if (vehicle.Definition.MaxShields > 0) { sendResponse(PlanetsideAttributeMessage(vehicle.GUID, vehicle.Definition.shieldUiAttribute, vehicle.Shields)) } @@ -2805,6 +2828,11 @@ class ZoningOperations( if (vehicle.Definition.MaxCapacitor > 0) { sendResponse(PlanetsideAttributeMessage(vehicle.GUID, 113, vehicle.Capacitor)) } + // vehicle entering zone + if (vehicle.History.headOption.exists { _.isInstanceOf[SpawningActivity] }) { + vehicle.LogActivity(ReconstructionActivity(VehicleSource(vehicle), continent.Number, None)) + } + // summon any passengers and cargo vehicles left behind on previous continent LoadZoneTransferPassengerMessages( guid, continent.id, @@ -2825,12 +2853,31 @@ class ZoningOperations( } else if (originalDeadState == DeadState.Dead || player.Health == 0) { //killed during spawn setup or possibly a relog into a corpse (by accident?) player.Actor ! Player.Die() + } else { + AvatarActor.savePlayerData(player) + sessionData.displayCharSavedMsgThenRenewTimer( + Config.app.game.savedMsg.short.fixed, + Config.app.game.savedMsg.short.variable + ) + //player + val effortBy = nextSpawnPoint + .collect { case sp: SpawnTube => (sp, continent.GUID(sp.Owner.GUID)) } + .collect { + case (_, Some(v: Vehicle)) => continent.GUID(v.Owner) + case (sp, Some(_: Building)) => Some(sp) + } + .collect { case Some(thing: PlanetSideGameObject with FactionAffinity) => Some(SourceEntry(thing)) } + .flatten + player.LogActivity({ + if (player.History.headOption.exists { _.isInstanceOf[SpawningActivity] }) { + ReconstructionActivity(PlayerSource(player), continent.Number, effortBy) + } else { + SpawningActivity(PlayerSource(player), continent.Number, effortBy) + } + }) + //ride + } - AvatarActor.savePlayerData(player) - sessionData.displayCharSavedMsgThenRenewTimer( - Config.app.game.savedMsg.short.fixed, - Config.app.game.savedMsg.short.variable - ) upstreamMessageCount = 0 setAvatar = true } diff --git a/src/main/scala/net/psforever/actors/zone/BuildingActor.scala b/src/main/scala/net/psforever/actors/zone/BuildingActor.scala index 84a82c40..8cfd403d 100644 --- a/src/main/scala/net/psforever/actors/zone/BuildingActor.scala +++ b/src/main/scala/net/psforever/actors/zone/BuildingActor.scala @@ -188,6 +188,10 @@ class BuildingActor( def setup(details: BuildingControlDetails): Behavior[Command] = { Behaviors.receiveMessage { + case ReceptionistListing(InterstellarClusterService.InterstellarClusterServiceKey.Listing(listings)) + if listings.isEmpty => + Behaviors.same + case ReceptionistListing(InterstellarClusterService.InterstellarClusterServiceKey.Listing(listings)) => switchToBehavior(details.copy(interstellarCluster = listings.head)) diff --git a/src/main/scala/net/psforever/actors/zone/ZoneActor.scala b/src/main/scala/net/psforever/actors/zone/ZoneActor.scala index b9286961..39f9756c 100644 --- a/src/main/scala/net/psforever/actors/zone/ZoneActor.scala +++ b/src/main/scala/net/psforever/actors/zone/ZoneActor.scala @@ -2,7 +2,6 @@ package net.psforever.actors.zone import akka.actor.typed.{ActorRef, Behavior, SupervisorStrategy} import akka.actor.typed.scaladsl.{AbstractBehavior, ActorContext, Behaviors} -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.ce.Deployable import net.psforever.objects.equipment.Equipment import net.psforever.objects.serverobject.structures.{StructureType, WarpGate} @@ -11,12 +10,13 @@ import net.psforever.objects.zones.blockmap.{BlockMapEntity, SectorGroup} import net.psforever.objects.{ConstructionItem, Player, Vehicle} import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} -import scala.collection.mutable.ListBuffer import akka.actor.typed.scaladsl.adapter._ import net.psforever.actors.zone.building.MajorFacilityLogic +import net.psforever.objects.sourcing.SourceEntry import net.psforever.util.Database._ import net.psforever.persistence +import scala.collection.mutable import scala.util.{Failure, Success} import scala.concurrent.ExecutionContext.Implicits.global @@ -26,7 +26,7 @@ object ZoneActor { .supervise[Command] { Behaviors.setup(context => new ZoneActor(context, zone)) } - .onFailure[Exception](SupervisorStrategy.restart) + .onFailure[Exception](SupervisorStrategy.resume) sealed trait Command @@ -73,13 +73,13 @@ object ZoneActor { } class ZoneActor(context: ActorContext[ZoneActor.Command], zone: Zone) - extends AbstractBehavior[ZoneActor.Command](context) { + extends AbstractBehavior[ZoneActor.Command](context) { import ZoneActor._ import ctx._ private[this] val log = org.log4s.getLogger - val players: ListBuffer[Player] = ListBuffer() + val players: mutable.ListBuffer[Player] = mutable.ListBuffer() zone.actor = context.self zone.init(context.toClassic) @@ -102,7 +102,7 @@ class ZoneActor(context: ActorContext[ZoneActor.Command], zone: Zone) case Failure(e) => log.error(e.getMessage) } - override def onMessage(msg: Command): Behavior[Command] = { + def onMessage(msg: Command): Behavior[Command] = { msg match { case GetZone(replyTo) => replyTo ! ZoneResponse(zone) diff --git a/src/main/scala/net/psforever/actors/zone/building/CavernFacilityLogic.scala b/src/main/scala/net/psforever/actors/zone/building/CavernFacilityLogic.scala index be476c20..30f41b25 100644 --- a/src/main/scala/net/psforever/actors/zone/building/CavernFacilityLogic.scala +++ b/src/main/scala/net/psforever/actors/zone/building/CavernFacilityLogic.scala @@ -38,17 +38,21 @@ case object CavernFacilityLogic def amenityStateChange(details: BuildingWrapper, entity: Amenity, data: Option[Any]): Behavior[Command] = { entity match { case terminal: CaptureTerminal => + val building = details.building // Notify amenities that listen for CC hack state changes, e.g. wall turrets to dismount seated players - details.building.Amenities.filter(x => x.isInstanceOf[CaptureTerminalAware]).foreach(amenity => { - data match { - case Some(isResecured: Boolean) => amenity.Actor ! CaptureTerminalAwareBehavior.TerminalStatusChanged(terminal, isResecured) - case _ => log(details).warn("CaptureTerminal AmenityStateChange was received with no attached data.") - } - }) + data match { + case Some(isResecured: Boolean) => + //pass hack information to amenities + building.Amenities.filter(x => x.isInstanceOf[CaptureTerminalAware]).foreach(amenity => { + amenity.Actor ! CaptureTerminalAwareBehavior.TerminalStatusChanged(terminal, isResecured) + }) + case _ => + log(details).warn("CaptureTerminal AmenityStateChange was received with no attached data.") + } // When a CC is hacked (or resecured) all currently hacked amenities for the base should return to their default unhacked state - details.building.HackableAmenities.foreach(amenity => { + building.HackableAmenities.foreach(amenity => { if (amenity.HackedBy.isDefined) { - details.building.Zone.LocalEvents ! LocalServiceMessage(amenity.Zone.id,LocalAction.ClearTemporaryHack(PlanetSideGUID(0), amenity)) + building.Zone.LocalEvents ! LocalServiceMessage(amenity.Zone.id,LocalAction.ClearTemporaryHack(PlanetSideGUID(0), amenity)) } }) // No map update needed - will be sent by `HackCaptureActor` when required diff --git a/src/main/scala/net/psforever/actors/zone/building/FacilityLogic.scala b/src/main/scala/net/psforever/actors/zone/building/FacilityLogic.scala index ff70ea2d..1290b995 100644 --- a/src/main/scala/net/psforever/actors/zone/building/FacilityLogic.scala +++ b/src/main/scala/net/psforever/actors/zone/building/FacilityLogic.scala @@ -38,17 +38,21 @@ case object FacilityLogic def amenityStateChange(details: BuildingWrapper, entity: Amenity, data: Option[Any]): Behavior[Command] = { entity match { case terminal: CaptureTerminal => + val building = details.building // Notify amenities that listen for CC hack state changes, e.g. wall turrets to dismount seated players - details.building.Amenities.filter(x => x.isInstanceOf[CaptureTerminalAware]).foreach(amenity => { - data match { - case Some(isResecured: Boolean) => amenity.Actor ! CaptureTerminalAwareBehavior.TerminalStatusChanged(terminal, isResecured) - case _ => log(details).warn("CaptureTerminal AmenityStateChange was received with no attached data.") - } - }) + data match { + case Some(isResecured: Boolean) => + //pass hack information to amenities + building.Amenities.filter(x => x.isInstanceOf[CaptureTerminalAware]).foreach(amenity => { + amenity.Actor ! CaptureTerminalAwareBehavior.TerminalStatusChanged(terminal, isResecured) + }) + case _ => + log(details).warn("CaptureTerminal AmenityStateChange was received with no attached data.") + } // When a CC is hacked (or resecured) all currently hacked amenities for the base should return to their default unhacked state - details.building.HackableAmenities.foreach(amenity => { + building.HackableAmenities.foreach(amenity => { if (amenity.HackedBy.isDefined) { - details.building.Zone.LocalEvents ! LocalServiceMessage(amenity.Zone.id,LocalAction.ClearTemporaryHack(PlanetSideGUID(0), amenity)) + building.Zone.LocalEvents ! LocalServiceMessage(amenity.Zone.id, LocalAction.ClearTemporaryHack(PlanetSideGUID(0), amenity)) } }) // No map update needed - will be sent by `HackCaptureActor` when required diff --git a/src/main/scala/net/psforever/actors/zone/building/MajorFacilityLogic.scala b/src/main/scala/net/psforever/actors/zone/building/MajorFacilityLogic.scala index 721272e9..546a4c4a 100644 --- a/src/main/scala/net/psforever/actors/zone/building/MajorFacilityLogic.scala +++ b/src/main/scala/net/psforever/actors/zone/building/MajorFacilityLogic.scala @@ -9,6 +9,7 @@ import net.psforever.actors.zone.{BuildingActor, BuildingControlDetails, ZoneAct import net.psforever.objects.serverobject.generator.{Generator, GeneratorControl} import net.psforever.objects.serverobject.structures.{Amenity, Building} import net.psforever.objects.serverobject.terminals.capture.{CaptureTerminal, CaptureTerminalAware, CaptureTerminalAwareBehavior} +import net.psforever.objects.sourcing.PlayerSource import net.psforever.services.{InterstellarClusterService, Service} import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.galaxy.{GalaxyAction, GalaxyServiceMessage} @@ -164,17 +165,21 @@ case object MajorFacilityLogic details.building.Zone.actor ! ZoneActor.ZoneMapUpdate() } case terminal: CaptureTerminal => + val building = details.building // Notify amenities that listen for CC hack state changes, e.g. wall turrets to dismount seated players - details.building.Amenities.filter(x => x.isInstanceOf[CaptureTerminalAware]).foreach(amenity => { - data match { - case Some(isResecured: Boolean) => amenity.Actor ! CaptureTerminalAwareBehavior.TerminalStatusChanged(terminal, isResecured) - case _ => log(details).warn("CaptureTerminal AmenityStateChange was received with no attached data.") - } - }) + data match { + case Some(isResecured: Boolean) => + //pass hack information to amenities + building.Amenities.filter(x => x.isInstanceOf[CaptureTerminalAware]).foreach(amenity => { + amenity.Actor ! CaptureTerminalAwareBehavior.TerminalStatusChanged(terminal, isResecured) + }) + case _ => + log(details).warn("CaptureTerminal AmenityStateChange was received with no attached data.") + } // When a CC is hacked (or resecured) all currently hacked amenities for the base should return to their default unhacked state - details.building.HackableAmenities.foreach(amenity => { + building.HackableAmenities.foreach(amenity => { if (amenity.HackedBy.isDefined) { - details.building.Zone.LocalEvents ! LocalServiceMessage(amenity.Zone.id,LocalAction.ClearTemporaryHack(PlanetSideGUID(0), amenity)) + building.Zone.LocalEvents ! LocalServiceMessage(amenity.Zone.id,LocalAction.ClearTemporaryHack(PlanetSideGUID(0), amenity)) } }) // No map update needed - will be sent by `HackCaptureActor` when required @@ -330,6 +335,14 @@ case object MajorFacilityLogic def alertToFactionChange(details: BuildingWrapper, building: Building): Behavior[Command] = { alignForceDomeStatus(details) + val bldg = details.building + //the presence of the flag means that we are involved in an ongoing llu hack + (bldg.GetFlag, bldg.CaptureTerminal) match { + case (Some(flag), Some(terminal)) if (flag.Target eq building) && flag.Faction != building.Faction => + //our hack destination may have been compromised and the hack needs to be cancelled + bldg.Zone.LocalEvents ! LocalServiceMessage("", LocalAction.ResecureCaptureTerminal(terminal, PlayerSource.Nobody)) + case _ => () + } Behaviors.same } diff --git a/src/main/scala/net/psforever/login/WorldSession.scala b/src/main/scala/net/psforever/login/WorldSession.scala index 148c60de..a4e921be 100644 --- a/src/main/scala/net/psforever/login/WorldSession.scala +++ b/src/main/scala/net/psforever/login/WorldSession.scala @@ -9,7 +9,10 @@ import net.psforever.objects.guid._ import net.psforever.objects.inventory.{Container, InventoryItem} import net.psforever.objects.locker.LockerContainer import net.psforever.objects.serverobject.PlanetSideServerObject -import net.psforever.objects.serverobject.containable.Containable +import net.psforever.objects.serverobject.containable.{Containable, ContainableBehavior} +import net.psforever.objects.serverobject.terminals.Terminal +import net.psforever.objects.sourcing.AmenitySource +import net.psforever.objects.vital.TerminalUsedActivity import net.psforever.objects.zones.Zone import net.psforever.types.{ExoSuitType, PlanetSideGUID, TransactionType, Vector3} import net.psforever.services.Service @@ -31,7 +34,8 @@ object WorldSession { * @return 1 for `true`; 0 for `false` */ implicit def boolToInt(b: Boolean): Int = if (b) 1 else 0 - private implicit val timeout = new Timeout(5000 milliseconds) + + private implicit val timeout: Timeout = new Timeout(5000 milliseconds) /** * Use this for placing equipment that has already been registered into a container, @@ -185,7 +189,6 @@ object WorldSession { val localZone = obj.Zone TaskBundle( new StraightforwardTask() { - private val localContainer = obj private val localItem = item private val localSlot = slot private val localFunc: (Equipment, Int) => Future[Any] = PutEquipmentInInventorySlot(obj) @@ -556,10 +559,12 @@ object WorldSession { val tile = item.Definition.Tile destination.Inventory.CheckCollisionsVar(dest, tile.Width, tile.Height) } match { - case Success(Nil) => + case Success(Nil) + if ContainableBehavior.PermitEquipmentStow(destination, item, dest) => //no swap item (true, None) - case Success(List(swapEntry: InventoryItem)) => + case Success(List(swapEntry: InventoryItem)) + if ContainableBehavior.PermitEquipmentStow(destination, item, dest) => //the swap item is to be registered to the source's zone (true, Some(swapEntry.obj.GUID)) case _ => @@ -568,13 +573,13 @@ object WorldSession { } if (performSwap) { def moveItemTaskFunc(toSlot: Int): Task = new StraightforwardTask() { - val localGUID = swapItemGUID //the swap item's original GUID, if any swap item - val localChannel = toChannel - val localSource = source - val localDestination = destination - val localItem = item - val localDestSlot = dest - val localSrcSlot = toSlot + val localGUID: Option[PlanetSideGUID] = swapItemGUID //the swap item's original GUID, if any swap item + val localChannel: String = toChannel + val localSource: PlanetSideServerObject with Container = source + val localDestination: PlanetSideServerObject with Container = destination + val localItem: Equipment = item + val localDestSlot: Int = dest + val localSrcSlot: Int = toSlot val localMoveOnComplete: Try[Any] => Unit = { case Success(Containable.ItemPutInSlot(_, _, _, Some(swapItem))) => //swapItem is not registered right now, we can not drop the item without re-registering it @@ -673,13 +678,13 @@ object WorldSession { } if (performSwap) { def moveItemTaskFunc(toSlot: Int): Task = new StraightforwardTask() { - val localGUID = swapItemGUID //the swap item's original GUID, if any swap item - val localChannel = toChannel - val localSource = source - val localDestination = destination - val localItem = item - val localDestSlot = dest - val localSrcSlot = toSlot + val localGUID: Option[PlanetSideGUID] = swapItemGUID //the swap item's original GUID, if any swap item + val localChannel: String = toChannel + val localSource: PlanetSideServerObject with Container = source + val localDestination: PlanetSideServerObject with Container = destination + val localItem: Equipment = item + val localDestSlot: Int = dest + val localSrcSlot: Int = toSlot val localMoveOnComplete: Try[Any] => Unit = { case Success(Containable.ItemPutInSlot(_, _, _, Some(swapItem))) => //swapItem is not registered right now, we can not drop the item without re-registering it @@ -936,6 +941,11 @@ object WorldSession { def TerminalResult(guid: PlanetSideGUID, player: Player, transaction: TransactionType.Value)( result: Boolean ): Unit = { + if (result) { + player.Zone.GUID(guid).collect { + case term: Terminal => player.LogActivity(TerminalUsedActivity(AmenitySource(term), transaction)) + } + } player.Zone.AvatarEvents ! AvatarServiceMessage( player.Name, AvatarAction.TerminalOrderResult(guid, transaction, result) diff --git a/src/main/scala/net/psforever/objects/BoomerDeployable.scala b/src/main/scala/net/psforever/objects/BoomerDeployable.scala index e18d5c24..0490c230 100644 --- a/src/main/scala/net/psforever/objects/BoomerDeployable.scala +++ b/src/main/scala/net/psforever/objects/BoomerDeployable.scala @@ -2,10 +2,10 @@ package net.psforever.objects import akka.actor.{ActorContext, Props} -import net.psforever.objects.ballistics.{PlayerSource, SourceEntry} import net.psforever.objects.ce.{Deployable, DeployedItem} import net.psforever.objects.guid.{GUIDTask, TaskWorkflow} import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.vital.etc.TriggerUsedReason import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.zones.Zone @@ -35,7 +35,7 @@ class BoomerDeployable(cdef: ExplosiveDeployableDefinition) } class BoomerDeployableDefinition(private val objectId: Int) extends ExplosiveDeployableDefinition(objectId) { - override def Initialize(obj: Deployable, context: ActorContext) = { + override def Initialize(obj: Deployable, context: ActorContext): Unit = { obj.Actor = context.actorOf(Props(classOf[BoomerDeployableControl], obj), PlanetSideServerObject.UniqueActorName(obj)) } @@ -97,7 +97,7 @@ class BoomerDeployableControl(mine: BoomerDeployable) } zone.AvatarEvents! AvatarServiceMessage( zone.id, - AvatarAction.ObjectDelete(Service.defaultPlayerGUID, trigger.GUID) + AvatarAction.ObjectDelete(Service.defaultPlayerGUID, guid) ) TaskWorkflow.execute(GUIDTask.unregisterObject(zone.GUID, trigger)) case None => ; diff --git a/src/main/scala/net/psforever/objects/DummyExplodingEntity.scala b/src/main/scala/net/psforever/objects/DummyExplodingEntity.scala index 5f533685..58183625 100644 --- a/src/main/scala/net/psforever/objects/DummyExplodingEntity.scala +++ b/src/main/scala/net/psforever/objects/DummyExplodingEntity.scala @@ -53,7 +53,7 @@ private class DefinitionWrappedInVitality(definition: ObjectDefinition) case p: ProjectileDefinition => p case _ => GlobalDefinitions.no_projectile } - + Name = { definition.Name } DefaultHealth = 1 //just cuz } diff --git a/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala b/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala index dbad8716..8388008b 100644 --- a/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala +++ b/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala @@ -2,7 +2,6 @@ package net.psforever.objects import akka.actor.{Actor, ActorContext, ActorRef, Props} -import net.psforever.objects.ballistics.{DeployableSource, PlayerSource, SourceEntry} import net.psforever.objects.ce._ import net.psforever.objects.definition.{DeployableDefinition, ExoSuitDefinition} import net.psforever.objects.definition.converter.SmallDeployableConverter @@ -12,13 +11,14 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.serverobject.damage.{Damageable, DamageableEntity} import net.psforever.objects.serverobject.damage.Damageable.Target +import net.psforever.objects.sourcing.{DeployableSource, PlayerSource, SourceEntry, UniquePlayer} import net.psforever.objects.vital.etc.TrippedMineReason import net.psforever.objects.vital.resolution.ResolutionCalculations.Output import net.psforever.objects.vital.{SimpleResolutions, Vitality} import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} import net.psforever.objects.vital.projectile.ProjectileReason import net.psforever.objects.zones.Zone -import net.psforever.types.{ExoSuitType, Vector3} +import net.psforever.types.{CharacterSex, ExoSuitType, Vector3} import net.psforever.services.Service import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage} @@ -127,7 +127,7 @@ object ExplosiveDeployableControl { * @param damage na */ def DamageResolution(target: ExplosiveDeployable, cause: DamageResult, damage: Int): Unit = { - target.History(cause) + target.LogActivity(cause) if (cause.interaction.cause.source.SympatheticExplosion) { explodes(target, cause) DestructionAwareness(target, cause) @@ -324,32 +324,32 @@ object MineDeployableControl { val deployableSource = DeployableSource(mine) val blame = mine.OwnerName match { case Some(name) => - val(charId, exosuit, seated): (Long, ExoSuitType.Value, Boolean) = mine.Zone + val(charId, exosuit, seatedIn): (Long, ExoSuitType.Value, Option[(SourceEntry, Int)]) = mine.Zone .LivePlayers .find { _.Name.equals(name) } match { case Some(player) => //if the owner is alive in the same zone as the mine, use data from their body to create the source - (player.CharId, player.ExoSuit, player.VehicleSeated.nonEmpty) + (player.CharId, player.ExoSuit, PlayerSource.mountableAndSeat(player)) case None => //if the owner is as dead as a corpse or is not in the same zone as the mine, use defaults - (0L, ExoSuitType.Standard, false) + (0L, ExoSuitType.Standard, None) } val faction = mine.Faction PlayerSource( - name, - charId, GlobalDefinitions.avatar, - mine.Faction, exosuit, - seated, - 100, - 100, + seatedIn, + health = 100, + armor = 0, mine.Position, Vector3.Zero, None, crouching = false, jumping = false, - ExoSuitDefinition.Select(exosuit, faction) + ExoSuitDefinition.Select(exosuit, faction), + bep = 0, + kills = Nil, + UniquePlayer(charId, name, CharacterSex.Male, mine.Faction) ) case None => //credit where credit is due diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index 49700979..e1187a84 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -5647,10 +5647,10 @@ object GlobalDefinitions { advanced_ace.Name = "advanced_ace" advanced_ace.Size = EquipmentSize.Rifle advanced_ace.Modes += new ConstructionFireMode { - Item(DeployedItem.portable_manned_turret, Set(Certification.AssaultEngineering)) + Item(DeployedItem.tank_traps, Set(Certification.FortificationEngineering)) } advanced_ace.Modes += new ConstructionFireMode { - Item(DeployedItem.tank_traps, Set(Certification.FortificationEngineering)) + Item(DeployedItem.portable_manned_turret, Set(Certification.AssaultEngineering)) } advanced_ace.Modes += new ConstructionFireMode { Item(DeployedItem.deployable_shield_generator, Set(Certification.AssaultEngineering)) @@ -9841,14 +9841,17 @@ object GlobalDefinitions { capture_terminal.Name = "capture_terminal" capture_terminal.Damageable = false capture_terminal.Repairable = false + capture_terminal.FacilityHackTime = 15.minutes secondary_capture.Name = "secondary_capture" secondary_capture.Damageable = false secondary_capture.Repairable = false + secondary_capture.FacilityHackTime = 1.nanosecond vanu_control_console.Name = "vanu_control_console" vanu_control_console.Damageable = false vanu_control_console.Repairable = false + vanu_control_console.FacilityHackTime = 10.minutes lodestar_repair_terminal.Name = "lodestar_repair_terminal" lodestar_repair_terminal.Interval = 1000 diff --git a/src/main/scala/net/psforever/objects/OwnableByPlayer.scala b/src/main/scala/net/psforever/objects/OwnableByPlayer.scala index fcbf4f1c..5892ef75 100644 --- a/src/main/scala/net/psforever/objects/OwnableByPlayer.scala +++ b/src/main/scala/net/psforever/objects/OwnableByPlayer.scala @@ -4,8 +4,9 @@ package net.psforever.objects import net.psforever.types.PlanetSideGUID trait OwnableByPlayer { - private var owner: Option[PlanetSideGUID] = None - private var ownerName: Option[String] = None + private var owner: Option[PlanetSideGUID] = None + private var ownerName: Option[String] = None + private var originalOwnerName: Option[String] = None def Owner: Option[PlanetSideGUID] = owner @@ -33,24 +34,27 @@ trait OwnableByPlayer { owner match { case Some(_) => ownerName = owner + originalOwnerName = originalOwnerName.orElse(owner) case None => ownerName = None } OwnerName } + def OriginalOwnerName: Option[String] = originalOwnerName + /** - * na - * @param player na - * @return na - */ + * na + * @param player na + * @return na + */ def AssignOwnership(player: Player): OwnableByPlayer = AssignOwnership(Some(player)) /** - * na - * @param playerOpt na - * @return na - */ + * na + * @param playerOpt na + * @return na + */ def AssignOwnership(playerOpt: Option[Player]): OwnableByPlayer = { playerOpt match { case Some(player) => diff --git a/src/main/scala/net/psforever/objects/Player.scala b/src/main/scala/net/psforever/objects/Player.scala index 43b35ba0..79725b2b 100644 --- a/src/main/scala/net/psforever/objects/Player.scala +++ b/src/main/scala/net/psforever/objects/Player.scala @@ -72,7 +72,6 @@ class Player(var avatar: Avatar) var spectator: Boolean = false var silenced: Boolean = false var death_by: Int = 0 - var lastSeenStreamMessage: Array[Long] = Array.fill[Long](65535)(0L) var lastShotSeq_time: Int = -1 /** From PlanetsideAttributeMessage */ diff --git a/src/main/scala/net/psforever/objects/Players.scala b/src/main/scala/net/psforever/objects/Players.scala index cc5bdc40..63f623af 100644 --- a/src/main/scala/net/psforever/objects/Players.scala +++ b/src/main/scala/net/psforever/objects/Players.scala @@ -60,12 +60,14 @@ object Players { * @param medic the name of the player doing the reviving * @param item the tool being used to revive the target player */ - def FinishRevivingPlayer(target: Player, medic: String, item: Tool)(): Unit = { + def FinishRevivingPlayer(target: Player, medic: Player, item: Tool)(): Unit = { val name = target.Name - log.info(s"$medic had revived $name") + val medicName = medic.Name + log.info(s"$medicName had revived $name") + //target.History(PlayerRespawn(PlayerSource(target), target.Zone, target.Position, Some(PlayerSource(medic)))) val magazine = item.Discharge(Some(25)) target.Zone.AvatarEvents ! AvatarServiceMessage( - medic, + medicName, AvatarAction.SendResponse( Service.defaultPlayerGUID, InventoryStateMessage(item.AmmoSlot.Box.GUID, item.GUID, magazine) diff --git a/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala b/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala index 2206eda8..18dca79d 100644 --- a/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala +++ b/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala @@ -89,7 +89,7 @@ class ShieldGeneratorControl(gen: ShieldGeneratorDeployable) val damageToShields = originalShields - shields val damage = damageToHealth + damageToShields if (WillAffectTarget(target, damage, cause)) { - target.History(cause) + target.LogActivity(cause) DamageLog( target, s"BEFORE=$originalHealth/$originalShields, AFTER=$health/$shields, CHANGE=$damageToHealth/$damageToShields" diff --git a/src/main/scala/net/psforever/objects/SpecialEmp.scala b/src/main/scala/net/psforever/objects/SpecialEmp.scala index 7c6f4551..32a59853 100644 --- a/src/main/scala/net/psforever/objects/SpecialEmp.scala +++ b/src/main/scala/net/psforever/objects/SpecialEmp.scala @@ -1,11 +1,11 @@ // Copyright (c) 2021 PSForever package net.psforever.objects -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.definition.ObjectDefinition import net.psforever.objects.equipment.{EffectTarget, TargetValidation} import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.{Vitality, VitalityDefinition} import net.psforever.objects.vital.base.DamageType import net.psforever.objects.vital.etc.EmpReason diff --git a/src/main/scala/net/psforever/objects/Vehicle.scala b/src/main/scala/net/psforever/objects/Vehicle.scala index 79126100..604702ca 100644 --- a/src/main/scala/net/psforever/objects/Vehicle.scala +++ b/src/main/scala/net/psforever/objects/Vehicle.scala @@ -590,13 +590,6 @@ object Vehicle { */ final case class Reactivate() - /** - * A request has been made to charge this vehicle's shields. - * @see `FacilityBenefitShieldChargeRequestMessage` - * @param amount the number of points to charge - */ - final case class ChargeShields(amount: Int) - /** * Following a successful shield charge tick, display the results of the update. * @see `FacilityBenefitShieldChargeRequestMessage` diff --git a/src/main/scala/net/psforever/objects/avatar/Avatar.scala b/src/main/scala/net/psforever/objects/avatar/Avatar.scala index 7283da25..4b00b9c4 100644 --- a/src/main/scala/net/psforever/objects/avatar/Avatar.scala +++ b/src/main/scala/net/psforever/objects/avatar/Avatar.scala @@ -2,13 +2,14 @@ package net.psforever.objects.avatar import net.psforever.actors.session.AvatarActor +import net.psforever.objects.avatar.scoring.ScoreCard import net.psforever.objects.definition.{AvatarDefinition, BasicDefinition} import net.psforever.objects.equipment.{EquipmentSize, EquipmentSlot} import net.psforever.objects.inventory.LocallyRegisteredInventory import net.psforever.objects.loadouts.{Loadout, SquadLoadout} import net.psforever.objects.locker.{LockerContainer, LockerEquipment} import net.psforever.objects.{GlobalDefinitions, OffhandEquipmentSlot} -import net.psforever.packet.game.objectcreate.RibbonBars +import net.psforever.packet.game.objectcreate.{BasicCharacterData, RibbonBars} import net.psforever.types._ import org.joda.time.{Duration, LocalDateTime, Seconds} @@ -74,6 +75,10 @@ object Avatar { GlobalDefinitions.super_staminakit -> 5.minutes // Temporary - Default value is 20 minutes ) + def apply(charId: Int, name: String, faction: PlanetSideEmpire.Value, sex: CharacterSex, head: Int, voice: CharacterVoice.Value): Avatar = { + Avatar(charId, BasicCharacterData(name, faction, sex, head, voice)) + } + def makeLocker(): LockerContainer = { new LockerContainer({ val inv = new LocallyRegisteredInventory(numbers = 40150 until 40450) // TODO var bad @@ -113,11 +118,7 @@ case class MemberLists( case class Avatar( /** unique identifier corresponding to a database table row index */ id: Int, - name: String, - faction: PlanetSideEmpire.Value, - sex: CharacterSex, - head: Int, - voice: CharacterVoice.Value, + basic: BasicCharacterData, bep: Long = 0, cep: Long = 0, stamina: Int = 100, @@ -132,7 +133,8 @@ case class Avatar( decoration: ProgressDecoration = ProgressDecoration(), loadouts: Loadouts = Loadouts(), cooldowns: Cooldowns = Cooldowns(), - people: MemberLists = MemberLists() + people: MemberLists = MemberLists(), + scorecard: ScoreCard = new ScoreCard() ) { assert(bep >= 0) assert(cep >= 0) @@ -140,6 +142,16 @@ case class Avatar( val br: BattleRank = BattleRank.withExperience(bep) val cr: CommandRank = CommandRank.withExperience(cep) + def name: String = basic.name + + def faction: PlanetSideEmpire.Value = basic.faction + + def sex: CharacterSex = basic.sex + + def head: Int = basic.head + + def voice: CharacterVoice.Value = basic.voice + private def cooldown( times: Map[String, LocalDateTime], cooldowns: Map[BasicDefinition, FiniteDuration], diff --git a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala index 46e90a21..1828fd05 100644 --- a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala +++ b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala @@ -4,8 +4,7 @@ package net.psforever.objects.avatar import akka.actor.{Actor, ActorRef, Props, typed} import net.psforever.actors.session.AvatarActor import net.psforever.login.WorldSession.{DropEquipmentFromInventory, HoldNewEquipmentUp, PutNewEquipmentInInventoryOrDrop, RemoveOldEquipmentFromInventory} -import net.psforever.objects.{Player, _} -import net.psforever.objects.ballistics.PlayerSource +import net.psforever.objects._ import net.psforever.objects.ce.Deployable import net.psforever.objects.definition.DeployAnimation import net.psforever.objects.definition.converter.OCM @@ -33,6 +32,7 @@ import net.psforever.objects.locker.LockerContainerControl import net.psforever.objects.serverobject.environment._ import net.psforever.objects.serverobject.repair.Repairable import net.psforever.objects.serverobject.shuttle.OrbitalShuttlePad +import net.psforever.objects.sourcing.PlayerSource import net.psforever.objects.vital.collision.CollisionReason import net.psforever.objects.vital.environment.EnvironmentReason import net.psforever.objects.vital.etc.{PainboxReason, SuicideReason} @@ -50,21 +50,21 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm with AggravatedBehavior with AuraEffectBehavior with RespondsToZoneEnvironment { - def JammableObject = player + def JammableObject: Player = player - def DamageableObject = player + def DamageableObject: Player = player - def ContainerObject = player + def ContainerObject: Player = player - def AggravatedObject = player + def AggravatedObject: Player = player - def AuraTargetObject = player + def AuraTargetObject: Player = player ApplicableEffect(Aura.Plasma) ApplicableEffect(Aura.Napalm) ApplicableEffect(Aura.Comet) ApplicableEffect(Aura.Fire) - def InteractiveObject = player + def InteractiveObject: Player = player SetInteraction(EnvironmentAttribute.Water, doInteractingWithWater) SetInteraction(EnvironmentAttribute.Lava, doInteractingWithLava) SetInteraction(EnvironmentAttribute.Death, doInteractingWithDeath) @@ -105,8 +105,18 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm case Player.Die(Some(reason)) => if (player.isAlive) { //primary death - PerformDamage(player, reason.calculate()) - suicide() + val health = player.Health + val psource = PlayerSource(player) + player.Health = 0 + HandleDamage( + player, + DamageResult(psource, psource.copy(health = 0), reason), + health, + damageToArmor = 0, + damageToStamina = 0, + damageToCapacitor = 0 + ) + damageLog.info(s"${player.Name}-infantry: dead by explicit reason - ${reason.cause.resolution}") } case Player.Die(None) => @@ -138,12 +148,11 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm ) ) events ! AvatarServiceMessage(zone.id, AvatarAction.PlanetsideAttributeToAll(guid, 0, newHealth)) - player.History( + player.LogActivity( HealFromEquipment( - PlayerSource(player), PlayerSource(user), - newHealth - originalHealth, - GlobalDefinitions.medicalapplicator + GlobalDefinitions.medicalapplicator, + newHealth - originalHealth ) ) } @@ -172,7 +181,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm ) { sender() ! CommonMessages.Progress( 4, - Players.FinishRevivingPlayer(player, user.Name, item), + Players.FinishRevivingPlayer(player, user, item), Players.RevivingTickAction(player, user, item) ) } @@ -202,12 +211,11 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm ) ) events ! AvatarServiceMessage(zone.id, AvatarAction.PlanetsideAttributeToAll(guid, 4, player.Armor)) - player.History( + player.LogActivity( RepairFromEquipment( - PlayerSource(player), PlayerSource(user), - newArmor - originalArmor, - GlobalDefinitions.bank + GlobalDefinitions.bank, + newArmor - originalArmor ) ) } @@ -242,7 +250,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm if (player.Health == player.MaxHealth) { (None, 0, 0, "@HealComplete") } else { - player.History(HealFromKit(PlayerSource(player), 25, kdef)) + player.LogActivity(HealFromKit(kdef, 25)) player.Health = player.Health + 25 (Some(index), 0, player.Health, "") } @@ -250,7 +258,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm if (player.Health == player.MaxHealth) { (None, 0, 0, "@HealComplete") } else { - player.History(HealFromKit(PlayerSource(player), 100, kdef)) + player.LogActivity(HealFromKit(kdef, 100)) player.Health = player.Health + 100 (Some(index), 0, player.Health, "") } @@ -258,7 +266,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm if (player.Armor == player.MaxArmor) { (None, 0, 0, "Armor at maximum - No repairing required.") } else { - player.History(RepairFromKit(PlayerSource(player), 200, kdef)) + player.LogActivity(RepairFromKit(kdef, 200)) player.Armor = player.Armor + 200 (Some(index), 4, player.Armor, "") } @@ -426,13 +434,14 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm val originalArmor = player.Armor player.ExoSuit = nextSuit val toMaxArmor = player.MaxArmor - val toArmor = + val toArmor = { if (originalSuit != nextSuit || originalSubtype != nextSubtype || originalArmor > toMaxArmor) { - player.History(HealFromExoSuitChange(PlayerSource(player), nextSuit)) + player.LogActivity(RepairFromExoSuitChange(nextSuit, toMaxArmor - player.Armor)) player.Armor = toMaxArmor } else { player.Armor = originalArmor } + } //ensure arm is down, even if it needs to go back up if (player.DrawnSlot != Player.HandsDownSlot) { player.DrawnSlot = Player.HandsDownSlot @@ -488,9 +497,9 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm ) player.Zone.AvatarEvents ! AvatarServiceMessage( player.Name, - AvatarAction.TerminalOrderResult(msg.terminal_guid, msg.transaction_type, true) + AvatarAction.TerminalOrderResult(msg.terminal_guid, msg.transaction_type, result=true) ) - case _ => assert(false, msg.toString) + case _ => assert(assertion=false, msg.toString) } case Zone.Ground.ItemOnGround(item, _, _) => @@ -528,8 +537,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm val trigger = new BoomerTrigger trigger.Companion = obj.GUID obj.Trigger = trigger - //TODO sufficiently delete the tool - zone.AvatarEvents ! AvatarServiceMessage(zone.id, AvatarAction.ObjectDelete(player.GUID, tool.GUID)) + zone.AvatarEvents ! AvatarServiceMessage(zone.id, AvatarAction.ObjectDelete(Service.defaultPlayerGUID, tool.GUID)) TaskWorkflow.execute(GUIDTask.unregisterEquipment(zone.GUID, tool)) player.Find(tool) match { case Some(index) if player.VisibleSlots.contains(index) => @@ -593,19 +601,18 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm val originalSubtype = Loadout.DetermineSubtype(player) val requestToChangeArmor = originalSuit != exosuit || originalSubtype != subtype val allowedToChangeArmor = Players.CertificationToUseExoSuit(player, exosuit, subtype) && - (if (exosuit == ExoSuitType.MAX) { - val weapon = GlobalDefinitions.MAXArms(subtype, player.Faction) - player.avatar.purchaseCooldown(weapon) match { - case Some(_) => - false - case None => - avatarActor ! AvatarActor.UpdatePurchaseTime(weapon) - true - } - } - else { - true - }) + (if (exosuit == ExoSuitType.MAX) { + val weapon = GlobalDefinitions.MAXArms(subtype, player.Faction) + player.avatar.purchaseCooldown(weapon) match { + case Some(_) => + false + case None => + avatarActor ! AvatarActor.UpdatePurchaseTime(weapon) + true + } + } else { + true + }) if (requestToChangeArmor && allowedToChangeArmor) { log.info(s"${player.Name} wants to change to a different exo-suit - $exosuit") val beforeHolsters = Players.clearHolsters(player.Holsters().iterator) @@ -614,13 +621,11 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm val originalArmor = player.Armor player.ExoSuit = exosuit //changes the value of MaxArmor to reflect the new exo-suit val toMaxArmor = player.MaxArmor - val toArmor = if (originalSuit != exosuit || originalSubtype != subtype || originalArmor > toMaxArmor) { - player.History(HealFromExoSuitChange(PlayerSource(player), exosuit)) - player.Armor = toMaxArmor - } - else { - player.Armor = originalArmor + val toArmor = toMaxArmor + if (originalArmor != toMaxArmor) { + player.LogActivity(RepairFromExoSuitChange(exosuit, toMaxArmor - originalArmor)) } + player.Armor = toMaxArmor //ensure arm is down, even if it needs to go back up if (player.DrawnSlot != Player.HandsDownSlot) { player.DrawnSlot = Player.HandsDownSlot @@ -804,7 +809,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm })) { //activate second wind player.Health += 25 - player.History(HealFromImplant(PlayerSource(player), 25, ImplantType.SecondWind)) + player.LogActivity(HealFromImplant(ImplantType.SecondWind, 25)) avatarActor ! AvatarActor.ResetImplant(ImplantType.SecondWind) avatarActor ! AvatarActor.RestoreStamina(25) } @@ -844,7 +849,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm cause.interaction.cause.source.Aggravated.nonEmpty } //log historical event (always) - target.History(cause) + target.LogActivity(cause) //stat changes if (damageToCapacitor > 0) { events ! AvatarServiceMessage( @@ -959,7 +964,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm avatarActor ! AvatarActor.DeinitializeImplants() //log historical event - target.History(cause) + target.LogActivity(cause) //log message cause.adversarial match { case Some(a) => @@ -1015,7 +1020,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm nameChannel, AvatarAction.SendResponse( Service.defaultPlayerGUID, - AvatarDeadStateMessage(DeadState.Dead, respawnTimer, respawnTimer, pos, target.Faction, true) + AvatarDeadStateMessage(DeadState.Dead, respawnTimer, respawnTimer, pos, target.Faction, unk5=true) ) ) //TODO other methods of death? diff --git a/src/main/scala/net/psforever/objects/avatar/scoring/EquipmentStat.scala b/src/main/scala/net/psforever/objects/avatar/scoring/EquipmentStat.scala new file mode 100644 index 00000000..15c5c07d --- /dev/null +++ b/src/main/scala/net/psforever/objects/avatar/scoring/EquipmentStat.scala @@ -0,0 +1,8 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.avatar.scoring + +final case class EquipmentStat(objectId: Int, shotsFired: Int, shotsLanded: Int, kills: Int) + +object EquipmentStat { + def apply(objectId: Int): EquipmentStat = EquipmentStat(objectId, 0, 1, 0) +} diff --git a/src/main/scala/net/psforever/objects/avatar/scoring/KDAStat.scala b/src/main/scala/net/psforever/objects/avatar/scoring/KDAStat.scala new file mode 100644 index 00000000..cf4117bf --- /dev/null +++ b/src/main/scala/net/psforever/objects/avatar/scoring/KDAStat.scala @@ -0,0 +1,19 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.avatar.scoring + +import net.psforever.objects.sourcing.PlayerSource +import net.psforever.objects.vital.interaction.DamageResult +import org.joda.time.LocalDateTime + +trait KDAStat { + def experienceEarned: Long + val time: LocalDateTime = LocalDateTime.now() +} + +final case class Kill(victim: PlayerSource, info: DamageResult, experienceEarned: Long) extends KDAStat + +final case class Assist(victim: PlayerSource, weapons: Seq[Int], damageInflictedPercentage: Float, experienceEarned: Long) extends KDAStat + +final case class Death(assailant: Seq[PlayerSource], timeAlive: Long, bep: Long) extends KDAStat { + def experienceEarned: Long = 0 +} diff --git a/src/main/scala/net/psforever/objects/avatar/scoring/Life.scala b/src/main/scala/net/psforever/objects/avatar/scoring/Life.scala new file mode 100644 index 00000000..105f72a6 --- /dev/null +++ b/src/main/scala/net/psforever/objects/avatar/scoring/Life.scala @@ -0,0 +1,17 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.avatar.scoring + +final case class Life( + kills: Seq[Kill], + assists: Seq[Assist], + death: Option[Death], + equipmentStats: Seq[EquipmentStat] + ) + +object Life { + def apply(): Life = Life(Nil, Nil, None, Nil) + + def bep(life: Life): Long = { + life.kills.foldLeft(0L)(_ + _.experienceEarned) + life.assists.foldLeft(0L)(_ + _.experienceEarned) + } +} diff --git a/src/main/scala/net/psforever/objects/avatar/scoring/ScoreCard.scala b/src/main/scala/net/psforever/objects/avatar/scoring/ScoreCard.scala new file mode 100644 index 00000000..43db48ef --- /dev/null +++ b/src/main/scala/net/psforever/objects/avatar/scoring/ScoreCard.scala @@ -0,0 +1,149 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.avatar.scoring + +import net.psforever.objects.GlobalDefinitions +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry, VehicleSource} +import net.psforever.types.{PlanetSideEmpire, StatisticalCategory} + +import scala.annotation.tailrec +import scala.collection.mutable + +class ScoreCard() { + private var curr: Life = Life() + private var lives: Seq[Life] = Seq() + private val killStatistics: mutable.HashMap[Int, Statistic] = mutable.HashMap[Int, Statistic]() + private val assistStatistics: mutable.HashMap[Int, Statistic] = mutable.HashMap[Int, Statistic]() + + def CurrentLife: Life = curr + + def Lives: Seq[Life] = lives + + def KillStatistics: Map[Int, Statistic] = killStatistics.toMap + + def AssistStatistics: Map[Int, Statistic] = assistStatistics.toMap + + def rate(msg: Any): Unit = { + msg match { + case e: EquipmentStat => + curr = ScoreCard.updateEquipmentStat(curr, e) + case k: Kill => + curr = curr.copy(kills = k +: curr.kills) + curr = ScoreCard.updateEquipmentStat(curr, EquipmentStat(k.info.interaction.cause.attribution, 0, 0, 1)) + ScoreCard.updateStatisticsFor(killStatistics, k.info.interaction.cause.attribution, k.victim.Faction) + case a: Assist => + curr = curr.copy(assists = a +: curr.assists) + val faction = a.victim.Faction + a.weapons.foreach { wid => + ScoreCard.updateStatisticsFor(assistStatistics, wid, faction) + } + case d: Death => + val expired = curr + curr = Life() + lives = expired.copy(death = Some(d)) +: lives + case _ => ; + } + } +} + +object ScoreCard { + private def updateEquipmentStat(curr: Life, entry: EquipmentStat): Life = { + updateEquipmentStat(curr, entry, entry.objectId, entry.kills) + } + + private def updateEquipmentStat( + curr: Life, + entry: EquipmentStat, + objectId: Int, + killCount: Int + ): Life = { + curr.equipmentStats.indexWhere { a => a.objectId == objectId } match { + case -1 => + curr.copy(equipmentStats = entry +: curr.equipmentStats) + case index => + val stats = curr.equipmentStats + val old = stats(index) + curr.copy( + equipmentStats = (stats.take(index) :+ old.copy( + shotsFired = old.shotsFired + entry.shotsFired, + shotsLanded = old.shotsLanded + entry.shotsLanded, + kills = old.kills + killCount + )) ++ stats.drop(index+1) + ) + } + } + + @tailrec + private def updateStatisticsFor( + statisticMap: mutable.HashMap[Int, Statistic], + objectId: Int, + victimFaction: PlanetSideEmpire.Value + ): Statistic = { + statisticMap.get(objectId) match { + case Some(fields) => + val outEntry = victimFaction match { + case PlanetSideEmpire.TR => fields.copy(tr_b = fields.tr_b + 1) + case PlanetSideEmpire.NC => fields.copy(nc_b = fields.nc_b + 1) + case PlanetSideEmpire.VS => fields.copy(vs_b = fields.vs_b + 1) + case PlanetSideEmpire.NEUTRAL => fields.copy(ps_b = fields.ps_b + 1) + } + outEntry + case _ => + val out = Statistic(0, 0, 0, 0, 0, 0, 0, 0) + statisticMap.put(objectId, out) + updateStatisticsFor(statisticMap, objectId, victimFaction) + } + } + + def weaponObjectIdMap(objectId: Int): Int = { + objectId match { + //aphelion + case 81 | 82 => 80 + case 90 | 92 => 88 + case 94 | 95 => 93 + case 102 | 104 => 100 + case 107 | 109 => 105 + //colossus + case 183 | 184 => 182 + case 187 | 189 => 185 + case 192 | 194 => 190 + case 202 | 203 => 201 + case 206 | 208 => 204 + //cycler + case 234 | 235 | 236 => 233 + //peregrine + case 634 | 635 => 633 + case 638 | 640 => 636 + case 646 | 648 => 644 + case 650 | 651 => 649 + case 660 | 662 => 658 + //eh + case _ => objectId + } + } + + def rewardKillGetCategories(victim: SourceEntry): Seq[StatisticalCategory] = { + victim match { + case p: PlayerSource => + p.seatedIn match { + case Some((v: VehicleSource, seat: Int)) => + val seatCategory = if (seat == 0) { + StatisticalCategory.DriverKilled + } else { + v.Definition.controlledWeapons().get(seat) match { + case Some(_) => StatisticalCategory.GunnerKilled + case None => StatisticalCategory.PassengerKilled + } + } + if (GlobalDefinitions.isFlightVehicle(v.Definition)) { + Seq(StatisticalCategory.Dogfighter, seatCategory) + } else { + Seq(seatCategory) + } + case _ => + Seq(StatisticalCategory.Destroyed) + } + case _ => + Seq(StatisticalCategory.Destroyed) + } + } +} diff --git a/src/main/scala/net/psforever/objects/avatar/scoring/Statistic.scala b/src/main/scala/net/psforever/objects/avatar/scoring/Statistic.scala new file mode 100644 index 00000000..a77ecc73 --- /dev/null +++ b/src/main/scala/net/psforever/objects/avatar/scoring/Statistic.scala @@ -0,0 +1,4 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.avatar.scoring + +final case class Statistic(tr_a: Int, tr_b: Int, nc_a: Int, nc_b: Int, vs_a: Int, vs_b: Int, ps_a: Int, ps_b: Int) diff --git a/src/main/scala/net/psforever/objects/ballistics/DeployableSource.scala b/src/main/scala/net/psforever/objects/ballistics/DeployableSource.scala deleted file mode 100644 index e13482eb..00000000 --- a/src/main/scala/net/psforever/objects/ballistics/DeployableSource.scala +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2017 PSForever -package net.psforever.objects.ballistics - -import net.psforever.objects.ce.Deployable -import net.psforever.objects.definition.{DeployableDefinition, ObjectDefinition} -import net.psforever.objects.vital.resistance.ResistanceProfile -import net.psforever.types.{PlanetSideEmpire, Vector3} - -final case class DeployableSource( - obj_def: ObjectDefinition with DeployableDefinition, - faction: PlanetSideEmpire.Value, - health: Int, - shields: Int, - owner: SourceEntry, - position: Vector3, - orientation: Vector3 -) extends SourceEntry { - override def Name = obj_def.Descriptor - override def Faction = faction - def Definition: ObjectDefinition with DeployableDefinition = obj_def - def Health = health - def Shields = shields - def OwnerName = owner.Name - def Position = position - def Orientation = orientation - def Velocity = None - def Modifiers = obj_def.asInstanceOf[ResistanceProfile] -} - -object DeployableSource { - def apply(obj: Deployable): DeployableSource = { - val ownerName = obj.OwnerName - val ownerSource = (obj.Zone.LivePlayers ++ obj.Zone.Corpses) - .find { p => ownerName.contains(p.Name) } - match { - case Some(p) => SourceEntry(p) - case _ => SourceEntry.None - } - DeployableSource( - obj.Definition, - obj.Faction, - obj.Health, - obj.Shields, - ownerSource, - obj.Position, - obj.Orientation - ) - } -} diff --git a/src/main/scala/net/psforever/objects/ballistics/InteractWithRadiationClouds.scala b/src/main/scala/net/psforever/objects/ballistics/InteractWithRadiationClouds.scala index a3c5a10c..4c815c3f 100644 --- a/src/main/scala/net/psforever/objects/ballistics/InteractWithRadiationClouds.scala +++ b/src/main/scala/net/psforever/objects/ballistics/InteractWithRadiationClouds.scala @@ -2,6 +2,7 @@ package net.psforever.objects.ballistics import net.psforever.objects.Player +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.etc.RadiationReason diff --git a/src/main/scala/net/psforever/objects/ballistics/ObjectSource.scala b/src/main/scala/net/psforever/objects/ballistics/ObjectSource.scala deleted file mode 100644 index 4fe77d4c..00000000 --- a/src/main/scala/net/psforever/objects/ballistics/ObjectSource.scala +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright (c) 2017 PSForever -package net.psforever.objects.ballistics - -import net.psforever.objects.PlanetSideGameObject -import net.psforever.objects.definition.ObjectDefinition -import net.psforever.objects.serverobject.affinity.FactionAffinity -import net.psforever.objects.vital.VitalityDefinition -import net.psforever.objects.vital.resistance.ResistanceProfileMutators -import net.psforever.types.{PlanetSideEmpire, Vector3} - -final case class ObjectSource( - obj: PlanetSideGameObject, - faction: PlanetSideEmpire.Value, - position: Vector3, - orientation: Vector3, - velocity: Option[Vector3] -) extends SourceEntry { - private val definition = obj.Definition match { - case vital : VitalityDefinition => vital - case genericDefinition => NonvitalDefinition(genericDefinition) - } - private val modifiers = definition match { - case nonvital : NonvitalDefinition => nonvital - case _ => ObjectSource.FixedResistances - } - override def Name = SourceEntry.NameFormat(obj.Definition.Name) - override def Faction = faction - def Definition = definition - def Position = position - def Orientation = orientation - def Velocity = velocity - def Modifiers = modifiers -} - -object ObjectSource { - final val FixedResistances = new ResistanceProfileMutators() { } - - def apply(obj: PlanetSideGameObject): ObjectSource = { - ObjectSource( - obj, - obj match { - case aligned: FactionAffinity => aligned.Faction - case _ => PlanetSideEmpire.NEUTRAL - }, - obj.Position, - obj.Orientation, - obj.Velocity - ) - } -} - -/** - * A wrapper for a definition that does not represent a `Vitality` object. - * @param definition the original definition - */ -class NonvitalDefinition(private val definition : ObjectDefinition) - extends ObjectDefinition(definition.ObjectId) - with ResistanceProfileMutators - with VitalityDefinition { - Name = { definition.Name } - Packet = { definition.Packet } - - def canEqual(a: Any) : Boolean = a.isInstanceOf[definition.type] - - override def equals(that: Any): Boolean = definition.equals(that) - - override def hashCode: Int = definition.hashCode -} - -object NonvitalDefinition { - //single point of contact for all wrapped definitions - private val storage: scala.collection.mutable.LongMap[NonvitalDefinition] = - new scala.collection.mutable.LongMap[NonvitalDefinition]() - - def apply(definition : ObjectDefinition) : NonvitalDefinition = { - storage.get(definition.ObjectId) match { - case Some(existing) => - existing - case None => - val out = new NonvitalDefinition(definition) - storage += definition.ObjectId.toLong -> out - out - } - } -} diff --git a/src/main/scala/net/psforever/objects/ballistics/PlayerSource.scala b/src/main/scala/net/psforever/objects/ballistics/PlayerSource.scala deleted file mode 100644 index 0a2d2120..00000000 --- a/src/main/scala/net/psforever/objects/ballistics/PlayerSource.scala +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2017 PSForever -package net.psforever.objects.ballistics - -import net.psforever.objects.Player -import net.psforever.objects.definition.{AvatarDefinition, ExoSuitDefinition} -import net.psforever.objects.vital.resistance.ResistanceProfile -import net.psforever.types.{ExoSuitType, PlanetSideEmpire, Vector3} - -final case class PlayerSource( - name: String, - char_id: Long, - obj_def: AvatarDefinition, - faction: PlanetSideEmpire.Value, - exosuit: ExoSuitType.Value, - seated: Boolean, - health: Int, - armor: Int, - position: Vector3, - orientation: Vector3, - velocity: Option[Vector3], - crouching: Boolean, - jumping: Boolean, - modifiers: ResistanceProfile -) extends SourceEntry { - override def Name = name - override def Faction = faction - override def CharId = char_id - def Definition = obj_def - def ExoSuit = exosuit - def Seated = seated - def Health = health - def Armor = armor - def Position = position - def Orientation = orientation - def Velocity = velocity - def Modifiers = modifiers -} - -object PlayerSource { - def apply(tplayer: Player): PlayerSource = { - PlayerSource( - tplayer.Name, - tplayer.CharId, - tplayer.Definition, - tplayer.Faction, - tplayer.ExoSuit, - tplayer.VehicleSeated.nonEmpty, - tplayer.Health, - tplayer.Armor, - tplayer.Position, - tplayer.Orientation, - tplayer.Velocity, - tplayer.Crouching, - tplayer.Jumping, - ExoSuitDefinition.Select(tplayer.ExoSuit, tplayer.Faction) - ) - } -} diff --git a/src/main/scala/net/psforever/objects/ballistics/Projectile.scala b/src/main/scala/net/psforever/objects/ballistics/Projectile.scala index b43ba44d..476616ae 100644 --- a/src/main/scala/net/psforever/objects/ballistics/Projectile.scala +++ b/src/main/scala/net/psforever/objects/ballistics/Projectile.scala @@ -1,8 +1,10 @@ // Copyright (c) 2017 PSForever package net.psforever.objects.ballistics -import java.util.concurrent.atomic.AtomicLong +import net.psforever.objects.sourcing.SourceEntry +import java.util.concurrent.atomic.AtomicLong +// import net.psforever.objects.PlanetSideGameObject import net.psforever.objects.definition.{ProjectileDefinition, ToolDefinition} import net.psforever.objects.entity.SimpleWorldEntity @@ -13,42 +15,44 @@ import net.psforever.objects.zones.blockmap.BlockMapEntity import net.psforever.types.Vector3 /** - * A summation of weapon discharge. - * @see `ProjectileDefinition` - * @see `ToolDefinition` - * @see `FireModeDefinition` - * @see `SourceEntry` - * @see `PlayerSource` - * @param profile an explanation of the damage that can be performed by this discharge - * @param tool_def the weapon that caused this discharge - * @param fire_mode the current fire mode of the tool used - * @param owner the agency that caused the weapon to produce this projectile; - * most often a player (`PlayerSource`) - * @param attribute_to an object ID that refers to the method of death that would be reported; - * usually the same as `tool_def.ObjectId`; - * if not, then it is a type of vehicle (and owner should have a positive `seated` field) - * @param shot_origin where the projectile started - * @param shot_angle in which direction the projectile was aimed when it was discharged - * @param shot_velocity the initial velocity coordinates of the projectile according to its world directions - * @param quality na - * @param id an exclusive identifier for this projectile; - * normally generated internally, but can be manually set (for modifying a continuous projectile reference) - * @param fire_time when the weapon discharged was recorded; - * defaults to `System.currentTimeMillis()` - */ + * A summation of weapon discharge. + * @see `ProjectileDefinition` + * @see `ToolDefinition` + * @see `FireModeDefinition` + * @see `SourceEntry` + * @see `PlayerSource` + * @param profile an explanation of the damage that can be performed by this discharge + * @param tool_def the weapon that caused this discharge + * @param fire_mode the current fire mode of the tool used + * @param mounted_in na + * @param owner the agency that caused the weapon to produce this projectile; + * most often a player (`PlayerSource`) + * @param attribute_to an object ID that refers to the method of death that would be reported; + * usually the same as `tool_def.ObjectId`; + * if not, then it is a type of vehicle (and owner should have a positive `seated` field) + * @param shot_origin where the projectile started + * @param shot_angle in which direction the projectile was aimed when it was discharged + * @param shot_velocity the initial velocity coordinates of the projectile according to its world directions + * @param quality na + * @param id an exclusive identifier for this projectile; + * normally generated internally, but can be manually set (for modifying a continuous projectile reference) + * @param fire_time when the weapon discharged was recorded; + * defaults to `System.currentTimeMillis()` + */ final case class Projectile( - profile: ProjectileDefinition, - tool_def: ToolDefinition, - fire_mode: FireModeDefinition, - owner: SourceEntry, - attribute_to: Int, - shot_origin: Vector3, - shot_angle: Vector3, - shot_velocity: Option[Vector3], - quality: ProjectileQuality = ProjectileQuality.Normal, - id: Long = Projectile.idGenerator.getAndIncrement(), - fire_time: Long = System.currentTimeMillis() -) extends PlanetSideGameObject + profile: ProjectileDefinition, + tool_def: ToolDefinition, + fire_mode: FireModeDefinition, + mounted_in: Option[(Int, SourceEntry)], + owner: SourceEntry, + attribute_to: Int, + shot_origin: Vector3, + shot_angle: Vector3, + shot_velocity: Option[Vector3], + quality: ProjectileQuality = ProjectileQuality.Normal, + id: Long = Projectile.idGenerator.getAndIncrement(), + fire_time: Long = System.currentTimeMillis() + ) extends PlanetSideGameObject with BlockMapEntity { Position = shot_origin Orientation = shot_angle @@ -66,18 +70,19 @@ final case class Projectile( private var resolved: DamageResolution.Value = DamageResolution.Unresolved /** - * Create a copy of this projectile with all the same information - * save for the quality. - * Used mainly for aggravated damage. - * It is important to note that the new projectile shares the (otherwise) exclusive id of the original. - * @param value the new quality - * @return a new `Projectile` entity - */ + * Create a copy of this projectile with all the same information + * save for the quality. + * Used mainly for aggravated damage. + * It is important to note that the new projectile shares the (otherwise) exclusive id of the original. + * @param value the new quality + * @return a new `Projectile` entity + */ def quality(value: ProjectileQuality): Projectile = { - val projectile = Projectile( + val projectile = new Projectile( profile, tool_def, fire_mode, + mounted_in, owner, attribute_to, shot_origin, @@ -93,8 +98,8 @@ final case class Projectile( } /** - * Mark the projectile as being "encountered" or "managed" at least once. - */ + * Mark the projectile as being "encountered" or "managed" at least once. + */ def Resolve(): Unit = { resolved = DamageResolution.Resolved } @@ -107,7 +112,7 @@ final case class Projectile( def isMiss: Boolean = resolved == DamageResolution.Missed - def Definition = profile + def Definition: ProjectileDefinition = profile } object Projectile { @@ -116,22 +121,22 @@ object Projectile { final val baseUID: Int = 40100 /** all clients progress through 40100 to 40124 normally, skipping only for long-lived projectiles - * 40125 to 40149 are being reserved as a guard against undetected overflow - */ + * 40125 to 40149 are being reserved as a guard against undetected overflow + */ final val rangeUID: Int = 40150 private val idGenerator: AtomicLong = new AtomicLong /** - * Overloaded constructor for an `Unresolved` projectile. - * @param profile an explanation of the damage that can be performed by this discharge - * @param tool_def the weapon that caused this discharge - * @param fire_mode the current fire mode of the tool used - * @param owner the agency that caused the weapon to produce this projectile - * @param shot_origin where the projectile started - * @param shot_angle in which direction the projectile was aimed when it was discharged - * @return the `Projectile` object - */ + * Overloaded constructor for an `Unresolved` projectile. + * @param profile an explanation of the damage that can be performed by this discharge + * @param tool_def the weapon that caused this discharge + * @param fire_mode the current fire mode of the tool used + * @param owner the agency that caused the weapon to produce this projectile + * @param shot_origin where the projectile started + * @param shot_angle in which direction the projectile was aimed when it was discharged + * @return the `Projectile` object + */ def apply( profile: ProjectileDefinition, tool_def: ToolDefinition, @@ -140,20 +145,20 @@ object Projectile { shot_origin: Vector3, shot_angle: Vector3 ): Projectile = { - Projectile(profile, tool_def, fire_mode, SourceEntry(owner), tool_def.ObjectId, shot_origin, shot_angle, None) + Projectile(profile, tool_def, fire_mode, None, SourceEntry(owner), tool_def.ObjectId, shot_origin, shot_angle, None) } /** - * Overloaded constructor for an `Unresolved` projectile. - * @param profile an explanation of the damage that can be performed by this discharge - * @param tool_def the weapon that caused this discharge - * @param fire_mode the current fire mode of the tool used - * @param owner the agency that caused the weapon to produce this projectile - * @param attribute_to an object ID that refers to the method of death that would be reported - * @param shot_origin where the projectile started - * @param shot_angle in which direction the projectile was aimed when it was discharged - * @return the `Projectile` object - */ + * Overloaded constructor for an `Unresolved` projectile. + * @param profile an explanation of the damage that can be performed by this discharge + * @param tool_def the weapon that caused this discharge + * @param fire_mode the current fire mode of the tool used + * @param owner the agency that caused the weapon to produce this projectile + * @param attribute_to an object ID that refers to the method of death that would be reported + * @param shot_origin where the projectile started + * @param shot_angle in which direction the projectile was aimed when it was discharged + * @return the `Projectile` object + */ def apply( profile: ProjectileDefinition, tool_def: ToolDefinition, @@ -163,7 +168,7 @@ object Projectile { shot_origin: Vector3, shot_angle: Vector3 ): Projectile = { - Projectile(profile, tool_def, fire_mode, SourceEntry(owner), attribute_to, shot_origin, shot_angle, None) + Projectile(profile, tool_def, fire_mode, None, SourceEntry(owner), attribute_to, shot_origin, shot_angle, None) } def apply( @@ -175,6 +180,6 @@ object Projectile { shot_origin: Vector3, shot_angle: Vector3 ): Projectile = { - Projectile(profile, tool_def, fire_mode, owner, attribute_to, shot_origin, shot_angle, None) + Projectile(profile, tool_def, fire_mode, None, owner, attribute_to, shot_origin, shot_angle, None) } } diff --git a/src/main/scala/net/psforever/objects/ballistics/SourceEntry.scala b/src/main/scala/net/psforever/objects/ballistics/SourceEntry.scala deleted file mode 100644 index 820fe1ce..00000000 --- a/src/main/scala/net/psforever/objects/ballistics/SourceEntry.scala +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2017 PSForever -package net.psforever.objects.ballistics - -import net.psforever.objects.ce.Deployable -import net.psforever.objects.definition.ObjectDefinition -import net.psforever.objects.{PlanetSideGameObject, Player, Vehicle} -import net.psforever.objects.entity.WorldEntity -import net.psforever.objects.serverobject.affinity.FactionAffinity -import net.psforever.objects.vital.VitalityDefinition -import net.psforever.objects.vital.resistance.ResistanceProfile -import net.psforever.types.{PlanetSideEmpire, Vector3} - -trait SourceEntry extends WorldEntity { - def Name: String = "" - def Definition: ObjectDefinition with VitalityDefinition - def CharId: Long = 0L - def Faction: PlanetSideEmpire.Value = PlanetSideEmpire.NEUTRAL - def Position_=(pos: Vector3) = Position - def Orientation_=(pos: Vector3) = Position - def Velocity_=(pos: Option[Vector3]) = Velocity - def Modifiers: ResistanceProfile -} - -object SourceEntry { - final val None = new SourceEntry() { - def Definition = null - def Position = Vector3.Zero - def Orientation = Vector3.Zero - def Velocity = Some(Vector3.Zero) - def Modifiers = null - } - - def apply(target: PlanetSideGameObject with FactionAffinity): SourceEntry = { - target match { - case obj: Player => PlayerSource(obj) - case obj: Vehicle => VehicleSource(obj) - case obj: Deployable => DeployableSource(obj) - case _ => ObjectSource(target) - } - } - - def NameFormat(name: String): String = { - name - .replace("_", " ") - .split(" ") - .map(_.capitalize) - .mkString(" ") - } -} diff --git a/src/main/scala/net/psforever/objects/ballistics/VehicleSource.scala b/src/main/scala/net/psforever/objects/ballistics/VehicleSource.scala deleted file mode 100644 index d347bfb1..00000000 --- a/src/main/scala/net/psforever/objects/ballistics/VehicleSource.scala +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2017 PSForever -package net.psforever.objects.ballistics - -import net.psforever.objects.Vehicle -import net.psforever.objects.definition.VehicleDefinition -import net.psforever.objects.vital.resistance.ResistanceProfile -import net.psforever.types.{PlanetSideEmpire, Vector3} - -final case class VehicleSource( - obj_def: VehicleDefinition, - faction: PlanetSideEmpire.Value, - health: Int, - shields: Int, - position: Vector3, - orientation: Vector3, - velocity: Option[Vector3], - occupants: List[SourceEntry], - modifiers: ResistanceProfile -) extends SourceEntry { - override def Name = SourceEntry.NameFormat(obj_def.Name) - override def Faction = faction - def Definition: VehicleDefinition = obj_def - def Health = health - def Shields = shields - def Position = position - def Orientation = orientation - def Velocity = velocity - def Modifiers = modifiers -} - -object VehicleSource { - def apply(obj: Vehicle): VehicleSource = { - VehicleSource( - obj.Definition, - obj.Faction, - obj.Health, - obj.Shields, - obj.Position, - obj.Orientation, - obj.Velocity, - obj.Seats.values.map { seat => - seat.occupant match { - case Some(p) => PlayerSource(p) - case _ => SourceEntry.None - } - }.toList, - obj.Definition.asInstanceOf[ResistanceProfile] - ) - } -} diff --git a/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala index f8918450..f2da98a8 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala @@ -65,7 +65,7 @@ object AvatarConverter { def MakeAppearanceData(obj: Player): Int => CharacterAppearanceData = { val alt_model_flag: Boolean = obj.isBackpack val aa: Int => CharacterAppearanceA = CharacterAppearanceA( - BasicCharacterData(obj.Name, obj.Faction, obj.Sex, obj.Head, obj.Voice), + obj.avatar.basic, CommonFieldData( obj.Faction, bops = false, diff --git a/src/main/scala/net/psforever/objects/definition/converter/CaptureFlagConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/CaptureFlagConverter.scala index e943a168..aee98e8e 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/CaptureFlagConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/CaptureFlagConverter.scala @@ -3,6 +3,7 @@ package net.psforever.objects.definition.converter import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.serverobject.llu.CaptureFlag import net.psforever.objects.serverobject.structures.Building +import net.psforever.objects.sourcing.PlayerSource import net.psforever.packet.game.objectcreate.{CaptureFlagData, PlacementData} import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} @@ -13,7 +14,7 @@ class CaptureFlagConverter extends ObjectCreateConverter[CaptureFlag]() { override def ConstructorData(obj : CaptureFlag) : Try[CaptureFlagData] = { val hackInfo = obj.Owner.asInstanceOf[Building].CaptureTerminal.get.HackedBy match { case Some(hackInfo) => hackInfo - case _ => Hackable.HackInfo("", PlanetSideGUID(0), PlanetSideEmpire.NEUTRAL, Vector3.Zero, 0L, 0L) + case _ => Hackable.HackInfo(PlayerSource("", PlanetSideEmpire.NEUTRAL, Vector3.Zero), PlanetSideGUID(0), 0L, 0L) } val millisecondsRemaining = TimeUnit.MILLISECONDS.convert(math.max(0, hackInfo.hackStartTime + hackInfo.hackDuration - System.nanoTime), TimeUnit.NANOSECONDS) diff --git a/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala index 2471b627..d6385319 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala @@ -39,7 +39,7 @@ class CharacterSelectConverter extends AvatarConverter { */ private def MakeAppearanceData(obj: Player): Int => CharacterAppearanceData = { val aa: Int => CharacterAppearanceA = CharacterAppearanceA( - BasicCharacterData(obj.Name, obj.Faction, obj.Sex, obj.Head, CharacterVoice.Mute), + obj.avatar.basic, CommonFieldData( obj.Faction, bops = false, diff --git a/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala index 357ef2ea..9692b7f1 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala @@ -30,7 +30,7 @@ class CorpseConverter extends AvatarConverter { */ private def MakeAppearanceData(obj: Player): Int => CharacterAppearanceData = { val aa: Int => CharacterAppearanceA = CharacterAppearanceA( - BasicCharacterData(obj.Name, obj.Faction, CharacterSex.Male, 0, CharacterVoice.Mute), + obj.avatar.basic, CommonFieldData( obj.Faction, bops = false, diff --git a/src/main/scala/net/psforever/objects/equipment/ArmorSiphonBehavior.scala b/src/main/scala/net/psforever/objects/equipment/ArmorSiphonBehavior.scala index b465a882..9c153e42 100644 --- a/src/main/scala/net/psforever/objects/equipment/ArmorSiphonBehavior.scala +++ b/src/main/scala/net/psforever/objects/equipment/ArmorSiphonBehavior.scala @@ -2,10 +2,10 @@ package net.psforever.objects.equipment import akka.actor.{Actor, Cancellable} -import net.psforever.objects.ballistics.VehicleSource import net.psforever.objects.{GlobalDefinitions, Tool, Vehicle} import net.psforever.objects.serverobject.CommonMessages import net.psforever.objects.serverobject.damage.Damageable +import net.psforever.objects.sourcing.VehicleSource import net.psforever.objects.vital.RepairFromArmorSiphon import net.psforever.objects.vital.etc.{ArmorSiphonModifiers, ArmorSiphonReason} import net.psforever.objects.vital.interaction.DamageInteraction @@ -76,7 +76,7 @@ object ArmorSiphonBehavior { if before < obj.MaxHealth => val after = obj.Health += amount if(before < after) { - obj.History(RepairFromArmorSiphon(asr.siphon.Definition, before - after)) + obj.LogActivity(RepairFromArmorSiphon(asr.siphon.Definition, VehicleSource(obj), before - after)) val zone = obj.Zone zone.VehicleEvents ! VehicleServiceMessage( zone.id, diff --git a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala index bb8a6d23..c19c8083 100644 --- a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala +++ b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala @@ -39,22 +39,38 @@ object EffectTarget { false } + /** + * To repair at this silo, the vehicle: + * can not be a flight vehicle, + * must have some health already, but does not have all its health, + * and can not have taken damage in the last five seconds. + */ def RepairSilo(target: PlanetSideGameObject): Boolean = target match { - case v: Vehicle => - !GlobalDefinitions.isFlightVehicle(v.Definition) && v.Health > 0 && v.Health < v.MaxHealth && !v.History.takeWhile(System.currentTimeMillis() - _.time <= 5000L).exists(_.isInstanceOf[DamagingActivity]) - case _ => - false + case v: Vehicle => !GlobalDefinitions.isFlightVehicle(v.Definition) && CommonRepairConditions(v) + case _ => false } + /** + * To repair at this landing pad, the vehicle: + * be a flight vehicle, + * must have some health already, but does not have all its health, + * and can not have taken damage in the last five seconds. + */ def PadLanding(target: PlanetSideGameObject): Boolean = target match { - case v: Vehicle => - GlobalDefinitions.isFlightVehicle(v.Definition) && v.Health > 0 && v.Health < v.MaxHealth && !v.History.takeWhile(System.currentTimeMillis() - _.time <= 5000L).exists(_.isInstanceOf[DamagingActivity]) - case _ => - false + case v: Vehicle => GlobalDefinitions.isFlightVehicle(v.Definition) && CommonRepairConditions(v) + case _ => false } + private def CommonRepairConditions(v: Vehicle): Boolean = { + v.Health > 0 && v.Health < v.MaxHealth && + v.History.findLast { entry => entry.isInstanceOf[DamagingActivity] }.exists { + case entry if System.currentTimeMillis() - entry.time < 5000L => true + case _ => false + } + } + def Player(target: PlanetSideGameObject): Boolean = target match { case p: Player => diff --git a/src/main/scala/net/psforever/objects/geometry/GeometryForm.scala b/src/main/scala/net/psforever/objects/geometry/GeometryForm.scala index 382ad578..83a6e1ac 100644 --- a/src/main/scala/net/psforever/objects/geometry/GeometryForm.scala +++ b/src/main/scala/net/psforever/objects/geometry/GeometryForm.scala @@ -1,8 +1,9 @@ // Copyright (c) 2021 PSForever package net.psforever.objects.geometry -import net.psforever.objects.ballistics.{PlayerSource, Projectile, SourceEntry} +import net.psforever.objects.ballistics.Projectile import net.psforever.objects.geometry.d3._ +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.{GlobalDefinitions, PlanetSideGameObject, Player} import net.psforever.types.{ExoSuitType, Vector3} diff --git a/src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala b/src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala index 97048bf8..50a07a9d 100644 --- a/src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala +++ b/src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.objects.serverobject -import net.psforever.objects.Player +import net.psforever.objects.{PlanetSideGameObject, Player} import net.psforever.objects.serverobject.hackable.Hackable //temporary location for these messages @@ -23,4 +23,15 @@ object CommonMessages { final case class Progress(delta: Float, completionAction: () => Unit, tickAction: Float => Boolean) { assert(delta > 0, s"progress activity change value must be positive number - $delta") } + + /** + * A request has been made to charge this entity's shields. + * @see `FacilityBenefitShieldChargeRequestMessage` + * @param amount the number of points to charge + * @param motivator the element that caused the shield to charge; + * allowed to be `None`; + * most often, a `Building`; + * if the vehicle instigated its own charge (battleframe robotics), specify that + */ + final case class ChargeShields(amount: Int, motivator: Option[PlanetSideGameObject]) } diff --git a/src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala index 6a028144..cb433ee5 100644 --- a/src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala @@ -4,6 +4,7 @@ package net.psforever.objects.serverobject.damage import akka.actor.{Actor, Cancellable} import net.psforever.objects.ballistics._ import net.psforever.objects.serverobject.aura.Aura +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.base._ import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} diff --git a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala index bcb185f7..b9369c38 100644 --- a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala @@ -16,7 +16,6 @@ trait DamageableAmenity extends DamageableEntity { override protected def DestructionAwareness(target: Damageable.Target, cause: DamageResult): Unit = { super.DestructionAwareness(target, cause) DamageableAmenity.DestructionAwareness(target, cause) - target.ClearHistory() } } diff --git a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala index 240ae5ca..b3d74ac1 100644 --- a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala @@ -56,7 +56,7 @@ trait DamageableEntity extends Damageable { val health = target.Health val damage = originalHealth - health if (WillAffectTarget(target, damage, cause)) { - target.History(cause) + target.LogActivity(cause) DamageLog(target, s"BEFORE=$originalHealth, AFTER=$health, CHANGE=$damage") HandleDamage(target, cause, damage) } else { diff --git a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala index 1ad0c43d..cedcc10f 100644 --- a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala @@ -2,8 +2,8 @@ package net.psforever.objects.serverobject.damage import net.psforever.objects.Player -import net.psforever.objects.ballistics.{PlayerSource, SourceEntry} import net.psforever.objects.serverobject.mount.Mountable +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} import net.psforever.packet.game.DamageWithPositionMessage import net.psforever.services.Service diff --git a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala index e6947c7d..2859bf90 100644 --- a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala @@ -49,7 +49,7 @@ trait DamageableVehicle //bfrs undergo a shiver spell before exploding val obj = DamageableObject obj.Health = 0 - obj.History(cause) + obj.LogActivity(cause) DestructionAwareness(obj, cause) } @@ -74,7 +74,7 @@ trait DamageableVehicle val damageToHealth = originalHealth - health val damageToShields = originalShields - shields if (WillAffectTarget(target, damageToHealth + damageToShields, cause)) { - target.History(cause) + target.LogActivity(cause) DamageLog( target, s"BEFORE=$originalHealth/$originalShields, AFTER=$health/$shields, CHANGE=$damageToHealth/$damageToShields" @@ -130,7 +130,7 @@ trait DamageableVehicle if (obj.MountedIn.nonEmpty) { //log historical event - target.History(cause) + target.LogActivity(cause) } //damage if (Damageable.CanDamageOrJammer(target, totalDamage, cause.interaction)) { @@ -214,7 +214,6 @@ trait DamageableVehicle } //clean up target.Actor ! Vehicle.Deconstruct(Some(1 minute)) - target.ClearHistory() DamageableWeaponTurret.DestructionAwareness(obj, cause) case _ => ; } diff --git a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala index 1abd1608..bef9a243 100644 --- a/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala @@ -51,7 +51,7 @@ trait DamageableWeaponTurret } //log historical event - target.History(cause) + target.LogActivity(cause) //damage if (Damageable.CanDamageOrJammer(target, damageToHealth, cause.interaction)) { //jammering diff --git a/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala b/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala index 67747460..5ff17689 100644 --- a/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala @@ -30,10 +30,10 @@ class GeneratorControl(gen: Generator) with DamageableEntity with RepairableEntity with AmenityAutoRepair { - def FactionObject = gen - def DamageableObject = gen - def RepairableObject = gen - def AutoRepairObject = gen + def FactionObject: Generator = gen + def DamageableObject: Generator = gen + def RepairableObject: Generator = gen + def AutoRepairObject: Generator = gen /** flagged to explode after some time */ var imminentExplosion: Boolean = false /** explode when this timer completes */ @@ -123,9 +123,9 @@ class GeneratorControl(gen: Generator) imminentExplosion = false //hate on everything nearby Zone.serverSideDamage(gen.Zone, gen, Zone.explosionDamage(gen.LastDamage), explosionFunc) - gen.ClearHistory() case GeneratorControl.Restored() => + gen.ClearHistory() GeneratorControl.UpdateOwner(gen, Some(GeneratorControl.Event.Online)) case _ => ; @@ -153,7 +153,6 @@ class GeneratorControl(gen: Generator) imminentExplosion = false gen.Condition = PlanetSideGeneratorState.Destroyed GeneratorControl.UpdateOwner(gen, Some(GeneratorControl.Event.Destroyed)) - gen.ClearHistory() case _ => } diff --git a/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala b/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala index 17ed208b..16f12d5b 100644 --- a/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala +++ b/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala @@ -3,6 +3,7 @@ package net.psforever.objects.serverobject.hackable import net.psforever.objects.Player import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.hackable.Hackable.HackInfo +import net.psforever.objects.sourcing.PlayerSource import net.psforever.packet.game.TriggeredSound import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} @@ -24,14 +25,14 @@ trait Hackable { def HackedBy_=(agent: Option[Player]): Option[HackInfo] = { (hackedBy, agent) match { case (None, Some(actor)) => - hackedBy = Some(HackInfo(actor.Name, actor.GUID, actor.Faction, actor.Position, System.nanoTime, 0L)) + hackedBy = Some(HackInfo(PlayerSource(actor), actor.GUID, System.nanoTime, 0L)) case (Some(info), Some(actor)) => if (actor.Faction == this.Faction) { //hack cleared hackedBy = None } else if (actor.Faction != info.hackerFaction) { //override the hack state with a new hack state if the new user has different faction affiliation - hackedBy = Some(HackInfo(actor.Name, actor.GUID, actor.Faction, actor.Position, System.nanoTime, 0L)) + hackedBy = Some(HackInfo(PlayerSource(actor), actor.GUID, System.nanoTime, 0L)) } case (_, None) => hackedBy = None @@ -67,30 +68,19 @@ trait Hackable { hackDuration = arr arr } - -// private var hackable : Option[Boolean] = None -// def Hackable : Boolean = hackable.getOrElse(Definition.Hackable) -// -// def Hackable_=(state : Boolean) : Boolean = Hackable_=(Some(state)) -// -// def Hackable_=(state : Option[Boolean]) : Boolean = { -// hackable = state -// Hackable -// } -// -// def Definition : HackableDefinition } object Hackable { final case class HackInfo( - hackerName: String, - hackerGUID: PlanetSideGUID, - hackerFaction: PlanetSideEmpire.Value, - hackerPos: Vector3, - hackStartTime: Long, - hackDuration: Long - ) { - def Duration(time: Long): HackInfo = - HackInfo(hackerName, hackerGUID, hackerFaction, hackerPos, hackStartTime, time) + player: PlayerSource, + hackerGUID: PlanetSideGUID, + hackStartTime: Long, + hackDuration: Long + ) { + def hackerName: String = player.Name + def hackerFaction: PlanetSideEmpire.Value = player.Faction + def hackerPos: Vector3 = player.Position + + def Duration(time: Long): HackInfo = HackInfo(player, hackerGUID, hackStartTime, time) } } diff --git a/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlag.scala b/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlag.scala index cdcc66e9..3d1dd5ab 100644 --- a/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlag.scala +++ b/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlag.scala @@ -1,3 +1,4 @@ +// Copyright (c) 2021 PSForever package net.psforever.objects.serverobject.llu import net.psforever.objects.serverobject.structures.{Amenity, AmenityOwner, Building} @@ -5,9 +6,28 @@ import net.psforever.objects.{GlobalDefinitions, Player} import net.psforever.types.{PlanetSideEmpire, Vector3} /** - * This object represents the LLU that gets spawned at a LLU socket when a LLU control console is hacked - */ -class CaptureFlag(tDef: CaptureFlagDefinition) extends Amenity { + * Represent a special entity that is carried by the player in certain circumstances. + * The entity is not a piece of `Equipment` so it does not go into the holsters, + * doe not into the player's inventory, + * and is not carried in or manipulated by the player's hands. + * The different game elements it simulates are: + * a facility's lattice logic unit (LLU), + * the cavern modules, + * and the rabbit ball (special game mode).
+ *
+ * For the lattice logic unit, when a facility is set to generate an LLU upon hack, + * and an adjacent facility on the lattice provides an accommodating faction connection, + * the unit gets spawned at the LLU socket within the hacked facility. + * The LLU socket actually doesn't do anything but keep track of the spawned flag and provide a location. + * It associates with the faction of the hacker and, carried by other players of the same faction only, + * must be brought to the control console of a designated facility that is owned by the faction of the hacking empire. + * If the hack is cancelled through a resecure, the LLU despawns. + * If the facility is counter-hacked, the active LLU despawns and a new LLU is spawned in the socket. + * Other empires can not interact with the LLU while it is dropped on the ground and + * vehicles will be warned and then deconstructed if they linges too long near a dropped LLU. + * The LLU can not be submerged in water or it will despawn and the hack will cancel. + */ +class CaptureFlag(private val tDef: CaptureFlagDefinition) extends Amenity { def Definition : CaptureFlagDefinition = tDef private var target: Building = Building.NoBuilding @@ -15,28 +35,35 @@ class CaptureFlag(tDef: CaptureFlagDefinition) extends Amenity { private var carrier: Option[Player] = None def Target: Building = target - def Target_=(new_target: Building): Building = { - target = new_target + def Target_=(newTarget: Building): Building = { + target = newTarget target } - // Since a LLU belongs to a base, but needs to be picked up by the enemy faction we need to be able to override the faction that owns the LLU to the hacker faction + /** + * Since a LLU belongs to a base, + * but needs to be picked up by the enemy faction, + * override the faction that owns the LLU to display the hacker faction. + */ override def Faction: PlanetSideEmpire.Value = faction - override def Faction_=(new_faction: PlanetSideEmpire.Value): PlanetSideEmpire.Value = { - faction = new_faction + override def Faction_=(newFaction: PlanetSideEmpire.Value): PlanetSideEmpire.Value = { + faction = newFaction faction } - // When the flag is carried by a player, the position returned should be that of the carrier not the flag + /** + * When the flag is carried by a player, the position returned should be that of the carrier not the flag. + * @return the position of the carrier, if there is a player carrying the flag, or the flag itself + */ override def Position: Vector3 = if (Carrier.nonEmpty) { carrier.get.Position } else { - Entity.Position + super.Position } def Carrier: Option[Player] = carrier - def Carrier_=(new_carrier: Option[Player]) : Option[Player] = { - carrier = new_carrier + def Carrier_=(newCarrier: Option[Player]) : Option[Player] = { + carrier = newCarrier carrier } } @@ -53,7 +80,6 @@ object CaptureFlag { obj.Target = target obj.Owner = owner obj.Faction = faction - obj } } diff --git a/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlagSocket.scala b/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlagSocket.scala index e68dfa60..d66e4fb9 100644 --- a/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlagSocket.scala +++ b/src/main/scala/net/psforever/objects/serverobject/llu/CaptureFlagSocket.scala @@ -13,6 +13,7 @@ import net.psforever.types.Vector3 */ class CaptureFlagSocket(tDef: CaptureFlagSocketDefinition) extends Amenity { + private var lastFlag: Option[CaptureFlag] = None private var spawnedCaptureFlag: Option[CaptureFlag] = None def captureFlag: Option[CaptureFlag] = spawnedCaptureFlag @@ -20,10 +21,19 @@ class CaptureFlagSocket(tDef: CaptureFlagSocketDefinition) def captureFlag_=(flag: CaptureFlag): Option[CaptureFlag] = captureFlag_=(Some(flag)) def captureFlag_=(flag: Option[CaptureFlag]): Option[CaptureFlag] = { + lastFlag = flag.orElse(lastFlag) spawnedCaptureFlag = flag captureFlag } + def previousFlag: Option[CaptureFlag] = lastFlag + + def clearOldFlagData(): Unit = { + if (spawnedCaptureFlag.isEmpty) { + lastFlag = None + } + } + def Definition : CaptureFlagSocketDefinition = tDef } diff --git a/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala index 0ea6dfb0..0f87181b 100644 --- a/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala +++ b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala @@ -3,13 +3,13 @@ package net.psforever.objects.serverobject.pad.process import akka.actor.Props import net.psforever.objects.PlanetSideGameObject -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.pad.{VehicleSpawnControl, VehicleSpawnPad} -import net.psforever.objects.vital.Vitality +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.etc.{ExplodingEntityReason, VehicleSpawnReason} import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} import net.psforever.objects.vital.prop.DamageProperties +import net.psforever.objects.vital.Vitality import net.psforever.objects.zones.Zone import scala.concurrent.ExecutionContext.Implicits.global diff --git a/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala b/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala index 0b2581fb..351d740f 100644 --- a/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala @@ -1,13 +1,14 @@ package net.psforever.objects.serverobject.painbox import akka.actor.Cancellable -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.serverobject.structures.{Building, PoweredAmenityControl} +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.etc.PainboxReason import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.{Default, GlobalDefinitions, Player} +import net.psforever.services.Service import net.psforever.types.{PlanetSideEmpire, Vector3} import scala.concurrent.ExecutionContext.Implicits.global @@ -58,7 +59,7 @@ class PainboxControl(painbox: Painbox) extends PoweredAmenityControl { } var commonBehavior: Receive = { - case "startup" => + case Service.Startup() => if (!disabled && domain.midpoint == Vector3.Zero) { initialStartup() } diff --git a/src/main/scala/net/psforever/objects/serverobject/repair/AmenityAutoRepair.scala b/src/main/scala/net/psforever/objects/serverobject/repair/AmenityAutoRepair.scala index 9be00f81..1d2f7c73 100644 --- a/src/main/scala/net/psforever/objects/serverobject/repair/AmenityAutoRepair.scala +++ b/src/main/scala/net/psforever/objects/serverobject/repair/AmenityAutoRepair.scala @@ -9,6 +9,7 @@ import net.psforever.actors.zone.BuildingActor import net.psforever.objects.{Default, NtuContainer, NtuStorageBehavior} import net.psforever.objects.serverobject.damage.Damageable import net.psforever.objects.serverobject.structures.{Amenity, AutoRepairStats, Building} +import net.psforever.objects.vital.RepairFromAmenityAutoRepair import net.psforever.util.Config import scala.concurrent.duration._ @@ -96,6 +97,7 @@ trait AmenityAutoRepair wholeRepairAmount + wholeOverflow } PerformRepairs(obj, finalRepairAmount) + obj.LogActivity(RepairFromAmenityAutoRepair(finalRepairAmount)) val currentTime = System.currentTimeMillis() val taskTime = currentTime - autoRepairQueueTask.getOrElse(currentTime) autoRepairQueueTask = Some(0L) @@ -148,7 +150,8 @@ trait AmenityAutoRepair * or if the current process has stalled. */ private def startAutoRepairIfStopped(): Unit = { - if(autoRepairQueueTask.isEmpty || stallDetection(stallTime = 15000L)) { + val stallTime: Long = 15000L + if(autoRepairQueueTask.isEmpty || stallDetection(stallTime)) { trySetupAutoRepairInitial() } } diff --git a/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala index 0a7a660c..1042acfe 100644 --- a/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala @@ -3,6 +3,8 @@ package net.psforever.objects.serverobject.repair import net.psforever.objects.Tool import net.psforever.objects.serverobject.structures.Amenity +import net.psforever.objects.sourcing.{SourceEntry, SourceWithHealthEntry} +import net.psforever.objects.vital.{DamagingActivity, RepairFromEquipment, SpawningActivity} import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** @@ -23,7 +25,7 @@ trait RepairableAmenity extends RepairableEntity { object RepairableAmenity { /** - * A resotred `Amenity` target dispatches two messages to chance its model and operational states. + * A restored `Amenity` target dispatches two messages to chance its model and operational states. * These `PlanetSideAttributeMessage` attributes are the same as reported during zone load client configuration. * @see `AvatarAction.PlanetsideAttributeToAll` * @see `AvatarServiceMessage` @@ -37,5 +39,27 @@ object RepairableAmenity { val targetGUID = target.GUID events ! AvatarServiceMessage(zoneId, AvatarAction.PlanetsideAttributeToAll(targetGUID, 50, 0)) events ! AvatarServiceMessage(zoneId, AvatarAction.PlanetsideAttributeToAll(targetGUID, 51, 0)) + RestorationOfHistory(target) + } + + /** + * The vitality change history will be forgotten as this entity, once destroyed, has been rebuilt. + * For the purpose of inheritance of experience due to interaction, + * the users who made an effort to repair the entity in its resurgence. + * @param target na + */ + def RestorationOfHistory(target: Repairable.Target): Unit = { + val list = target.ClearHistory() + val effort = list.slice( + list.lastIndexWhere { + case dam: DamagingActivity => dam.data.targetAfter.asInstanceOf[SourceWithHealthEntry].health == 0 + case _ => false + }, + list.size + ).collect { + case entry: RepairFromEquipment => Some(entry.user) + case _ => None + }.flatten.distinctBy(_.Name) + target.LogActivity(SpawningActivity(SourceEntry(target), target.Zone.Number, effort.headOption)) } } diff --git a/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala index 4198d0e5..11b51ad8 100644 --- a/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala @@ -1,6 +1,8 @@ //Copyright (c) 2020 PSForever package net.psforever.objects.serverobject.repair +import net.psforever.objects.sourcing.PlayerSource +import net.psforever.objects.vital.RepairFromEquipment import net.psforever.objects.{Player, Tool} import net.psforever.packet.game.{InventoryStateMessage, RepairMessage} import net.psforever.types.{PlanetSideEmpire, Vector3} @@ -92,6 +94,13 @@ trait RepairableEntity extends Repairable { InventoryStateMessage(item.AmmoSlot.Box.GUID, item.GUID, magazine.toLong) ) ) + target.LogActivity( + RepairFromEquipment( + PlayerSource(player), + item.Definition, + repairValue + ) + ) PerformRepairs(target, repairValue) } else { originalHealth diff --git a/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala index 905025cc..f7f5fd69 100644 --- a/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala +++ b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala @@ -16,6 +16,7 @@ trait RepairableWeaponTurret extends RepairableEntity { override def Restoration(target: Repairable.Target): Unit = { super.Restoration(target) + RepairableAmenity.RestorationOfHistory(target) RepairableWeaponTurret.Restoration(RepairableObject) } } diff --git a/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala b/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala index 47e757eb..ab1bf430 100644 --- a/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala +++ b/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala @@ -1,8 +1,6 @@ // Copyright (c) 2017 PSForever package net.psforever.objects.serverobject.structures -import java.util.concurrent.TimeUnit - import akka.actor.ActorContext import net.psforever.actors.zone.BuildingActor import net.psforever.objects.{GlobalDefinitions, NtuContainer, Player} @@ -20,32 +18,37 @@ import akka.actor.typed.scaladsl.adapter._ import net.psforever.objects.serverobject.llu.{CaptureFlag, CaptureFlagSocket} import net.psforever.objects.serverobject.terminals.capture.CaptureTerminal +import scala.collection.mutable +import java.util.concurrent.TimeUnit +import scala.concurrent.duration._ + class Building( - private val name: String, - private val building_guid: Int, - private val map_id: Int, - private val zone: Zone, - private val buildingType: StructureType, - private val buildingDefinition: BuildingDefinition -) extends AmenityOwner + private val name: String, + private val building_guid: Int, + private val map_id: Int, + private val zone: Zone, + private val buildingType: StructureType, + private val buildingDefinition: BuildingDefinition + ) extends AmenityOwner with BlockMapEntity { private var faction: PlanetSideEmpire.Value = PlanetSideEmpire.NEUTRAL private var playersInSOI: List[Player] = List.empty private val capitols = List("Thoth", "Voltan", "Neit", "Anguta", "Eisa", "Verica") private var forceDomeActive: Boolean = false + private var participationFunc: Building.ParticipationLogic = Building.NoParticipation super.Zone_=(zone) super.GUID_=(PlanetSideGUID(building_guid)) //set Invalidate() //unset; guid can be used during setup, but does not stop being registered properly later - override def toString = name + override def toString: String = name def Name: String = name /** - * The map_id is the identifier number used in BuildingInfoUpdateMessage. This is the index that the building appears in the MPO file starting from index 1 - * The GUID is the identifier number used in SetEmpireMessage / Facility hacking / PlanetSideAttributeMessage. - */ + * The map_id is the identifier number used in BuildingInfoUpdateMessage. This is the index that the building appears in the MPO file starting from index 1 + * The GUID is the identifier number used in SetEmpireMessage / Facility hacking / PlanetSideAttributeMessage. + */ def MapId: Int = map_id def IsCapitol: Boolean = capitols.contains(name) @@ -82,10 +85,13 @@ class Building( box.Actor ! Painbox.Stop() } } + participationFunc.Players(building = this, list) playersInSOI = list playersInSOI } + def PlayerContribution: Map[Player, Long] = participationFunc.Contribution() + // Get all lattice neighbours def AllNeighbours: Option[Set[Building]] = { zone.Lattice find this match { @@ -139,7 +145,11 @@ class Building( case _ => false } - def GetFlagSocket: Option[CaptureFlagSocket] = this.Amenities.find(_.Definition == GlobalDefinitions.llm_socket).asInstanceOf[Option[CaptureFlagSocket]] + def GetFlagSocket: Option[CaptureFlagSocket] = { + this.Amenities + .find(_.Definition == GlobalDefinitions.llm_socket) + .map(_.asInstanceOf[CaptureFlagSocket]) + } def GetFlag: Option[CaptureFlag] = { GetFlagSocket match { case Some(socket) => socket.captureFlag @@ -175,10 +185,10 @@ class Building( val (hacking, hackingFaction, hackTime): (Boolean, PlanetSideEmpire.Value, Long) = CaptureTerminal match { case Some(obj: CaptureTerminal with Hackable) => obj.HackedBy match { - case Some(Hackable.HackInfo(_, _, hfaction, _, start, length)) => + case Some(Hackable.HackInfo(p, _, start, length)) => val hack_time_remaining_ms = TimeUnit.MILLISECONDS.convert(math.max(0, start + length - System.nanoTime), TimeUnit.NANOSECONDS) - (true, hfaction, hack_time_remaining_ms) + (true, p.Faction, hack_time_remaining_ms) case _ => (false, PlanetSideEmpire.NEUTRAL, 0L) } @@ -199,8 +209,8 @@ class Building( } val cavernBenefit: Set[CavernBenefit] = if ( generatorState != PlanetSideGeneratorState.Destroyed && - faction != PlanetSideEmpire.NEUTRAL && - connectedCavern().nonEmpty + faction != PlanetSideEmpire.NEUTRAL && + connectedCavern().nonEmpty ) { Set(CavernBenefit.VehicleModule, CavernBenefit.EquipmentModule) } else { @@ -233,22 +243,28 @@ class Building( } def hasLatticeBenefit(wantedBenefit: LatticeBenefit): Boolean = { - val genState = Generator match { - case Some(obj) => obj.Condition != PlanetSideGeneratorState.Destroyed + val baseDownState = (NtuSource match { + case Some(ntu) => ntu.NtuCapacitor < 1f case _ => false - } - if (genState || Faction == PlanetSideEmpire.NEUTRAL) { + }) || + (Generator match { + case Some(obj) => obj.Condition == PlanetSideGeneratorState.Destroyed + case _ => false + }) || + Faction == PlanetSideEmpire.NEUTRAL + if (baseDownState) { false } else { // Check this Building is on the lattice first zone.Lattice find this match { case Some(_) => + val faction = Faction val subGraph = Zone.Lattice filter ( - (b : Building) => - b.Faction == this.Faction && - !b.CaptureTerminalIsHacked && - b.NtuLevel > 0 && - (b.Generator.isEmpty || b.Generator.get.Condition != PlanetSideGeneratorState.Destroyed) + (b: Building) => + b.Faction == faction && + !b.CaptureTerminalIsHacked && + b.NtuLevel > 0 && + (b.Generator.isEmpty || b.Generator.get.Condition != PlanetSideGeneratorState.Destroyed) ) findLatticeBenefit(wantedBenefit, subGraph) case None => @@ -282,7 +298,10 @@ class Building( case Some(obj) => obj.Condition case _ => PlanetSideGeneratorState.Normal } - if (genState == PlanetSideGeneratorState.Destroyed || Faction == PlanetSideEmpire.NEUTRAL) { + if (genState == PlanetSideGeneratorState.Destroyed || + Faction == PlanetSideEmpire.NEUTRAL || + CaptureTerminalIsHacked + ) { Set(LatticeBenefit.None) } else { friendlyFunctionalNeighborhood().map { _.Definition.LatticeLinkBenefit } @@ -296,10 +315,10 @@ class Building( while (currBuilding.nonEmpty) { val building = currBuilding.head val neighborsToAdd = if (!visitedNeighbors.contains(building.MapId) - && (building match { case _ : WarpGate => false; case _ => true }) - && !building.CaptureTerminalIsHacked - && building.NtuLevel > 0 - && (building.Generator match { + && (building match { case _ : WarpGate => false; case _ => true }) + && !building.CaptureTerminalIsHacked + && building.NtuLevel > 0 + && (building.Generator match { case Some(o) => o.Condition != PlanetSideGeneratorState.Destroyed case _ => true }) @@ -321,14 +340,14 @@ class Building( } /** - * Starting from an overworld zone facility, - * find a lattice connected cavern facility that is the same faction as this starting building. - * Except for the necessary examination of the major facility on the other side of a warp gate pair, - * do not let the search escape the current zone into another. - * If we start in a cavern zone, do not continue a fruitless search; - * just fail. - * @return the discovered faction-aligned cavern facility - */ + * Starting from an overworld zone facility, + * find a lattice connected cavern facility that is the same faction as this starting building. + * Except for the necessary examination of the major facility on the other side of a warp gate pair, + * do not let the search escape the current zone into another. + * If we start in a cavern zone, do not continue a fruitless search; + * just fail. + * @return the discovered faction-aligned cavern facility + */ def connectedCavern(): Option[Building] = net.psforever.objects.zones.Zone.findConnectedCavernFacility(building = this) def BuildingType: StructureType = buildingType @@ -339,10 +358,46 @@ class Building( override def Continent_=(zone: String): String = Continent //building never leaves zone after being set in constructor + override def Amenities_=(obj: Amenity): List[Amenity] = { + obj match { + case _: CaptureTerminal => participationFunc = Building.FacilityHackParticipation + case _ => ; + } + super.Amenities_=(obj) + } + def Definition: BuildingDefinition = buildingDefinition } object Building { + trait ParticipationLogic { + def Players(building: Building, list: List[Player]): Unit = { } + def Contribution(): Map[Player, Long] + } + + final case object NoParticipation extends ParticipationLogic { + def Contribution(): Map[Player, Long] = Map.empty[Player, Long] + } + + final case object FacilityHackParticipation extends ParticipationLogic { + private var playerContribution: mutable.HashMap[Player, Long] = mutable.HashMap[Player, Long]() + + override def Players(building: Building, list: List[Player]): Unit = { + if (list.isEmpty) { + playerContribution.clear() + } else { + val hackTime = (building.CaptureTerminal.get.Definition.FacilityHackTime + 10.minutes).toMillis + val curr = System.currentTimeMillis() + val list2 = list.map { p => (p, curr) } + playerContribution = playerContribution.filterNot { case (p, t) => + list2.contains(p) || curr - t > hackTime + } ++ list2 + } + } + + def Contribution(): Map[Player, Long] = playerContribution.toMap + } + final val NoBuilding: Building = new Building(name = "", 0, map_id = 0, Zone.Nowhere, StructureType.Platform, GlobalDefinitions.building) { override def Faction_=(faction: PlanetSideEmpire.Value): PlanetSideEmpire.Value = PlanetSideEmpire.NEUTRAL @@ -355,11 +410,11 @@ object Building { } def Structure( - buildingType: StructureType, - location: Vector3, - rotation: Vector3, - definition: BuildingDefinition - )(name: String, guid: Int, map_id: Int, zone: Zone, context: ActorContext): Building = { + buildingType: StructureType, + location: Vector3, + rotation: Vector3, + definition: BuildingDefinition + )(name: String, guid: Int, map_id: Int, zone: Zone, context: ActorContext): Building = { val obj = new Building(name, guid, map_id, zone, buildingType, definition) obj.Position = location obj.Orientation = rotation @@ -368,9 +423,9 @@ object Building { } def Structure( - buildingType: StructureType, - location: Vector3 - )(name: String, guid: Int, map_id: Int, zone: Zone, context: ActorContext): Building = { + buildingType: StructureType, + location: Vector3 + )(name: String, guid: Int, map_id: Int, zone: Zone, context: ActorContext): Building = { val obj = new Building(name, guid, map_id, zone, buildingType, GlobalDefinitions.building) obj.Position = location obj.Actor = context.spawn(BuildingActor(zone, obj), s"$map_id-$buildingType-building").toClassic @@ -378,18 +433,18 @@ object Building { } def Structure( - buildingType: StructureType - )(name: String, guid: Int, map_id: Int, zone: Zone, context: ActorContext): Building = { + buildingType: StructureType + )(name: String, guid: Int, map_id: Int, zone: Zone, context: ActorContext): Building = { val obj = new Building(name, guid, map_id, zone, buildingType, GlobalDefinitions.building) obj.Actor = context.spawn(BuildingActor(zone, obj), s"$map_id-$buildingType-building").toClassic obj } def Structure( - buildingType: StructureType, - buildingDefinition: BuildingDefinition, - location: Vector3 - )(name: String, guid: Int, id: Int, zone: Zone, context: ActorContext): Building = { + buildingType: StructureType, + buildingDefinition: BuildingDefinition, + location: Vector3 + )(name: String, guid: Int, id: Int, zone: Zone, context: ActorContext): Building = { val obj = new Building(name, guid, id, zone, buildingType, buildingDefinition) obj.Position = location obj.Actor = context.spawn(BuildingActor(zone, obj), s"$id-$buildingType-building").toClassic diff --git a/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala deleted file mode 100644 index cc638369..00000000 --- a/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2020 PSForever -package net.psforever.objects.serverobject.terminals - -import net.psforever.objects.Player -import net.psforever.objects.serverobject.CommonMessages -import net.psforever.objects.serverobject.terminals.capture.CaptureTerminal -import net.psforever.services.local.{LocalAction, LocalServiceMessage} - -import scala.util.{Failure, Success} - -object CaptureTerminals { - private val log = org.log4s.getLogger("CaptureTerminals") - - /** - * The process of hacking an object is completed. - * Pass the message onto the hackable object and onto the local events system. - * @param target the `Hackable` object that has been hacked - * @param unk na; - * used by `HackMessage` as `unk5` - * @see `HackMessage` - */ - //TODO add params here depending on which params in HackMessage are important - def FinishHackingCaptureConsole(target: CaptureTerminal, hackingPlayer: Player, unk: Long)(): Unit = { - import akka.pattern.ask - import scala.concurrent.duration._ - log.info(s"${hackingPlayer.toString} hacked a ${target.Definition.Name}") - // Wait for the target actor to set the HackedBy property - import scala.concurrent.ExecutionContext.Implicits.global - ask(target.Actor, CommonMessages.Hack(hackingPlayer, target))(1 second).mapTo[Boolean].onComplete { - case Success(_) => - target.Zone.LocalEvents ! LocalServiceMessage( - target.Zone.id, - LocalAction.TriggerSound(hackingPlayer.GUID, target.HackSound, hackingPlayer.Position, 30, 0.49803925f) - ) - val isResecured = hackingPlayer.Faction == target.Faction - if (isResecured) { - // Resecure the CC - target.Zone.LocalEvents ! LocalServiceMessage( - target.Zone.id, - LocalAction.ResecureCaptureTerminal( - target - ) - ) - } - else { - // Start the CC hack timer - target.Zone.LocalEvents ! LocalServiceMessage( - target.Zone.id, - LocalAction.StartCaptureTerminalHack( - target - ) - ) - } - case Failure(_) => log.warn(s"Hack message failed on target guid: ${target.GUID}") - } - } -} diff --git a/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala index 463ce061..4882b70b 100644 --- a/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala @@ -2,8 +2,13 @@ package net.psforever.objects.serverobject.terminals import akka.actor.{ActorRef, Cancellable} +import net.psforever.objects.sourcing.AmenitySource +import org.log4s.Logger + +import scala.collection.mutable +import scala.concurrent.duration._ +// import net.psforever.objects._ -import net.psforever.objects.ballistics.{PlayerSource, VehicleSource} import net.psforever.objects.equipment.Equipment import net.psforever.objects.serverobject.CommonMessages import net.psforever.objects.serverobject.affinity.FactionAffinityBehavior @@ -12,39 +17,37 @@ import net.psforever.objects.serverobject.damage.DamageableAmenity import net.psforever.objects.serverobject.hackable.{GenericHackables, HackableBehavior} import net.psforever.objects.serverobject.repair.{AmenityAutoRepair, RepairableAmenity} import net.psforever.objects.serverobject.structures.{Building, PoweredAmenityControl} -import net.psforever.objects.vital.{HealFromTerm, RepairFromTerm} +import net.psforever.objects.vital.{HealFromTerm, RepairFromTerm, Vitality} +import net.psforever.objects.zones.ZoneAware import net.psforever.packet.game.InventoryStateMessage import net.psforever.services.Service import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} -import scala.collection.mutable -import scala.concurrent.duration._ - /** - * An `Actor` that handles messages being dispatched to a specific `ProximityTerminal`. - * Although this "terminal" itself does not accept the same messages as a normal `Terminal` object, - * it returns the same type of messages - wrapped in a `TerminalMessage` - to the `sender`. - * @param term the proximity unit (terminal) - */ + * An `Actor` that handles messages being dispatched to a specific `ProximityTerminal`. + * Although this "terminal" itself does not accept the same messages as a normal `Terminal` object, + * it returns the same type of messages - wrapped in a `TerminalMessage` - to the `sender`. + * @param term the proximity unit (terminal) + */ class ProximityTerminalControl(term: Terminal with ProximityUnit) - extends PoweredAmenityControl + extends PoweredAmenityControl with FactionAffinityBehavior.Check with HackableBehavior.GenericHackable with DamageableAmenity with RepairableAmenity with AmenityAutoRepair { - def FactionObject = term - def HackableObject = term - def TerminalObject = term - def DamageableObject = term - def RepairableObject = term - def AutoRepairObject = term + def FactionObject: Terminal with ProximityUnit = term + def HackableObject: Terminal with ProximityUnit = term + def TerminalObject: Terminal with ProximityUnit = term + def DamageableObject: Terminal with ProximityUnit = term + def RepairableObject: Terminal with ProximityUnit = term + def AutoRepairObject: Terminal with ProximityUnit = term var terminalAction: Cancellable = Default.Cancellable val callbacks: mutable.ListBuffer[ActorRef] = new mutable.ListBuffer[ActorRef]() - val log = org.log4s.getLogger + val log: Logger = org.log4s.getLogger val commonBehavior: Receive = checkBehavior .orElse(takesDamage) @@ -63,7 +66,7 @@ class ProximityTerminalControl(term: Terminal with ProximityUnit) .orElse(hackableBehavior) .orElse { case CommonMessages.Use(player, Some(item: SimpleItem)) - if item.Definition == GlobalDefinitions.remote_electronics_kit => + if item.Definition == GlobalDefinitions.remote_electronics_kit => //TODO setup certifications check term.Owner match { case b: Building if (b.Faction != player.Faction || b.CaptureTerminalIsHacked) && term.HackedBy.isEmpty => @@ -214,16 +217,16 @@ object ProximityTerminalControl { private case class TerminalAction() /** - * Determine which functionality to pursue by a generic proximity-functional unit given the target for its activity. - * @see `VehicleService:receive, ProximityUnit.Action` - * @param terminal the proximity-based unit - * @param target the object being affected by the unit - */ + * Determine which functionality to pursue by a generic proximity-functional unit given the target for its activity. + * @see `VehicleService:receive, ProximityUnit.Action` + * @param terminal the proximity-based unit + * @param target the object being affected by the unit + */ def selectAndTryProximityUnitBehavior( - callback: ActorRef, - terminal: Terminal with ProximityUnit, - target: PlanetSideGameObject - ): Boolean = { + callback: ActorRef, + terminal: Terminal with ProximityUnit, + target: PlanetSideGameObject + ): Boolean = { (terminal.Definition, target) match { case (_: MedicalTerminalDefinition, p: Player) => HealthAndArmorTerminal(terminal, p) case (_: WeaponRechargeTerminalDefinition, p: Player) => WeaponRechargeTerminal(terminal, p) @@ -234,110 +237,131 @@ object ProximityTerminalControl { } /** - * When standing on the platform of a(n advanced) medical terminal, - * restore the player's health and armor points (when they need their health and armor points restored). - * If the player is both fully healed and fully repaired, stop using the terminal. - * @param unit the medical terminal - * @param target the player being healed - */ + * When standing on the platform of a(n advanced) medical terminal, + * restore the player's health and armor points (when they need their health and armor points restored). + * If the player is both fully healed and fully repaired, stop using the terminal. + * @param unit the medical terminal + * @param target the player being healed + */ def HealthAndArmorTerminal(unit: Terminal with ProximityUnit, target: Player): Boolean = { - val medDef = unit.Definition.asInstanceOf[MedicalTerminalDefinition] - val healAmount = medDef.HealAmount - val healthFull: Boolean = if (healAmount != 0 && target.Health < target.MaxHealth) { - target.History(HealFromTerm(PlayerSource(target), healAmount, 0, medDef)) - HealAction(target, healAmount) - } else { - true - } - val repairAmount = medDef.ArmorAmount - val armorFull: Boolean = if (repairAmount != 0 && target.Armor < target.MaxArmor) { - target.History(HealFromTerm(PlayerSource(target), 0, repairAmount, medDef)) - ArmorRepairAction(target, repairAmount) - } else { - true - } - healthFull && armorFull + val medDef = unit.Definition.asInstanceOf[MedicalTerminalDefinition] + val fullHeal = HealAction(unit, target, medDef.HealAmount, PlayerHealthCallback) + val fullRepair = ArmorRepairAction(unit, target, medDef.ArmorAmount) + fullHeal && fullRepair } /** - * Restore, at most, a specific amount of health points on a player. - * Send messages to connected client and to events system. - * @param tplayer the player - * @param healValue the amount to heal; - * 10 by default - * @return whether the player can be repaired for any more health points - */ - def HealAction(tplayer: Player, healValue: Int = 10): Boolean = { - tplayer.Health = tplayer.Health + healValue - val zone = tplayer.Zone - zone.AvatarEvents ! AvatarServiceMessage( - zone.id, - AvatarAction.PlanetsideAttributeToAll(tplayer.GUID, 0, tplayer.Health) - ) - tplayer.Health == tplayer.MaxHealth - } - - /** - * Restore, at most, a specific amount of personal armor points on a player. - * Send messages to connected client and to events system. - * @param tplayer the player - * @param repairValue the amount to repair; - * 10 by default - * @return whether the player can be repaired for any more armor points - */ - def ArmorRepairAction(tplayer: Player, repairValue: Int = 10): Boolean = { - tplayer.Armor = tplayer.Armor + repairValue - val zone = tplayer.Zone - zone.AvatarEvents ! AvatarServiceMessage( - zone.id, - AvatarAction.PlanetsideAttributeToAll(tplayer.GUID, 4, tplayer.Armor) - ) - tplayer.Armor == tplayer.MaxArmor - } - - /** - * When driving a vehicle close to a rearm/repair silo, - * restore the vehicle's health points. - * If the vehicle is fully repaired, stop using the terminal. - * @param unit the terminal - * @param target the vehicle being repaired - */ + * When driving a vehicle close to a rearm/repair silo, + * restore the vehicle's health points. + * If the vehicle is fully repaired, stop using the terminal. + * @param unit the terminal + * @param target the vehicle being repaired + */ def VehicleRepairTerminal(unit: Terminal with ProximityUnit, target: Vehicle): Boolean = { - val medDef = unit.Definition.asInstanceOf[MedicalTerminalDefinition] - val healAmount = medDef.HealAmount - val maxHealth = target.MaxHealth - val noMoreHeal = if (!target.Destroyed && unit.Validate(target)) { - //repair vehicle - if (healAmount > 0 && target.Health < maxHealth) { - target.Health = target.Health + healAmount - target.History(RepairFromTerm(VehicleSource(target), healAmount, medDef)) - val zone = target.Zone - zone.VehicleEvents ! VehicleServiceMessage( - zone.id, - VehicleAction.PlanetsideAttribute(Service.defaultPlayerGUID, target.GUID, 0, target.Health) - ) - target.Health == maxHealth - } else { + unit.Definition match { + case medDef: MedicalTerminalDefinition if !target.Destroyed && unit.Validate(target) => + HealAction(unit, target, medDef.HealAmount, VehicleHealthCallback) + case _ => true - } - } else { - true } - noMoreHeal } /** - * When standing in a friendly SOI whose facility is under the influence of an Ancient Weapon Module benefit, - * and the player is in possession of Ancient weaponnry whose magazine is not full, - * restore some ammunition to its magazine. - * If no valid weapons are discovered or the discovered valid weapons have full magazines, stop using the terminal. - * @param unit the terminal - * @param target the player with weapons being recharged - */ + * Restore, at most, a specific amount of health points on a player. + * Send messages to connected client and to events system. + * @param terminal na + * @param target that which will accept the health + * @param healAmount health value to be given to the target + * @param updateFunc callback to update the UI + * @return whether the target can be healed any further + */ + def HealAction( + terminal: Terminal, + target: PlanetSideGameObject with Vitality with ZoneAware, + healAmount: Int, + updateFunc: PlanetSideGameObject with Vitality with ZoneAware=>Unit + ): Boolean = { + val health = target.Health + val maxHealth = target.MaxHealth + val nextHealth = health + healAmount + if (healAmount != 0 && health < maxHealth) { + val finalHealthAmount = if (nextHealth > maxHealth) { + nextHealth - maxHealth + } else { + healAmount + } + target.Health = health + finalHealthAmount + target.LogActivity(HealFromTerm(AmenitySource(terminal), finalHealthAmount)) + updateFunc(target) + target.Health == maxHealth + } else { + true + } + } + + def PlayerHealthCallback(target: PlanetSideGameObject with Vitality with ZoneAware): Unit = { + val zone = target.Zone + zone.AvatarEvents ! AvatarServiceMessage( + zone.id, + AvatarAction.PlanetsideAttributeToAll(target.GUID, 0, target.Health) + ) + } + + def VehicleHealthCallback(target: PlanetSideGameObject with Vitality with ZoneAware): Unit = { + val zone = target.Zone + zone.VehicleEvents ! VehicleServiceMessage( + zone.id, + VehicleAction.PlanetsideAttribute(Service.defaultPlayerGUID, target.GUID, 0, target.Health) + ) + } + + /** + * Restore, at most, a specific amount of personal armor points on a player. + * Send messages to connected client and to events system. + * @param terminal na + * @param target that which will accept the repair + * @param repairAmount armor value to be given to the target + * @return whether the target can be repaired any further + */ + def ArmorRepairAction( + terminal: Terminal, + target: Player, + repairAmount: Int + ): Boolean = { + val armor = target.Armor + val maxArmor = target.MaxArmor + val nextArmor = armor + repairAmount + if (repairAmount != 0 && armor < maxArmor) { + val finalRepairAmount = if (nextArmor > maxArmor) { + nextArmor - maxArmor + } else { + repairAmount + } + target.Armor = armor + finalRepairAmount + target.LogActivity(RepairFromTerm(AmenitySource(terminal), finalRepairAmount)) + val zone = target.Zone + zone.AvatarEvents ! AvatarServiceMessage( + zone.id, + AvatarAction.PlanetsideAttributeToAll(target.GUID, 4, target.Armor) + ) + target.Armor == maxArmor + } else { + true + } + } + + /** + * When standing in a friendly SOI whose facility is under the influence of an Ancient Weapon Module benefit, + * and the player is in possession of Ancient weaponnry whose magazine is not full, + * restore some ammunition to its magazine. + * If no valid weapons are discovered or the discovered valid weapons have full magazines, stop using the terminal. + * @param unit the terminal + * @param target the player with weapons being recharged + */ def WeaponRechargeTerminal(unit: Terminal with ProximityUnit, target: Player): Boolean = { val result = WeaponsBeingRechargedWithSomeAmmunition( unit.Definition.asInstanceOf[WeaponRechargeTerminalDefinition].AmmoAmount, - target.Holsters().map { _.Equipment }.flatten.toIterable ++ target.Inventory.Items.map { _.obj } + target.Holsters().flatMap { _.Equipment }.toIterable ++ target.Inventory.Items.map { _.obj } ) val events = unit.Zone.AvatarEvents val channel = target.Name @@ -349,17 +373,17 @@ object ProximityTerminalControl { ) } } - !result.unzip._2.flatten.exists { slot => slot.Magazine < slot.MaxMagazine() } + !result.flatMap { _._2 }.exists { slot => slot.Magazine < slot.MaxMagazine() } } /** - * When driving close to a rearm/repair silo whose facility is under the influence of an Ancient Weapon Module benefit, - * and the vehicle is an Ancient vehicle with mounted weaponry whose magazine(s) is not full, - * restore some ammunition to the magazine(s). - * If no valid weapons are discovered or the discovered valid weapons have full magazines, stop using the terminal. - * @param unit the terminal - * @param target the vehicle with weapons being recharged - */ + * When driving close to a rearm/repair silo whose facility is under the influence of an Ancient Weapon Module benefit, + * and the vehicle is an Ancient vehicle with mounted weaponry whose magazine(s) is not full, + * restore some ammunition to the magazine(s). + * If no valid weapons are discovered or the discovered valid weapons have full magazines, stop using the terminal. + * @param unit the terminal + * @param target the vehicle with weapons being recharged + */ def WeaponRechargeTerminal(unit: Terminal with ProximityUnit, target: Vehicle): Boolean = { val result = WeaponsBeingRechargedWithSomeAmmunition( unit.Definition.asInstanceOf[WeaponRechargeTerminalDefinition].AmmoAmount, @@ -375,17 +399,17 @@ object ProximityTerminalControl { ) } } - !result.unzip._2.flatten.exists { slot => slot.Magazine < slot.MaxMagazine() } + !result.flatMap { _._2 }.exists { slot => slot.Magazine < slot.MaxMagazine() } } /** - * Collect all weapons with magazines that need to have ammunition reloaded, - * and reload some ammunition into them. - * @param ammoAdded the amount of ammo to be added to a weapon - * @param equipment the equipment being considered; - * weapons whose ammo will be increased will be isolated - * @return na - */ + * Collect all weapons with magazines that need to have ammunition reloaded, + * and reload some ammunition into them. + * @param ammoAdded the amount of ammo to be added to a weapon + * @param equipment the equipment being considered; + * weapons whose ammo will be increased will be isolated + * @return na + */ def WeaponsBeingRechargedWithSomeAmmunition( ammoAdded: Int, equipment: Iterable[Equipment] @@ -399,12 +423,12 @@ object ProximityTerminalControl { } /** - * Collect all magazines from this weapon that need to have ammunition reloaded, - * and reload some ammunition into them. - * @param ammoAdded the amount of ammo to be added to a weapon - * @param slots the vehicle with weapons being recharged - * @return ammunition slots that were affected - */ + * Collect all magazines from this weapon that need to have ammunition reloaded, + * and reload some ammunition into them. + * @param ammoAdded the amount of ammo to be added to a weapon + * @param slots the vehicle with weapons being recharged + * @return ammunition slots that were affected + */ def WeaponAmmoRecharge( ammoAdded: Int, slots: List[Tool.FireModeSlot] diff --git a/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminalDefinition.scala index 8d366fc7..f002867c 100644 --- a/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminalDefinition.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminalDefinition.scala @@ -1,12 +1,15 @@ package net.psforever.objects.serverobject.terminals.capture import net.psforever.objects.serverobject.structures.AmenityDefinition +import scala.concurrent.duration.{Duration, FiniteDuration} class CaptureTerminalDefinition(objectId: Int) extends AmenityDefinition(objectId) { - Name = objectId match { - case 158 => "capture_terminal" - case 751 => "secondary_capture" - case 930 => "vanu_control_console" - case _ => throw new IllegalArgumentException("Not a valid capture terminal object id") + private var hackTime: FiniteDuration = Duration.Zero + + def FacilityHackTime: FiniteDuration = hackTime + + def FacilityHackTime_=(time: FiniteDuration): FiniteDuration = { + hackTime = time + FacilityHackTime } } diff --git a/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminals.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminals.scala index 06109a34..0ed0f716 100644 --- a/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminals.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminals.scala @@ -1,13 +1,16 @@ package net.psforever.objects.serverobject.terminals.capture +import akka.util.Timeout import net.psforever.objects.Player import net.psforever.objects.serverobject.CommonMessages +import net.psforever.objects.sourcing.PlayerSource import net.psforever.services.local.{LocalAction, LocalServiceMessage} import scala.util.{Failure, Success} -object CaptureTerminals { +object CaptureTerminals {import scala.concurrent.duration._ private val log = org.log4s.getLogger("CaptureTerminals") + private implicit val timeout: Timeout = 1.second /** * The process of hacking an object is completed. @@ -22,39 +25,34 @@ object CaptureTerminals { def FinishHackingCaptureConsole(target: CaptureTerminal, hackingPlayer: Player, unk: Long)(): Unit = { import akka.pattern.ask - import scala.concurrent.duration._ log.info(s"${hackingPlayer.toString} hacked a ${target.Definition.Name}") // Wait for the target actor to set the HackedBy property import scala.concurrent.ExecutionContext.Implicits.global - ask(target.Actor, CommonMessages.Hack(hackingPlayer, target))(1 second).mapTo[Boolean].onComplete { + ask(target.Actor, CommonMessages.Hack(hackingPlayer, target)).mapTo[Boolean].onComplete { case Success(_) => - target.Zone.LocalEvents ! LocalServiceMessage( - target.Zone.id, + val zone = target.Zone + val zoneid = zone.id + val events = zone.LocalEvents + val isResecured = hackingPlayer.Faction == target.Faction + events ! LocalServiceMessage( + zoneid, LocalAction.TriggerSound(hackingPlayer.GUID, target.HackSound, hackingPlayer.Position, 30, 0.49803925f) ) - - val isResecured = hackingPlayer.Faction == target.Faction - if (isResecured) { // Resecure the CC - target.Zone.LocalEvents ! LocalServiceMessage( - target.Zone.id, - LocalAction.ResecureCaptureTerminal( - target - ) + events ! LocalServiceMessage( + zoneid, + LocalAction.ResecureCaptureTerminal(target, PlayerSource(hackingPlayer)) ) } else { // Start the CC hack timer - target.Zone.LocalEvents ! LocalServiceMessage( - target.Zone.id, - LocalAction.StartCaptureTerminalHack( - target - ) + events ! LocalServiceMessage( + zoneid, + LocalAction.StartCaptureTerminalHack(target) ) } - case Failure(_) => log.warn(s"Hack message failed on target guid: ${target.GUID}") + case Failure(_) => + log.warn(s"Hack message failed on target guid: ${target.GUID}") } } - - } diff --git a/src/main/scala/net/psforever/objects/serverobject/terminals/implant/ImplantTerminalMechControl.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/implant/ImplantTerminalMechControl.scala index 4ab3462e..839c82d8 100644 --- a/src/main/scala/net/psforever/objects/serverobject/terminals/implant/ImplantTerminalMechControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/implant/ImplantTerminalMechControl.scala @@ -6,7 +6,7 @@ import net.psforever.objects.serverobject.damage.Damageable.Target import net.psforever.objects.serverobject.damage.{Damageable, DamageableEntity, DamageableMountable} import net.psforever.objects.serverobject.hackable.{GenericHackables, HackableBehavior} import net.psforever.objects.serverobject.mount.{Mountable, MountableBehavior} -import net.psforever.objects.serverobject.repair.{AmenityAutoRepair, RepairableEntity} +import net.psforever.objects.serverobject.repair.{AmenityAutoRepair, RepairableAmenity, RepairableEntity} import net.psforever.objects.serverobject.structures.{Building, PoweredAmenityControl} import net.psforever.objects.serverobject.terminals.capture.CaptureTerminalAwareBehavior import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} @@ -27,13 +27,13 @@ class ImplantTerminalMechControl(mech: ImplantTerminalMech) with RepairableEntity with AmenityAutoRepair with CaptureTerminalAwareBehavior { - def MountableObject = mech - def HackableObject = mech - def FactionObject = mech - def DamageableObject = mech - def RepairableObject = mech - def AutoRepairObject = mech - def CaptureTerminalAwareObject = mech + def MountableObject: ImplantTerminalMech = mech + def HackableObject: ImplantTerminalMech = mech + def FactionObject: ImplantTerminalMech = mech + def DamageableObject: ImplantTerminalMech = mech + def RepairableObject: ImplantTerminalMech = mech + def AutoRepairObject: ImplantTerminalMech = mech + def CaptureTerminalAwareObject: ImplantTerminalMech = mech def commonBehavior: Receive = checkBehavior @@ -98,7 +98,6 @@ class ImplantTerminalMechControl(mech: ImplantTerminalMech) override protected def DestructionAwareness(target: Damageable.Target, cause: DamageResult): Unit = { super.DestructionAwareness(target, cause) DamageableMountable.DestructionAwareness(DamageableObject, cause) - target.ClearHistory() } override def PerformRepairs(target : Damageable.Target, amount : Int) : Int = { @@ -136,4 +135,9 @@ class ImplantTerminalMechControl(mech: ImplantTerminalMech) def powerTurnOnCallback(): Unit = { tryAutoRepair() } + + override def Restoration(obj: Target): Unit = { + super.Restoration(obj) + RepairableAmenity.RestorationOfHistory(obj) + } } diff --git a/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala b/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala index 5fdddea4..c3ab7e93 100644 --- a/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala @@ -1,6 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.objects.serverobject.turret +import akka.actor.Cancellable import net.psforever.objects.{Default, GlobalDefinitions, Player, Tool} import net.psforever.objects.equipment.{Ammo, JammableMountedWeapons} import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} @@ -37,16 +38,16 @@ class FacilityTurretControl(turret: FacilityTurret) with AmenityAutoRepair with JammableMountedWeapons with CaptureTerminalAwareBehavior { - def FactionObject = turret - def MountableObject = turret - def JammableObject = turret - def DamageableObject = turret - def RepairableObject = turret - def AutoRepairObject = turret - def CaptureTerminalAwareObject = turret + def FactionObject: FacilityTurret = turret + def MountableObject: FacilityTurret = turret + def JammableObject: FacilityTurret = turret + def DamageableObject: FacilityTurret = turret + def RepairableObject: FacilityTurret = turret + def AutoRepairObject: FacilityTurret = turret + def CaptureTerminalAwareObject: FacilityTurret = turret // Used for timing ammo recharge for vanu turrets in caves - var weaponAmmoRechargeTimer = Default.Cancellable + var weaponAmmoRechargeTimer: Cancellable = Default.Cancellable override def postStop(): Unit = { super.postStop() @@ -186,7 +187,7 @@ class FacilityTurretControl(turret: FacilityTurret) seat.unmount(player) player.VehicleSeated = None if (player.HasGUID) { - events ! VehicleServiceMessage(zoneId, VehicleAction.KickPassenger(player.GUID, 4, false, guid)) + events ! VehicleServiceMessage(zoneId, VehicleAction.KickPassenger(player.GUID, 4, unk2=false, guid)) } case None => ; } diff --git a/src/main/scala/net/psforever/objects/sourcing/AmenitySource.scala b/src/main/scala/net/psforever/objects/sourcing/AmenitySource.scala new file mode 100644 index 00000000..32b1b97e --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/AmenitySource.scala @@ -0,0 +1,67 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.definition.ObjectDefinition +import net.psforever.objects.serverobject.hackable.Hackable +import net.psforever.objects.serverobject.hackable.Hackable.HackInfo +import net.psforever.objects.serverobject.mount.Mountable +import net.psforever.objects.serverobject.structures.Amenity +import net.psforever.objects.sourcing +import net.psforever.objects.vital.resistance.ResistanceProfile +import net.psforever.objects.vital.{Vitality, VitalityDefinition} +import net.psforever.types.{PlanetSideEmpire, Vector3} + +final case class AmenitySource( + private val objdef: ObjectDefinition, + Faction: PlanetSideEmpire.Value, + health: Int, + Orientation: Vector3, + occupants: List[SourceEntry], + hacked: Option[HackInfo], + unique: UniqueAmenity + ) extends SourceWithHealthEntry { + private val definition = objdef match { + case vital: VitalityDefinition => vital + case genericDefinition => NonvitalDefinition(genericDefinition) + } + private val modifiers = definition match { + case nonvital: NonvitalDefinition => nonvital + case _ => ObjectSource.FixedResistances + } + + def Name: String = SourceEntry.NameFormat(definition.Descriptor) + def Definition: ObjectDefinition with VitalityDefinition = definition + def Health: Int = health + def total: Int = health + def Modifiers: ResistanceProfile = modifiers + def Position: Vector3 = unique.position + def Velocity: Option[Vector3] = None +} + +object AmenitySource { + def apply(obj: Amenity): AmenitySource = { + val health: Int = obj match { + case o: Vitality => o.Health + case _ => 1 + } + val hackData = obj match { + case o: Hackable => o.HackedBy + case _ => None + } + val amenity = AmenitySource( + obj.Definition, + obj.Faction, + health, + obj.Orientation, + Nil, + hackData, + sourcing.UniqueAmenity(obj.Zone.Number, obj.GUID, obj.Position) + ) + amenity.copy(occupants = obj match { + case o: Mountable => + o.Seats.values.flatMap { _.occupants }.map { p => PlayerSource.inSeat(p, o, amenity) }.toList + case _ => + Nil + }) + } +} diff --git a/src/main/scala/net/psforever/objects/sourcing/BuildingSource.scala b/src/main/scala/net/psforever/objects/sourcing/BuildingSource.scala new file mode 100644 index 00000000..92445d6d --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/BuildingSource.scala @@ -0,0 +1,41 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.definition.ObjectDefinition +import net.psforever.objects.serverobject.structures.{Building, BuildingDefinition} +import net.psforever.objects.vital.VitalityDefinition +import net.psforever.objects.vital.resistance.ResistanceProfile +import net.psforever.types.{LatticeBenefit, PlanetSideEmpire, PlanetSideGUID, Vector3} + +final case class UniqueBuilding( + zone_number: Int, + building_guid: PlanetSideGUID + ) extends SourceUniqueness + +final case class BuildingSource( + private val obj_def: BuildingDefinition, + Faction: PlanetSideEmpire.Value, + Position: Vector3, + Orientation: Vector3, + benefits: Set[LatticeBenefit], + unique: UniqueBuilding + ) extends SourceEntry { + private val definition = NonvitalDefinition(obj_def) + def Name: String = SourceEntry.NameFormat(Definition.Name) + def Definition: ObjectDefinition with VitalityDefinition = definition + def Modifiers: ResistanceProfile = ObjectSource.FixedResistances + def Velocity: Option[Vector3] = None +} + +object BuildingSource { + def apply(b: Building): BuildingSource = { + BuildingSource( + b.Definition, + b.Faction, + b.Position, + b.Orientation, + b.latticeConnectedFacilityBenefits(), + UniqueBuilding(b.Zone.Number, b.GUID) + ) + } +} diff --git a/src/main/scala/net/psforever/objects/sourcing/DeployableSource.scala b/src/main/scala/net/psforever/objects/sourcing/DeployableSource.scala new file mode 100644 index 00000000..62dd6247 --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/DeployableSource.scala @@ -0,0 +1,64 @@ +// Copyright (c) 2017 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.ce.Deployable +import net.psforever.objects.definition.{DeployableDefinition, ObjectDefinition} +import net.psforever.objects.serverobject.mount.Mountable +import net.psforever.objects.vital.resistance.ResistanceProfile +import net.psforever.types.{PlanetSideEmpire, Vector3} + +final case class DeployableSource( + Definition: ObjectDefinition with DeployableDefinition, + Faction: PlanetSideEmpire.Value, + health: Int, + shields: Int, + owner: SourceEntry, + Position: Vector3, + Orientation: Vector3, + occupants: List[SourceEntry], + unique: UniqueDeployable + ) extends SourceWithHealthEntry { + def Name: String = Definition.Descriptor + def Health: Int = health + def Shields: Int = shields + def OwnerName: String = owner.Name + def Velocity: Option[Vector3] = None + def Modifiers: ResistanceProfile = Definition.asInstanceOf[ResistanceProfile] + + def total: Int = health + shields +} + +object DeployableSource { + def apply(obj: Deployable): DeployableSource = { + val ownerName = obj.OwnerName + val ownerSource = (obj.Zone.LivePlayers ++ obj.Zone.Corpses) + .find { p => ownerName.contains(p.Name) } + match { + case Some(p) => SourceEntry(p) + case _ => SourceEntry.None + } + val occupants = obj match { + case o: Mountable => + o.Seats.values.flatMap { _.occupants }.map { PlayerSource(_) }.toList + case _ => + Nil + } + DeployableSource( + obj.Definition, + obj.Faction, + obj.Health, + obj.Shields, + ownerSource, + obj.Position, + obj.Orientation, + occupants, + UniqueDeployable( + obj.History.headOption match { + case Some(entry) => entry.time + case None => 0L + }, + obj.OriginalOwnerName.getOrElse("none") + ) + ) + } +} diff --git a/src/main/scala/net/psforever/objects/sourcing/NonvitalDefinition.scala b/src/main/scala/net/psforever/objects/sourcing/NonvitalDefinition.scala new file mode 100644 index 00000000..167942f5 --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/NonvitalDefinition.scala @@ -0,0 +1,42 @@ +// Copyright (c) 2017-2023 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.definition.ObjectDefinition +import net.psforever.objects.vital.VitalityDefinition +import net.psforever.objects.vital.resistance.ResistanceProfileMutators + +/** + * A wrapper for a definition that does not represent a `Vitality` object + * but needs to look like one internally to satisfy type requirements. + * @param definition the original definition + */ +class NonvitalDefinition(private val definition : ObjectDefinition) + extends ObjectDefinition(definition.ObjectId) + with ResistanceProfileMutators + with VitalityDefinition { + Name = definition.Name + Packet = definition.Packet + + def canEqual(a: Any) : Boolean = a.isInstanceOf[definition.type] + + override def equals(that: Any): Boolean = definition.equals(that) + + override def hashCode: Int = definition.hashCode +} + +object NonvitalDefinition { + //single point of contact for all wrapped definitions + private val storage: scala.collection.mutable.LongMap[NonvitalDefinition] = + new scala.collection.mutable.LongMap[NonvitalDefinition]() + + def apply(definition : ObjectDefinition) : NonvitalDefinition = { + storage.get(definition.ObjectId) match { + case Some(existing) => + existing + case None => + val out = new NonvitalDefinition(definition) + storage += definition.ObjectId.toLong -> out + out + } + } +} \ No newline at end of file diff --git a/src/main/scala/net/psforever/objects/sourcing/ObjectSource.scala b/src/main/scala/net/psforever/objects/sourcing/ObjectSource.scala new file mode 100644 index 00000000..48624c3d --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/ObjectSource.scala @@ -0,0 +1,50 @@ +// Copyright (c) 2017 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.PlanetSideGameObject +import net.psforever.objects.definition.ObjectDefinition +import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.vital.VitalityDefinition +import net.psforever.objects.vital.resistance.{ResistanceProfile, ResistanceProfileMutators} +import net.psforever.types.{PlanetSideEmpire, Vector3} + +final case class UniqueObject(objectId: Int) extends SourceUniqueness + +final case class ObjectSource( + private val obj_def: ObjectDefinition, + Faction: PlanetSideEmpire.Value, + Position: Vector3, + Orientation: Vector3, + Velocity: Option[Vector3], + unique: UniqueObject + ) extends SourceEntry { + private val definition = obj_def match { + case vital : VitalityDefinition => vital + case genericDefinition => NonvitalDefinition(genericDefinition) + } + private val modifiers = definition match { + case nonvital : NonvitalDefinition => nonvital + case _ => ObjectSource.FixedResistances + } + def Name: String = SourceEntry.NameFormat(Definition.Name) + def Definition: ObjectDefinition with VitalityDefinition = definition + def Modifiers: ResistanceProfile = modifiers +} + +object ObjectSource { + final val FixedResistances = new ResistanceProfileMutators() { } + + def apply(obj: PlanetSideGameObject): ObjectSource = { + ObjectSource( + obj.Definition, + obj match { + case aligned: FactionAffinity => aligned.Faction + case _ => PlanetSideEmpire.NEUTRAL + }, + obj.Position, + obj.Orientation, + obj.Velocity, + UniqueObject(obj.Definition.ObjectId) + ) + } +} diff --git a/src/main/scala/net/psforever/objects/sourcing/PlayerSource.scala b/src/main/scala/net/psforever/objects/sourcing/PlayerSource.scala new file mode 100644 index 00000000..7f2e1506 --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/PlayerSource.scala @@ -0,0 +1,135 @@ +// Copyright (c) 2017 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.definition.{AvatarDefinition, ExoSuitDefinition} +import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.serverobject.mount.Mountable +import net.psforever.objects.vital.resistance.ResistanceProfile +import net.psforever.objects.{GlobalDefinitions, PlanetSideGameObject, Player} +import net.psforever.types.{CharacterSex, ExoSuitType, PlanetSideEmpire, Vector3} + +final case class UniquePlayer( + charId: Long, + name: String, + sex: CharacterSex, + faction: PlanetSideEmpire.Value + ) extends SourceUniqueness + +final case class PlayerSource( + Definition: AvatarDefinition, + ExoSuit: ExoSuitType.Value, + seatedIn: Option[(SourceEntry, Int)], + health: Int, + armor: Int, + Position: Vector3, + Orientation: Vector3, + Velocity: Option[Vector3], + crouching: Boolean, + jumping: Boolean, + Modifiers: ResistanceProfile, + bep: Long, + kills: Seq[Any], + unique: UniquePlayer + ) extends SourceWithHealthEntry { + override def Name: String = unique.name + override def Faction: PlanetSideEmpire.Value = unique.faction + override def CharId: Long = unique.charId + + def Seated: Boolean = seatedIn.nonEmpty + def Health: Int = health + def Armor: Int = armor + def total: Int = health + armor +} + +object PlayerSource { + def apply(p: Player): PlayerSource = { + val exosuit = p.ExoSuit + val faction = p.Faction + val seatedEntity = mountableAndSeat(p) + PlayerSource( + p.Definition, + exosuit, + seatedEntity, + p.Health, + p.Armor, + p.Position, + p.Orientation, + p.Velocity, + p.Crouching, + p.Jumping, + ExoSuitDefinition.Select(exosuit, faction), + p.avatar.bep, + kills = Nil, + UniquePlayer(p.CharId, p.Name, p.Sex, faction) + ) + } + + def apply(name: String, faction: PlanetSideEmpire.Value, position: Vector3): PlayerSource = { + new PlayerSource( + GlobalDefinitions.avatar, + ExoSuitType.Standard, + seatedIn = None, + health = 100, + armor = 0, + position, + Orientation = Vector3.Zero, + Velocity = None, + crouching = false, + jumping = false, + GlobalDefinitions.Standard, + bep = 0L, + kills = Nil, + UniquePlayer(0L, name, CharacterSex.Male, faction) + ) + } + + def mountableAndSeat(player: Player): Option[(SourceEntry, Int)] = { + player.Zone.GUID(player.VehicleSeated) match { + case Some(thing: PlanetSideGameObject with Mountable with FactionAffinity) => + Some((SourceEntry(thing), thing.PassengerInSeat(player).get)) + case _ => + None + } + } + + /** + * Produce a mostly normal player source entity + * but the `seatedIn` field is just a shallow copy of the mountable information. + * Said "shallow copy" will not reflect that the player is an occupant of the mountable entity + * even if this function is entirely for the purpose of establishing that the player is an occupant of the mountable entity.
+ * Don't think too much about it. + * @param player player + * @param mount mountable entity in which the player should be seated + * @param source a `SourceEntry` for the aforementioned mountable entity + * @return a `PlayerSource` entity + */ + def inSeat(player: Player, mount: Mountable, source: SourceEntry): PlayerSource = { + val exosuit = player.ExoSuit + val faction = player.Faction + PlayerSource( + player.Definition, + exosuit, + Some((source, mount.PassengerInSeat(player).get)), + player.Health, + player.Armor, + player.Position, + player.Orientation, + player.Velocity, + player.Crouching, + player.Jumping, + ExoSuitDefinition.Select(exosuit, faction), + player.avatar.bep, + kills = Nil, + UniquePlayer(player.CharId, player.Name, player.Sex, faction) + ) + } + + /** + * "Nobody is my name: Nobody they call me – + * my mother and my father and all my other companions” + * Thus I spoke but he immediately replied to me with a ruthless spirit: + * “I shall kill Nobody last of all, after his companions, + * the others first: this will be my guest-gift to you.” + */ + final val Nobody = PlayerSource("Nobody", PlanetSideEmpire.NEUTRAL, Vector3.Zero) +} diff --git a/src/main/scala/net/psforever/objects/sourcing/SourceEntry.scala b/src/main/scala/net/psforever/objects/sourcing/SourceEntry.scala new file mode 100644 index 00000000..aae15dca --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/SourceEntry.scala @@ -0,0 +1,71 @@ +// Copyright (c) 2017 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.ce.Deployable +import net.psforever.objects.definition.ObjectDefinition +import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.serverobject.structures.{Amenity, Building} +import net.psforever.objects.serverobject.turret.FacilityTurret +import net.psforever.objects.vital.VitalityDefinition +import net.psforever.objects.vital.resistance.ResistanceProfile +import net.psforever.objects.{PlanetSideGameObject, Player, TurretDeployable, Vehicle} +import net.psforever.types.{PlanetSideEmpire, Vector3} + +trait SourceUniqueness + +trait SourceEntry { + def Name: String + def Definition: ObjectDefinition with VitalityDefinition + def CharId: Long = 0L + def Faction: PlanetSideEmpire.Value + def Position: Vector3 + def Orientation: Vector3 + def Velocity: Option[Vector3] + def Modifiers: ResistanceProfile + def unique: SourceUniqueness +} + +trait SourceWithHealthEntry extends SourceEntry { + def health: Int + def total: Int +} + +trait SourceWithShieldsEntry extends SourceWithHealthEntry { + def shields: Int +} + +object SourceEntry { + final protected val nonUnique: SourceUniqueness = new SourceUniqueness() { } + + final val None = new SourceEntry() { + def Name: String = "none" + def Definition: ObjectDefinition with VitalityDefinition = null + def Faction: PlanetSideEmpire.Value = PlanetSideEmpire.NEUTRAL + def Position: Vector3 = Vector3.Zero + def Orientation: Vector3 = Vector3.Zero + def Velocity: Option[Vector3] = Some(Vector3.Zero) + def Modifiers: ResistanceProfile = null + def unique: SourceUniqueness = nonUnique + } + + def apply(target: PlanetSideGameObject with FactionAffinity): SourceEntry = { + target match { + case obj: Player => PlayerSource(obj) + case obj: Vehicle => VehicleSource(obj) + case obj: FacilityTurret => TurretSource(obj) + case obj: Amenity => AmenitySource(obj) + case obj: TurretDeployable => TurretSource(obj) + case obj: Deployable => DeployableSource(obj) + case obj: Building => BuildingSource(obj) + case _ => ObjectSource(target) + } + } + + def NameFormat(name: String): String = { + name + .replace("_", " ") + .split(" ") + .map(_.capitalize) + .mkString(" ") + } +} diff --git a/src/main/scala/net/psforever/objects/sourcing/TurretSource.scala b/src/main/scala/net/psforever/objects/sourcing/TurretSource.scala new file mode 100644 index 00000000..783e655d --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/TurretSource.scala @@ -0,0 +1,65 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.definition.ObjectDefinition +import net.psforever.objects.serverobject.mount.Mountable +import net.psforever.objects.serverobject.turret.{FacilityTurret, WeaponTurret} +import net.psforever.objects.vital.VitalityDefinition +import net.psforever.objects.vital.resistance.ResistanceProfile +import net.psforever.objects.{PlanetSideGameObject, TurretDeployable} +import net.psforever.types.{PlanetSideEmpire, Vector3} + +final case class TurretSource( + Definition: ObjectDefinition with VitalityDefinition, + Faction: PlanetSideEmpire.Value, + health: Int, + shields: Int, + Position: Vector3, + Orientation: Vector3, + occupants: List[SourceEntry], + unique: SourceUniqueness + ) extends SourceWithHealthEntry with SourceWithShieldsEntry { + def Name: String = SourceEntry.NameFormat(Definition.Descriptor) + def Health: Int = health + def Shields: Int = shields + def Velocity: Option[Vector3] = None + def Modifiers: ResistanceProfile = Definition.asInstanceOf[ResistanceProfile] + + def total: Int = health + shields +} + +object TurretSource { + def apply(obj: PlanetSideGameObject with WeaponTurret): TurretSource = { + val position = obj.Position + val identifer = obj match { + case o: TurretDeployable => + UniqueDeployable( + o.History.headOption match { + case Some(entry) => entry.time + case None => 0L + }, + o.OriginalOwnerName.getOrElse("none") + ) + case o: FacilityTurret => + UniqueAmenity(o.Zone.Number, o.GUID, position) + case o => + throw new IllegalArgumentException(s"was given ${o.Actor.toString()} when only wanted to model turrets") + } + val turret = TurretSource( + obj.Definition.asInstanceOf[ObjectDefinition with VitalityDefinition], + obj.Faction, + obj.Health, + shields = 0, //TODO implement later + position, + obj.Orientation, + Nil, + identifer + ) + turret.copy(occupants = obj match { + case o: Mountable => + o.Seats.values.flatMap { _.occupants }.map { p => PlayerSource.inSeat(p, o, turret) }.toList + case _ => + Nil + }) + } +} diff --git a/src/main/scala/net/psforever/objects/sourcing/UniqueAmenity.scala b/src/main/scala/net/psforever/objects/sourcing/UniqueAmenity.scala new file mode 100644 index 00000000..b5a27df1 --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/UniqueAmenity.scala @@ -0,0 +1,10 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.sourcing + +import net.psforever.types.{PlanetSideGUID, Vector3} + +final case class UniqueAmenity( + zoneNumber: Int, + guid: PlanetSideGUID, + position: Vector3 +) extends SourceUniqueness diff --git a/src/main/scala/net/psforever/objects/sourcing/UniqueDeployable.scala b/src/main/scala/net/psforever/objects/sourcing/UniqueDeployable.scala new file mode 100644 index 00000000..f8e6ba22 --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/UniqueDeployable.scala @@ -0,0 +1,7 @@ +// Copyright (c) 2023 PSForever +package net.psforever.objects.sourcing + +final case class UniqueDeployable( + spawnTime: Long, + originalOwnerName: String +) extends SourceUniqueness diff --git a/src/main/scala/net/psforever/objects/sourcing/VehicleSource.scala b/src/main/scala/net/psforever/objects/sourcing/VehicleSource.scala new file mode 100644 index 00000000..c9d84f51 --- /dev/null +++ b/src/main/scala/net/psforever/objects/sourcing/VehicleSource.scala @@ -0,0 +1,64 @@ +// Copyright (c) 2017 PSForever +package net.psforever.objects.sourcing + +import net.psforever.objects.Vehicle +import net.psforever.objects.definition.VehicleDefinition +import net.psforever.objects.vital.resistance.ResistanceProfile +import net.psforever.types.{DriveState, PlanetSideEmpire, Vector3} + +final case class UniqueVehicle(spawnTime: Long, originalOwnerName: String) extends SourceUniqueness + +final case class VehicleSource( + Definition: VehicleDefinition, + Faction: PlanetSideEmpire.Value, + health: Int, + shields: Int, + Position: Vector3, + Orientation: Vector3, + Velocity: Option[Vector3], + deployed: DriveState.Value, + occupants: List[SourceEntry], + Modifiers: ResistanceProfile, + unique: UniqueVehicle + ) extends SourceWithHealthEntry with SourceWithShieldsEntry { + def Name: String = SourceEntry.NameFormat(Definition.Name) + def Health: Int = health + def Shields: Int = shields + def total: Int = health + shields +} + +object VehicleSource { + def apply(obj: Vehicle): VehicleSource = { + val faction = obj.HackedBy match { + case Some(o) => o.player.Faction + case _ => obj.Faction + } + val vehicle = VehicleSource( + obj.Definition, + faction, + obj.Health, + obj.Shields, + obj.Position, + obj.Orientation, + obj.Velocity, + obj.DeploymentState, + Nil, + obj.Definition.asInstanceOf[ResistanceProfile], + UniqueVehicle( + obj.History.headOption match { + case Some(entry) => entry.time + case None => 0L + }, + obj.OriginalOwnerName.getOrElse("none") + ) + ) + vehicle.copy(occupants = { + obj.Seats.values.map { seat => + seat.occupant match { + case Some(p) => PlayerSource.inSeat(p, obj, vehicle) //shallow + case _ => PlayerSource.Nobody + } + }.toList + }) + } +} diff --git a/src/main/scala/net/psforever/objects/vehicles/InteractWithRadiationCloudsSeatedInVehicle.scala b/src/main/scala/net/psforever/objects/vehicles/InteractWithRadiationCloudsSeatedInVehicle.scala index 588df47b..763fed3d 100644 --- a/src/main/scala/net/psforever/objects/vehicles/InteractWithRadiationCloudsSeatedInVehicle.scala +++ b/src/main/scala/net/psforever/objects/vehicles/InteractWithRadiationCloudsSeatedInVehicle.scala @@ -2,7 +2,8 @@ package net.psforever.objects.vehicles import net.psforever.objects.Vehicle -import net.psforever.objects.ballistics.{Projectile, ProjectileQuality, SourceEntry} +import net.psforever.objects.ballistics.{Projectile, ProjectileQuality} +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.base.{DamageResolution, DamageType} import net.psforever.objects.vital.etc.RadiationReason diff --git a/src/main/scala/net/psforever/objects/vehicles/control/BfrControl.scala b/src/main/scala/net/psforever/objects/vehicles/control/BfrControl.scala index a23e3684..1a6606b4 100644 --- a/src/main/scala/net/psforever/objects/vehicles/control/BfrControl.scala +++ b/src/main/scala/net/psforever/objects/vehicles/control/BfrControl.scala @@ -3,7 +3,6 @@ package net.psforever.objects.vehicles.control import akka.actor.Cancellable import net.psforever.objects._ -import net.psforever.objects.ballistics.VehicleSource import net.psforever.objects.definition.{ToolDefinition, VehicleDefinition} import net.psforever.objects.equipment._ import net.psforever.objects.inventory.{GridInventory, InventoryItem} @@ -11,8 +10,9 @@ import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObjec import net.psforever.objects.serverobject.containable.ContainableBehavior import net.psforever.objects.serverobject.damage.Damageable.Target import net.psforever.objects.serverobject.transfer.TransferBehavior +import net.psforever.objects.sourcing.{SourceEntry, VehicleSource} import net.psforever.objects.vehicles._ -import net.psforever.objects.vital.VehicleShieldCharge +import net.psforever.objects.vital.ShieldCharge import net.psforever.objects.vital.interaction.DamageResult import net.psforever.objects.zones.Zone import net.psforever.packet.game._ @@ -37,12 +37,12 @@ class BfrControl(vehicle: Vehicle) * `Cancellable.alreadyCancelled` indicates a permanant cessation of charging activity (vehicle destruction) */ var shieldCharge: Cancellable = Default.Cancellable - def SiphoningObject = vehicle + def SiphoningObject: Vehicle = vehicle - def ChargeTransferObject = vehicle + def ChargeTransferObject: Vehicle = vehicle if (vehicle.Shields < vehicle.MaxShields) { - chargeShields(amount = 0) //start charging if starts as uncharged + chargeShields(amount = 0, Some(VehicleSource(vehicle))) //start charging if starts as uncharged } override def postStop(): Unit = { @@ -107,7 +107,7 @@ class BfrControl(vehicle: Vehicle) shieldCharge = context.system.scheduler.scheduleOnce( delay = vehicle.Definition.ShieldDamageDelay milliseconds, self, - Vehicle.ChargeShields(0) + CommonMessages.ChargeShields(0, Some(vehicle)) ) } } @@ -242,7 +242,7 @@ class BfrControl(vehicle: Vehicle) val (stow, _) = GridInventory.recoverInventory(afterInventory, vehicle.Inventory) val afterWeapons = weapons .map { item => item.start += 1; item } - (culledWeaponMounts(pairedArmSubsys.unzip._2), afterWeapons, stow) + (culledWeaponMounts(pairedArmSubsys.map { _._2 }), afterWeapons, stow) } else if(vWeapons.size == 2 && GlobalDefinitions.isBattleFrameGunnerVehicle(definition)) { //battleframe is a flight variant but loadout spec is for gunner variant // remap the hands, shave the gunner mount from the spec, and refit the trunk @@ -312,7 +312,7 @@ class BfrControl(vehicle: Vehicle) ) } - override def chargeShields(amount: Int): Unit = { + override def chargeShields(amount: Int, motivator: Option[SourceEntry]): Unit = { chargeShieldsOnly(amount) shieldCharge(vehicle.Shields, vehicle.Definition, delay = 0) //continue charge? } @@ -328,7 +328,7 @@ class BfrControl(vehicle: Vehicle) }).getOrElse(amount) * vehicle.SubsystemStatusMultiplier(sys = "BattleframeShieldGenerator.RechargeRate")).toInt) vehicle.Shields = before + chargeAmount val after = vehicle.Shields - vehicle.History(VehicleShieldCharge(VehicleSource(vehicle), after - before)) + vehicle.LogActivity(ShieldCharge(after - before, Some(VehicleSource(vehicle)))) showShieldCharge() if (before == 0 && after > 0) { enableShield() @@ -346,7 +346,7 @@ class BfrControl(vehicle: Vehicle) shieldCharge = context.system.scheduler.scheduleOnce( delay = definition.ShieldPeriodicDelay + delay milliseconds, self, - Vehicle.ChargeShields(0) + CommonMessages.ChargeShields(0, Some(vehicle)) ) } else { shieldCharge = Default.Cancellable diff --git a/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala b/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala index bf92686f..651e46f1 100644 --- a/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala +++ b/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala @@ -4,7 +4,6 @@ package net.psforever.objects.vehicles.control import akka.actor.Cancellable import net.psforever.actors.zone.ZoneActor import net.psforever.objects._ -import net.psforever.objects.ballistics.VehicleSource import net.psforever.objects.definition.VehicleDefinition import net.psforever.objects.definition.converter.OCM import net.psforever.objects.entity.WorldEntity @@ -20,9 +19,10 @@ import net.psforever.objects.serverobject.hackable.GenericHackables import net.psforever.objects.serverobject.mount.{Mountable, MountableBehavior} import net.psforever.objects.serverobject.repair.RepairableVehicle import net.psforever.objects.serverobject.terminals.Terminal +import net.psforever.objects.sourcing.{SourceEntry, VehicleSource} import net.psforever.objects.vehicles._ import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} -import net.psforever.objects.vital.{DamagingActivity, VehicleShieldCharge, VitalsActivity} +import net.psforever.objects.vital.{DamagingActivity, InGameActivity, ShieldCharge} import net.psforever.objects.vital.environment.EnvironmentReason import net.psforever.objects.vital.etc.SuicideReason import net.psforever.objects.zones._ @@ -60,23 +60,15 @@ class VehicleControl(vehicle: Vehicle) //make control actors belonging to utilities when making control actor belonging to vehicle vehicle.Utilities.foreach { case (_, util) => util.Setup } - def MountableObject = vehicle - - def JammableObject = vehicle - - def FactionObject = vehicle - - def DamageableObject = vehicle - - def SiphonableObject = vehicle - - def RepairableObject = vehicle - - def ContainerObject = vehicle - - def InteractiveObject = vehicle - - def CargoObject = vehicle + def MountableObject: Vehicle = vehicle + def JammableObject: Vehicle = vehicle + def FactionObject: Vehicle = vehicle + def DamageableObject: Vehicle = vehicle + def SiphonableObject: Vehicle = vehicle + def RepairableObject: Vehicle = vehicle + def ContainerObject: Vehicle = vehicle + def InteractiveObject: Vehicle = vehicle + def CargoObject: Vehicle = vehicle SetInteraction(EnvironmentAttribute.Water, doInteractingWithWater) SetInteraction(EnvironmentAttribute.Lava, doInteractingWithLava) @@ -136,8 +128,8 @@ class VehicleControl(vehicle: Vehicle) dismountBehavior.apply(msg) dismountCleanup(seat_num) - case Vehicle.ChargeShields(amount) => - chargeShields(amount) + case CommonMessages.ChargeShields(amount, motivator) => + chargeShields(amount, motivator.collect { case o: PlanetSideGameObject with FactionAffinity => SourceEntry(o) }) case Vehicle.UpdateZoneInteractionProgressUI(player) => updateZoneInteractionProgressUI(player) @@ -406,6 +398,7 @@ class VehicleControl(vehicle: Vehicle) TaskWorkflow.execute(GUIDTask.unregisterVehicle(zone.GUID, vehicle)) //banished to the shadow realm vehicle.Position = Vector3.Zero + vehicle.ClearHistory() //queue final deletion decayTimer = context.system.scheduler.scheduleOnce(5 seconds, self, VehicleControl.Deletion()) } @@ -559,14 +552,14 @@ class VehicleControl(vehicle: Vehicle) //make certain vehicles don't charge shields too quickly def canChargeShields: Boolean = { - val func: VitalsActivity => Boolean = VehicleControl.LastShieldChargeOrDamage(System.currentTimeMillis(), vehicle.Definition) + val func: InGameActivity => Boolean = VehicleControl.LastShieldChargeOrDamage(System.currentTimeMillis(), vehicle.Definition) vehicle.Health > 0 && vehicle.Shields < vehicle.MaxShields && - !vehicle.History.exists(func) + vehicle.History.findLast(func).isEmpty } - def chargeShields(amount: Int): Unit = { + def chargeShields(amount: Int, motivator: Option[SourceEntry]): Unit = { if (canChargeShields) { - vehicle.History(VehicleShieldCharge(VehicleSource(vehicle), amount)) + vehicle.LogActivity(ShieldCharge(amount, motivator)) vehicle.Shields = vehicle.Shields + amount vehicle.Zone.VehicleEvents ! VehicleServiceMessage( s"${vehicle.Actor}", @@ -874,7 +867,7 @@ class VehicleControl(vehicle: Vehicle) } object VehicleControl { - import net.psforever.objects.vital.{VehicleShieldCharge, VitalsActivity} + import net.psforever.objects.vital.{ShieldCharge} private case class PrepareForDeletion() @@ -893,10 +886,10 @@ object VehicleControl { * @return `true`, if the shield charge would be blocked; * `false`, otherwise */ - def LastShieldChargeOrDamage(now: Long, vdef: VehicleDefinition)(act: VitalsActivity): Boolean = { + def LastShieldChargeOrDamage(now: Long, vdef: VehicleDefinition)(act: InGameActivity): Boolean = { act match { case dact: DamagingActivity => now - dact.time < vdef.ShieldDamageDelay //damage delays next charge - case vsc: VehicleShieldCharge => now - vsc.time < vdef.ShieldPeriodicDelay //previous charge delays next + case vsc: ShieldCharge => now - vsc.time < vdef.ShieldPeriodicDelay //previous charge delays next case _ => false } } diff --git a/src/main/scala/net/psforever/objects/vital/InGameHistory.scala b/src/main/scala/net/psforever/objects/vital/InGameHistory.scala new file mode 100644 index 00000000..ae832624 --- /dev/null +++ b/src/main/scala/net/psforever/objects/vital/InGameHistory.scala @@ -0,0 +1,241 @@ +// Copyright (c) 2020 PSForever +package net.psforever.objects.vital + +import net.psforever.objects.PlanetSideGameObject +import net.psforever.objects.definition.{EquipmentDefinition, KitDefinition, ToolDefinition} +import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.sourcing.{AmenitySource, ObjectSource, PlayerSource, SourceEntry, SourceWithHealthEntry, VehicleSource} +import net.psforever.objects.vital.environment.EnvironmentReason +import net.psforever.objects.vital.etc.{ExplodingEntityReason, PainboxReason, SuicideReason} +import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} +import net.psforever.objects.vital.projectile.ProjectileReason +import net.psforever.types.{ExoSuitType, ImplantType, TransactionType} + +/* root */ + +/** + * The root of all chronological activity. + * Must keep track of the time (ms) the activity occurred. + */ +trait InGameActivity { + val time: Long = System.currentTimeMillis() +} + +/* normal history */ + +/** + * A generic classification of activity. + */ +trait GeneralActivity extends InGameActivity + +final case class SpawningActivity(src: SourceEntry, zoneNumber: Int, unit: Option[SourceEntry]) extends GeneralActivity + +final case class ReconstructionActivity(src: SourceEntry, zoneNumber: Int, unit: Option[SourceEntry]) extends GeneralActivity + +final case class ShieldCharge(amount: Int, cause: Option[SourceEntry]) extends GeneralActivity + +final case class TerminalUsedActivity(terminal: AmenitySource, transaction: TransactionType.Value) extends GeneralActivity + +/* vitals history */ + +/** + * A vital entity can be hurt or damaged or healed or repaired (HDHR).
+ * Shields are not included in the definition of what is a "vital statistic", + * and that includes Infantry shields due to the Personal Shield implant + * and MAX shields due to being a New Conglomerate soldier. + */ +trait VitalsActivity extends InGameActivity { + def amount: Int +} + +trait HealingActivity extends VitalsActivity + +trait RepairingActivity extends VitalsActivity + +trait DamagingActivity extends VitalsActivity { + override val time: Long = data.interaction.hitTime + def data: DamageResult + + def amount: Int = { + (data.targetBefore, data.targetAfter) match { + case (pb: SourceWithHealthEntry, pa: SourceWithHealthEntry) => pb.total - pa.total + case _ => 0 + } + } + + def health: Int = { + (data.targetBefore, data.targetAfter) match { + case (pb: PlayerSource, pa: PlayerSource) if pb.ExoSuit == ExoSuitType.MAX => pb.total - pa.total + case (pb: SourceWithHealthEntry, pa: SourceWithHealthEntry) => pb.health - pa.health + case _ => 0 + } + } +} + +final case class HealFromKit(kit_def: KitDefinition, amount: Int) + extends HealingActivity + +final case class HealFromEquipment(user: PlayerSource, equipment_def: EquipmentDefinition, amount: Int) + extends HealingActivity + +final case class HealFromTerm(term: AmenitySource, amount: Int) + extends HealingActivity + +final case class HealFromImplant(implant: ImplantType, amount: Int) + extends HealingActivity + +final case class RepairFromExoSuitChange(exosuit: ExoSuitType.Value, amount: Int) + extends RepairingActivity + +final case class RepairFromKit(kit_def: KitDefinition, amount: Int) + extends RepairingActivity() + +final case class RepairFromEquipment(user: PlayerSource, equipment_def: EquipmentDefinition, amount: Int) + extends RepairingActivity + +final case class RepairFromTerm(term: AmenitySource, amount: Int) extends RepairingActivity + +final case class RepairFromArmorSiphon(siphon_def: ToolDefinition, vehicle: VehicleSource, amount: Int) + extends RepairingActivity + +final case class RepairFromAmenityAutoRepair(amount: Int) + extends RepairingActivity + +final case class DamageFrom(data: DamageResult) + extends DamagingActivity + +final case class DamageFromProjectile(data: DamageResult) + extends DamagingActivity + +final case class DamageFromPainbox(data: DamageResult) + extends DamagingActivity + +final case class DamageFromEnvironment(data: DamageResult) + extends DamagingActivity + +final case class PlayerSuicide(player: PlayerSource) + extends DamagingActivity { + private lazy val result = { + val out = DamageResult( + player, + player.copy(health = 0), + DamageInteraction(player, SuicideReason(), player.Position) + ) + out + } + def data: DamageResult = result +} + +final case class DamageFromExplodingEntity(data: DamageResult) + extends DamagingActivity + + +trait InGameHistory { + /** a list of important events that have occurred in chronological order */ + private var history: List[InGameActivity] = List.empty[InGameActivity] + /** the last source of damage that cna be used to indicate blame for damage */ + private var lastDamage: Option[DamageResult] = None + + def History: List[InGameActivity] = history + + /** + * Only the changes to vitality statistics. + * @return a list of the chronologically-consistent vitality events + */ + def VitalsHistory(): List[VitalsActivity] = History.collect { + case event: VitalsActivity => event + } + + /** + * An in-game event must be recorded. + * Add new entry to the front of the list (for recent activity). + * @param action the fully-informed entry + * @return the list of previous changes to this entity + */ + def LogActivity(action: InGameActivity): List[InGameActivity] = LogActivity(Some(action)) + + + /** + * An in-game event must be recorded. + * Add new entry to the front of the list (for recent activity). + * @param action the fully-informed entry + * @return the list of previous changes to this entity + */ + def LogActivity(action: Option[InGameActivity]): List[InGameActivity] = { + action match { + case Some(act) => + history = act +: history + case None => () + } + history + } + + /** + * Very common example of a `VitalsActivity` event involving damage. + * They are repackaged before submission and are often tagged for specific blame. + * @param result the fully-informed entry + * @return the list of previous changes to this object's vital statistics + */ + def LogActivity(result: DamageResult): List[InGameActivity] = { + result.interaction.cause match { + case _: ProjectileReason => + LogActivity(DamageFromProjectile(result)) + lastDamage = Some(result) + case _: ExplodingEntityReason => + LogActivity(DamageFromExplodingEntity(result)) + lastDamage = Some(result) + case _: PainboxReason => + LogActivity(DamageFromPainbox(result)) + case _: EnvironmentReason => + LogActivity(DamageFromEnvironment(result)) + case _ => ; + LogActivity(DamageFrom(result)) + if(result.adversarial.nonEmpty) { + lastDamage = Some(result) + } + } + History + } + + def LastDamage: Option[DamageResult] = lastDamage + + /** + * Find, specifically, the last instance of a weapon discharge that caused damage. + * @return information about the discharge + */ + def LastShot: Option[DamageResult] = { + History.findLast({ p => p.isInstanceOf[DamageFromProjectile] }).map { + case entry: DamageFromProjectile => entry.data + } + } + + def ClearHistory(): List[InGameActivity] = { + lastDamage = None + val out = history + history = List.empty + out + } +} + +object InGameHistory { + def SpawnReconstructionActivity( + obj: PlanetSideGameObject with FactionAffinity with InGameHistory, + zoneNumber: Int, + unit: Option[SourceEntry] + ): Unit = { + val event: GeneralActivity = if (obj.History.nonEmpty || obj.History.headOption.exists { + _.isInstanceOf[SpawningActivity] + }) { + ReconstructionActivity(ObjectSource(obj), zoneNumber, unit) + } else { + SpawningActivity(ObjectSource(obj), zoneNumber, unit) + } + if (obj.History.lastOption match { + case Some(evt: SpawningActivity) => evt != event + case Some(evt: ReconstructionActivity) => evt != event + case _ => true + }) { + obj.LogActivity(event) + } + } +} diff --git a/src/main/scala/net/psforever/objects/vital/Vitality.scala b/src/main/scala/net/psforever/objects/vital/Vitality.scala index 6747727d..c45665b8 100644 --- a/src/main/scala/net/psforever/objects/vital/Vitality.scala +++ b/src/main/scala/net/psforever/objects/vital/Vitality.scala @@ -8,7 +8,7 @@ import net.psforever.objects.vital.resolution.{DamageAndResistance, ResolutionCa * The amount of HDHR is controlled by the damage model of this vital object reacting to stimulus. * The damage model is provided. */ -trait Vitality extends VitalsHistory { +trait Vitality extends InGameHistory { private var health: Int = Definition.DefaultHealth private var defaultHealth: Option[Int] = None private var maxHealth: Option[Int] = None diff --git a/src/main/scala/net/psforever/objects/vital/VitalsHistory.scala b/src/main/scala/net/psforever/objects/vital/VitalsHistory.scala deleted file mode 100644 index 2255089c..00000000 --- a/src/main/scala/net/psforever/objects/vital/VitalsHistory.scala +++ /dev/null @@ -1,237 +0,0 @@ -// Copyright (c) 2020 PSForever -package net.psforever.objects.vital - -import net.psforever.objects.Player -import net.psforever.objects.ballistics.{PlayerSource, VehicleSource} -import net.psforever.objects.definition.{EquipmentDefinition, KitDefinition, ToolDefinition} -import net.psforever.objects.serverobject.terminals.TerminalDefinition -import net.psforever.objects.vital.environment.EnvironmentReason -import net.psforever.objects.vital.etc.{ExplodingEntityReason, PainboxReason, SuicideReason} -import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} -import net.psforever.objects.vital.projectile.ProjectileReason -import net.psforever.types.{ExoSuitType, ImplantType} - -trait VitalsActivity { - def time: Long -} - -trait HealingActivity extends VitalsActivity { - def amount: Int - val time: Long = System.currentTimeMillis() -} - -trait DamagingActivity extends VitalsActivity { - def time: Long = data.interaction.hitTime - def data: DamageResult -} - -final case class HealFromKit(kit_def: KitDefinition, amount: Int) - extends HealingActivity - -final case class HealFromEquipment( - user: PlayerSource, - equipment_def: EquipmentDefinition, - amount: Int -) extends HealingActivity - -final case class HealFromTerm(term_def: TerminalDefinition, health: Int, armor: Int) - extends HealingActivity { - def amount: Int = health + armor -} - -final case class HealFromImplant(implant: ImplantType, health: Int) - extends HealingActivity { - def amount: Int = health -} - -final case class HealFromExoSuitChange(exosuit: ExoSuitType.Value) - extends HealingActivity { - def amount: Int = 0 -} - -final case class RepairFromKit(kit_def: KitDefinition, amount: Int) - extends HealingActivity() - -final case class RepairFromEquipment( - user: PlayerSource, - equipment_def: EquipmentDefinition, - amount: Int -) extends HealingActivity - -final case class RepairFromTerm(term_def: TerminalDefinition, amount: Int) - extends HealingActivity - -final case class RepairFromArmorSiphon(siphon_def: ToolDefinition, amount: Int) - extends HealingActivity - -final case class VehicleShieldCharge(amount: Int) - extends HealingActivity //TODO facility - -final case class DamageFrom(data: DamageResult) - extends DamagingActivity - -final case class DamageFromProjectile(data: DamageResult) - extends DamagingActivity - -final case class DamageFromPainbox(data: DamageResult) - extends DamagingActivity - -final case class DamageFromEnvironment(data: DamageResult) - extends DamagingActivity - -final case class PlayerSuicide(player: PlayerSource) - extends DamagingActivity { - private lazy val result = { - val out = DamageResult( - player, - player.copy(health = 0), - DamageInteraction(player, SuicideReason(), player.Position) - ) - out - } - def data: DamageResult = result -} - -final case class DamageFromExplodingEntity(data: DamageResult) - extends DamagingActivity - -/** - * A vital object can be hurt or damaged or healed or repaired (HDHR). - * A history of the previous changes in vital statistics of the underlying object is recorded - * in reverse chronological order. - */ -trait VitalsHistory { - - /** a reverse-order list of chronological events that have occurred to these vital statistics */ - private var vitalsHistory: List[VitalsActivity] = List.empty[VitalsActivity] - - private var lastDamage: Option[DamageResult] = None - - def History: List[VitalsActivity] = vitalsHistory - - /** - * A `VitalsActivity` event must be recorded. - * Add new entry to the front of the list (for recent activity). - * @param action the fully-informed entry - * @return the list of previous changes to this object's vital statistics - */ - def History(action: VitalsActivity): List[VitalsActivity] = History(Some(action)) - - /** - * A `VitalsActivity` event must be recorded. - * Add new entry to the front of the list (for recent activity). - * @param action the fully-informed entry - * @return the list of previous changes to this object's vital statistics - */ - def History(action: Option[VitalsActivity]): List[VitalsActivity] = { - action match { - case Some(act) => - vitalsHistory = act +: vitalsHistory - case None => ; - } - vitalsHistory - } - - /** - * Very common example of a `VitalsActivity` event involving damage. - * @param result the fully-informed entry - * @return the list of previous changes to this object's vital statistics - */ - def History(result: DamageResult): List[VitalsActivity] = { - result.interaction.cause match { - case _: ProjectileReason => - vitalsHistory = DamageFromProjectile(result) +: vitalsHistory - lastDamage = Some(result) - case _: ExplodingEntityReason => - vitalsHistory = DamageFromExplodingEntity(result) +: vitalsHistory - lastDamage = Some(result) - case _: PainboxReason => - vitalsHistory = DamageFromPainbox(result) +: vitalsHistory - case _: EnvironmentReason => - vitalsHistory = DamageFromEnvironment(result) +: vitalsHistory - case _ => ; - vitalsHistory = DamageFrom(result) +: vitalsHistory - if(result.adversarial.nonEmpty) { - lastDamage = Some(result) - } - } - vitalsHistory - } - - def LastDamage: Option[DamageResult] = lastDamage - - /** - * Find, specifically, the last instance of a weapon discharge vital statistics change. - * @return information about the discharge - */ - def LastShot: Option[DamageResult] = { - vitalsHistory.find({ p => p.isInstanceOf[DamageFromProjectile] }) match { - case Some(entry: DamageFromProjectile) => - Some(entry.data) - case _ => - None - } - } - - def ClearHistory(): List[VitalsActivity] = { - val out = vitalsHistory - vitalsHistory = List.empty[VitalsActivity] - out - } -} - -//deprecated overrides -object HealFromKit { - def apply(Target: PlayerSource, amount: Int, kit_def: KitDefinition): HealFromKit = - HealFromKit(kit_def, amount) -} - -object HealFromEquipment { - def apply( - Target: PlayerSource, - user: PlayerSource, - amount: Int, - equipment_def: EquipmentDefinition - ): HealFromEquipment = - HealFromEquipment(user, equipment_def, amount) -} - -object HealFromTerm { - def apply(Target: PlayerSource, health: Int, armor: Int, term_def: TerminalDefinition): HealFromTerm = - HealFromTerm(term_def, health, armor) -} - -object HealFromImplant { - def apply(Target: PlayerSource, amount: Int, implant: ImplantType): HealFromImplant = - HealFromImplant(implant, amount) -} - -object HealFromExoSuitChange { - def apply(Target: PlayerSource, exosuit: ExoSuitType.Value): HealFromExoSuitChange = - HealFromExoSuitChange(exosuit) -} - -object RepairFromKit { - def apply(Target: PlayerSource, amount: Int, kit_def: KitDefinition): RepairFromKit = - RepairFromKit(kit_def, amount) -} - -object RepairFromEquipment { - def apply( - Target: PlayerSource, - user: PlayerSource, - amount: Int, - equipment_def: EquipmentDefinition - ) : RepairFromEquipment = - RepairFromEquipment(user, equipment_def, amount) -} - -object RepairFromTerm { - def apply(Target: VehicleSource, amount: Int, term_def: TerminalDefinition): RepairFromTerm = - RepairFromTerm(term_def, amount) -} - -object VehicleShieldCharge { - def apply(Target: VehicleSource, amount: Int): VehicleShieldCharge = - VehicleShieldCharge(amount) -} diff --git a/src/main/scala/net/psforever/objects/vital/base/DamageReason.scala b/src/main/scala/net/psforever/objects/vital/base/DamageReason.scala index a854a028..fb37733d 100644 --- a/src/main/scala/net/psforever/objects/vital/base/DamageReason.scala +++ b/src/main/scala/net/psforever/objects/vital/base/DamageReason.scala @@ -1,7 +1,7 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.base -import net.psforever.objects.ballistics.SourceEntry +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.damage.DamageProfile import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.prop.DamageProperties diff --git a/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala b/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala index f3f66e9a..aa4d5073 100644 --- a/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala +++ b/src/main/scala/net/psforever/objects/vital/collision/CollisionDamageModifierFunctions.scala @@ -1,8 +1,8 @@ // Copyright (c) 2021 PSForever package net.psforever.objects.vital.collision -import net.psforever.objects.ballistics.{DeployableSource, PlayerSource, VehicleSource} import net.psforever.objects.definition.ExoSuitDefinition +import net.psforever.objects.sourcing.{DeployableSource, PlayerSource, VehicleSource} import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.types.Vector3 diff --git a/src/main/scala/net/psforever/objects/vital/collision/CollisionReason.scala b/src/main/scala/net/psforever/objects/vital/collision/CollisionReason.scala index 7b45af57..40c749d1 100644 --- a/src/main/scala/net/psforever/objects/vital/collision/CollisionReason.scala +++ b/src/main/scala/net/psforever/objects/vital/collision/CollisionReason.scala @@ -1,7 +1,7 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.collision -import net.psforever.objects.ballistics.{DeployableSource, SourceEntry, VehicleSource} +import net.psforever.objects.sourcing.{DeployableSource, SourceEntry, VehicleSource} import net.psforever.objects.vital.base.{DamageModifiers, DamageReason, DamageResolution, DamageType} import net.psforever.objects.vital.prop.DamageProperties import net.psforever.objects.vital.resolution.DamageAndResistance diff --git a/src/main/scala/net/psforever/objects/vital/damage/DamageModifierFunctions.scala b/src/main/scala/net/psforever/objects/vital/damage/DamageModifierFunctions.scala index 0983a016..bb8bdc76 100644 --- a/src/main/scala/net/psforever/objects/vital/damage/DamageModifierFunctions.scala +++ b/src/main/scala/net/psforever/objects/vital/damage/DamageModifierFunctions.scala @@ -2,7 +2,7 @@ package net.psforever.objects.vital.damage import net.psforever.objects.GlobalDefinitions -import net.psforever.objects.ballistics._ +import net.psforever.objects.sourcing.VehicleSource import net.psforever.objects.vital.base.{DamageModifiers, DamageReason} import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.prop.DamageWithPosition diff --git a/src/main/scala/net/psforever/objects/vital/environment/EnvironmentDamageModifierFunctions.scala b/src/main/scala/net/psforever/objects/vital/environment/EnvironmentDamageModifierFunctions.scala index 0f9149bf..787e6df9 100644 --- a/src/main/scala/net/psforever/objects/vital/environment/EnvironmentDamageModifierFunctions.scala +++ b/src/main/scala/net/psforever/objects/vital/environment/EnvironmentDamageModifierFunctions.scala @@ -1,9 +1,9 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.environment -import net.psforever.objects.ballistics.PlayerSource import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.serverobject.environment.EnvironmentAttribute +import net.psforever.objects.sourcing.PlayerSource /** * The deeper you move into lava, the greater the amount of health you burn through. diff --git a/src/main/scala/net/psforever/objects/vital/environment/EnvironmentReason.scala b/src/main/scala/net/psforever/objects/vital/environment/EnvironmentReason.scala index 3f1f37ed..4d1c08d1 100644 --- a/src/main/scala/net/psforever/objects/vital/environment/EnvironmentReason.scala +++ b/src/main/scala/net/psforever/objects/vital/environment/EnvironmentReason.scala @@ -1,8 +1,8 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.environment -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.serverobject.environment.{EnvironmentAttribute, PieceOfEnvironment} +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.base.{DamageReason, DamageResolution} import net.psforever.objects.vital.damage.DamageCalculations import net.psforever.objects.vital.prop.DamageProperties diff --git a/src/main/scala/net/psforever/objects/vital/etc/ArmorSiphonReason.scala b/src/main/scala/net/psforever/objects/vital/etc/ArmorSiphonReason.scala index 687c4c07..b24c09de 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/ArmorSiphonReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/ArmorSiphonReason.scala @@ -1,8 +1,8 @@ // Copyright (c) 2021 PSForever package net.psforever.objects.vital.etc +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.{GlobalDefinitions, Tool, Vehicle} -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.vital.base.{DamageModifiers, DamageReason, DamageResolution} import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.prop.DamageWithPosition diff --git a/src/main/scala/net/psforever/objects/vital/etc/EmpReason.scala b/src/main/scala/net/psforever/objects/vital/etc/EmpReason.scala index e3eb107d..7269fab5 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/EmpReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/EmpReason.scala @@ -2,8 +2,8 @@ package net.psforever.objects.vital.etc import net.psforever.objects.PlanetSideGameObject -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.base.{DamageReason, DamageResolution} import net.psforever.objects.vital.prop.DamageWithPosition diff --git a/src/main/scala/net/psforever/objects/vital/etc/ExplodingEntityReason.scala b/src/main/scala/net/psforever/objects/vital/etc/ExplodingEntityReason.scala index c86eac69..434e6417 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/ExplodingEntityReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/ExplodingEntityReason.scala @@ -2,9 +2,9 @@ package net.psforever.objects.vital.etc import net.psforever.objects.PlanetSideGameObject -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.definition.ObjectDefinition import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.{Vitality, VitalityDefinition} import net.psforever.objects.vital.base.{DamageModifiers, DamageReason, DamageResolution} import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} diff --git a/src/main/scala/net/psforever/objects/vital/etc/PainboxReason.scala b/src/main/scala/net/psforever/objects/vital/etc/PainboxReason.scala index f02b2e38..764697bd 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/PainboxReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/PainboxReason.scala @@ -1,8 +1,8 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.etc -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.serverobject.painbox.Painbox +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.{NoResistanceSelection, SimpleResolutions} import net.psforever.objects.vital.base.{DamageReason, DamageResolution} import net.psforever.objects.vital.damage.DamageCalculations diff --git a/src/main/scala/net/psforever/objects/vital/etc/RadiationReason.scala b/src/main/scala/net/psforever/objects/vital/etc/RadiationReason.scala index 011cdb5a..8b16c9aa 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/RadiationReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/RadiationReason.scala @@ -1,7 +1,8 @@ // Copyright (c) 2021 PSForever package net.psforever.objects.vital.etc -import net.psforever.objects.ballistics.{PlayerSource, SourceEntry, Projectile => ActualProjectile} +import net.psforever.objects.ballistics.{Projectile => ActualProjectile} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.vital.base._ import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.projectile.{ProjectileDamageModifierFunctions, ProjectileReason} diff --git a/src/main/scala/net/psforever/objects/vital/etc/SuicideReason.scala b/src/main/scala/net/psforever/objects/vital/etc/SuicideReason.scala index 1d2f4e8c..cf7f1f08 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/SuicideReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/SuicideReason.scala @@ -1,7 +1,7 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.etc -import net.psforever.objects.ballistics.SourceEntry +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.{NoResistanceSelection, SimpleResolutions} import net.psforever.objects.vital.base.{DamageReason, DamageResolution} import net.psforever.objects.vital.damage.DamageCalculations diff --git a/src/main/scala/net/psforever/objects/vital/etc/TriggerUsedReason.scala b/src/main/scala/net/psforever/objects/vital/etc/TriggerUsedReason.scala index b25531a8..ca6f95ef 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/TriggerUsedReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/TriggerUsedReason.scala @@ -2,7 +2,7 @@ package net.psforever.objects.vital.etc import net.psforever.objects.GlobalDefinitions -import net.psforever.objects.ballistics.{PlayerSource, SourceEntry} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.vital.{NoResistanceSelection, SimpleResolutions} import net.psforever.objects.vital.base.{DamageReason, DamageResolution} import net.psforever.objects.vital.damage.DamageCalculations.AgainstExoSuit diff --git a/src/main/scala/net/psforever/objects/vital/etc/TrippedMineReason.scala b/src/main/scala/net/psforever/objects/vital/etc/TrippedMineReason.scala index 2da819e2..3f4595c9 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/TrippedMineReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/TrippedMineReason.scala @@ -1,7 +1,7 @@ // Copyright (c) 2021 PSForever package net.psforever.objects.vital.etc -import net.psforever.objects.ballistics.{DeployableSource, SourceEntry} +import net.psforever.objects.sourcing.{DeployableSource, SourceEntry} import net.psforever.objects.vital.base.{DamageReason, DamageResolution} import net.psforever.objects.vital.prop.DamageProperties import net.psforever.objects.vital.resolution.DamageAndResistance diff --git a/src/main/scala/net/psforever/objects/vital/etc/VehicleSpawnReason.scala b/src/main/scala/net/psforever/objects/vital/etc/VehicleSpawnReason.scala index 62f06bc1..32fcc550 100644 --- a/src/main/scala/net/psforever/objects/vital/etc/VehicleSpawnReason.scala +++ b/src/main/scala/net/psforever/objects/vital/etc/VehicleSpawnReason.scala @@ -1,7 +1,7 @@ // Copyright (c) 2021 PSForever package net.psforever.objects.vital.etc -import net.psforever.objects.ballistics.SourceEntry +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.{NoResistanceSelection, SimpleResolutions} import net.psforever.objects.vital.base.{DamageReason, DamageResolution} import net.psforever.objects.vital.damage.DamageCalculations.AgainstNothing diff --git a/src/main/scala/net/psforever/objects/vital/interaction/DamageInteraction.scala b/src/main/scala/net/psforever/objects/vital/interaction/DamageInteraction.scala index a6d908bd..bf8daf0f 100644 --- a/src/main/scala/net/psforever/objects/vital/interaction/DamageInteraction.scala +++ b/src/main/scala/net/psforever/objects/vital/interaction/DamageInteraction.scala @@ -2,8 +2,8 @@ package net.psforever.objects.vital.interaction import net.psforever.objects.PlanetSideGameObject -import net.psforever.objects.ballistics.SourceEntry import net.psforever.objects.serverobject.affinity.FactionAffinity +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.base.{DamageReason, DamageResolution, DamageType} import net.psforever.objects.vital.resolution.{DamageAndResistance, ResolutionCalculations} import net.psforever.types.Vector3 diff --git a/src/main/scala/net/psforever/objects/vital/interaction/DamageResult.scala b/src/main/scala/net/psforever/objects/vital/interaction/DamageResult.scala index d1029ec6..17e08ff2 100644 --- a/src/main/scala/net/psforever/objects/vital/interaction/DamageResult.scala +++ b/src/main/scala/net/psforever/objects/vital/interaction/DamageResult.scala @@ -1,7 +1,7 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.interaction -import net.psforever.objects.ballistics.SourceEntry +import net.psforever.objects.sourcing.SourceEntry /** * But one thing's sure. The player is hurt, attacked, and somebody's responsible. diff --git a/src/main/scala/net/psforever/objects/vital/projectile/ProjectileDamageModifierFunctions.scala b/src/main/scala/net/psforever/objects/vital/projectile/ProjectileDamageModifierFunctions.scala index 2486a9b7..e9fcaa11 100644 --- a/src/main/scala/net/psforever/objects/vital/projectile/ProjectileDamageModifierFunctions.scala +++ b/src/main/scala/net/psforever/objects/vital/projectile/ProjectileDamageModifierFunctions.scala @@ -3,6 +3,7 @@ package net.psforever.objects.vital.projectile import net.psforever.objects.ballistics._ import net.psforever.objects.equipment.ChargeFireModeDefinition +import net.psforever.objects.sourcing.PlayerSource import net.psforever.objects.vital.base._ import net.psforever.objects.vital.damage.DamageModifierFunctions import net.psforever.objects.vital.interaction.DamageInteraction @@ -461,7 +462,7 @@ object ProjectileDamageModifierFunctions { case _ => 1f } - if (p.exosuit == ExoSuitType.MAX) { + if (p.ExoSuit == ExoSuitType.MAX) { (damage * degradation * aggravation.max_factor) toInt } else { val resist = cause.damageModel.ResistUsing(data)(data) diff --git a/src/main/scala/net/psforever/objects/vital/projectile/ProjectileReason.scala b/src/main/scala/net/psforever/objects/vital/projectile/ProjectileReason.scala index d125b15d..5bbb34a8 100644 --- a/src/main/scala/net/psforever/objects/vital/projectile/ProjectileReason.scala +++ b/src/main/scala/net/psforever/objects/vital/projectile/ProjectileReason.scala @@ -1,7 +1,8 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.vital.projectile -import net.psforever.objects.ballistics.{SourceEntry, Projectile => ActualProjectile} +import net.psforever.objects.ballistics.{Projectile => ActualProjectile} +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.vital.base._ import net.psforever.objects.vital.damage.DamageProfile import net.psforever.objects.vital.prop.DamageProperties diff --git a/src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala b/src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala index 63a7d0cd..215a4850 100644 --- a/src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala +++ b/src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala @@ -2,9 +2,9 @@ package net.psforever.objects.vital.resistance import net.psforever.objects.GlobalDefinitions -import net.psforever.objects.ballistics._ import net.psforever.objects.definition.ExoSuitDefinition -import net.psforever.objects.serverobject.structures.Amenity +import net.psforever.objects.serverobject.structures.AmenityDefinition +import net.psforever.objects.sourcing.{ObjectSource, PlayerSource, SourceEntry, VehicleSource} import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.types.ExoSuitType @@ -110,7 +110,7 @@ object ResistanceCalculations { def ValidAmenityTarget(data: DamageInteraction): Try[ObjectSource] = { data.target match { case target: ObjectSource => - if (target.obj.isInstanceOf[Amenity]) { + if (target.Definition.isInstanceOf[AmenityDefinition]) { Success(target) } else { failure(s"${target.Definition.Name} amenity") diff --git a/src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala b/src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala index a6daa654..e6112726 100644 --- a/src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala +++ b/src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala @@ -2,13 +2,13 @@ package net.psforever.objects.vital.resolution import net.psforever.objects._ -import net.psforever.objects.ballistics.{PlayerSource, SourceEntry} import net.psforever.objects.ce.Deployable import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.damage.Damageable +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.vehicles.VehicleSubsystemEntry import net.psforever.objects.vital.base.DamageResolution -import net.psforever.objects.vital.{DamagingActivity, Vitality, VitalsHistory} +import net.psforever.objects.vital.{DamagingActivity, Vitality, InGameHistory} import net.psforever.objects.vital.damage.DamageCalculations import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} import net.psforever.objects.vital.projectile.ProjectileReason @@ -368,7 +368,7 @@ object ResolutionCalculations { } } - private def noDoubleLash(target: PlanetSideGameObject with VitalsHistory, data: DamageInteraction): Boolean = { + private def noDoubleLash(target: PlanetSideGameObject with InGameHistory, data: DamageInteraction): Boolean = { data.cause match { case reason: ProjectileReason if reason.resolution == DamageResolution.Lash => val curr = System.currentTimeMillis() diff --git a/src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala b/src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala index 268fed35..a831b859 100644 --- a/src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala +++ b/src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala @@ -64,6 +64,9 @@ class ActivityReport { /** heat increases each time the hotspot is considered active and receives more activity */ private var heat: Int = 0 + /** the time of the first activity report, when heat was last equal to zero */ + private var firstReport: Option[Long] = None + /** the time of the last activity report */ private var lastReport: Option[Long] = None @@ -138,6 +141,18 @@ class ActivityReport { this } + /** + * Submit new activity, increasing the lifespan of the current report's existence. + * @see `Renew` + * @return the current report + */ + def Report(pow: Int, duration: FiniteDuration): ActivityReport = { + RaiseHeat(pow) + Duration = duration + Renew + this + } + /** * Submit new activity. * Do not increase the lifespan of the current report's existence. @@ -163,6 +178,7 @@ class ActivityReport { */ def Renew: Long = { val t = System.nanoTime + firstReport = firstReport.orElse(Some(t)) lastReport = Some(t) t } @@ -173,6 +189,7 @@ class ActivityReport { */ def Clear(): Unit = { heat = 0 + firstReport = None lastReport = None duration = FiniteDuration(0, "nanoseconds") } diff --git a/src/main/scala/net/psforever/objects/zones/MapInfo.scala b/src/main/scala/net/psforever/objects/zones/MapInfo.scala index 8bab9921..2f4e1e8e 100644 --- a/src/main/scala/net/psforever/objects/zones/MapInfo.scala +++ b/src/main/scala/net/psforever/objects/zones/MapInfo.scala @@ -13,6 +13,7 @@ sealed abstract class MapInfo( val value: String, val checksum: Long, val scale: MapScale, + val hotSpotSpan: Int, val environment: List[PieceOfEnvironment] ) extends StringEnumEntry {} @@ -23,6 +24,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map01", checksum = 2094187456L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List( SeaLevel(EnvironmentAttribute.Water, 35), Pool(EnvironmentAttribute.Water, 44.92f, 5965.164f, 4801.2266f, 5893.1094f, 4730.203f), //east of seth @@ -47,6 +49,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map02", checksum = 1113780607L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = { //exclude parts of voltan and naum due to their generator rooms being below sealevel val northVoltan = 3562.4844f @@ -84,6 +87,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map03", checksum = 1624200906L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List( SeaLevel(EnvironmentAttribute.Water, 29.5f), Pool(EnvironmentAttribute.Water, 67.3125f, 3449.586f, 5870.383f, 3313.75f, 5715.3203f), //east of itan, south of kaang @@ -116,6 +120,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map04", checksum = 2455050867L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 19.984375f)) ++ MapEnvironment.zoneMapEdgeKillPlane( MapScale.Dim8192, @@ -133,6 +138,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map05", checksum = 107922342L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List( SeaLevel(EnvironmentAttribute.Water, 35.015625f), Pool(EnvironmentAttribute.Water, 51.875f, 4571.8125f, 3015.5547f, 4455.8047f, 2852.711f), //down the road, west of bel @@ -164,6 +170,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map06", checksum = 579139514L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List( SeaLevel(EnvironmentAttribute.Water, 10.03125f), Pool(EnvironmentAttribute.Water, 213.03125f, 3116.7266f, 4724.414f, 2685.8281f, 4363.461f), //east side of southwest of tootega @@ -184,6 +191,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map07", checksum = 1564014762L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 29.984375f)) ++ MapEnvironment.zoneMapEdgeKillPlane( MapScale.Dim8192, (10, 10, 10, 10), @@ -200,6 +208,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map08", checksum = 0L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 26.078125f)) ++ MapEnvironment.zoneMapEdgeKillPlane( MapScale.Dim8192, (200, 200, 200, 200), @@ -216,6 +225,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map09", checksum = 1380643455L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List( SeaLevel(EnvironmentAttribute.Water, 30), Pool(EnvironmentAttribute.Water, 41.46875f, 5964.461f, 1947.1328f, 5701.6016f, 1529.8438f), //north of wakea @@ -242,6 +252,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map10", checksum = 230810349L, scale = MapScale.Dim8192, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 28)) ++ MapEnvironment.zoneMapEdgeKillPlane( MapScale.Dim8192, (200, 200, 200, 200), @@ -258,6 +269,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map11", checksum = 4129515529L, scale = MapScale.Dim8192, + hotSpotSpan = 0, environment = List( SeaLevel(EnvironmentAttribute.Water, 24), Pool(EnvironmentAttribute.Water, 44.453125f, 4289.4766f, 3124.8125f, 4070.7031f, 2892.9922f), //H10 @@ -283,6 +295,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map12", checksum = 962888126L, scale = MapScale.Dim8192, + hotSpotSpan = 0, environment = List(SeaLevel(EnvironmentAttribute.Water, 20.03125f)) ++ MapEnvironment.map12Environment ++ MapEnvironment.dim8192MapEdgeKillPlanes @@ -293,6 +306,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map13", checksum = 3904659548L, scale = MapScale.Dim8192, + hotSpotSpan = 0, environment = List(SeaLevel(EnvironmentAttribute.Water, 30)) ++ MapEnvironment.map13Environment ++ MapEnvironment.dim8192MapEdgeKillPlanes @@ -303,6 +317,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map14", checksum = 0L, scale = MapScale.Dim1024, + hotSpotSpan = 0, environment = List(SeaLevel(EnvironmentAttribute.Water, 0)) ++ MapEnvironment.dim1024MapEdgeKillPlanes ) @@ -312,6 +327,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map15", checksum = 0L, scale = MapScale.Dim8192, + hotSpotSpan = 0, environment = List(SeaLevel(EnvironmentAttribute.Water, 0)) ++ MapEnvironment.dim8192MapEdgeKillPlanes ) @@ -321,6 +337,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map16", checksum = 0L, scale = MapScale.Dim1024, + hotSpotSpan = 0, environment = List(SeaLevel(EnvironmentAttribute.Water, 0)) ++ MapEnvironment.dim1024MapEdgeKillPlanes ) @@ -330,6 +347,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "ugd01", checksum = 3405929729L, scale = MapScale.Dim2560, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 50.734375f)) //TODO waterfalls! ) @@ -338,6 +356,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "ugd02", checksum = 2702486449L, scale = MapScale.Dim2560, + hotSpotSpan = 80, environment = List( Pool(EnvironmentAttribute.Water, 194.89062f, 1763.4141f, 1415.125f, 1333.9531f, 1280.4609f), //east, northern pool Pool(EnvironmentAttribute.Water, 192.40625f, 1717.5703f, 1219.3359f, 1572.8828f, 1036.1328f), //bottom, northern pool @@ -353,6 +372,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "ugd03", checksum = 1673539651L, scale = MapScale.Dim2048, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Death, 10)) //not actually lava, but a kill plane if you fall beneath the map ) @@ -361,6 +381,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "ugd04", checksum = 3797992164L, scale = MapScale.Dim2048, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Death, 51f)) //ADB: 51.414f ) @@ -369,6 +390,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "ugd05", checksum = 1769572498L, scale = MapScale.Dim2048, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Death, 115)) //not actually lava, but a kill plane if you fall beneath the map ) @@ -377,6 +399,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "ugd06", checksum = 4274683970L, scale = MapScale.Dim2560, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Death, 30)) //not actually lava, but a kill plane if you fall beneath the map ) @@ -385,6 +408,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map96", checksum = 846603446L, scale = MapScale.Dim4096, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 17.015625f)) ++ MapEnvironment.dim4096MapEdgeKillPlanes ) @@ -394,6 +418,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map97", checksum = 2810790213L, scale = MapScale.Dim4096, + hotSpotSpan = 80, environment = List( SeaLevel(EnvironmentAttribute.Water, 10.09375f), Pool(EnvironmentAttribute.Water, 20.484375f, 2183.8203f, 2086.5078f, 2127.2266f, 1992.5f), //north @@ -407,6 +432,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map98", checksum = 3654267088L, scale = MapScale.Dim4096, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 3.5f)) ++ MapEnvironment.dim4096MapEdgeKillPlanes ) @@ -416,6 +442,7 @@ case object MapInfo extends StringEnum[MapInfo] { value = "map99", checksum = 4113726460L, scale = MapScale.Dim4096, + hotSpotSpan = 80, environment = List(SeaLevel(EnvironmentAttribute.Water, 44.0625f)) ++ MapEnvironment.dim4096MapEdgeKillPlanes ) diff --git a/src/main/scala/net/psforever/objects/zones/Zone.scala b/src/main/scala/net/psforever/objects/zones/Zone.scala index 4d8c0e54..b9e01657 100644 --- a/src/main/scala/net/psforever/objects/zones/Zone.scala +++ b/src/main/scala/net/psforever/objects/zones/Zone.scala @@ -2,9 +2,9 @@ package net.psforever.objects.zones import akka.actor.{ActorContext, ActorRef, Props} -import net.psforever.objects.{PlanetSideGameObject, _} -import net.psforever.objects.ballistics.{Projectile, SourceEntry} -import net.psforever.objects.ce.Deployable +import net.psforever.objects._ +import net.psforever.objects.ballistics.Projectile +import net.psforever.objects.ce.{Deployable, DeployableCategory} import net.psforever.objects.equipment.Equipment import net.psforever.objects.guid.{NumberPoolHub, UniqueNumberOps, UniqueNumberSetup} import net.psforever.objects.guid.key.LoanedKey @@ -44,7 +44,8 @@ import net.psforever.objects.serverobject.locks.IFFLock import net.psforever.objects.serverobject.terminals.implant.ImplantTerminalMech import net.psforever.objects.serverobject.shuttle.OrbitalShuttlePad import net.psforever.objects.serverobject.tube.SpawnTube -import net.psforever.objects.vehicles.UtilityType +import net.psforever.objects.sourcing.SourceEntry +import net.psforever.objects.vehicles.{MountedWeapons, UtilityType} import net.psforever.objects.vital.etc.ExplodingEntityReason import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult} import net.psforever.objects.vital.prop.DamageWithPosition @@ -53,6 +54,7 @@ import net.psforever.objects.zones.blockmap.BlockMap import net.psforever.services.Service import scala.annotation.tailrec +import scala.collection.mutable import scala.concurrent.{Future, Promise} /** @@ -160,6 +162,8 @@ class Zone(val id: String, val map: ZoneMap, zoneNumber: Int) { /** calculate a duration from a given interaction's participants */ private var hotspotTimeFunc: (SourceEntry, SourceEntry) => FiniteDuration = Zone.HotSpot.Rules.NoTime + private val linkDynamicTurretWeapon: mutable.HashMap[Int, Int] = mutable.HashMap[Int, Int]() + /** */ private var avatarEvents: ActorRef = Default.Actor @@ -207,9 +211,9 @@ class Zone(val id: String, val map: ZoneMap, zoneNumber: Int) { SetupNumberPools() context.actorOf(Props(classOf[UniqueNumberSys], this, this.guid), s"zone-$id-uns") ground = context.actorOf(Props(classOf[ZoneGroundActor], this, equipmentOnGround), s"zone-$id-ground") - deployables = context.actorOf(Props(classOf[ZoneDeployableActor], this, constructions), s"zone-$id-deployables") + deployables = context.actorOf(Props(classOf[ZoneDeployableActor], this, constructions, linkDynamicTurretWeapon), s"zone-$id-deployables") projectiles = context.actorOf(Props(classOf[ZoneProjectileActor], this, projectileList), s"zone-$id-projectiles") - transport = context.actorOf(Props(classOf[ZoneVehicleActor], this, vehicles), s"zone-$id-vehicles") + transport = context.actorOf(Props(classOf[ZoneVehicleActor], this, vehicles, linkDynamicTurretWeapon), s"zone-$id-vehicles") population = context.actorOf(Props(classOf[ZonePopulationActor], this, players, corpses), s"zone-$id-players") projector = context.actorOf( Props(classOf[ZoneHotSpotDisplay], this, hotspots, 15 seconds, hotspotHistory, 60 seconds), @@ -668,9 +672,10 @@ class Zone(val id: String, val map: ZoneMap, zoneNumber: Int) { map.objectToBuilding.foreach({ case (object_guid, building_id) => (buildings.get(building_id), guid(object_guid)) match { - case (Some(building), Some(amenity)) => - building.Amenities = amenity.asInstanceOf[Amenity] - case (None, _) | (_, None) => ; //let ZoneActor's sanity check catch this error + case (Some(building), Some(amenity: Amenity)) => + building.Amenities = amenity + //amenity.History(EntitySpawn(SourceEntry(amenity), this)) + case (Some(_), _) | (None, _) | (_, None) => ; //let ZoneActor's sanity check catch this error } }) //doors with nearby locks use those locks as their unlocking mechanism @@ -692,7 +697,7 @@ class Zone(val id: String, val map: ZoneMap, zoneNumber: Int) { .flatMap(_.Amenities.filter(_.Definition.isInstanceOf[PainboxDefinition])) .collect { case painbox: Painbox => - painbox.Actor ! "startup" + painbox.Actor ! Service.Startup() } //the orbital_buildings in sanctuary zones have to establish their shuttle routes map.shuttleBays @@ -826,6 +831,8 @@ class Zone(val id: String, val map: ZoneMap, zoneNumber: Int) { */ def ClientInitialization(): Zone = this + def turretToWeapon: Map[Int, Int] = linkDynamicTurretWeapon.toMap[Int, Int] ++ map.turretToWeapon + def AvatarEvents: ActorRef = avatarEvents def LocalEvents: ActorRef = localEvents @@ -1088,6 +1095,8 @@ object Zone { */ final case class InContainer(obj: Container, index: Int) extends ItemLocation + final case class Mounted(obj: MountedWeapons, index: Int) extends ItemLocation + /** * The target item is found on the Ground. * @see `ZoneGroundActor` @@ -1104,9 +1113,12 @@ object Zone { * and a token that qualifies the current location of the object in the zone is returned. * The following groups of objects are searched: * the inventories of all players and all corpses, - * all vehicles weapon mounts and trunks, - * the lockers of all players and corpses; - * and, if still not found, the ground is scoured too. + * the lockers of all players and corpses, + * all vehicles's weapon mounts and trunks, + * all weapon-mounted deployables's mounted turrets, + * all facilities's natural mounted turrets; + * and, if still not found, the ground is scoured too; + * and, if still not found after that, it __shouldn't__ exist (in this zone). * @see `ItemLocation` * @see `LockerContainer` * @param equipment the target object @@ -1127,8 +1139,29 @@ object Zone { }).orElse(continent.Players.find(_.locker.Find(guid).nonEmpty) match { case Some(avatar) => Some((avatar.locker, avatar.locker.Find(guid))) case _ => None - }) match { - case Some((obj, Some(index))) => + }).orElse({ + (continent.DeployableList.filter( d => d.Definition.DeployCategory == DeployableCategory.FieldTurrets ) ++ + continent.DeployableList.filter( d => d.Definition.DeployCategory == DeployableCategory.SmallTurrets )).find { + case w: MountedWeapons => w.Weapons.values.flatMap(_.Equipment).exists(_ eq equipment) + case _ => false + } match { + case Some(deployable) => Some((deployable, Some(0))) + case _ => None + } + }).orElse({ + continent.Buildings.values + .flatMap(_.Amenities).find { + case w: MountedWeapons => w.Weapons.values.flatMap(_.Equipment).exists(_ eq equipment) + case _ => false + } match { + case Some(turret) => Some((turret.asInstanceOf[MountedWeapons], Some(0))) + case _ => None + } + }) + match { + case Some((obj: MountedWeapons, Some(index))) => + Some(Zone.EquipmentIs.Mounted(obj, index)) + case Some((obj: Container, Some(index))) => Some(Zone.EquipmentIs.InContainer(obj, index)) case _ => continent.EquipmentOnGround.find(_.GUID == guid) match { diff --git a/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala b/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala index 3921506c..728cbce8 100644 --- a/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala +++ b/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala @@ -5,15 +5,23 @@ import akka.actor.Actor import net.psforever.objects.Player import net.psforever.actors.zone.ZoneActor import net.psforever.objects.ce.Deployable +import net.psforever.objects.sourcing.ObjectSource +import net.psforever.objects.vehicles.MountedWeapons +import net.psforever.objects.vital.SpawningActivity import scala.annotation.tailrec +import scala.collection.mutable import scala.collection.mutable.ListBuffer /** * na * @param zone the `Zone` object */ -class ZoneDeployableActor(zone: Zone, deployableList: ListBuffer[Deployable]) extends Actor { +class ZoneDeployableActor( + zone: Zone, + deployableList: ListBuffer[Deployable], + turretToMount: mutable.HashMap[Int, Int] + ) extends Actor { import ZoneDeployableActor._ private[this] val log = org.log4s.getLogger @@ -22,8 +30,21 @@ class ZoneDeployableActor(zone: Zone, deployableList: ListBuffer[Deployable]) ex case Zone.Deployable.Build(obj) => if (DeployableBuild(obj, deployableList)) { obj.Zone = zone + obj match { + case mounting: MountedWeapons => + val dguid = obj.GUID.guid + mounting + .Weapons + .values + .flatten { _.Equipment.map { _.GUID.guid } } + .foreach { guid => + turretToMount.put(guid, dguid) + } + case _ => ; + } obj.Definition.Initialize(obj, context) zone.actor ! ZoneActor.AddToBlockMap(obj, obj.Position) + //obj.History(EntitySpawn(SourceEntry(obj), obj.Zone)) obj.Actor ! Zone.Deployable.Setup() } else { log.warn(s"failed to build a ${obj.Definition.Name}") @@ -33,8 +54,21 @@ class ZoneDeployableActor(zone: Zone, deployableList: ListBuffer[Deployable]) ex case Zone.Deployable.BuildByOwner(obj, owner, tool) => if (DeployableBuild(obj, deployableList)) { obj.Zone = zone + obj match { + case mounting: MountedWeapons => + val dguid = obj.GUID.guid + mounting + .Weapons + .values + .flatten { _.Equipment.map { _.GUID.guid } } + .foreach { guid => + turretToMount.put(guid, dguid) + } + case _ => ; + } obj.Definition.Initialize(obj, context) zone.actor ! ZoneActor.AddToBlockMap(obj, obj.Position) + obj.LogActivity(SpawningActivity(ObjectSource(obj), zone.Number, None)) owner.Actor ! Player.BuildDeployable(obj, tool) } else { log.warn(s"failed to build a ${obj.Definition.Name} belonging to ${obj.OwnerName.getOrElse("no one")}") @@ -43,8 +77,15 @@ class ZoneDeployableActor(zone: Zone, deployableList: ListBuffer[Deployable]) ex case Zone.Deployable.Dismiss(obj) => if (DeployableDismiss(obj, deployableList)) { + obj match { + case _: MountedWeapons => + val dguid = obj.GUID.guid + turretToMount.filterInPlace { case (_, guid) => guid != dguid } + case _ => ; + } obj.Actor ! Zone.Deployable.IsDismissed(obj) obj.Definition.Uninitialize(obj, context) + obj.ClearHistory() zone.actor ! ZoneActor.RemoveFromBlockMap(obj) } diff --git a/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala b/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala index 3fa058d3..5ee7928d 100644 --- a/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala +++ b/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala @@ -35,11 +35,11 @@ class ZoneHotSpotDisplay( dataList: ListBuffer[HotSpotInfo], dataBlanking: FiniteDuration ) extends Actor { - val projector = context.actorOf( + val projector: ActorRef = context.actorOf( Props(classOf[ZoneHotSpotProjector], zone, outputList, outputBlanking), s"${zone.id}-hotspot-projector" ) - val backup = + val backup: ActorRef = context.actorOf(Props(classOf[ZoneHotSpotHistory], zone, dataList, dataBlanking), s"${zone.id}-hotspot-backup") def receive: Receive = { @@ -164,18 +164,11 @@ class ZoneHotSpotProjector(zone: Zone, hotspots: ListBuffer[HotSpotInfo], blanki ) val noPriorActivity = !(hotspot.ActivityBy(defenderFaction) && hotspot.ActivityBy(attackerFaction)) //update the activity report for these factions - val affectedFactions = Seq(attackerFaction, defenderFaction) - affectedFactions.foreach { f => - hotspot.ActivityFor(f) match { - case Some(events) => - events.Duration = duration - events.Report() - case None => ; - } - } + hotspot.Activity(attackerFaction).Report(pow = 2, duration) + hotspot.Activity(defenderFaction).Report(pow = 1, duration) //if the level of activity changed for one of the participants or the number of hotspots was zero if (noPriorActivity || noPriorHotSpots) { - UpdateHotSpots(affectedFactions, hotspots) + UpdateHotSpots(Seq(attackerFaction, defenderFaction), hotspots) if (noPriorHotSpots) { import scala.concurrent.ExecutionContext.Implicits.global blanking.cancel() @@ -331,9 +324,41 @@ class ZoneHotSpotHistory(zone: Zone, hotspots: ListBuffer[HotSpotInfo], blanking /* this component does not actually the visible hotspots * a duplicate of the projector device otherwise */ override def UpdateHotSpots( - affectedFactions: Iterable[PlanetSideEmpire.Value], - hotSpotInfos: Iterable[HotSpotInfo] - ): Unit = {} + affectedFactions: Iterable[PlanetSideEmpire.Value], + hotSpotInfos: Iterable[HotSpotInfo] + ): Unit = { } + override def Established: Receive = { + case ZoneHotSpotProjector.ExposeHeatForRegion(center, radius) => + MapInfo.values.find(_.value == zone.map.name) match { + case Some(mapInfo) if mapInfo.hotSpotSpan > 0 => + //turn the radius into the number of hotspots, then sample all hotspots outwards from the center region + val span = mapInfo.hotSpotSpan + val spanIntervalsHalf = (radius / span).toInt + 1 + val cornerOffset = span * spanIntervalsHalf.toFloat + val lowerLeftCorner = zone.HotSpotCoordinateFunction(center) + Vector3(-cornerOffset, -cornerOffset, 0f) + val progressionOfIntervals = 0 to spanIntervalsHalf * 2 + val squareRadius = radius * radius + val out = progressionOfIntervals + .flatMap { y => + val yFloat = span * y.toFloat + progressionOfIntervals.map { x => TryHotSpot(lowerLeftCorner + Vector3(span * x.toFloat, yFloat, 0f)) } + } + .filter { info => Vector3.DistanceSquared(center, info.DisplayLocation) < squareRadius } + .distinctBy { _.DisplayLocation } + .toList + sender() ! ZoneHotSpotProjector.ExposedHeat(center, radius, out) + + case _ => + //can't validate the radius so just get the center hotspot + sender() ! ZoneHotSpotProjector.ExposedHeat( + center, + radius, + List(TryHotSpot(zone.HotSpotCoordinateFunction(center))) + ) + } + case msg => + super.Established.apply(msg) + } } object ZoneHotSpotProjector { @@ -353,6 +378,10 @@ object ZoneHotSpotProjector { */ private case class BlankingPhase() + final case class ExposeHeatForRegion(center: Vector3, radius: Float) + + final case class ExposedHeat(center: Vector3, radius: Float, activity: List[HotSpotInfo]) + /** * Extract related hotspot activity information based on association with a faction. * @param faction the faction diff --git a/src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala b/src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala index 2b7f47cf..f7480a8a 100644 --- a/src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala +++ b/src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala @@ -4,6 +4,8 @@ package net.psforever.objects.zones import akka.actor.{Actor, ActorRef, Props} import net.psforever.actors.zone.ZoneActor import net.psforever.objects.avatar.{CorpseControl, PlayerControl} +import net.psforever.objects.sourcing.PlayerSource +import net.psforever.objects.vital.{InGameHistory, SpawningActivity} import net.psforever.objects.{Default, Player} import net.psforever.types.Vector3 @@ -51,6 +53,7 @@ class ZonePopulationActor(zone: Zone, playerMap: TrieMap[Int, Option[Player]], c PopulationSpawn(avatar.id, player, playerMap) match { case Some((tplayer, newToZone)) => tplayer.Zone = zone + InGameHistory.SpawnReconstructionActivity(player, zone.Number, None) if (tplayer ne player) { sender() ! Zone.Population.PlayerAlreadySpawned(zone, player) } else if (newToZone) { @@ -94,6 +97,8 @@ class ZonePopulationActor(zone: Zone, playerMap: TrieMap[Int, Option[Player]], c (player.Zone == Zone.Nowhere || player.Zone == zone, None) } if (canBeCorpse && CorpseAdd(player, corpseList)) { + player.ClearHistory() + player.LogActivity(SpawningActivity(PlayerSource(player), zone.Number, None)) player.Actor = context.actorOf( Props(classOf[CorpseControl], player), name = s"corpse_of_${GetPlayerControlName(player, control)}" diff --git a/src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala b/src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala index 6f86ae45..ebabcc10 100644 --- a/src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala +++ b/src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala @@ -3,17 +3,18 @@ package net.psforever.objects.zones import akka.actor.Actor import net.psforever.actors.zone.ZoneActor +import net.psforever.objects.vital.InGameHistory import net.psforever.objects.{Default, Vehicle} import net.psforever.types.Vector3 import scala.annotation.tailrec -import scala.collection.mutable.ListBuffer +import scala.collection.mutable /** * Synchronize management of the list of `Vehicles` maintained by some `Zone`. */ //COMMENTS IMPORTED FROM FORMER VehicleContextActor: -/** + /* * Provide a context for a `Vehicle` `Actor` - the `VehicleControl`.
*
* A vehicle can be passed between different zones and, therefore, does not belong to the zone. @@ -27,7 +28,11 @@ import scala.collection.mutable.ListBuffer *
* This `Actor` is intended to sit on top of the event system that handles broadcast messaging. */ -class ZoneVehicleActor(zone: Zone, vehicleList: ListBuffer[Vehicle]) extends Actor { +class ZoneVehicleActor( + zone: Zone, + vehicleList: mutable.ListBuffer[Vehicle], + turretToMount: mutable.HashMap[Int, Int] + ) extends Actor { //private[this] val log = org.log4s.getLogger def receive: Receive = { @@ -41,11 +46,20 @@ class ZoneVehicleActor(zone: Zone, vehicleList: ListBuffer[Vehicle]) extends Act } else { vehicleList += vehicle vehicle.Zone = zone + val vguid = vehicle.GUID.guid + vehicle + .Weapons + .values + .flatten { _.Equipment.map { _.GUID.guid } } + .foreach { guid => + turretToMount.put(guid, vguid) + } vehicle.Definition.Initialize(vehicle, context) } if (vehicle.MountedIn.isEmpty) { zone.actor ! ZoneActor.AddToBlockMap(vehicle, vehicle.Position) } + InGameHistory.SpawnReconstructionActivity(vehicle, zone.Number, None) sender() ! Zone.Vehicle.HasSpawned(zone, vehicle) case Zone.Vehicle.Despawn(vehicle) => @@ -53,7 +67,10 @@ class ZoneVehicleActor(zone: Zone, vehicleList: ListBuffer[Vehicle]) extends Act case Some(index) => vehicleList.remove(index) vehicle.Definition.Uninitialize(vehicle, context) + val vguid = vehicle.GUID.guid + turretToMount.filterInPlace { case (_, guid) => guid != vguid } vehicle.Position = Vector3.Zero + vehicle.ClearHistory() zone.actor ! ZoneActor.RemoveFromBlockMap(vehicle) sender() ! Zone.Vehicle.HasDespawned(zone, vehicle) case None => ; diff --git a/src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala index cc7e241f..e91d1363 100644 --- a/src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala +++ b/src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala @@ -2,6 +2,8 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.{StatisticalCategory, StatisticalElement} +import scodec.Attempt.{Failure, Successful} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} @@ -9,93 +11,153 @@ import shapeless.{::, HNil} import scala.annotation.switch /** - * na - * @param unk1 na - * @param unk2 na - * @param unk3 na - */ -final case class Statistics(unk1: Option[Int], unk2: Option[Int], unk3: List[Long]) + * na + */ +sealed abstract class Statistic(val code: Int) +/** + * na + */ +sealed trait ComplexStatistic { + def category: StatisticalCategory + def unk: StatisticalElement + def fields: List[Long] +} +/** + * na + */ +sealed case class IntermediateStatistic( + category: StatisticalCategory, + unk: StatisticalElement, + fields: List[Long] + ) extends ComplexStatistic /** - * na - * @param unk na - * @param stats na - */ -final case class AvatarStatisticsMessage(unk: Int, stats: Statistics) extends PlanetSideGamePacket { + * + * @param category na + * @param unk na + * @param fields four pairs of values that add together to produce the first columns on the statistics spreadsheet; + * organized as TR, NC, VS, BO (PS) + */ +final case class InitStatistic( + category: StatisticalCategory, + unk: StatisticalElement, + fields: List[Long] + ) extends Statistic(code = 0) with ComplexStatistic + +/** + * + * @param category na + * @param unk na + * @param fields four pairs of values that add together to produce the first column(s) on the statistics spreadsheet; + * organized as TR, NC, VS, BO (PS) + */ +final case class UpdateStatistic( + category: StatisticalCategory, + unk: StatisticalElement, + fields: List[Long] + ) extends Statistic(code = 1) with ComplexStatistic + +/** + * + * @param deaths how badly you suck, quantitatively analyzed + */ +final case class DeathStatistic(deaths: Long) extends Statistic(code = 2) + +/** + * na + * @param stats na + */ +final case class AvatarStatisticsMessage(stats: Statistic) extends PlanetSideGamePacket { type Packet = AvatarStatisticsMessage def opcode = GamePacketOpcode.AvatarStatisticsMessage def encode = AvatarStatisticsMessage.encode(this) } object AvatarStatisticsMessage extends Marshallable[AvatarStatisticsMessage] { - /** - * na - */ - private val longCodec: Codec[Statistics] = ulong(32).hlist.exmap( - { - case n :: HNil => - Attempt.Successful(Statistics(None, None, List(n))) - }, - { - case Statistics(_, _, Nil) => - Attempt.Failure(Err("missing value (32-bit)")) - - case Statistics(_, _, n) => - Attempt.Successful(n.head :: HNil) - } - ) - - /** - * na - */ - private val complexCodec: Codec[Statistics] = ( - uint(5) :: - uintL(11) :: - PacketHelpers.listOfNSized(8, uint32L) - ).exmap[Statistics]( + * na + */ + private val complexCodec: Codec[IntermediateStatistic] = ( + PacketHelpers.createIntEnumCodec(StatisticalCategory, uint(bits = 5)) :: + PacketHelpers.createIntEnumCodec(StatisticalElement, uintL(bits = 11)) :: + PacketHelpers.listOfNSized(size = 8, uint32L) + ).exmap[IntermediateStatistic]( { case a :: b :: c :: HNil => - Attempt.Successful(Statistics(Some(a), Some(b), c)) + Attempt.Successful(IntermediateStatistic(a, b, c)) }, { - case Statistics(None, _, _) => - Attempt.Failure(Err("missing value (5-bit)")) - - case Statistics(_, None, _) => - Attempt.Failure(Err("missing value (11-bit)")) - - case Statistics(a, b, c) => + case IntermediateStatistic(a, b, c) => if (c.length != 8) { Attempt.Failure(Err("list must have 8 entries")) } else { - Attempt.Successful(a.get :: b.get :: c :: HNil) + Attempt.Successful(a :: b :: c :: HNil) } + case _ => + Attempt.Failure(Err("wrong type of statistic object or missing values (5-bit, 11-bit, 8 x 32-bit)")) } ) /** - * na - * @param n na - * @return na - */ - private def selectCodec(n: Int): Codec[Statistics] = + * na + */ + private val initCodec: Codec[Statistic] = complexCodec.exmap[Statistic]( + { + case IntermediateStatistic(a, b, c) => Successful(InitStatistic(a, b, c)) + }, + { + case InitStatistic(a, b, c) => Successful(IntermediateStatistic(a, b, c)) + case _ => Failure(Err("expected initializing statistic, but found something else")) + } + ) + /** + * na + */ + private val updateCodec: Codec[Statistic] = complexCodec.exmap[Statistic]( + { + case IntermediateStatistic(a, b, c) => Successful(UpdateStatistic(a, b, c)) + }, + { + case UpdateStatistic(a, b, c) => Successful(IntermediateStatistic(a, b, c)) + case _ => Failure(Err("expected updating statistic, but found something else")) + } + ) + /** + * na + */ + private val deathCodec: Codec[Statistic] = ulongL(bits = 32).hlist.exmap[Statistic]( + { + case n :: HNil => Successful(DeathStatistic(n)) + }, + { + case DeathStatistic(n) => Successful(n :: HNil) + case _ => Failure(Err("wrong type of statistics object or missing value (32-bit)")) + } + ) + + /** + * na + * @param n na + * @return na + */ + private def selectCodec(n: Int): Codec[Statistic] + = (n: @switch) match { - case 2 | 3 => - longCodec - case _ => - complexCodec + case 2 => deathCodec + case 1 => updateCodec + case _ => initCodec } - implicit val codec: Codec[AvatarStatisticsMessage] = (("unk" | uint(3)) >>:~ { unk => - ("stats" | selectCodec(unk)).hlist - }).as[AvatarStatisticsMessage] -} - -object Statistics { - def apply(unk: Long): Statistics = - Statistics(None, None, List(unk)) - - def apply(unk1: Int, unk2: Int, unk3: List[Long]): Statistics = - Statistics(Some(unk1), Some(unk2), unk3) + implicit val codec: Codec[AvatarStatisticsMessage] = ( + uint(bits = 3) >>:~ { code => + ("stats" | selectCodec(code)).hlist + } + ).xmap[AvatarStatisticsMessage]( + { + case _ :: stat :: HNil => AvatarStatisticsMessage(stat) + }, + { + case AvatarStatisticsMessage(stat) => stat.code :: stat :: HNil + } + ) } diff --git a/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala b/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala index 372a1fbc..0ef6ccad 100644 --- a/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala +++ b/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala @@ -2,39 +2,29 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.PlanetSideGUID +import net.psforever.types.{ExperienceType, PlanetSideGUID} import scodec.Codec import scodec.codecs._ /** - * Inform the client how many battle experience points (BEP) the player currently has earned.
- *
- * The amount of `experience` earned is an accumulating value. - * Whenever the server sends this packet, the value of this field is equal to the player's current total BEP. - * Each packet updates to a higher BEP score and the client occasionally reports of the difference as an event message. - * "You have been awarded `x` battle experience points." - * Milestone notifications that occur due to BEP gain, e.g., rank progression, will trigger naturally as the client is updated.
- *
- * It is possible to award more battle experience than is necessary to progress one's character to the highest battle rank. - * (This must be accomplished in a single event packet.) - * Only the most significant notifications will be displayed in that case. - * If the BEP has been modified, there will be an extra three bits to indicate which message to display.
- *
- * Messages:
- * 0 - Normal
- * 1 - Normal (repeat?)
- * 2 - Support bonus ("due to support activity")
- * 4 - Rabbit bonus ("+25% rabbit Bonus")
- * (Support message has priority over Rabbit message.)
- *
- * Exploration:
- * `msg = 1` probably does not do the same thing as `mod = 0`. - * @param player_guid the player - * @param experience the current total experience - * @param msg modifies the awarded experience message - */ -final case class BattleExperienceMessage(player_guid: PlanetSideGUID, experience: Long, msg: Int) - extends PlanetSideGamePacket { + * Inform the client how many battle experience points (BEP) the player currently has earned.
+ *
+ * The amount of `experience` earned is an accumulating value. + * Whenever the server sends this packet, the value of this field is equal to the player's current total BEP. + * Each packet updates to a higher BEP score and the client occasionally reports of the difference as an event message. + * "You have been awarded `x` battle experience points." + * Milestone notifications that occur due to BEP gain, e.g., rank progression, will trigger naturally as the client is updated.
+ *
+ * It is possible to award more battle experience than is necessary to progress one's character to the highest battle rank. + * (This must be accomplished in a single event packet.) + * Only the most significant notifications will be displayed in that case. + * If the BEP has been modified, the message in the event chat can be modified in two extra ways. + * @param player_guid the player + * @param experience the current total experience + * @param msg modifies the awarded experience message + */ +final case class BattleExperienceMessage(player_guid: PlanetSideGUID, experience: Long, msg: ExperienceType) + extends PlanetSideGamePacket { type Packet = BattleExperienceMessage def opcode = GamePacketOpcode.BattleExperienceMessage def encode = BattleExperienceMessage.encode(this) @@ -44,6 +34,6 @@ object BattleExperienceMessage extends Marshallable[BattleExperienceMessage] { implicit val codec: Codec[BattleExperienceMessage] = ( ("player_guid" | PlanetSideGUID.codec) :: ("experience" | uint32L) :: - ("msg" | uintL(3)) - ).as[BattleExperienceMessage] + ("msg" | ExperienceType.codec) + ).as[BattleExperienceMessage] } diff --git a/src/main/scala/net/psforever/packet/game/DestroyMessage.scala b/src/main/scala/net/psforever/packet/game/DestroyMessage.scala index 44026d6a..0028e359 100644 --- a/src/main/scala/net/psforever/packet/game/DestroyMessage.scala +++ b/src/main/scala/net/psforever/packet/game/DestroyMessage.scala @@ -6,8 +6,12 @@ import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ -final case class DestroyMessage(unk1: PlanetSideGUID, unk2: PlanetSideGUID, unk3: PlanetSideGUID, pos: Vector3) - extends PlanetSideGamePacket { +final case class DestroyMessage( + victim_guid: PlanetSideGUID, + killer_guid: PlanetSideGUID, + weapon_guid: PlanetSideGUID, + position: Vector3 + ) extends PlanetSideGamePacket { type Packet = DestroyMessage def opcode = GamePacketOpcode.DestroyMessage def encode = DestroyMessage.encode(this) @@ -15,9 +19,9 @@ final case class DestroyMessage(unk1: PlanetSideGUID, unk2: PlanetSideGUID, unk3 object DestroyMessage extends Marshallable[DestroyMessage] { implicit val codec: Codec[DestroyMessage] = ( - ("unk1" | PlanetSideGUID.codec) :: - ("unk2" | PlanetSideGUID.codec) :: - ("unk3" | PlanetSideGUID.codec) :: - ("pos" | Vector3.codec_pos) - ).as[DestroyMessage] + ("victim_guid" | PlanetSideGUID.codec) :: + ("killer_guid" | PlanetSideGUID.codec) :: + ("weapon_guid" | PlanetSideGUID.codec) :: + ("position" | Vector3.codec_pos) + ).as[DestroyMessage] } diff --git a/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala b/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala index a22fd925..d6259040 100644 --- a/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala +++ b/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala @@ -25,7 +25,7 @@ import scodec.codecs._ *
* Global (GUID=0)
* `75 - Russian client region check` (value checks with bitmask `& 8`)
- * `82 - ???`
+ * `82 - event chat message in green, "You have been Silenced by a Game Official. You can not talk in Command Chat."`
* `83 - max boomers`
* `84 - max he mines`
* `85 - max disruptor mines`
diff --git a/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala index ace0ad0c..25a20a14 100644 --- a/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala +++ b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala @@ -172,6 +172,7 @@ object ObjectClass { final val cycler_v3 = 235 final val cycler_v4 = 236 final val dropship_rear_turret = 262 + final val dynomite = 267 final val energy_gun = 274 final val energy_gun_nc = 276 final val energy_gun_tr = 278 @@ -182,6 +183,7 @@ object ObjectClass { final val flux_cannon_thresher = 306 final val fluxpod = 309 final val forceblade = 324 + final val frag_grenade = 330 final val fragmentation_grenade = 334 final val fury_weapon_systema = 336 final val galaxy_gunship_cannon = 339 @@ -189,6 +191,7 @@ object ObjectClass { final val galaxy_gunship_tailgun = 342 final val gauss = 345 final val gauss_cannon = 346 + final val generic_grenade = 354 final val grenade_launcher_marauder = 371 final val heavy_rail_beam_magrider = 394 final val heavy_sniper = 396 @@ -196,11 +199,10 @@ object ObjectClass { final val hunterseeker = 406 final val ilc9 = 407 final val isp = 411 + final val jammer_grenade = 416 final val katana = 421 final val lancer = 425 final val lasher = 429 - final val lasher_projectile = 430 - final val lasher_projectile_ap = 431 final val liberator_25mm_cannon = 433 final val liberator_bomb_bay = 435 final val liberator_weapon_system = 440 @@ -208,6 +210,7 @@ object ObjectClass { final val lightning_weapon_system = 448 final val maelstrom = 462 final val magcutter = 468 + final val mine_sweeper = 552 final val mediumtransport_weapon_systemA = 534 final val mediumtransport_weapon_systemB = 535 final val mini_chaingun = 556 @@ -239,6 +242,7 @@ object ObjectClass { final val phalanx_sgl_hevgatcan = 670 final val phantasm_12mm_machinegun = 672 final val phoenix = 673 + final val plasma_grenade = 680 final val prowler_weapon_systemA = 699 final val prowler_weapon_systemB = 700 final val pulsar = 701 @@ -274,12 +278,6 @@ object ObjectClass { final val vulture_tail_cannon = 992 final val wasp_weapon_system = 1002 final val winchester = 1003 - final val dynomite = 267 - final val frag_grenade = 330 - final val generic_grenade = 354 - final val jammer_grenade = 416 - final val mine_sweeper = 552 - final val plasma_grenade = 680 //medkits final val medkit = 536 final val super_armorkit = 842 @@ -319,6 +317,8 @@ object ObjectClass { final val aphelion_starfire_projectile = 108 final val flamethrower_fire_cloud = 301 final val hunter_seeker_missile_projectile = 405 //phoenix projectile + final val lasher_projectile = 430 + final val lasher_projectile_ap = 431 final val maelstrom_grenade_damager = 464 final val meteor_common = 543 final val meteor_projectile_b_large = 544 diff --git a/src/main/scala/net/psforever/persistence/Avatar.scala b/src/main/scala/net/psforever/persistence/Avatar.scala index 6a489076..28fd2eac 100644 --- a/src/main/scala/net/psforever/persistence/Avatar.scala +++ b/src/main/scala/net/psforever/persistence/Avatar.scala @@ -1,9 +1,6 @@ package net.psforever.persistence -import net.psforever.objects.avatar -import net.psforever.objects.avatar.{Cosmetic, ProgressDecoration} import org.joda.time.LocalDateTime -import net.psforever.types.{CharacterSex, CharacterVoice, PlanetSideEmpire} case class Avatar( id: Int, @@ -20,18 +17,4 @@ case class Avatar( lastLogin: LocalDateTime = LocalDateTime.now(), lastModified: LocalDateTime = LocalDateTime.now(), deleted: Boolean = false -) { - - def toAvatar: avatar.Avatar = - avatar.Avatar( - id, - name, - PlanetSideEmpire(factionId), - CharacterSex.valuesToEntriesMap(genderId), - headId, - CharacterVoice(voiceId), - bep, - cep, - decoration = ProgressDecoration(cosmetics = cosmetics.map(c => Cosmetic.valuesFromObjectCreateValue(c))) - ) -} +) diff --git a/src/main/scala/net/psforever/services/InterstellarClusterService.scala b/src/main/scala/net/psforever/services/InterstellarClusterService.scala index 97323464..6776f1fe 100644 --- a/src/main/scala/net/psforever/services/InterstellarClusterService.scala +++ b/src/main/scala/net/psforever/services/InterstellarClusterService.scala @@ -276,24 +276,21 @@ class InterstellarClusterService(context: ActorContext[InterstellarClusterServic case DroppodLaunchRequest(zoneNumber, position, faction, replyTo) => zones.find(_.Number == zoneNumber) match { + //TODO all of the checks for the specific DroppodLaunchResponseMessage excuses go here + case Some(zone) if zone.map.cavern => + //just being cautious - caverns are typically not normally selectable as drop zones + replyTo ! DroppodLaunchDenial(DroppodError.ZoneNotAvailable, None) + case Some(zone) if zone.Number == Zones.sanctuaryZoneNumber(faction) => + replyTo ! DroppodLaunchDenial(DroppodError.OwnFactionLocked, None) case Some(zone) => - //TODO all of the checks for the specific DroppodLaunchResponseMessage excuses go here - if(zone.map.cavern) { - //just being cautious - caverns are typically not normally selectable as drop zones - replyTo ! DroppodLaunchDenial(DroppodError.ZoneNotAvailable, None) - } else if (zone.Number == Zones.sanctuaryZoneNumber(faction)) { - replyTo ! DroppodLaunchDenial(DroppodError.OwnFactionLocked, None) - } else { - replyTo ! DroppodLaunchConfirmation(zone, position) - } + replyTo ! DroppodLaunchConfirmation(zone, position) case None => replyTo ! DroppodLaunchDenial(DroppodError.InvalidLocation, None) } case CavernRotation(rotationMsg) => - cavernRotation match { - case Some(rotation) => rotation ! rotationMsg - case _ => ; + cavernRotation.foreach { + rotation => rotation ! rotationMsg } } this @@ -374,10 +371,19 @@ class InterstellarClusterService(context: ActorContext[InterstellarClusterServic (raw.head, raw.last) } ((_zones.find(_.id.equals(zone1)), _zones.find(_.id.equals(zone2))) match { - case (Some(z1), Some(z2)) => (z1.Building(gate1), z2.Building(gate2)) - case _ => (None, None) + case (Some(z1), Some(z2)) => + (z1.Building(gate1), z2.Building(gate2)) + case _ => + /* + one or both of the zones is not loaded; + the cavern lattice link will not be created and that may not be our fault; + the zone may have been intentionally excluded; + warnings may be thrown when caverns try to rotate depending on the plan; + @see `Config.app.game.cavernRotation.enhancedRotationOrder` + */ + (Some(Building.NoBuilding), Some(Building.NoBuilding)) }) match { - case (Some(_), Some(_)) => ; + case (Some(_), Some(_)) => () case _ => log.error(s"InterstellarCluster: can't create cavern lattice link between $a and $b") } diff --git a/src/main/scala/net/psforever/services/avatar/AvatarServiceMessage.scala b/src/main/scala/net/psforever/services/avatar/AvatarServiceMessage.scala index d5335f2a..feaef692 100644 --- a/src/main/scala/net/psforever/services/avatar/AvatarServiceMessage.scala +++ b/src/main/scala/net/psforever/services/avatar/AvatarServiceMessage.scala @@ -2,11 +2,12 @@ package net.psforever.services.avatar import net.psforever.objects.Player -import net.psforever.objects.ballistics.{Projectile, SourceEntry} +import net.psforever.objects.ballistics.Projectile import net.psforever.objects.ce.Deployable import net.psforever.objects.equipment.Equipment import net.psforever.objects.inventory.InventoryItem import net.psforever.objects.serverobject.environment.OxygenStateTarget +import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.zones.Zone import net.psforever.packet.PlanetSideGamePacket import net.psforever.packet.game.objectcreate.{ConstructorData, ObjectCreateMessageParent} diff --git a/src/main/scala/net/psforever/services/avatar/AvatarServiceResponse.scala b/src/main/scala/net/psforever/services/avatar/AvatarServiceResponse.scala index 440d4bc2..4064cec4 100644 --- a/src/main/scala/net/psforever/services/avatar/AvatarServiceResponse.scala +++ b/src/main/scala/net/psforever/services/avatar/AvatarServiceResponse.scala @@ -2,10 +2,11 @@ package net.psforever.services.avatar import net.psforever.objects.Player -import net.psforever.objects.ballistics.{Projectile, SourceEntry} +import net.psforever.objects.ballistics.Projectile import net.psforever.objects.equipment.Equipment import net.psforever.objects.inventory.InventoryItem import net.psforever.objects.serverobject.environment.OxygenStateTarget +import net.psforever.objects.sourcing.SourceEntry import net.psforever.packet.PlanetSideGamePacket import net.psforever.packet.game.objectcreate.ConstructorData import net.psforever.packet.game.ObjectCreateMessage diff --git a/src/main/scala/net/psforever/services/local/LocalService.scala b/src/main/scala/net/psforever/services/local/LocalService.scala index d534402e..ce247b82 100644 --- a/src/main/scala/net/psforever/services/local/LocalService.scala +++ b/src/main/scala/net/psforever/services/local/LocalService.scala @@ -104,8 +104,8 @@ class LocalService(zone: Zone) extends Actor { case LocalAction.ClearTemporaryHack(_, target) => hackClearer ! HackClearActor.ObjectIsResecured(target) - case LocalAction.ResecureCaptureTerminal(target) => - hackCapturer ! HackCaptureActor.ResecureCaptureTerminal(target, zone) + case LocalAction.ResecureCaptureTerminal(target, hacker) => + hackCapturer ! HackCaptureActor.ResecureCaptureTerminal(target, zone, hacker) case LocalAction.StartCaptureTerminalHack(target) => hackCapturer ! HackCaptureActor.StartCaptureTerminalHack(target, zone, 0, 8L) case LocalAction.LluCaptured(llu) => @@ -121,13 +121,13 @@ class LocalService(zone: Zone) extends Actor { ) ) - case LocalAction.LluDespawned(player_guid, llu) => + case LocalAction.LluDespawned(player_guid, guid, position) => // Forward to all clients to destroy object locally LocalEvents.publish( LocalServiceResponse( s"/$forChannel/Local", player_guid, - LocalResponse.LluDespawned(llu) + LocalResponse.LluDespawned(guid, position) ) ) @@ -320,7 +320,7 @@ class LocalService(zone: Zone) extends Actor { LocalServiceResponse( s"/${zone.id}/Local", PlanetSideGUID(0), - LocalResponse.ProximityTerminalEffect(terminal.GUID, true) + LocalResponse.ProximityTerminalEffect(terminal.GUID, effectState = true) ) ) case Terminal.StopProximityEffect(terminal) => @@ -328,7 +328,7 @@ class LocalService(zone: Zone) extends Actor { LocalServiceResponse( s"/${zone.id}/Local", PlanetSideGUID(0), - LocalResponse.ProximityTerminalEffect(terminal.GUID, false) + LocalResponse.ProximityTerminalEffect(terminal.GUID, effectState = false) ) ) diff --git a/src/main/scala/net/psforever/services/local/LocalServiceMessage.scala b/src/main/scala/net/psforever/services/local/LocalServiceMessage.scala index 4f3d210b..6a162058 100644 --- a/src/main/scala/net/psforever/services/local/LocalServiceMessage.scala +++ b/src/main/scala/net/psforever/services/local/LocalServiceMessage.scala @@ -7,6 +7,7 @@ import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.serverobject.llu.CaptureFlag import net.psforever.objects.serverobject.terminals.capture.CaptureTerminal +import net.psforever.objects.sourcing.PlayerSource import net.psforever.objects.vehicles.Utility import net.psforever.objects.zones.Zone import net.psforever.objects.{PlanetSideGameObject, TelepadDeployable, Vehicle} @@ -55,11 +56,11 @@ object LocalAction { final case class ClearTemporaryHack(player_guid: PlanetSideGUID, target: PlanetSideServerObject with Hackable) extends Action - final case class ResecureCaptureTerminal(target: CaptureTerminal) extends Action + final case class ResecureCaptureTerminal(target: CaptureTerminal, hacker: PlayerSource) extends Action final case class StartCaptureTerminalHack(target: CaptureTerminal) extends Action final case class LluCaptured(llu: CaptureFlag) extends Action final case class LluSpawned(player_guid: PlanetSideGUID, llu: CaptureFlag) extends Action - final case class LluDespawned(player_guid: PlanetSideGUID, llu: CaptureFlag) extends Action + final case class LluDespawned(player_guid: PlanetSideGUID, guid: PlanetSideGUID, position: Vector3) extends Action final case class SendPacket(packet: PlanetSideGamePacket) extends Action final case class SendPlanetsideAttributeMessage( diff --git a/src/main/scala/net/psforever/services/local/LocalServiceResponse.scala b/src/main/scala/net/psforever/services/local/LocalServiceResponse.scala index e40a93ec..2e050ac6 100644 --- a/src/main/scala/net/psforever/services/local/LocalServiceResponse.scala +++ b/src/main/scala/net/psforever/services/local/LocalServiceResponse.scala @@ -46,7 +46,7 @@ object LocalResponse { final case class SendGenericActionMessage(action_num: GenericAction) extends Response final case class LluSpawned(llu: CaptureFlag) extends Response - final case class LluDespawned(llu: CaptureFlag) extends Response + final case class LluDespawned(guid: PlanetSideGUID, position: Vector3) extends Response final case class ObjectDelete(item_guid: PlanetSideGUID, unk: Int) extends Response final case class ProximityTerminalAction(terminal: Terminal with ProximityUnit, target: PlanetSideGameObject) diff --git a/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala b/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala index 6f07ca2f..42560209 100644 --- a/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala +++ b/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala @@ -1,3 +1,4 @@ +// Copyright (c) 2021 PSForever package net.psforever.services.local.support import akka.actor.{Actor, ActorRef, Cancellable} @@ -9,10 +10,9 @@ import net.psforever.objects.serverobject.structures.Building import net.psforever.objects.serverobject.terminals.capture.CaptureTerminal import net.psforever.objects.zones.Zone import net.psforever.packet.game._ -import net.psforever.services.ServiceManager +import net.psforever.services.{Service, ServiceManager} import net.psforever.services.ServiceManager.{Lookup, LookupResult} import net.psforever.services.galaxy.{GalaxyAction, GalaxyServiceMessage} -import net.psforever.services.local.support.CaptureFlagLostReasonEnum.CaptureFlagLostReasonEnum import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.types.{ChatMessageType, PlanetSideEmpire, PlanetSideGUID, Vector3} @@ -21,65 +21,26 @@ import scala.concurrent.duration.DurationInt /** * Responsible for handling capture flag related lifecycles */ -class CaptureFlagManager(zone: Zone) extends Actor{ +class CaptureFlagManager(zone: Zone) extends Actor { private[this] val log = org.log4s.getLogger(self.path.name) - var galaxyService: ActorRef = ActorRef.noSender - + private var galaxyService: ActorRef = ActorRef.noSender private var mapUpdateTick: Cancellable = Default.Cancellable - - /** An internally tracked list of current flags, to avoid querying AmenityOwners each second for flag lookups */ + /** An internally tracked list of cached flags, to avoid querying the amenity owner each second for flag lookups. */ private var flags: List[CaptureFlag] = Nil - private def TrackFlag(flag: CaptureFlag): Unit = { - flag.Owner.Amenities = flag - flags = flags :+ flag - - if (mapUpdateTick.isCancelled) { - // Start sending map updates periodically - import scala.concurrent.ExecutionContext.Implicits.global - mapUpdateTick = context.system.scheduler.scheduleAtFixedRate(0 seconds, 1 second, self, CaptureFlagManager.MapUpdate()) - } - } - - private def UntrackFlag(flag: CaptureFlag): Unit = { - flag.Owner.RemoveAmenity(flag) - flags = flags.filterNot(x => x == flag) - - if (flags.isEmpty) { - mapUpdateTick.cancel() - - // Send one final map update to clear the last flag from the map - self ! CaptureFlagManager.MapUpdate() - } - } - - val serviceManager = ServiceManager.serviceManager - serviceManager ! Lookup("galaxy") + ServiceManager.serviceManager ! Lookup("galaxy") def receive: Receive = { case LookupResult("galaxy", endpoint) => galaxyService = endpoint case CaptureFlagManager.MapUpdate() => - val flagInfo = flags.map(flag => - FlagInfo( - u1 = 0, - owner_map_id = flag.Owner.asInstanceOf[Building].MapId, - target_map_id = flag.Target.MapId, - x = flag.Position.x, - y = flag.Position.y, - hack_time_remaining = flag.Owner.asInstanceOf[Building].infoUpdateMessage().hack_time_remaining, - is_monolith_unit = false - ) - ) - - galaxyService ! GalaxyServiceMessage(GalaxyAction.FlagMapUpdate(CaptureFlagUpdateMessage(zone.Number, flagInfo))) + DoMapUpdate() case CaptureFlagManager.SpawnCaptureFlag(capture_terminal, target, hackingFaction) => val zone = capture_terminal.Zone val socket = capture_terminal.Owner.asInstanceOf[Building].GetFlagSocket.get - // Override CC message when looked at zone.LocalEvents ! LocalServiceMessage( zone.id, @@ -89,40 +50,38 @@ class CaptureFlagManager(zone: Zone) extends Actor{ GenericObjectActionEnum.FlagSpawned ) ) - // Register LLU object create task and callback to create on clients val flag: CaptureFlag = CaptureFlag.Constructor( - Vector3(socket.Position.x, socket.Position.y, socket.Position.z - 1), + socket.Position - Vector3.z(value = 1), socket.Orientation, target, socket.Owner, hackingFaction ) - // Add the flag as an amenity and track it internally socket.captureFlag = flag TrackFlag(flag) - TaskWorkflow.execute(WorldSession.CallBackForTask( GUIDTask.registerObject(socket.Zone.GUID, flag), socket.Zone.LocalEvents, LocalServiceMessage( socket.Zone.id, - LocalAction.LluSpawned(PlanetSideGUID(-1), flag) + LocalAction.LluSpawned(Service.defaultPlayerGUID, flag) ) )) - // Broadcast chat message for LLU spawn val owner = flag.Owner.asInstanceOf[Building] ChatBroadcast(flag.Zone, CaptureFlagChatMessageStrings.CTF_FlagSpawned(owner, flag.Target)) case CaptureFlagManager.Captured(flag: CaptureFlag) => + val name = flag.Carrier match { + case Some(carrier) => carrier.Name + case None => "A soldier" + } // Trigger Install sound flag.Zone.LocalEvents ! LocalServiceMessage(flag.Zone.id, LocalAction.TriggerSound(PlanetSideGUID(-1), TriggeredSound.LLUInstall, flag.Target.CaptureTerminal.get.Position, 20, 0.8000001f)) - // Broadcast capture chat message - ChatBroadcast(flag.Zone, CaptureFlagChatMessageStrings.CTF_Success(flag.Carrier.get, flag.Owner.asInstanceOf[Building].Name)) - + ChatBroadcast(flag.Zone, CaptureFlagChatMessageStrings.CTF_Success(name, flag.Faction, flag.Owner.asInstanceOf[Building].Name)) // Despawn flag HandleFlagDespawn(flag) @@ -131,58 +90,88 @@ class CaptureFlagManager(zone: Zone) extends Actor{ case CaptureFlagLostReasonEnum.Resecured => ChatBroadcast( flag.Zone, - CaptureFlagChatMessageStrings.CTF_Failed_SourceResecured(flag.Owner.asInstanceOf[Building]) + CaptureFlagChatMessageStrings.CTF_Failed_SourceResecured(flag.Owner.asInstanceOf[Building].Name, flag.Faction) ) case CaptureFlagLostReasonEnum.TimedOut => + val building = flag.Owner.asInstanceOf[Building] ChatBroadcast( flag.Zone, - CaptureFlagChatMessageStrings.CTF_Failed_TimedOut(flag.Owner.asInstanceOf[Building].Name, flag.Target) + CaptureFlagChatMessageStrings.CTF_Failed_TimedOut(building.Name, flag.Target.Name, flag.Faction) ) - case CaptureFlagLostReasonEnum.Ended => ; /* no message */ + case CaptureFlagLostReasonEnum.Ended => + () } HandleFlagDespawn(flag) case CaptureFlagManager.PickupFlag(flag: CaptureFlag, player: Player) => val continent = flag.Zone - flag.Carrier = Some(player) - continent.LocalEvents ! LocalServiceMessage(continent.id, LocalAction.SendPacket(ObjectAttachMessage(player.GUID, flag.GUID, 252))) continent.LocalEvents ! LocalServiceMessage(continent.id, LocalAction.TriggerSound(PlanetSideGUID(-1), TriggeredSound.LLUPickup, player.Position, 15, volume = 0.8f)) - - ChatBroadcast(flag.Zone, CaptureFlagChatMessageStrings.CTF_FlagPickedUp(player, flag.Owner.asInstanceOf[Building].Name), fanfare = false) + ChatBroadcast(flag.Zone, CaptureFlagChatMessageStrings.CTF_FlagPickedUp(player.Name, player.Faction, flag.Owner.asInstanceOf[Building].Name), fanfare = false) case CaptureFlagManager.DropFlag(flag: CaptureFlag) => flag.Carrier match { case Some(player: Player) => // Set the flag position to where the player is that dropped it flag.Position = player.Position - // Remove attached player from flag flag.Carrier = None - // Send drop packet flag.Zone.LocalEvents ! LocalServiceMessage(flag.Zone.id, LocalAction.SendPacket(ObjectDetachMessage(player.GUID, flag.GUID, player.Position, 0, 0, 0))) - // Send dropped chat message - ChatBroadcast(flag.Zone, CaptureFlagChatMessageStrings.CTF_FlagDropped(player, flag.Owner.asInstanceOf[Building].Name), fanfare = false) - - case None => + ChatBroadcast(flag.Zone, CaptureFlagChatMessageStrings.CTF_FlagDropped(player.Name, player.Faction, flag.Owner.asInstanceOf[Building].Name), fanfare = false) + case _ => log.warn("Tried to drop flag but flag has no carrier") } case _ => - log.warn("Received unhandled message"); + log.warn("Received unhandled message") + } + + private def DoMapUpdate(): Unit = { + val flagInfo = flags.map(flag => + FlagInfo( + u1 = 0, + owner_map_id = flag.Owner.asInstanceOf[Building].MapId, + target_map_id = flag.Target.MapId, + x = flag.Position.x, + y = flag.Position.y, + hack_time_remaining = flag.Owner.asInstanceOf[Building].infoUpdateMessage().hack_time_remaining, + is_monolith_unit = false + ) + ) + galaxyService ! GalaxyServiceMessage(GalaxyAction.FlagMapUpdate(CaptureFlagUpdateMessage(zone.Number, flagInfo))) + } + + private def TrackFlag(flag: CaptureFlag): Unit = { + flag.Owner.Amenities = flag + flags = flags :+ flag + if (mapUpdateTick.isCancelled) { + // Start sending map updates periodically + import scala.concurrent.ExecutionContext.Implicits.global + mapUpdateTick = context.system.scheduler.scheduleAtFixedRate(0 seconds, 1 second, self, CaptureFlagManager.MapUpdate()) + } + } + + private def UntrackFlag(flag: CaptureFlag): Unit = { + flag.Owner.RemoveAmenity(flag) + flags = flags.filterNot(x => x eq flag) + if (flags.isEmpty) { + mapUpdateTick.cancel() + DoMapUpdate() + } } private def HandleFlagDespawn(flag: CaptureFlag): Unit = { + val zone = flag.Zone // Remove the flag as an amenity flag.Owner.asInstanceOf[Building].GetFlagSocket.get.captureFlag = None UntrackFlag(flag) // Unregister LLU from clients, - flag.Zone.LocalEvents ! LocalServiceMessage(flag.Zone.id, LocalAction.LluDespawned(PlanetSideGUID(-1), flag)) + zone.LocalEvents ! LocalServiceMessage(zone.id, LocalAction.LluDespawned(PlanetSideGUID(-1), flag.GUID, flag.Position)) // Then unregister it from the GUID pool - TaskWorkflow.execute(GUIDTask.unregisterObject(flag.Zone.GUID,flag)) + TaskWorkflow.execute(GUIDTask.unregisterObject(zone.GUID, flag)) } private def ChatBroadcast(zone: Zone, message: String, fanfare: Boolean = true): Unit = { @@ -191,7 +180,6 @@ class CaptureFlagManager(zone: Zone) extends Actor{ } else { ChatMessageType.UNK_229 } - zone.LocalEvents ! LocalServiceMessage( zone.id, LocalAction.SendChatMsg( @@ -224,45 +212,47 @@ object CaptureFlagChatMessageStrings { */ // @CTF_Success=%1 captured %2's LLU for the %3! - /** {player.Name} captured {owner_name}'s LLU for the {player.Faction}! */ - def CTF_Success(player: Player, owner_name: String): String = s"@CTF_Success^${player.Name}~^@$owner_name~^@${GetFactionString(player.Faction)}~" + /** {player.Name} captured {ownerName}'s LLU for the {player.Faction}! */ + private[support] def CTF_Success(playerName:String, playerFaction: PlanetSideEmpire.Value, ownerName: String): String = + s"@CTF_Success^$playerName~^@$ownerName~^@${GetFactionString(playerFaction)}~" // @CTF_Failed_TimedOut=The %1 failed to deliver %2's LLU to %3 in time!\nHack canceled! - /** The {target.Faction} failed to deliver {owner_name}'s LLU to {target.Name} in time!\nHack canceled! */ - def CTF_Failed_TimedOut(owner_name: String, target: Building): String = s"@CTF_Failed_TimedOut^@${GetFactionString(target.Faction)}~^@$owner_name~^@${target.Name}~" + /** The {faction} failed to deliver {ownerName}'s LLU to {name} in time!\nHack canceled! */ + private[support] def CTF_Failed_TimedOut(ownerName: String, name: String, faction: PlanetSideEmpire.Value): String = + s"@CTF_Failed_TimedOut^@${GetFactionString(faction)}~^@$ownerName~^@$name~" // @CTF_Failed_SourceResecured=The %1 resecured %2!\nThe LLU was lost! - /** The {owner.Faction} resecured {owner.Name}!\nThe LLU was lost! */ - def CTF_Failed_SourceResecured(owner: Building): String = s"@CTF_Failed_SourceResecured^@${CaptureFlagChatMessageStrings.GetFactionString(owner.Faction)}~^@${owner.Name}~" - - + /** The {faction} resecured {name}!\nThe LLU was lost! */ + private[support] def CTF_Failed_SourceResecured(name: String, faction: PlanetSideEmpire.Value): String = + s"@CTF_Failed_SourceResecured^@${CaptureFlagChatMessageStrings.GetFactionString(faction)}~^@$name~" // @CTF_FlagSpawned=%1 %2 has spawned a LLU.\nIt must be taken to %3 %4's Control Console within %5 minutes or the hack will fail! /** {facilityType} {facilityName} has spawned a LLU.\nIt must be taken to {targetFacilityType} {targetFacilityName}'s Control Console within 15 minutes or the hack will fail! */ - def CTF_FlagSpawned(owner: Building, target: Building): String = s"@CTF_FlagSpawned^@${owner.Definition.Name}~^@${owner.Name}~^@${target.Definition.Name}~^@${target.Name}~^15~" - + private[support] def CTF_FlagSpawned(owner: Building, target: Building): String = + s"@CTF_FlagSpawned^@${owner.Definition.Name}~^@${owner.Name}~^@${target.Definition.Name}~^@${target.Name}~^15~" // @CTF_FlagPickedUp=%1 of the %2 picked up %3's LLU - /** {playerName} of the {faction} picked up {facilityName}'s LLU */ - def CTF_FlagPickedUp(player: Player, owner_name: String): String = s"@CTF_FlagPickedUp^${player.Name}~^@${CaptureFlagChatMessageStrings.GetFactionString(player.Faction)}~^@$owner_name~" + /** {player.Name} of the {player.Faction} picked up {ownerName}'s LLU */ + def CTF_FlagPickedUp(playerName: String, playerFaction: PlanetSideEmpire.Value, ownerName: String): String = + s"@CTF_FlagPickedUp^$playerName~^@${CaptureFlagChatMessageStrings.GetFactionString(playerFaction)}~^@$ownerName~" // @CTF_FlagDropped=%1 of the %2 dropped %3's LLU /** {playerName} of the {faction} dropped {facilityName}'s LLU */ - def CTF_FlagDropped(player: Player, owner_name: String): String = s"@CTF_FlagDropped^${player.Name}~^@${CaptureFlagChatMessageStrings.GetFactionString(player.Faction)}~^@$owner_name~" + def CTF_FlagDropped(playerName: String, playerFaction: PlanetSideEmpire.Value, ownerName: String): String = + s"@CTF_FlagDropped^$playerName~^@${CaptureFlagChatMessageStrings.GetFactionString(playerFaction)}~^@$ownerName~" - // todo: make private - private def GetFactionString(faction: PlanetSideEmpire.Value): String = { - faction match { - case PlanetSideEmpire.TR => "TerranRepublic" - case PlanetSideEmpire.NC => "NewConglomerate" - case PlanetSideEmpire.VS => "VanuSovereigncy" // Yes, this is wrong. It is like that in packet captures. - case _ => "TerranRepublic" //todo: BO message? - } + private def GetFactionString: PlanetSideEmpire.Value=>String = { + case PlanetSideEmpire.TR => "TerranRepublic" + case PlanetSideEmpire.NC => "NewConglomerate" + case PlanetSideEmpire.VS => "VanuSovereigncy" //intentional typo; it's like this in packet captures + case _ => "TerranRepublic" //todo: BO message? } } -object CaptureFlagLostReasonEnum extends Enumeration { - type CaptureFlagLostReasonEnum = Value +sealed trait CaptureFlagLostReasonEnum - val Resecured, TimedOut, Ended = Value +object CaptureFlagLostReasonEnum { + final case object Resecured extends CaptureFlagLostReasonEnum + final case object TimedOut extends CaptureFlagLostReasonEnum + final case object Ended extends CaptureFlagLostReasonEnum } diff --git a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala index 707aed6a..c8cf0579 100644 --- a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala +++ b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala @@ -1,3 +1,4 @@ +// Copyright (c) 2021 PSForever package net.psforever.services.local.support import akka.actor.{Actor, Cancellable} @@ -8,165 +9,168 @@ import net.psforever.objects.serverobject.llu.CaptureFlag import net.psforever.objects.serverobject.structures.Building import net.psforever.objects.serverobject.terminals.capture.CaptureTerminal import net.psforever.objects.zones.Zone -import net.psforever.objects.{Default, GlobalDefinitions} +import net.psforever.objects.{Default, Player} import net.psforever.packet.game.{GenericAction, PlanetsideAttributeEnum} +import net.psforever.objects.sourcing.PlayerSource +import net.psforever.objects.zones.ZoneHotSpotProjector +import net.psforever.services.Service import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} +import net.psforever.util.Config import java.util.concurrent.TimeUnit +import scala.collection.mutable import scala.concurrent.duration.{FiniteDuration, _} -import scala.util.Random +import scala.util.{Random, Success} /** - * Responsible for handling the aspects related to hacking control consoles and capturing bases. - */ + * Responsible for handling the aspects related to hacking control consoles and capturing bases. + */ class HackCaptureActor extends Actor { private[this] val log = org.log4s.getLogger + /** main timer for completing or clearing hacked states */ private var clearTrigger: Cancellable = Default.Cancellable - - /** A `List` of currently hacked server objects */ + /** list of currently hacked server objects */ private var hackedObjects: List[HackCaptureActor.HackEntry] = Nil def receive: Receive = { case HackCaptureActor.StartCaptureTerminalHack(target, zone, unk1, unk2, startTime) => log.trace(s"StartCaptureTerminalHack: ${target.GUID} is hacked.") - val duration = target.Definition match { - case GlobalDefinitions.capture_terminal => - // Base CC - 15 minutes - case GlobalDefinitions.secondary_capture => - // Tower CC - 1 nanosecond - case GlobalDefinitions.vanu_control_console => - // Cavern CC - 10 minutes - } - target.HackedBy match { - case Some(hackInfo) => - target.HackedBy = hackInfo.Duration(duration.toNanos) - case None => - log.error(s"Initial $target hack information is missing") - } - hackedObjects.find(_.target == target) match { - case Some(_) => - log.trace( - s"StartCaptureTerminalHack: ${target.GUID} was already hacked - removing it from the hacked objects list before re-adding it." - ) - hackedObjects = hackedObjects.filterNot(x => x.target == target) - case _ => ; - } - hackedObjects = hackedObjects :+ HackCaptureActor.HackEntry(target, zone, unk1, unk2, duration, startTime) - // Restart the timer, in case this is the first object in the hacked objects list or the object was removed and re-added - RestartTimer() - NotifyHackStateChange(target, isResecured = false) - TrySpawnCaptureFlag(target) + val duration = target.Definition.FacilityHackTime + target.HackedBy match { + case Some(hackInfo) => + target.HackedBy = hackInfo.Duration(duration.toNanos) + case None => + log.error(s"Initial $target hack information is missing") + } + hackedObjects.find(_.target == target).foreach { _ => + log.trace( + s"StartCaptureTerminalHack: ${target.GUID} was already hacked - removing it from the hacked objects list before re-adding it." + ) + hackedObjects = hackedObjects.filterNot(x => x.target == target) + } + hackedObjects = hackedObjects :+ HackCaptureActor.HackEntry(target, zone, unk1, unk2, duration, startTime) + // Restart the timer, in case this is the first object in the hacked objects list or the object was removed and re-added + RestartTimer() + NotifyHackStateChange(target, isResecured = false) + TrySpawnCaptureFlag(target) case HackCaptureActor.ProcessCompleteHacks() => log.trace("Processing complete hacks") clearTrigger.cancel() val now: Long = System.nanoTime - val stillHacked = hackedObjects.filter(x => now - x.hack_timestamp <= x.duration.toNanos) - val finishedHacks = hackedObjects.filter(x => now - x.hack_timestamp >= x.duration.toNanos) + val (stillHacked, finishedHacks) = hackedObjects.partition(x => now - x.hack_timestamp < x.duration.toNanos) hackedObjects = stillHacked - finishedHacks.foreach(entry => { - log.trace(s"ProcessCompleteHacks: capture terminal hack timeout reached for terminal ${entry.target.GUID}") - - val hackedByFaction = entry.target.HackedBy.get.hackerFaction - entry.target.Actor ! CommonMessages.ClearHack() - + finishedHacks.foreach { entry => + val terminal = entry.target + log.trace(s"ProcessCompleteHacks: capture terminal hack timeout reached for terminal ${terminal.GUID}") + val hackInfo = terminal.HackedBy.get + val hacker = hackInfo.player + val hackedByFaction = hackInfo.hackerFaction + terminal.Actor ! CommonMessages.ClearHack() // If the base has a socket, but no flag spawned it means the hacked base is neutral with no friendly neighbouring bases to deliver to, making it a timed hack. - (entry.target.Owner.asInstanceOf[Building].GetFlagSocket, entry.target.Owner.asInstanceOf[Building].GetFlag) match { - case (Some(socket), Some(_)) => + val building = terminal.Owner.asInstanceOf[Building] + building.GetFlag match { + case Some(llu) => // LLU was not delivered in time. Send resecured notifications - entry.target.Owner.asInstanceOf[Building].GetFlag match { - case Some(flag: CaptureFlag) => entry.target.Zone.LocalEvents ! CaptureFlagManager.Lost(flag, CaptureFlagLostReasonEnum.TimedOut) - case None => log.warn(s"Failed to find capture flag matching socket ${socket.GUID}") - } + terminal.Zone.LocalEvents ! CaptureFlagManager.Lost(llu, CaptureFlagLostReasonEnum.TimedOut) + NotifyHackStateChange(terminal, isResecured = true) - NotifyHackStateChange(entry.target, isResecured = true) case _ => // Timed hack finished (or neutral LLU base with no neighbour as timed hack), capture the base - HackCompleted(entry.target, hackedByFaction) + HackCompleted(terminal, hackedByFaction) + HackCaptureActor.RewardFacilityCaptureParticipants( + building, + terminal, + hacker, + now - entry.hack_timestamp, + isResecured = false + ) } - }) - + } // If there's hacked objects left in the list restart the timer with the shortest hack time left RestartTimer() - case HackCaptureActor.ResecureCaptureTerminal(target, _) => - hackedObjects = hackedObjects.filterNot(x => x.target == target) - + case HackCaptureActor.ResecureCaptureTerminal(target, _, hacker) => + val (results, remainder) = hackedObjects.partition(x => x.target eq target) + target.HackedBy = None + hackedObjects = remainder + val building = target.Owner.asInstanceOf[Building] // If LLU exists it was not delivered. Send resecured notifications - target.Owner.asInstanceOf[Building].GetFlag match { - case Some(flag: CaptureFlag) => target.Zone.LocalEvents ! CaptureFlagManager.Lost(flag, CaptureFlagLostReasonEnum.Resecured) - case None => ; + building.GetFlag.collect { + case flag: CaptureFlag => target.Zone.LocalEvents ! CaptureFlagManager.Lost(flag, CaptureFlagLostReasonEnum.Resecured) } - NotifyHackStateChange(target, isResecured = true) - +// HackCaptureActor.RewardFacilityCaptureParticipants( +// building, +// target, +// hacker, +// System.currentTimeMillis() - results.head.hack_timestamp, +// isResecured = true +// ) // Restart the timer in case the object we just removed was the next one scheduled RestartTimer() + case HackCaptureActor.FlagCaptured(flag) => log.warn(hackedObjects.toString()) - hackedObjects.find(_.target.GUID == flag.Owner.asInstanceOf[Building].CaptureTerminal.get.GUID) match { + val building = flag.Owner.asInstanceOf[Building] + val bguid = building.CaptureTerminal.map { _.GUID } + hackedObjects.find(entry => bguid.contains(entry.target.GUID)) match { case Some(entry) => - val hackedByFaction = entry.target.HackedBy.get.hackerFaction + val terminal = entry.target + val hackInfo = terminal.HackedBy.get + val hacker = hackInfo.player + val hackedByFaction = hackInfo.hackerFaction hackedObjects = hackedObjects.filterNot(x => x == entry) - HackCompleted(entry.target, hackedByFaction) - + HackCompleted(terminal, hackedByFaction) +// HackCaptureActor.RewardFacilityCaptureParticipants( +// building, +// terminal, +// hacker, +// System.currentTimeMillis() - entry.hack_timestamp, +// isResecured = false +// ) entry.target.Actor ! CommonMessages.ClearHack() - flag.Zone.LocalEvents ! CaptureFlagManager.Captured(flag) - // If there's hacked objects left in the list restart the timer with the shortest hack time left RestartTimer() + case _ => log.error(s"Attempted LLU capture for ${flag.Owner.asInstanceOf[Building].Name} but CC GUID ${flag.Owner.asInstanceOf[Building].CaptureTerminal.get.GUID} was not in list of hacked objects") } - case _ => ; + case _ => () } private def TrySpawnCaptureFlag(terminal: CaptureTerminal): Boolean = { // Handle LLUs if the base contains a LLU socket // If there are no neighbouring bases belonging to the hacking faction this will be handled as a regular timed hack (e.g. neutral base in enemy territory) - terminal.Owner match { - case owner: Building if owner.IsCtfBase => - val socket = owner.GetFlagSocket.get - val flag = socket.captureFlag - val owningFaction = owner.Faction - val hackingFaction = HackCaptureActor.GetHackingFaction(terminal).get - owner.Neighbours(hackingFaction) match { - case Some(neighbours) => - if (flag.isEmpty) { - log.info(s"An LLU is being spawned for facility ${owner.Name} by $hackingFaction") - spawnCaptureFlag(neighbours, terminal, hackingFaction) - true - } else if (hackingFaction != flag.get.Faction) { - log.info(s"$hackingFaction is overriding the ongoing LLU hack of facility ${owner.Name} by ${flag.get.Faction}") - terminal.Zone.LocalEvents ! CaptureFlagManager.Lost(flag.get, CaptureFlagLostReasonEnum.Ended) - NotifyHackStateChange(terminal, isResecured = false) - RestartTimer() - spawnCaptureFlag(neighbours, terminal, hackingFaction) - true - } else if (hackingFaction == owningFaction) { - log.error(s"Owning faction and hacking faction match for facility ${owner.Name}; should we be resecuring instead?") - false - } else { - log.warn(s"LLU hack of facility ${owner.Name} by $hackingFaction in progress - no change") - false - } - case None => ; - log.info(s"Couldn't find any neighbouring $hackingFaction facilities of ${owner.Name} for LLU hack") - false - } - - case _: Building => - false //building does not possess an LLU socket - - case thing => - log.error(s"Capture terminal has unexpected owner - $thing - that is not a facility") + val hackingFaction = HackCaptureActor.GetHackingFaction(terminal).get + (terminal.Owner match { + case owner: Building if owner.IsCtfBase => Some((owner, owner.GetFlag, owner.Neighbours(hackingFaction))) + case _ => None + }) match { + case Some((owner, None, Some(neighbours))) if neighbours.nonEmpty => + log.info(s"An LLU is being spawned for facility ${owner.Name} by $hackingFaction") + spawnCaptureFlag(neighbours, terminal, hackingFaction) + true + case Some((owner, Some(flag), Some(neighbours))) if neighbours.nonEmpty && hackingFaction != flag.Faction => + log.info(s"$hackingFaction is overriding the ongoing LLU hack of facility ${owner.Name} by ${flag.Faction}") + terminal.Zone.LocalEvents ! CaptureFlagManager.Lost(flag, CaptureFlagLostReasonEnum.Ended) + NotifyHackStateChange(terminal, isResecured = false) + RestartTimer() + spawnCaptureFlag(neighbours, terminal, hackingFaction) + true + case Some((owner, Some(flag), _)) if hackingFaction == flag.Faction => + log.error(s"TrySpawnCaptureFlag: owning faction and hacking faction match for facility ${owner.Name}; should we be resecuring instead?") + false + case Some((owner, _, _)) => + log.error(s"TrySpawnCaptureFlag: couldn't find any neighbouring $hackingFaction facilities of ${owner.Name} for LLU hack") + owner.GetFlagSocket.foreach { _.clearOldFlagData() } + false + case _ => + log.error(s"TrySpawnCaptureFlag: expecting a terminal ${terminal.GUID.guid} with the ctf owning facility") false } } @@ -182,25 +186,24 @@ class HackCaptureActor extends Actor { terminal.Zone.LocalEvents ! CaptureFlagManager.SpawnCaptureFlag(terminal, targetBase, hackingFaction) } - private def NotifyHackStateChange(terminal: CaptureTerminal, isResecured: Boolean): Unit = { - val attribute_value = HackCaptureActor.GetHackUpdateAttributeValue(terminal, isResecured) - - // Notify all clients that CC has been hacked + private def NotifyHackStateChange( + terminal: CaptureTerminal, + isResecured: Boolean + ): Unit = { + val attributeValue = HackCaptureActor.GetHackUpdateAttributeValue(terminal, isResecured) + // Notify all clients that CC has had its hack state changed terminal.Zone.LocalEvents ! LocalServiceMessage( terminal.Zone.id, LocalAction.SendPlanetsideAttributeMessage( PlanetSideGUID(-1), terminal.GUID, PlanetsideAttributeEnum.ControlConsoleHackUpdate, - attribute_value + attributeValue ) ) - val owner = terminal.Owner.asInstanceOf[Building] - // Notify parent building that state has changed owner.Actor ! BuildingActor.AmenityStateChange(terminal, Some(isResecured)) - // Push map update to clients owner.Zone.actor ! ZoneActor.ZoneMapUpdate() } @@ -210,35 +213,27 @@ class HackCaptureActor extends Actor { if (building.NtuLevel > 0) { log.info(s"Setting base ${building.GUID} / MapId: ${building.MapId} as owned by $hackedByFaction") building.Actor! BuildingActor.SetFaction(hackedByFaction) - - // todo: This should probably only go to those within the captured SOI who belong to the capturing faction - building.Zone.LocalEvents ! LocalServiceMessage(building.Zone.id, LocalAction.SendGenericActionMessage(PlanetSideGUID(-1), GenericAction.FacilityCaptureFanfare)) + //dispatch to players aligned with the capturing faction within the SOI + val events = building.Zone.LocalEvents + val msg = LocalAction.SendGenericActionMessage(Service.defaultPlayerGUID, GenericAction.FacilityCaptureFanfare) + building + .PlayersInSOI + .collect { case p if p.Faction == hackedByFaction => + events ! LocalServiceMessage(p.Name, msg) + } } else { log.info("Base hack completed, but base was out of NTU.") } - NotifyHackStateChange(terminal, isResecured = true) - // todo: this appears to be the way to reset the base warning lights after the hack finishes but it doesn't seem to work. - context.parent ! HackClearActor.SendHackMessageHackCleared(building.GUID, terminal.Zone.id, 3212836864L, 8L) //call up to the `LocalService` + context.parent ! HackClearActor.SendHackMessageHackCleared(building.GUID, terminal.Zone.id, 3212836864L, 8L) //call up } private def RestartTimer(): Unit = { if (hackedObjects.nonEmpty) { - val now = System.nanoTime() - def minTimeLeft( - entry1: HackCaptureActor.HackEntry, - entry2: HackCaptureActor.HackEntry - ): HackCaptureActor.HackEntry = { - val entry1TimeLeft = entry1.duration.toNanos - (now - entry1.hack_timestamp) - val entry2TimeLeft = entry2.duration.toNanos - (now - entry2.hack_timestamp) - if (entry1TimeLeft < entry2TimeLeft) entry1 else entry2 - } - - val hackEntry = hackedObjects.reduceLeft(minTimeLeft) + val hackEntry = hackedObjects.reduceLeft(HackCaptureActor.minTimeLeft(System.nanoTime())) val short_timeout: FiniteDuration = - math.max(1, hackEntry.duration.toNanos - (System.nanoTime - hackEntry.hack_timestamp)) nanoseconds - + math.max(1, hackEntry.duration.toNanos - (System.nanoTime - hackEntry.hack_timestamp)).nanoseconds log.trace(s"RestartTimer: still items left in hacked objects list. Checking again in ${short_timeout.toSeconds} seconds") import scala.concurrent.ExecutionContext.Implicits.global clearTrigger = context.system.scheduler.scheduleOnce(short_timeout, self, HackCaptureActor.ProcessCompleteHacks()) @@ -248,57 +243,197 @@ class HackCaptureActor extends Actor { object HackCaptureActor { final case class StartCaptureTerminalHack( - target: CaptureTerminal, - zone: Zone, - unk1: Long, - unk2: Long, - startTime: Long = System.nanoTime() - ) + target: CaptureTerminal, + zone: Zone, + unk1: Long, + unk2: Long, + startTime: Long = System.nanoTime() + ) - final case class ResecureCaptureTerminal(target: CaptureTerminal, zone: Zone) + final case class ResecureCaptureTerminal(target: CaptureTerminal, zone: Zone, hacker: PlayerSource) final case class FlagCaptured(flag: CaptureFlag) private final case class ProcessCompleteHacks() - private final case class HackEntry( - target: CaptureTerminal with Hackable, - zone: Zone, - unk1: Long, - unk2: Long, - duration: FiniteDuration, - hack_timestamp: Long - ) + sealed case class HackEntry( + target: CaptureTerminal with Hackable, + zone: Zone, + unk1: Long, + unk2: Long, + duration: FiniteDuration, + hack_timestamp: Long + ) def GetHackingFaction(terminal: CaptureTerminal): Option[PlanetSideEmpire.Value] = { - terminal.HackedBy match { - case Some(Hackable.HackInfo(_, _, hackingFaction, _, _, _)) => - Some(hackingFaction) - case _ => None - } + terminal.HackedBy.map { a => a.player.Faction } } def GetHackUpdateAttributeValue(terminal: CaptureTerminal, isResecured: Boolean): Long = { - if (isResecured) { - 17039360L - } else { - terminal.HackedBy match { - case Some(Hackable.HackInfo(_, _, hackingFaction, _, start, length)) => - // See PlanetSideAttributeMessage #20 documentation for an explanation of how the timer is calculated - val hack_time_remaining_ms = - TimeUnit.MILLISECONDS.convert(math.max(0, start + length - System.nanoTime), TimeUnit.NANOSECONDS) - - val start_num = hackingFaction match { - case PlanetSideEmpire.TR => 0x10000 - case PlanetSideEmpire.NC => 0x20000 - case PlanetSideEmpire.VS => 0x30000 - } - - start_num + (hack_time_remaining_ms / 100) // Add time remaining as deciseconds - - case _ => - 0 - } + terminal.HackedBy match { + case _ if isResecured => + 17039360L + case Some(Hackable.HackInfo(p, _, start, length)) => + // See PlanetSideAttributeMessage #20 documentation for an explanation of how the timer is calculated + val hackTimeRemainingMS = + TimeUnit.MILLISECONDS.convert(math.max(0, start + length - System.nanoTime), TimeUnit.NANOSECONDS) + val startNum = p.Faction match { + case PlanetSideEmpire.TR => 0x10000 + case PlanetSideEmpire.NC => 0x20000 + case PlanetSideEmpire.VS => 0x30000 + } + startNum + (hackTimeRemainingMS / 100) // Add time remaining as deciseconds + case _ => + 0L } } -} + def minTimeLeft(now: Long)( + entry1: HackCaptureActor.HackEntry, + entry2: HackCaptureActor.HackEntry + ): HackCaptureActor.HackEntry = { + val entry1TimeLeft = entry1.duration.toNanos - (now - entry1.hack_timestamp) + val entry2TimeLeft = entry2.duration.toNanos - (now - entry2.hack_timestamp) + if (entry1TimeLeft < entry2TimeLeft) { + entry1 + } else { + entry2 + } + } + + import akka.pattern.ask + import akka.util.Timeout + import scala.concurrent.duration._ + import scala.concurrent.ExecutionContext.Implicits.global + + private implicit val timeout: Timeout = Timeout(5.seconds) + + private def RewardFacilityCaptureParticipants( + building: Building, + terminal: CaptureTerminal, + hacker: PlayerSource, + time: Long, + isResecured: Boolean + ): Unit = { + val faction: PlanetSideEmpire.Value = terminal.Faction + val (contributionVictor, contributionAgainst) = building.PlayerContribution.keys.partition { _.Faction == faction } + val contributionVictorSize = contributionVictor.size + val flagCarrier = if (!isResecured) { + building.GetFlagSocket.flatMap(_.previousFlag).flatMap(_.Carrier) + } else { + None + } + val request = ask(building.Zone.Activity, ZoneHotSpotProjector.ExposeHeatForRegion(building.Position, building.Definition.SOIRadius.toFloat)) + request.onComplete { + case Success(ZoneHotSpotProjector.ExposedHeat(_, _, activity)) => + val (heatVictor, heatAgainst) = { + val reports = activity.map { _.Activity } + val allHeat: List[Long] = reports.map { a => a.values.foldLeft(0L)(_ + _.Heat) } + val _rewardedHeat: List[Long] = reports.flatMap { rep => rep.get(faction).map { _.Heat.toLong } } + val _enemyHeat = allHeat.indices.map { index => + val allHeatValue = allHeat(index) + val rewardedHeatValue = _rewardedHeat(index) + allHeatValue - rewardedHeatValue + } + (_rewardedHeat, _enemyHeat.toList) + } + val heatVictorSum: Long = heatVictor.sum[Long] + val heatAgainstSum: Long = heatAgainst.sum[Long] + if (contributionVictorSize > 0) { + val contributionRate = if (heatVictorSum * heatAgainstSum != 0) { + math.log(heatVictorSum * contributionVictorSize / heatAgainstSum.toFloat).toFloat + } else { + contributionAgainst.size / contributionVictorSize.toFloat + } + RewardFacilityCaptureParticipants(building, terminal, faction, hacker, building.PlayersInSOI, flagCarrier, isResecured, time, contributionRate) + } + case _ => + RewardFacilityCaptureParticipants(building, terminal, faction, hacker, building.PlayersInSOI, flagCarrier, isResecured, time, victorContributionRate = 1.0f) + } + request.recover { + _ => RewardFacilityCaptureParticipants(building, terminal, faction, hacker, building.PlayersInSOI, flagCarrier, isResecured, time, victorContributionRate = 1.0f) + } + } + + private def RewardFacilityCaptureParticipants( + building: Building, + terminal: CaptureTerminal, + faction: PlanetSideEmpire.Value, + hacker: PlayerSource, + targets: List[Player], + flagCarrier: Option[Player], + isResecured: Boolean, + hackTime: Long, + victorContributionRate: Float + ): Unit = { + val contribution = building.PlayerContribution + val (contributionVictor, contributionAgainst) = contribution.keys.partition { _.Faction == faction } + val contributionVictorSize = contributionVictor.size + val contributionAgainstSize = contributionAgainst.size + val (contributionByTime, contributionByTimePartitioned) = { + val curr = System.currentTimeMillis() + val interval = 300000 + val range: Seq[Long] = { + val htime = hackTime.toInt + ( + if (htime < 60000) { + Seq(htime, interval + htime, 2 * interval + htime) + } else if (htime <= interval) { + Seq(60000, htime, interval + htime, 2 * interval + htime) + } else { + (60000 +: (interval to htime by interval)) ++ Seq(interval + htime, 2 * interval + htime) + } + ).map { _.toLong } + } + val playerMap = Array.fill[mutable.ListBuffer[Player]](range.size)(mutable.ListBuffer.empty) + contribution.foreach { case (p, t) => + playerMap(range.lastIndexWhere(time => curr - t <= time)).addOne(p) + } + (playerMap, playerMap.map { _.partition(_.Faction == faction) }) + } + val contributionByTimeSize = contributionByTime.length + + val base: Long = 50L + val overallPopulationBonus = { + contributionByTime.map { _.size }.sum * contributionByTimeSize + + contributionByTime.zipWithIndex.map { case (lst, index) => + ((contributionByTimeSize - index) * lst.size * + { + val lists = contributionByTimePartitioned(index) + lists._2.size / math.max(lists._1.size, 1).toFloat + }).toLong + }.sum + } + val competitionBonus: Long = if (contributionAgainstSize * 1.5f < contributionVictorSize.toFloat) { + //steamroll by the victor + 25L * (contributionVictorSize - contributionAgainstSize) + } else if (contributionVictorSize * 1.5f <= contributionAgainstSize.toFloat) { + //victory against overwhelming odds + 500L + 50L * contribution.keys.size + } else { + //still a battle + 10L * math.min(contributionAgainstSize, contributionVictorSize) + } + val timeMultiplier: Float = { + val buildingHackTimeMilli = terminal.Definition.FacilityHackTime.toMillis.toFloat + 1f + (if (isResecured) { + (buildingHackTimeMilli - hackTime) / buildingHackTimeMilli + } else { + 0f + }) + } + val finalCep: Long = ((base + overallPopulationBonus + competitionBonus) * timeMultiplier * Config.app.game.cepRate).toLong + //reward participant(s) +// targets +// .filter { player => +// player.Faction == faction && !player.Name.equals(hacker.Name) +// } +// .foreach { player => +// events ! AvatarServiceMessage(player.Name, AvatarAction.AwardCep(0, finalCep)) +// } +// events ! AvatarServiceMessage(hacker.Name, AvatarAction.AwardCep(hacker.CharId, finalCep)) +// flagCarrier match { +// case Some(player) => events ! AvatarServiceMessage(player.Name, AvatarAction.AwardCep(player.CharId, finalCep / 2)) +// case None => ; +// } + } +} diff --git a/src/main/scala/net/psforever/types/ExperienceType.scala b/src/main/scala/net/psforever/types/ExperienceType.scala new file mode 100644 index 00000000..20413503 --- /dev/null +++ b/src/main/scala/net/psforever/types/ExperienceType.scala @@ -0,0 +1,19 @@ +// Copyright (c) 2023 PSForever +package net.psforever.types + +import enumeratum.values.{IntEnum, IntEnumEntry} +import net.psforever.packet.PacketHelpers +import scodec.Codec +import scodec.codecs.uint + +sealed abstract class ExperienceType(val value: Int) extends IntEnumEntry + +object ExperienceType extends IntEnum[ExperienceType] { + val values: IndexedSeq[ExperienceType] = findValues + + case object Normal extends ExperienceType(value = 0) + case object Support extends ExperienceType(value = 2) + case object RabbitBall extends ExperienceType(value = 4) + + implicit val codec: Codec[ExperienceType] = PacketHelpers.createIntEnumCodec(enum = this, uint(bits = 3)) +} diff --git a/src/main/scala/net/psforever/types/Statistics.scala b/src/main/scala/net/psforever/types/Statistics.scala new file mode 100644 index 00000000..8ded368d --- /dev/null +++ b/src/main/scala/net/psforever/types/Statistics.scala @@ -0,0 +1,405 @@ +// Copyright (c) 2023 PSForever +package net.psforever.types + +import enumeratum.values.{IntEnum, IntEnumEntry} +import net.psforever.types.StatisticalElement.{AMS, ANT, AgileExoSuit, ApcNc, ApcTr, ApcVs, Aphelion, AphelionFlight, AphelionGunner, Battlewagon, Colossus, ColossusFlight, ColossusGunner, Droppod, Dropship, Flail, Fury, GalaxyGunship, ImplantTerminalMech, InfiltrationExoSuit, Liberator, Lightgunship, Lightning, Lodestar, Magrider, MechanizedAssaultExoSuit, MediumTransport, Mosquito, Peregrine, PeregrineFlight, PeregrineGunner, PhalanxTurret, Phantasm, PortableMannedTurretNc, PortableMannedTurretTr, PortableMannedTurretVs, Prowler, QuadAssault, QuadStealth, Raider, ReinforcedExoSuit, Router, Skyguard, SpitfireAA, SpitfireCloaked, SpitfireTurret, StandardExoSuit, Sunderer, Switchblade, TankTraps, ThreeManHeavyBuggy, Thunderer, TwoManAssaultBuggy, TwoManHeavyBuggy, TwoManHoverBuggy, VanSentryTurret, Vanguard, Vulture, Wasp} + +sealed abstract class StatisticalCategory(val value: Int) extends IntEnumEntry + +sealed abstract class StatisticalElement(val value: Int) extends IntEnumEntry + +object StatisticalCategory extends IntEnum[StatisticalCategory] { + val values: IndexedSeq[StatisticalCategory] = findValues + + final case object Destroyed extends StatisticalCategory(value = 1) + final case object Unknown2 extends StatisticalCategory(value = 2) + final case object Capture extends StatisticalCategory(value = 3) + final case object ReviveAssist extends StatisticalCategory(value = 4) //number of allies who killed enemies after being revived + final case object CavernCapture extends StatisticalCategory(value = 7) + final case object Breach extends StatisticalCategory(value = 8) + final case object Unknown9 extends StatisticalCategory(value = 9) + final case object AmenityDestroyed extends StatisticalCategory(value = 10) //does not include turrets + final case object DriverKilled extends StatisticalCategory(value = 12) + final case object GunnerKilled extends StatisticalCategory(value = 13) + final case object PassengerKilled extends StatisticalCategory(value = 14) + final case object CargoDestroyed extends StatisticalCategory(value = 15) + final case object BombadierKilled extends StatisticalCategory(value = 16) + final case object Special extends StatisticalCategory(value = 17) + final case object DriverAssist extends StatisticalCategory(value = 18) + final case object Dogfighter extends StatisticalCategory(value = 19) + final case object HealKillAssist extends StatisticalCategory(value = 20) + final case object ReviveKillAssist extends StatisticalCategory(value = 21) //number of enemies killed by allies you have revived + final case object RepairKillAssist extends StatisticalCategory(value = 22) //number of enemies killed by allies you have repaired + final case object AmsRespawnKillAssist extends StatisticalCategory(value = 23) + final case object HotDropKillAssist extends StatisticalCategory(value = 24) + final case object HackKillAssist extends StatisticalCategory(value = 25) + final case object LodestarRearmKillAssist extends StatisticalCategory(value = 26) + final case object AmsResupplyKillAssist extends StatisticalCategory(value = 27) + final case object RouterKillAssist extends StatisticalCategory(value = 28) + final case object Unknown29 extends StatisticalCategory(value = 29) + + private val gunnerVehicles: Seq[StatisticalElement] = Seq( + Sunderer, ApcTr, ApcNc, ApcVs, Aphelion, AphelionGunner, Battlewagon, + Colossus, ColossusGunner, Dropship, GalaxyGunship, Liberator, + Magrider, MediumTransport, Peregrine, PeregrineGunner, Prowler, Raider, + Skyguard, ThreeManHeavyBuggy, Thunderer, TwoManAssaultBuggy, + TwoManHeavyBuggy, TwoManHoverBuggy, Vanguard, Vulture + ) + private val driverOnlyVehicles: Seq[StatisticalElement] = Seq( + AMS, ANT, AphelionFlight, ColossusFlight, Flail, Fury, + Lightgunship, Lightning, Lodestar, Mosquito, PeregrineFlight, + QuadAssault, QuadStealth, Router, Switchblade, Wasp + ) + private val exosuitElements: Seq[StatisticalElement] = Seq( + MechanizedAssaultExoSuit, AgileExoSuit, ReinforcedExoSuit, StandardExoSuit, InfiltrationExoSuit + ) + private val mannedTurretElements = Seq( + PhalanxTurret, PortableMannedTurretTr, PortableMannedTurretNc, PortableMannedTurretVs, VanSentryTurret + ) + + val statElements: Seq[Seq[StatisticalElement]] = { + import StatisticalElement._ + Seq( + Nil, + Seq(Phantasm, ImplantTerminalMech, Droppod, SpitfireAA, SpitfireCloaked, SpitfireTurret, TankTraps) ++ + driverOnlyVehicles ++ gunnerVehicles ++ mannedTurretElements ++ exosuitElements, + Seq( + // Chaingun12mm, Chaingun15mm, Cannon20mm, Deliverer20mm, DropshipL20mm, Cannon75mm, Lightning75mm, AdvancedMissileLauncherT, AMS, AnniversaryGun, AnniversaryGunA, AnniversaryGunB, ANT, Sunderer, ApcBallGunL, ApcBallGunR, ApcTr, ApcNc, ApcVs, ApcWeaponSystemA, ApcWeaponSystemB, ApcWeaponSystemC, ApcWeaponSystemCNc, ApcWeaponSystemCTr, ApcWeaponSystemCVs, ApcWeaponSystemD, ApcWeaponSystemDNc, ApcWeaponSystemDTr, ApcWeaponSystemDVs, Aphelion, AphelionArmorSiphon, AphelionFlight, AphelionGunner, AphelionImmolationCannon, AphelionLaser, AphelionNtuSiphon, AphelionPlasmaCloud, AphelionPlasmaRocketPod, + // AphelionPpa, AphelionStarfire, AuroraWeaponSystemA, AuroraWeaponSystemB, Battlewagon, BattlewagonWeaponSystemA, BattlewagonWeaponSystemB, BattlewagonWeaponSystemC, BattlewagonWeaponSystemD, Infantry, Raider, Beamer, BoltDriver, Boomer, Chainblade, ChaingunP, Colossus, ColossusArmorSiphon, ColossusBurster, ColossusChaingun, ColossusClusterBombPod, ColossusDual100mmCannons, ColossusFlight, + // ColossusGunner, ColossusNtuSiphon, ColossusTankCannon, Cycler, CyclerV2, CyclerV3, CyclerV4, Dropship, DropshipRearTurret, Dynomite, EnergyGunNc, EnergyGunTr, EnergyGunVs, Flail, FlailWeapon, Flamethrower, + // Flechette, FluxCannonThresher, Fluxpod, Forceblade, FragGrenade, Fury, FragmentationGrenade, FuryWeaponSystemA, GalaxyGunship, GalaxyGunshipCannon, GalaxyGunshipGun, GalaxyGunshipTailgun, Gauss, GaussCannon, GrenadeLauncherMarauder, HeMine, HeavyRailBeamMagrider, HeavySniper, Hellfire, + // Hunterseeker, Ilc9, Isp, JammerGrenade, Katana, Knife, Lancer, Lasher, Liberator, Liberator25mmCannon, LiberatorBombBay, LiberatorWeaponSystem, Lightgunship, LightgunshipWeapon20mm, LightgunshipWeaponRocket, LightgunshipWeaponSystem, Lightning, LightningWeaponSystem, Lodestar, Maelstrom, Magcutter, Magrider, PhalanxTurret, + // MedicalApplicator, MediumTransport, MediumTransportWeaponSystemA, MediumTransportWeaponSystemB, MineSweeper, MiniChaingun, Mosquito, NchevFalcon, NchevScattercannon, NchevSparrow, Oicw, + // OrbitalStrikeBig, OrbitalStrikeSmall, ParticleBeamMagrider, PelletGun, Peregrine, PeregrineArmorSiphon, PeregrineDualMachineGun, PeregrineDualRocketPods, PeregrineFlight, PeregrineGunner, PeregrineMechhammer, PeregrineNtuSiphon, PeregrineParticleCannon, PeregrineSparrow, PhalanxAvcombo, PhalanxFlakcombo, PhalanxSglHevgatcan, Phantasm, Phantasm12mmMachinegun, Phoenix, PlasmaGrenade, Prowler, ProwlerWeaponSystemA, + // ProwlerWeaponSystemB, Pulsar, PulsedParticleAccelerator, Punisher, QuadAssault, QuadAssaultWeaponSystem, QuadStealth, RShotgun, Radiator, Repeater, Rocklet, RotaryChaingunMosquito, Router, RouterTelepadDeployable, Scythe, SixShooter, Skyguard, SkyguardWeaponSystem, + // Spiker, SpitfireAA, SpitfireCloaked, SpitfireTurret, Striker, Suppressor, Switchblade, ThreeManHeavyBuggy, Thumper, Thunderer, ThundererWeaponSystemA, ThundererWeaponSystemB, TrhevBurster, TrhevDualcycler, TrhevPounder, TwoManAssaultBuggy, TwoManHeavyBuggy, + // TwoManHoverBuggy, Vanguard, VanguardWeapon150mm, VanguardWeapon20mm, VanguardWeaponSystem, VanuModule, VanuSentryTurretWeapon, VanuModuleBeam, VshevComet, VshevQuasar, VshevStarfire, Vulture, VultureBombBay, VultureNoseWeaponSystem, VultureTailCannon, Wasp, WaspWeaponSystem, Winchester + ), + Seq(Facilities, Redoubt, Tower, VanuControlPoint, VanuVehicleStation), + exosuitElements, + Nil, + Nil, + Seq(Facilities, Redoubt, VanuControlPoint, VanuVehicleStation), + Seq(BfrTerminal, Door, Terminal), + Seq(Phantasm) ++ driverOnlyVehicles ++ gunnerVehicles, + Seq(BfrTerminal, Generator, RespawnTube, Terminal), + Nil, + Seq(Phantasm) ++ driverOnlyVehicles ++ gunnerVehicles, + mannedTurretElements ++ gunnerVehicles, + Seq(Phantasm) ++ gunnerVehicles, + Seq(Dropship, Lodestar), + Seq(Liberator, Vulture), + Seq( + MonolithAmerish, MonolithCeryshen, MonolithCyssor, MonolithEsamir, MonolithForseral, + MonolithHossin, MonolithIshundar, MonolithSearhus, MonolithSolsar, + XmasCharlie1, XmasCharlie2, XmasCharlie3, XmasCharlie4, XmasCharlie5, XmasCharlie6, XmasCharlie7, XmasCharlie8, XmasCharlie9, + XmasGingermanAtar, XmasGingermanDahaka, XmasGingermanHvar, XmasGingermanIzha, XmasGingermanJamshid, + XmasGingermanMithra, XmasGingermanRashnu, XmasGingermanSraosha, XmasGingermanYazata, XmasGingermanZal, + XmasSled1, XmasSled2, XmasSled3, XmasSled4, XmasSled5, XmasSled6, XmasSled7, XmasSled8, XmasSled9, + XmasSnowmanAmerish, XmasSnowmanCeryshen, XmasSnowmanCyssor, XmasSnowmanEsamir, XmasSnowmanForseral, + XmasSnowmanHossin, XmasSnowmanIshundar, XmasSnowmanSearhus, XmasSnowmanSolsar + ), + Seq(Phantasm, Flail) ++ mannedTurretElements ++ gunnerVehicles, + Seq(AirToAir), + Seq(Infantry), + Seq(Infantry), + Seq(Infantry, Vehicle, Lodestar, PhalanxTurret, SpitfireAA, SpitfireCloaked, SpitfireTurret), + Seq(AMS), + Seq(Dropship), + Seq(BfrTerminal, Locker, MedicalTerminal, EquipmentTerminal, VehicleTerminal), + Seq(Lodestar), + Seq(AMS), + Seq(Router, RouterTelepadDeployable), + Seq(AgileExoSuit, ReinforcedExoSuit) + ) + } +} + +object StatisticalElement extends IntEnum[StatisticalElement] { + val values: IndexedSeq[StatisticalElement] = findValues + + final case object Chaingun12mm extends StatisticalElement(value = 2) + final case object Chaingun15mm extends StatisticalElement(value = 8) + final case object Cannon20mm extends StatisticalElement(value = 12) + final case object Deliverer20mm extends StatisticalElement(value = 13) + final case object Dropship20mm extends StatisticalElement(value = 14) + final case object DropshipL20mm extends StatisticalElement(value = 15) + final case object Cannon75mm extends StatisticalElement(value = 23) + final case object Lightning75mm extends StatisticalElement(value = 24) + final case object AdvancedMissileLauncherT extends StatisticalElement(value = 40) + final case object AnniversaryGun extends StatisticalElement(value = 55) + final case object AnniversaryGunA extends StatisticalElement(value = 56) + final case object AnniversaryGunB extends StatisticalElement(value = 57) + final case object ApcBallGunL extends StatisticalElement(value = 63) + final case object ApcBallGunR extends StatisticalElement(value = 64) + final case object ApcWeaponSystemA extends StatisticalElement(value = 69) + final case object ApcWeaponSystemB extends StatisticalElement(value = 70) + final case object ApcWeaponSystemC extends StatisticalElement(value = 71) + final case object ApcWeaponSystemCNc extends StatisticalElement(value = 72) + final case object ApcWeaponSystemCTr extends StatisticalElement(value = 73) + final case object ApcWeaponSystemCVs extends StatisticalElement(value = 74) + final case object ApcWeaponSystemD extends StatisticalElement(value = 75) + final case object ApcWeaponSystemDNc extends StatisticalElement(value = 76) + final case object ApcWeaponSystemDTr extends StatisticalElement(value = 77) + final case object ApcWeaponSystemDVs extends StatisticalElement(value = 78) + final case object AphelionArmorSiphon extends StatisticalElement(value = 80) + final case object AphelionImmolationCannon extends StatisticalElement(value = 85) + final case object AphelionLaser extends StatisticalElement(value = 88) + final case object AphelionNtuSiphon extends StatisticalElement(value = 93) + final case object AphelionPlasmaRocketPod extends StatisticalElement(value = 98) + final case object AphelionPpa extends StatisticalElement(value = 100) + final case object AphelionStarfire extends StatisticalElement(value = 105) + final case object AuroraWeaponSystemA extends StatisticalElement(value = 119) + final case object AuroraWeaponSystemB extends StatisticalElement(value = 120) + final case object BattlewagonWeaponSystemA extends StatisticalElement(value = 136) + final case object BattlewagonWeaponSystemB extends StatisticalElement(value = 137) + final case object BattlewagonWeaponSystemC extends StatisticalElement(value = 138) + final case object BattlewagonWeaponSystemD extends StatisticalElement(value = 139) + final case object Beamer extends StatisticalElement(value = 140) + final case object BoltDriver extends StatisticalElement(value = 146) + final case object Chainblade extends StatisticalElement(value = 175) + final case object ChaingunP extends StatisticalElement(value = 177) + final case object ColossusArmorSiphon extends StatisticalElement(value = 182) + final case object ColossusBurster extends StatisticalElement(value = 185) + final case object ColossusChaingun extends StatisticalElement(value = 190) + final case object ColossusClusterBombPod extends StatisticalElement(value = 196) + final case object ColossusDual100mmCannons extends StatisticalElement(value = 198) + final case object ColossusNtuSiphon extends StatisticalElement(value = 201) + final case object ColossusTankCannon extends StatisticalElement(value = 204) + final case object Cycler extends StatisticalElement(value = 233) + final case object CyclerV2 extends StatisticalElement(value = 234) + final case object CyclerV3 extends StatisticalElement(value = 235) + final case object CyclerV4 extends StatisticalElement(value = 236) + final case object DropshipRearTurret extends StatisticalElement(value = 262) + final case object Dynomite extends StatisticalElement(value = 267) + final case object EnergyGun extends StatisticalElement(value = 274) + final case object EnergyGunNc extends StatisticalElement(value = 276) + final case object EnergyGunTr extends StatisticalElement(value = 278) + final case object EnergyGunVs extends StatisticalElement(value = 280) + final case object FlailWeapon extends StatisticalElement(value = 298) + final case object Flamethrower extends StatisticalElement(value = 299) + final case object Flechette extends StatisticalElement(value = 304) + final case object FluxCannonThresher extends StatisticalElement(value = 306) + final case object Fluxpod extends StatisticalElement(value = 309) + final case object Forceblade extends StatisticalElement(value = 324) + final case object FragGrenade extends StatisticalElement(value = 330) + final case object FragmentationGrenade extends StatisticalElement(value = 334) + final case object FuryWeaponSystemA extends StatisticalElement(value = 336) + final case object GalaxyGunshipCannon extends StatisticalElement(value = 339) + final case object GalaxyGunshipGun extends StatisticalElement(value = 340) + final case object GalaxyGunshipTailgun extends StatisticalElement(value = 342) + final case object Gauss extends StatisticalElement(value = 345) + final case object GaussCannon extends StatisticalElement(value = 346) + final case object GrenadeLauncherMarauder extends StatisticalElement(value = 371) + final case object HeavyRailBeamMagrider extends StatisticalElement(value = 394) + final case object HeavySniper extends StatisticalElement(value = 396) + final case object Hellfire extends StatisticalElement(value = 398) + final case object Hunterseeker extends StatisticalElement(value = 406) + final case object Ilc9 extends StatisticalElement(value = 407) + final case object Isp extends StatisticalElement(value = 411) + final case object JammerGrenade extends StatisticalElement(value = 416) + final case object Katana extends StatisticalElement(value = 421) + final case object Lancer extends StatisticalElement(value = 425) + final case object Lasher extends StatisticalElement(value = 429) + final case object Liberator25mmCannon extends StatisticalElement(value = 433) + final case object LiberatorBombBay extends StatisticalElement(value = 435) + final case object LiberatorWeaponSystem extends StatisticalElement(value = 440) + final case object LightgunshipWeaponSystem extends StatisticalElement(value = 445) + final case object LightningWeaponSystem extends StatisticalElement(value = 448) + final case object Maelstrom extends StatisticalElement(value = 462) + final case object Magcutter extends StatisticalElement(value = 468) + final case object MediumTransportWeaponSystemA extends StatisticalElement(value = 534) + final case object MediumTransportWeaponSystemB extends StatisticalElement(value = 535) + final case object MineSweeper extends StatisticalElement(value = 552) + final case object MiniChaingun extends StatisticalElement(value = 556) + final case object NchevFalcon extends StatisticalElement(value = 587) + final case object NchevScattercannon extends StatisticalElement(value = 588) + final case object NchevSparrow extends StatisticalElement(value = 589) + final case object Oicw extends StatisticalElement(value = 599) + final case object ParticleBeamMagrider extends StatisticalElement(value = 628) + final case object PelletGun extends StatisticalElement(value = 629) + final case object PeregrineArmorSiphon extends StatisticalElement(value = 633) + final case object PeregrineDualMachineGun extends StatisticalElement(value = 636) + final case object PeregrineDualRocketPods extends StatisticalElement(value = 641) + final case object PeregrineMechhammer extends StatisticalElement(value = 644) + final case object PeregrineNtuSiphon extends StatisticalElement(value = 649) + final case object PeregrineParticleCannon extends StatisticalElement(value = 652) + final case object PeregrineSparrow extends StatisticalElement(value = 658) + final case object PhalanxAvcombo extends StatisticalElement(value = 666) + final case object PhalanxFlakcombo extends StatisticalElement(value = 668) + final case object PhalanxSglHevgatcan extends StatisticalElement(value = 670) + final case object Phantasm12mmMachinegun extends StatisticalElement(value = 672) + final case object Phoenix extends StatisticalElement(value = 673) + final case object PlasmaGrenade extends StatisticalElement(value = 680) + final case object ProwlerWeaponSystemA extends StatisticalElement(value = 699) + final case object ProwlerWeaponSystemB extends StatisticalElement(value = 700) + final case object Pulsar extends StatisticalElement(value = 701) + final case object PulsedParticleAccelerator extends StatisticalElement(value = 705) + final case object Punisher extends StatisticalElement(value = 706) + final case object QuadAssaultWeaponSystem extends StatisticalElement(value = 709) + final case object RShotgun extends StatisticalElement(value = 714) + final case object Radiator extends StatisticalElement(value = 716) + final case object Repeater extends StatisticalElement(value = 730) + final case object Rocklet extends StatisticalElement(value = 737) + final case object RotaryChaingunMosquito extends StatisticalElement(value = 740) + final case object Scythe extends StatisticalElement(value = 747) + final case object SixShooter extends StatisticalElement(value = 761) + final case object SkyguardWeaponSystem extends StatisticalElement(value = 788) + final case object Spiker extends StatisticalElement(value = 817) + final case object Striker extends StatisticalElement(value = 838) + final case object Suppressor extends StatisticalElement(value = 845) + final case object Thumper extends StatisticalElement(value = 864) + final case object ThundererWeaponSystemA extends StatisticalElement(value = 866) + final case object ThundererWeaponSystemB extends StatisticalElement(value = 867) + final case object TrhevBurster extends StatisticalElement(value = 888) + final case object TrhevDualcycler extends StatisticalElement(value = 889) + final case object TrhevPounder extends StatisticalElement(value = 890) + final case object VanguardWeapon150mm extends StatisticalElement(value = 925) + final case object VanguardWeapon20mm extends StatisticalElement(value = 926) + final case object VanguardWeaponSystem extends StatisticalElement(value = 927) + final case object VanuSentryTurretWeapon extends StatisticalElement(value = 945) + final case object VshevComet extends StatisticalElement(value = 968) + final case object VshevQuasar extends StatisticalElement(value = 969) + final case object VshevStarfire extends StatisticalElement(value = 970) + final case object VultureBombBay extends StatisticalElement(value = 987) + final case object VultureNoseWeaponSystem extends StatisticalElement(value = 990) + final case object VultureTailCannon extends StatisticalElement(value = 992) + final case object WaspWeaponSystem extends StatisticalElement(value = 1002) + final case object Winchester extends StatisticalElement(value = 1003) + + final case object AphelionPlasmaCloud extends StatisticalElement(value = 96) + final case object Boomer extends StatisticalElement(value = 148) + final case object HeMine extends StatisticalElement(value = 388) + final case object Knife extends StatisticalElement(value = 424) + final case object LightgunshipWeapon20mm extends StatisticalElement(value = 443) + final case object LightgunshipWeaponRocket extends StatisticalElement(value = 444) + final case object MedicalApplicator extends StatisticalElement(value = 531) + final case object OrbitalStrikeBig extends StatisticalElement(value = 609) + final case object OrbitalStrikeSmall extends StatisticalElement(value = 610) + final case object VanuModule extends StatisticalElement(value = 934) + final case object VanuModuleBeam extends StatisticalElement(value = 950) + + final case object AMS extends StatisticalElement(value = 46) + final case object ANT extends StatisticalElement(value = 60) + final case object Sunderer extends StatisticalElement(value = 62) + final case object ApcTr extends StatisticalElement(value = 66) + final case object ApcNc extends StatisticalElement(value = 67) + final case object ApcVs extends StatisticalElement(value = 68) + final case object Aphelion extends StatisticalElement(value = 79) + final case object AphelionFlight extends StatisticalElement(value = 83) + final case object AphelionGunner extends StatisticalElement(value = 84) + final case object Battlewagon extends StatisticalElement(value = 118) //aurora + final case object Infantry extends StatisticalElement(value = 121) + final case object Raider extends StatisticalElement(value = 135) + final case object BfrTerminal extends StatisticalElement(value = 143) + final case object Colossus extends StatisticalElement(value = 179) + final case object ColossusFlight extends StatisticalElement(value = 199) + final case object ColossusGunner extends StatisticalElement(value = 200) + final case object Door extends StatisticalElement(value = 242) + final case object Droppod extends StatisticalElement(value = 258) + final case object Dropship extends StatisticalElement(value = 259) + final case object Facilities extends StatisticalElement(value = 284) + final case object Flail extends StatisticalElement(value = 294) + final case object Fury extends StatisticalElement(value = 335) + final case object GalaxyGunship extends StatisticalElement(value = 338) + final case object Generator extends StatisticalElement(value = 351) + final case object Vehicle extends StatisticalElement(value = 356) + final case object MechanizedAssaultExoSuit extends StatisticalElement(value = 390) + final case object ImplantTerminalMech extends StatisticalElement(value = 410) + final case object Liberator extends StatisticalElement(value = 432) + final case object Lightgunship extends StatisticalElement(value = 441) + final case object Locker extends StatisticalElement(value = 456) + final case object Lightning extends StatisticalElement(value = 446) + final case object AgileExoSuit extends StatisticalElement(value = 449) + final case object Lodestar extends StatisticalElement(value = 459) + final case object Magrider extends StatisticalElement(value = 470) + final case object PhalanxTurret extends StatisticalElement(value = 480) + final case object ReinforcedExoSuit extends StatisticalElement(value = 528) + final case object MedicalTerminal extends StatisticalElement(value = 529) + final case object MediumTransport extends StatisticalElement(value = 532) + final case object MonolithAmerish extends StatisticalElement(value = 560) + final case object MonolithCeryshen extends StatisticalElement(value = 562) + final case object MonolithCyssor extends StatisticalElement(value = 563) + final case object MonolithEsamir extends StatisticalElement(value = 564) + final case object MonolithForseral extends StatisticalElement(value = 566) + final case object MonolithHossin extends StatisticalElement(value = 567) + final case object MonolithIshundar extends StatisticalElement(value = 568) + final case object MonolithSearhus extends StatisticalElement(value = 569) + final case object MonolithSolsar extends StatisticalElement(value = 570) + final case object Mosquito extends StatisticalElement(value = 572) + final case object EquipmentTerminal extends StatisticalElement(value = 612) + final case object Peregrine extends StatisticalElement(value = 632) + final case object PeregrineFlight extends StatisticalElement(value = 642) + final case object PeregrineGunner extends StatisticalElement(value = 643) + final case object Phantasm extends StatisticalElement(value = 671) + final case object PortableMannedTurretTr extends StatisticalElement(value = 686) + final case object PortableMannedTurretNc extends StatisticalElement(value = 687) + final case object PortableMannedTurretVs extends StatisticalElement(value = 688) + final case object Prowler extends StatisticalElement(value = 697) + final case object QuadAssault extends StatisticalElement(value = 707) + final case object QuadStealth extends StatisticalElement(value = 710) + final case object Redoubt extends StatisticalElement(value = 726) + final case object RespawnTube extends StatisticalElement(value = 732) + final case object Router extends StatisticalElement(value = 741) + final case object RouterTelepadDeployable extends StatisticalElement(value = 744) + final case object Skyguard extends StatisticalElement(value = 784) + final case object SpitfireAA extends StatisticalElement(value = 819) + final case object SpitfireCloaked extends StatisticalElement(value = 825) + final case object SpitfireTurret extends StatisticalElement(value = 826) + final case object StandardExoSuit extends StatisticalElement(value = 829) + final case object AirToAir extends StatisticalElement(value = 832) + final case object InfiltrationExoSuit extends StatisticalElement(value = 837) + final case object Switchblade extends StatisticalElement(value = 847) + final case object TankTraps extends StatisticalElement(value = 849) + final case object Terminal extends StatisticalElement(value = 854) + final case object ThreeManHeavyBuggy extends StatisticalElement(value = 862) + final case object Thunderer extends StatisticalElement(value = 865) + final case object Tower extends StatisticalElement(value = 868) + final case object TwoManAssaultBuggy extends StatisticalElement(value = 896) + final case object TwoManHeavyBuggy extends StatisticalElement(value = 898) + final case object TwoManHoverBuggy extends StatisticalElement(value = 900) + final case object Vanguard extends StatisticalElement(value = 923) + final case object VanuControlPoint extends StatisticalElement(value = 931) + final case object VanSentryTurret extends StatisticalElement(value = 943) + final case object VanuVehicleStation extends StatisticalElement(value = 948) + final case object VehicleTerminal extends StatisticalElement(value = 953) + final case object Vulture extends StatisticalElement(value = 986) + final case object Wasp extends StatisticalElement(value = 997) + final case object XmasCharlie1 extends StatisticalElement(value = 1007) + final case object XmasCharlie2 extends StatisticalElement(value = 1008) + final case object XmasCharlie3 extends StatisticalElement(value = 1009) + final case object XmasCharlie4 extends StatisticalElement(value = 1010) + final case object XmasCharlie5 extends StatisticalElement(value = 1011) + final case object XmasCharlie6 extends StatisticalElement(value = 1012) + final case object XmasCharlie7 extends StatisticalElement(value = 1013) + final case object XmasCharlie8 extends StatisticalElement(value = 1014) + final case object XmasCharlie9 extends StatisticalElement(value = 1015) + final case object XmasGingermanAtar extends StatisticalElement(value = 1017) + final case object XmasGingermanDahaka extends StatisticalElement(value = 1018) + final case object XmasGingermanHvar extends StatisticalElement(value = 1019) + final case object XmasGingermanIzha extends StatisticalElement(value = 1020) + final case object XmasGingermanJamshid extends StatisticalElement(value = 1021) + final case object XmasGingermanMithra extends StatisticalElement(value = 1022) + final case object XmasGingermanRashnu extends StatisticalElement(value = 1023) + final case object XmasGingermanSraosha extends StatisticalElement(value = 1024) + final case object XmasGingermanYazata extends StatisticalElement(value = 1025) + final case object XmasGingermanZal extends StatisticalElement(value = 1026) + final case object XmasSled1 extends StatisticalElement(value = 1028) + final case object XmasSled2 extends StatisticalElement(value = 1029) + final case object XmasSled3 extends StatisticalElement(value = 1030) + final case object XmasSled4 extends StatisticalElement(value = 1031) + final case object XmasSled5 extends StatisticalElement(value = 1032) + final case object XmasSled6 extends StatisticalElement(value = 1033) + final case object XmasSled7 extends StatisticalElement(value = 1034) + final case object XmasSled8 extends StatisticalElement(value = 1035) + final case object XmasSled9 extends StatisticalElement(value = 1036) + final case object XmasSnowmanAmerish extends StatisticalElement(value = 1038) + final case object XmasSnowmanCeryshen extends StatisticalElement(value = 1039) + final case object XmasSnowmanCyssor extends StatisticalElement(value = 1040) + final case object XmasSnowmanEsamir extends StatisticalElement(value = 1041) + final case object XmasSnowmanForseral extends StatisticalElement(value = 1042) + final case object XmasSnowmanHossin extends StatisticalElement(value = 1043) + final case object XmasSnowmanIshundar extends StatisticalElement(value = 1044) + final case object XmasSnowmanSearhus extends StatisticalElement(value = 1045) + final case object XmasSnowmanSolsar extends StatisticalElement(value = 1046) +} diff --git a/src/main/scala/net/psforever/zones/Zones.scala b/src/main/scala/net/psforever/zones/Zones.scala index 56957221..bce08ea0 100644 --- a/src/main/scala/net/psforever/zones/Zones.scala +++ b/src/main/scala/net/psforever/zones/Zones.scala @@ -1,16 +1,14 @@ package net.psforever.zones import java.io.FileNotFoundException - import net.psforever.objects.serverobject.terminals.{ProximityTerminal, ProximityTerminalDefinition, Terminal, TerminalDefinition} import net.psforever.objects.serverobject.mblocker.Locker -import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.atomic.AtomicInteger import akka.actor.ActorContext import io.circe._ import io.circe.parser._ import net.psforever.objects.{GlobalDefinitions, LocalLockerItem, LocalProjectile} -import net.psforever.objects.ballistics.Projectile import net.psforever.objects.definition.BasicDefinition import net.psforever.objects.guid.selector.{NumberSelector, RandomSelector, SpecificSelector} import net.psforever.objects.serverobject.doors.{Door, DoorDefinition, SpawnTubeDoor} @@ -27,6 +25,7 @@ import net.psforever.objects.serverobject.terminals.implant.ImplantTerminalMech import net.psforever.objects.serverobject.tube.SpawnTube import net.psforever.objects.serverobject.turret.{FacilityTurret, FacilityTurretDefinition} import net.psforever.objects.serverobject.zipline.ZipLinePath +import net.psforever.objects.sourcing.{DeployableSource, ObjectSource, PlayerSource, VehicleSource} import net.psforever.objects.zones.{MapInfo, Zone, ZoneInfo, ZoneMap} import net.psforever.types.{Angular, PlanetSideEmpire, Vector3} import net.psforever.util.DefinitionUtil @@ -62,7 +61,7 @@ object Zones { max: Int, selector: String ) { - def getSelector() : NumberSelector = { + def getSelector(): NumberSelector = { if (selector.equals("random")) new RandomSelector else new SpecificSelector } @@ -693,9 +692,9 @@ object Zones { super.init(context) if (!info.id.startsWith("tz")) { - this.HotSpotCoordinateFunction = Zones.HotSpots.standardRemapping(info.map.scale, 80, 80) + this.HotSpotCoordinateFunction = Zones.HotSpots.standardRemapping(info.map.scale, info.map.hotSpotSpan, info.map.hotSpotSpan) this.HotSpotTimeFunction = Zones.HotSpots.standardTimeRules - Zones.initZoneAmenities(this) + Zones.initZoneAmenities(zone = this) } //special conditions @@ -915,7 +914,8 @@ object Zones { } object HotSpots { - import net.psforever.objects.ballistics.SourceEntry + + import net.psforever.objects.sourcing.SourceEntry import net.psforever.objects.zones.MapScale import net.psforever.types.Vector3 @@ -986,7 +986,6 @@ object Zones { */ def standardTimeRules(defender: SourceEntry, attacker: SourceEntry): FiniteDuration = { import net.psforever.objects.GlobalDefinitions - import net.psforever.objects.ballistics._ if (attacker.Faction == defender.Faction) { 0 seconds } else { diff --git a/src/test/scala/CryptoTest.scala b/src/test/scala/CryptoTest.scala index c268011c..a723bee0 100644 --- a/src/test/scala/CryptoTest.scala +++ b/src/test/scala/CryptoTest.scala @@ -66,7 +66,6 @@ class CryptoTest extends Specification { ) val encrypted = PacketCoding.marshalPacket(packet, Some(10), Some(crypto)).require - println(s"encrypted ${encrypted}") val (decryptedPacket, sequence) = PacketCoding.unmarshalPacket(encrypted.bytes, Some(crypto)).require decryptedPacket mustEqual packet diff --git a/src/test/scala/game/AvatarStatisticsMessageTest.scala b/src/test/scala/game/AvatarStatisticsMessageTest.scala index 4856932d..8bd8589a 100644 --- a/src/test/scala/game/AvatarStatisticsMessageTest.scala +++ b/src/test/scala/game/AvatarStatisticsMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.{StatisticalCategory, StatisticalElement} import scodec.bits._ class AvatarStatisticsMessageTest extends Specification { @@ -13,12 +14,13 @@ class AvatarStatisticsMessageTest extends Specification { "decode (long)" in { PacketCoding.decodePacket(string_long).require match { - case AvatarStatisticsMessage(unk, stats) => - unk mustEqual 2 - stats.unk1 mustEqual None - stats.unk2 mustEqual None - stats.unk3.length mustEqual 1 - stats.unk3.head mustEqual 0 + case AvatarStatisticsMessage(stat) => + stat match { + case DeathStatistic(value) => + value mustEqual 0L + case _ => + ko + } case _ => ko } @@ -26,55 +28,40 @@ class AvatarStatisticsMessageTest extends Specification { "decode (complex)" in { PacketCoding.decodePacket(string_complex).require match { - case AvatarStatisticsMessage(unk, stats) => - unk mustEqual 0 - stats.unk1 mustEqual Some(1) - stats.unk2 mustEqual Some(572) - stats.unk3.length mustEqual 8 - stats.unk3.head mustEqual 1 - stats.unk3(1) mustEqual 6 - stats.unk3(2) mustEqual 0 - stats.unk3(3) mustEqual 1 - stats.unk3(4) mustEqual 1 - stats.unk3(5) mustEqual 2 - stats.unk3(6) mustEqual 0 - stats.unk3(7) mustEqual 0 + case AvatarStatisticsMessage(stat) => + stat match { + case InitStatistic(a, b, c) => + a mustEqual StatisticalCategory.Destroyed + b mustEqual StatisticalElement.Mosquito + c mustEqual List(1, 6, 0, 1, 1, 2, 0, 0) + case _ => + ko + } case _ => ko } } "encode (long)" in { - val msg = AvatarStatisticsMessage(2, Statistics(0L)) + val msg = AvatarStatisticsMessage(DeathStatistic(0L)) val pkt = PacketCoding.encodePacket(msg).require.toByteVector pkt mustEqual string_long } "encode (complex)" in { - val msg = AvatarStatisticsMessage(0, Statistics(1, 572, List[Long](1, 6, 0, 1, 1, 2, 0, 0))) + val msg = AvatarStatisticsMessage( + InitStatistic(StatisticalCategory.Destroyed, StatisticalElement.Mosquito, List[Long](1, 6, 0, 1, 1, 2, 0, 0)) + ) val pkt = PacketCoding.encodePacket(msg).require.toByteVector pkt mustEqual string_complex } - "encode (failure; long; missing value)" in { - val msg = AvatarStatisticsMessage(0, Statistics(None, None, List(0L))) - PacketCoding.encodePacket(msg).isFailure mustEqual true - } - - "encode (failure; complex; missing value (5-bit))" in { - val msg = AvatarStatisticsMessage(0, Statistics(None, Some(572), List[Long](1, 6, 0, 1, 1, 2, 0, 0))) - PacketCoding.encodePacket(msg).isFailure mustEqual true - } - - "encode (failure; complex; missing value (11-bit))" in { - val msg = AvatarStatisticsMessage(0, Statistics(Some(1), None, List[Long](1, 6, 0, 1, 1, 2, 0, 0))) - PacketCoding.encodePacket(msg).isFailure mustEqual true - } - "encode (failure; complex; wrong number of list entries)" in { - val msg = AvatarStatisticsMessage(0, Statistics(Some(1), None, List[Long](1, 6, 0, 1))) + val msg = AvatarStatisticsMessage( + InitStatistic(StatisticalCategory.Destroyed, StatisticalElement.Mosquito, List[Long](1, 6, 0, 1)) + ) PacketCoding.encodePacket(msg).isFailure mustEqual true } } diff --git a/src/test/scala/game/BattleExperienceMessageTest.scala b/src/test/scala/game/BattleExperienceMessageTest.scala index 25eeeb10..c78c19be 100644 --- a/src/test/scala/game/BattleExperienceMessageTest.scala +++ b/src/test/scala/game/BattleExperienceMessageTest.scala @@ -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.{ExperienceType, PlanetSideGUID} import scodec.bits._ class BattleExperienceMessageTest extends Specification { @@ -15,14 +15,14 @@ class BattleExperienceMessageTest extends Specification { case BattleExperienceMessage(player_guid, experience, unk) => player_guid mustEqual PlanetSideGUID(2698) experience mustEqual 999 - unk mustEqual 0 + unk mustEqual ExperienceType.Normal case _ => ko } } "encode" in { - val msg = BattleExperienceMessage(PlanetSideGUID(2698), 999, 0) + val msg = BattleExperienceMessage(PlanetSideGUID(2698), 999, ExperienceType.Normal) val pkt = PacketCoding.encodePacket(msg).require.toByteVector pkt mustEqual string diff --git a/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala b/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala index 64f7250b..20d6d559 100644 --- a/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala +++ b/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala @@ -294,7 +294,7 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification { Some(member_list) ) => u1 mustEqual 3 - u2 mustEqual 1792 + u2 mustEqual 7 char_id mustEqual 42771010L u3 mustEqual 529745L leader mustEqual "HofD" @@ -832,7 +832,7 @@ class SquadDetailDefinitionUpdateMessageTest extends Specification { PlanetSideGUID(3), SquadDetail( 3, - 1792, + 7, 42771010L, 529745L, "HofD", diff --git a/src/test/scala/objects/AvatarTest.scala b/src/test/scala/objects/AvatarTest.scala index 7a7dbbc7..74ab89e3 100644 --- a/src/test/scala/objects/AvatarTest.scala +++ b/src/test/scala/objects/AvatarTest.scala @@ -6,6 +6,7 @@ import net.psforever.objects._ import net.psforever.objects.avatar.{Avatar, BattleRank, Implant} import net.psforever.objects.definition.ImplantDefinition import net.psforever.objects.locker.LockerEquipment +import net.psforever.packet.game.objectcreate.BasicCharacterData import net.psforever.types.{CharacterSex, CharacterVoice, ImplantType, PlanetSideEmpire} import org.specs2.mutable._ @@ -59,13 +60,16 @@ class AvatarTest extends Specification { val testplant = Implant(new ImplantDefinition(ImplantType.AdvancedRegen)) var obj = Avatar( 0, - "Chord", - PlanetSideEmpire.TR, - CharacterSex.Male, - 0, - CharacterVoice.Voice5, + BasicCharacterData( + "Chord", + PlanetSideEmpire.TR, + CharacterSex.Male, + 0, + CharacterVoice.Voice5 + ), bep = BattleRank.BR6.experience ) + obj obj.implants.nonEmpty must beTrue obj.implants.length mustEqual 3 obj = obj.copy(implants = obj.implants.updated(0, Some(testplant))) diff --git a/src/test/scala/objects/BuildingTest.scala b/src/test/scala/objects/BuildingTest.scala index 6e65b948..194e324e 100644 --- a/src/test/scala/objects/BuildingTest.scala +++ b/src/test/scala/objects/BuildingTest.scala @@ -10,6 +10,7 @@ import net.psforever.objects.zones.Zone import net.psforever.types.PlanetSideEmpire import org.specs2.mutable.Specification import akka.actor.typed.scaladsl.adapter._ +import net.psforever.services.{InterstellarClusterService, ServiceManager} class AmenityTest extends Specification { val definition = new AmenityDefinition(0) { @@ -114,6 +115,8 @@ class WarpGateTest extends Specification { class BuildingActor1Test extends ActorTest { "Building Control" should { "construct" in { + ServiceManager.boot(system) + system.spawn(InterstellarClusterService(Seq(Zone.Nowhere)), InterstellarClusterService.InterstellarClusterServiceKey.id) val bldg = Building("Building", 0, 10, Zone.Nowhere, StructureType.Building) bldg.Actor = system.spawn(BuildingActor(Zone.Nowhere, bldg), "test").toClassic assert(bldg.Actor != Default.Actor) diff --git a/src/test/scala/objects/DamageModelTests.scala b/src/test/scala/objects/DamageModelTests.scala index da003aea..b19467e7 100644 --- a/src/test/scala/objects/DamageModelTests.scala +++ b/src/test/scala/objects/DamageModelTests.scala @@ -16,6 +16,7 @@ import net.psforever.packet.game.objectcreate.ObjectClass import net.psforever.types._ import org.specs2.mutable.Specification import net.psforever.objects.avatar.Avatar +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry, VehicleSource} import net.psforever.objects.vital.base._ import net.psforever.objects.vital.interaction.DamageInteraction diff --git a/src/test/scala/objects/DamageableTest.scala b/src/test/scala/objects/DamageableTest.scala index 94c05604..8a258f2d 100644 --- a/src/test/scala/objects/DamageableTest.scala +++ b/src/test/scala/objects/DamageableTest.scala @@ -2,6 +2,7 @@ package objects import akka.actor.Props +import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.testkit.TestProbe import base.{ActorTest, FreedContextActorTest} import net.psforever.actors.zone.ZoneActor @@ -17,7 +18,7 @@ import net.psforever.objects.serverobject.terminals.{Terminal, TerminalControl, import net.psforever.objects.serverobject.tube.SpawnTube import net.psforever.objects.serverobject.turret.{FacilityTurret, FacilityTurretControl, TurretUpgrade} import net.psforever.objects.vehicles.control.VehicleControl -import net.psforever.objects.vital.Vitality +import net.psforever.objects.vital.{SpawningActivity, Vitality} import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.DamageWithPositionMessage import net.psforever.types._ @@ -31,6 +32,7 @@ import org.specs2.mutable.Specification import scala.concurrent.duration._ import net.psforever.objects.avatar.Avatar import net.psforever.objects.serverobject.terminals.implant.{ImplantTerminalMech, ImplantTerminalMechControl} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry, VehicleSource} import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.projectile.ProjectileReason @@ -74,6 +76,7 @@ class DamageableTest extends Specification { "ignore attempts at damaging friendly targets not designated for friendly fire" in { val target = new Generator(GlobalDefinitions.generator) + target.GUID = PlanetSideGUID(1) target.Owner = new Building("test-building", 0, 0, Zone.Nowhere, StructureType.Building, GlobalDefinitions.building) { Faction = player1.Faction @@ -108,6 +111,7 @@ class DamageableTest extends Specification { "ignore attempts at damaging a target that is not damageable" in { val target = new SpawnTube(GlobalDefinitions.respawn_tube_sanctuary) + target.GUID = PlanetSideGUID(1) target.Owner = new Building("test-building", 0, 0, Zone.Nowhere, StructureType.Building, GlobalDefinitions.building) { Faction = PlanetSideEmpire.NC @@ -137,6 +141,7 @@ class DamageableTest extends Specification { override def Request(player: Player, msg: Any): Terminal.Exchange = null }) + target.GUID = PlanetSideGUID(2) target.Owner = new Building("test-building", 0, 0, Zone.Nowhere, StructureType.Building, GlobalDefinitions.building) { Faction = player1.Faction @@ -706,6 +711,7 @@ class DamageableMountableDestroyTest extends ActorTest { val activityProbe = TestProbe() val avatarProbe = TestProbe() val buildingProbe = TestProbe() + zone.actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref zone.Activity = activityProbe.ref zone.AvatarEvents = avatarProbe.ref building.Actor = buildingProbe.ref @@ -777,6 +783,7 @@ class DamageableWeaponTurretDamageTest extends ActorTest { val activityProbe = TestProbe() val avatarProbe = TestProbe() val vehicleProbe = TestProbe() + zone.actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref zone.Activity = activityProbe.ref zone.AvatarEvents = avatarProbe.ref zone.VehicleEvents = vehicleProbe.ref @@ -784,6 +791,8 @@ class DamageableWeaponTurretDamageTest extends ActorTest { turret.Actor = system.actorOf(Props(classOf[TurretControl], turret), "turret-control") turret.Zone = zone turret.Position = Vector3(1, 0, 0) + turret.LogActivity(SpawningActivity(SourceEntry(turret), zone.Number, None)) //seed a spawn event + val tSource = SourceEntry(turret) val player1 = Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)) //guid=3 player1.Spawn() @@ -805,7 +814,7 @@ class DamageableWeaponTurretDamageTest extends ActorTest { val projectile = weapon.Projectile val pSource = PlayerSource(player1) val resolved = DamageInteraction( - SourceEntry(turret), + tSource, ProjectileReason( DamageResolution.Hit, Projectile( @@ -842,8 +851,8 @@ class DamageableWeaponTurretDamageTest extends ActorTest { assert( msg3 match { case activity: Zone.HotSpot.Activity => - activity.attacker == pSource && - activity.defender == SourceEntry(turret) && + activity.attacker.unique == pSource.unique && + activity.defender.unique == tSource.unique && activity.location == Vector3(1, 0, 0) case _ => false } @@ -971,6 +980,7 @@ class DamageableWeaponTurretDestructionTest extends ActorTest { val avatarProbe = TestProbe() val vehicleProbe = TestProbe() val buildingProbe = TestProbe() + zone.actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref zone.Activity = activityProbe.ref zone.AvatarEvents = avatarProbe.ref zone.VehicleEvents = vehicleProbe.ref @@ -1007,6 +1017,7 @@ class DamageableWeaponTurretDestructionTest extends ActorTest { building.Amenities = turret val turretSource = SourceEntry(turret) + //turret.History(EntitySpawn(turretSource, zone)) //seed a spawn event val weaponA = Tool(GlobalDefinitions.jammer_grenade) val projectileA = weaponA.Projectile val resolvedA = DamageInteraction( @@ -1118,6 +1129,7 @@ class DamageableVehicleDamageTest extends ActorTest { val activityProbe = TestProbe() val avatarProbe = TestProbe() val vehicleProbe = TestProbe() + zone.actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref zone.Activity = activityProbe.ref zone.AvatarEvents = avatarProbe.ref zone.VehicleEvents = vehicleProbe.ref @@ -1125,6 +1137,7 @@ class DamageableVehicleDamageTest extends ActorTest { val atv = Vehicle(GlobalDefinitions.quadstealth) //guid=1 atv.Actor = system.actorOf(Props(classOf[VehicleControl], atv), "vehicle-control") atv.Position = Vector3(1, 0, 0) + //atv.History(EntitySpawn(turretSource, zone)) //seed a spawn event val player1 = Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)) //guid=2 @@ -1147,6 +1160,7 @@ class DamageableVehicleDamageTest extends ActorTest { val weapon = Tool(GlobalDefinitions.suppressor) val projectile = weapon.Projectile + val pSource = PlayerSource(player1) val vehicleSource = SourceEntry(atv) val resolved = DamageInteraction( vehicleSource, @@ -1194,9 +1208,9 @@ class DamageableVehicleDamageTest extends ActorTest { assert( msg3 match { case activity: Zone.HotSpot.Activity => - activity.attacker == PlayerSource(player1) && - activity.defender == VehicleSource(atv) && - activity.location == Vector3(1, 0, 0) + activity.attacker.unique == pSource.unique && + activity.defender.unique == vehicleSource.unique && + activity.location == Vector3(1, 0, 0) case _ => false } ) @@ -1225,6 +1239,7 @@ class DamageableVehicleDamageMountedTest extends FreedContextActorTest { val activityProbe = TestProbe() val avatarProbe = TestProbe() val vehicleProbe = TestProbe() + zone.actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref zone.Activity = activityProbe.ref zone.AvatarEvents = avatarProbe.ref zone.VehicleEvents = vehicleProbe.ref @@ -1233,6 +1248,7 @@ class DamageableVehicleDamageMountedTest extends FreedContextActorTest { val lodestar = Vehicle(GlobalDefinitions.lodestar) //guid=1 & 4,5,6,7,8,9 lodestar.Position = Vector3(1, 0, 0) + //lodestar.History(EntitySpawn(VehicleSource(lodestar), zone)) //seed a spawn event val atv = Vehicle(GlobalDefinitions.quadstealth) //guid=11 atv.Position = Vector3(1, 0, 0) atv.Actor = system.actorOf(Props(classOf[VehicleControl], atv), "atv-control") @@ -1280,8 +1296,9 @@ class DamageableVehicleDamageMountedTest extends FreedContextActorTest { val weapon = Tool(GlobalDefinitions.phoenix) //decimator val projectile = weapon.Projectile val pSource = PlayerSource(player1) + val vSource = SourceEntry(lodestar) val resolved = DamageInteraction( - SourceEntry(lodestar), + vSource, ProjectileReason( DamageResolution.Hit, Projectile( @@ -1323,8 +1340,8 @@ class DamageableVehicleDamageMountedTest extends FreedContextActorTest { } msg3 match { case activity: Zone.HotSpot.Activity => - assert(activity.attacker == pSource && - activity.defender == SourceEntry(lodestar) && + assert(activity.attacker.unique == pSource.unique && + activity.defender.unique == vSource.unique && activity.location == Vector3(1, 0, 0)) case _ => assert(false) } @@ -1473,6 +1490,7 @@ class DamageableVehicleDestroyTest extends ActorTest { val activityProbe = TestProbe() val avatarProbe = TestProbe() val vehicleProbe = TestProbe() + zone.actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref zone.Activity = activityProbe.ref zone.AvatarEvents = avatarProbe.ref zone.VehicleEvents = vehicleProbe.ref diff --git a/src/test/scala/objects/DeployableBehaviorTest.scala b/src/test/scala/objects/DeployableBehaviorTest.scala index ada501a3..f6ee808b 100644 --- a/src/test/scala/objects/DeployableBehaviorTest.scala +++ b/src/test/scala/objects/DeployableBehaviorTest.scala @@ -18,6 +18,7 @@ import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.types._ +import scala.collection.mutable import scala.collection.mutable.ListBuffer import scala.concurrent.duration._ @@ -27,7 +28,7 @@ class DeployableBehaviorSetupTest extends ActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) @@ -86,7 +87,7 @@ class DeployableBehaviorSetupOwnedP1Test extends ActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) @@ -132,7 +133,7 @@ class DeployableBehaviorSetupOwnedP2Test extends FreedContextActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) @@ -232,7 +233,7 @@ class DeployableBehaviorDeconstructTest extends ActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) @@ -284,7 +285,7 @@ class DeployableBehaviorDeconstructOwnedTest extends FreedContextActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) diff --git a/src/test/scala/objects/DeployableTest.scala b/src/test/scala/objects/DeployableTest.scala index 38562f44..71fd1418 100644 --- a/src/test/scala/objects/DeployableTest.scala +++ b/src/test/scala/objects/DeployableTest.scala @@ -6,7 +6,7 @@ import akka.testkit.TestProbe import base.ActorTest import net.psforever.actors.zone.ZoneActor import net.psforever.objects.ballistics._ -import net.psforever.objects.ce.DeployedItem +import net.psforever.objects.ce.{Deployable, DeployedItem} import net.psforever.objects.guid.NumberPoolHub import net.psforever.objects.guid.source.MaxNumberSource import net.psforever.objects.serverobject.mount.{MountInfo, Mountable} @@ -23,10 +23,10 @@ import net.psforever.objects.avatar.Avatar import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.projectile.ProjectileReason - import akka.actor.typed.scaladsl.adapter._ +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} -import scala.collection.mutable.ListBuffer +import scala.collection.mutable import scala.concurrent.duration._ class DeployableTest extends Specification { @@ -318,9 +318,9 @@ class ExplosiveDeployableJammerTest extends ActorTest { val avatar2 = Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute) val player2 = Player(avatar2) //guid=4 val weapon = Tool(GlobalDefinitions.jammer_grenade) //guid=5 - val deployableList = new ListBuffer() + val deployableList = new mutable.ListBuffer[Deployable]() val zone = new Zone("test", new ZoneMap("test"), 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools() = {} GUID(guid) @@ -395,9 +395,9 @@ class ExplosiveDeployableJammerExplodeTest extends ActorTest { val avatar2 = Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute) val player2 = Player(avatar2) //guid=4 val weapon = Tool(GlobalDefinitions.jammer_grenade) //guid=5 - val deployableList = new ListBuffer() + val deployableList = new mutable.ListBuffer[Deployable]() val zone = new Zone("test", new ZoneMap("test"), 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools() = {} GUID(guid) @@ -504,9 +504,9 @@ class ExplosiveDeployableDestructionTest extends ActorTest { val avatar2 = Avatar(0, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute) val player2 = Player(avatar2) //guid=4 val weapon = Tool(GlobalDefinitions.suppressor) //guid=5 - val deployableList = new ListBuffer() + val deployableList = new mutable.ListBuffer[Deployable]() val zone = new Zone("test", new ZoneMap("test"), 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools() = {} GUID(guid) diff --git a/src/test/scala/objects/GeneratorTest.scala b/src/test/scala/objects/GeneratorTest.scala index 5825c7f8..ef2c175e 100644 --- a/src/test/scala/objects/GeneratorTest.scala +++ b/src/test/scala/objects/GeneratorTest.scala @@ -1,10 +1,11 @@ // Copyright (c) 2020 PSForever package objects +import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.actor.{ActorRef, Props} import akka.testkit.TestProbe import base.ActorTest -import net.psforever.actors.zone.BuildingActor +import net.psforever.actors.zone.{BuildingActor, ZoneActor} import net.psforever.objects.avatar.{Avatar, Certification} import net.psforever.objects.ballistics._ import net.psforever.objects.{GlobalDefinitions, Player, Tool} @@ -13,6 +14,7 @@ import net.psforever.objects.guid.source.MaxNumberSource import net.psforever.objects.serverobject.CommonMessages import net.psforever.objects.serverobject.generator.{Generator, GeneratorControl, GeneratorDefinition} import net.psforever.objects.serverobject.structures.{Building, StructureType} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.interaction.DamageInteraction @@ -359,6 +361,7 @@ class GeneratorControlKillsTest extends ActorTest { val activityProbe = TestProbe() val guid = new NumberPoolHub(new MaxNumberSource(5)) val zone = new Zone("test", new ZoneMap("test"), 0) { + actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref override def SetupNumberPools() = {} GUID(guid) override def LivePlayers = List(player1, player2) diff --git a/src/test/scala/objects/OrbitalShuttlePadTest.scala b/src/test/scala/objects/OrbitalShuttlePadTest.scala index 82db9ac3..04eb3f25 100644 --- a/src/test/scala/objects/OrbitalShuttlePadTest.scala +++ b/src/test/scala/objects/OrbitalShuttlePadTest.scala @@ -18,36 +18,35 @@ import net.psforever.services.hart.HartService import net.psforever.types.PlanetSideEmpire import scala.collection.concurrent.TrieMap -import scala.collection.mutable.ListBuffer +import scala.collection.mutable import scala.concurrent.duration._ class OrbitalShuttlePadControlTest extends FreedContextActorTest { import akka.actor.typed.scaladsl.adapter._ - system.spawn(InterstellarClusterService(Nil), InterstellarClusterService.InterstellarClusterServiceKey.id) - val services = ServiceManager.boot(system) + val services: ActorRef = ServiceManager.boot(system) services ! ServiceManager.Register(Props[GalaxyService](), "galaxy") services ! ServiceManager.Register(Props[HartService](), "hart") expectNoMessage(1000 milliseconds) var buildingMap = new TrieMap[Int, Building]() - val vehicles = ListBuffer[Vehicle]() + val vehicles: mutable.ListBuffer[Vehicle] = mutable.ListBuffer[Vehicle]() val guid = new NumberPoolHub(new MaxNumberSource(max = 20)) guid.AddPool("vehicles", (11 to 15).toList) guid.AddPool("tools", (16 to 19).toList) - val catchall = new TestProbe(system).ref - val unops = new UniqueNumberOps(guid, UniqueNumberSetup.AllocateNumberPoolActors(context, guid)) - val zone = new Zone("test", new ZoneMap("test-map"), 0) { - val transport: ActorRef = context.actorOf(Props(classOf[ZoneVehicleActor], this, vehicles), s"zone-test-vehicles") + val catchall: ActorRef = new TestProbe(system).ref + val unops: UniqueNumberOps = new UniqueNumberOps(guid, UniqueNumberSetup.AllocateNumberPoolActors(context, guid)) + val zone: Zone = new Zone("test", new ZoneMap("test-map"), 0) { + val transport: ActorRef = context.actorOf(Props(classOf[ZoneVehicleActor], this, vehicles, mutable.HashMap[Int, Int]()), s"zone-test-vehicles") - override def SetupNumberPools() = {} + override def SetupNumberPools(): Unit = {} GUID(guid) - override def GUID = { unops } - override def AvatarEvents = catchall - override def LocalEvents = catchall - override def VehicleEvents = catchall - override def Activity = catchall - override def Transport = { transport } - override def Vehicles = { vehicles.toList } - override def Buildings = { buildingMap.toMap } + override def GUID: UniqueNumberOps = { unops } + override def AvatarEvents: ActorRef = catchall + override def LocalEvents: ActorRef = catchall + override def VehicleEvents: ActorRef = catchall + override def Activity: ActorRef = catchall + override def Transport: ActorRef = { transport } + override def Vehicles:List[Vehicle] = { vehicles.toList } + override def Buildings: Map[Int, Building] = { buildingMap.toMap } import akka.actor.typed.scaladsl.adapter._ this.actor = new TestProbe(system).ref.toTyped[ZoneActor.Command] @@ -60,8 +59,9 @@ class OrbitalShuttlePadControlTest extends FreedContextActorTest { StructureType.Building, GlobalDefinitions.orbital_building_tr ) - building.Faction = PlanetSideEmpire.TR buildingMap += 1 -> building + system.spawn(InterstellarClusterService(Seq(zone)), InterstellarClusterService.InterstellarClusterServiceKey.id) + building.Faction = PlanetSideEmpire.TR building.Actor = context.spawn(BuildingActor(zone, building), "test-orbital-building-tr-control").toClassic building.Invalidate() guid.register(building, number = 1) diff --git a/src/test/scala/objects/PlayerControlTest.scala b/src/test/scala/objects/PlayerControlTest.scala index 42aa9f15..9266d0c7 100644 --- a/src/test/scala/objects/PlayerControlTest.scala +++ b/src/test/scala/objects/PlayerControlTest.scala @@ -3,9 +3,11 @@ package objects import akka.actor.typed.ActorRef import akka.actor.{ActorSystem, Props} +import akka.actor.typed.scaladsl.adapter._ import akka.testkit.TestProbe import base.ActorTest import net.psforever.actors.session.AvatarActor +import net.psforever.actors.zone.ZoneActor import net.psforever.objects.avatar.{Avatar, Certification, PlayerControl} import net.psforever.objects.ballistics._ import net.psforever.objects.guid.NumberPoolHub @@ -15,6 +17,7 @@ import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.objects._ import net.psforever.objects.serverobject.CommonMessages import net.psforever.objects.serverobject.environment.{DeepSquare, EnvironmentAttribute, OxygenStateTarget, Pool} +import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.projectile.ProjectileReason @@ -606,167 +609,168 @@ class PlayerControlDeathStandingTest extends ActorTest { } } -class PlayerControlDeathSeatedTest extends ActorTest { - val player1 = - Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)) //guid=1 - val player2 = - Player(Avatar(1, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute)) //guid=2 - val avatarProbe = TestProbe() - val activityProbe = TestProbe() - val guid = new NumberPoolHub(new MaxNumberSource(15)) - val zone = new Zone("test", new ZoneMap("test"), 0) { - override def SetupNumberPools() = {} - GUID(guid) - override def LivePlayers = List(player1, player2) - override def AvatarEvents = avatarProbe.ref - override def Activity = activityProbe.ref - } - - player1.Zone = zone - player1.Spawn() - player1.Position = Vector3(2, 0, 0) - guid.register(player1.avatar.locker, 5) - player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1, null), name = "player1-control") - player2.Zone = zone - player2.Spawn() - guid.register(player2.avatar.locker, 6) - val (probe, avatarActor) = PlayerControlTest.DummyAvatar(system) - player2.Actor = system.actorOf(Props(classOf[PlayerControl], player2, avatarActor), name = "player2-control") - - val tool = Tool(GlobalDefinitions.suppressor) //guid 3 & 4 - val vehicle = Vehicle(GlobalDefinitions.quadstealth) //guid=5 - vehicle.Faction = player2.Faction - - guid.register(player1, 1) - guid.register(player2, 2) - guid.register(tool, 3) - guid.register(tool.AmmoSlot.Box, 4) - guid.register(vehicle, 7) - val projectile = tool.Projectile - val player1Source = PlayerSource(player1) - val resolved = DamageInteraction( - SourceEntry(player2), - ProjectileReason( - DamageResolution.Hit, - Projectile( - projectile, - tool.Definition, - tool.FireMode, - player1Source, - 0, - Vector3(2, 0, 0), - Vector3(-1, 0, 0) - ), - player1.DamageModel - ), - Vector3(1, 0, 0) - ) - val applyDamageTo = resolved.calculate() - expectNoMessage(200 milliseconds) - - "PlayerControl" should { - "handle death when seated (in something)" in { - player2.Health = player2.Definition.DamageDestroysAt + 1 //initial state manip - player2.VehicleSeated = vehicle.GUID //initial state manip, anything - vehicle.Seats(0).mount(player2) - player2.Armor = 0 //initial state manip - assert(player2.Health > player2.Definition.DamageDestroysAt) - assert(player2.isAlive) - - player2.Actor ! Vitality.Damage(applyDamageTo) - val msg_avatar = avatarProbe.receiveN(9, 500 milliseconds) - val msg_stamina = probe.receiveOne(500 milliseconds) - activityProbe.expectNoMessage(200 milliseconds) - assert( - msg_stamina match { - case AvatarActor.DeinitializeImplants() => true - case _ => false - } - ) - assert( - msg_avatar.head match { - case AvatarServiceMessage("TestCharacter2", AvatarAction.DropSpecialItem()) => true - case _ => false - } - ) - assert( - msg_avatar(1) match { - case AvatarServiceMessage( - "TestCharacter2", - AvatarAction.Killed(PlanetSideGUID(2), Some(PlanetSideGUID(7))) - ) => - true - case _ => false - } - ) - assert( - msg_avatar(2) match { - case AvatarServiceMessage( - "TestCharacter2", - AvatarAction.SendResponse(_, ObjectDetachMessage(PlanetSideGUID(7), PlanetSideGUID(2), _, _, _, _)) - ) => - true - case _ => false - } - ) - assert( - msg_avatar(3) match { - case AvatarServiceMessage( - "TestCharacter2", - AvatarAction.PlanetsideAttributeToAll(PlanetSideGUID(2), 29, 1) - ) => - true - case _ => false - } - ) - assert( - msg_avatar(4) match { - case AvatarServiceMessage("test", AvatarAction.ObjectDelete(PlanetSideGUID(2), PlanetSideGUID(2), _)) => true - case _ => false - } - ) - assert( - msg_avatar(5) match { - case AvatarServiceMessage("test", AvatarAction.PlanetsideAttributeToAll(PlanetSideGUID(2), 0, _)) => true - case _ => false - } - ) - assert( - msg_avatar(6) match { - case AvatarServiceMessage( - "TestCharacter2", - AvatarAction.SendResponse(_, DestroyMessage(PlanetSideGUID(2), PlanetSideGUID(1), _, _)) - ) => - true - case _ => false - } - ) - assert( - msg_avatar(7) match { - case AvatarServiceMessage( - "TestCharacter2", - AvatarAction.SendResponse( - _, - AvatarDeadStateMessage(DeadState.Dead, 300000, 300000, Vector3.Zero, PlanetSideEmpire.NC, true) - ) - ) => - true - case _ => false - } - ) - assert( - msg_avatar(8) match { - case AvatarServiceMessage("test", AvatarAction.DestroyDisplay(killer, victim, _, _)) - if killer.Name.equals(player1.Name) && victim.Name.equals(player2.Name) => - true - case _ => false - } - ) - assert(player2.Health <= player2.Definition.DamageDestroysAt) - assert(!player2.isAlive) - } - } -} +//class PlayerControlDeathSeatedTest extends ActorTest { +// val player1 = +// Player(Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)) //guid=1 +// val player2 = +// Player(Avatar(1, "TestCharacter2", PlanetSideEmpire.NC, CharacterSex.Male, 0, CharacterVoice.Mute)) //guid=2 +// val avatarProbe = TestProbe() +// val activityProbe = TestProbe() +// val guid = new NumberPoolHub(new MaxNumberSource(15)) +// val zone = new Zone("test", new ZoneMap("test"), 0) { +// override def SetupNumberPools() = {} +// GUID(guid) +// override def LivePlayers = List(player1, player2) +// override def AvatarEvents = avatarProbe.ref +// override def Activity = activityProbe.ref +// } +// zone.actor = system.spawn(ZoneActor(zone), s"test-zone-${System.nanoTime()}") +// +// player1.Zone = zone +// player1.Spawn() +// player1.Position = Vector3(2, 0, 0) +// guid.register(player1.avatar.locker, 5) +// player1.Actor = system.actorOf(Props(classOf[PlayerControl], player1, null), name = "player1-control") +// player2.Zone = zone +// player2.Spawn() +// guid.register(player2.avatar.locker, 6) +// val (probe, avatarActor) = PlayerControlTest.DummyAvatar(system) +// player2.Actor = system.actorOf(Props(classOf[PlayerControl], player2, avatarActor), name = "player2-control") +// +// val tool = Tool(GlobalDefinitions.suppressor) //guid 3 & 4 +// val vehicle = Vehicle(GlobalDefinitions.quadstealth) //guid=5 +// vehicle.Faction = player2.Faction +// +// guid.register(player1, 1) +// guid.register(player2, 2) +// guid.register(tool, 3) +// guid.register(tool.AmmoSlot.Box, 4) +// guid.register(vehicle, 7) +// val projectile = tool.Projectile +// val player1Source = PlayerSource(player1) +// val resolved = DamageInteraction( +// SourceEntry(player2), +// ProjectileReason( +// DamageResolution.Hit, +// Projectile( +// projectile, +// tool.Definition, +// tool.FireMode, +// player1Source, +// 0, +// Vector3(2, 0, 0), +// Vector3(-1, 0, 0) +// ), +// player1.DamageModel +// ), +// Vector3(1, 0, 0) +// ) +// val applyDamageTo = resolved.calculate() +// expectNoMessage(200 milliseconds) +// +// "PlayerControl" should { +// "handle death when seated (in something)" in { +// player2.Health = player2.Definition.DamageDestroysAt + 1 //initial state manip +// player2.VehicleSeated = vehicle.GUID //initial state manip, anything +// vehicle.Seats(0).mount(player2) +// player2.Armor = 0 //initial state manip +// assert(player2.Health > player2.Definition.DamageDestroysAt) +// assert(player2.isAlive) +// +// player2.Actor ! Vitality.Damage(applyDamageTo) +// val msg_avatar = avatarProbe.receiveN(9, 1500 milliseconds) +// val msg_stamina = probe.receiveOne(500 milliseconds) +// activityProbe.expectNoMessage(200 milliseconds) +// assert( +// msg_stamina match { +// case AvatarActor.DeinitializeImplants() => true +// case _ => false +// } +// ) +// assert( +// msg_avatar.head match { +// case AvatarServiceMessage("TestCharacter2", AvatarAction.DropSpecialItem()) => true +// case _ => false +// } +// ) +// assert( +// msg_avatar(1) match { +// case AvatarServiceMessage( +// "TestCharacter2", +// AvatarAction.Killed(PlanetSideGUID(2), Some(PlanetSideGUID(7))) +// ) => +// true +// case _ => false +// } +// ) +// assert( +// msg_avatar(2) match { +// case AvatarServiceMessage( +// "TestCharacter2", +// AvatarAction.SendResponse(_, ObjectDetachMessage(PlanetSideGUID(7), PlanetSideGUID(2), _, _, _, _)) +// ) => +// true +// case _ => false +// } +// ) +// assert( +// msg_avatar(3) match { +// case AvatarServiceMessage( +// "TestCharacter2", +// AvatarAction.PlanetsideAttributeToAll(PlanetSideGUID(2), 29, 1) +// ) => +// true +// case _ => false +// } +// ) +// assert( +// msg_avatar(4) match { +// case AvatarServiceMessage("test", AvatarAction.ObjectDelete(PlanetSideGUID(2), PlanetSideGUID(2), _)) => true +// case _ => false +// } +// ) +// assert( +// msg_avatar(5) match { +// case AvatarServiceMessage("test", AvatarAction.PlanetsideAttributeToAll(PlanetSideGUID(2), 0, _)) => true +// case _ => false +// } +// ) +// assert( +// msg_avatar(6) match { +// case AvatarServiceMessage( +// "TestCharacter2", +// AvatarAction.SendResponse(_, DestroyMessage(PlanetSideGUID(2), PlanetSideGUID(1), _, _)) +// ) => +// true +// case _ => false +// } +// ) +// assert( +// msg_avatar(7) match { +// case AvatarServiceMessage( +// "TestCharacter2", +// AvatarAction.SendResponse( +// _, +// AvatarDeadStateMessage(DeadState.Dead, 300000, 300000, Vector3.Zero, PlanetSideEmpire.NC, true) +// ) +// ) => +// true +// case _ => false +// } +// ) +// assert( +// msg_avatar(8) match { +// case AvatarServiceMessage("test", AvatarAction.DestroyDisplay(killer, victim, _, _)) +// if killer.Name.equals(player1.Name) && victim.Name.equals(player2.Name) => +// true +// case _ => false +// } +// ) +// assert(player2.Health <= player2.Definition.DamageDestroysAt) +// assert(!player2.isAlive) +// } +// } +//} class PlayerControlInteractWithWaterTest extends ActorTest { val player1 = diff --git a/src/test/scala/objects/ProjectileTest.scala b/src/test/scala/objects/ProjectileTest.scala index 62d1e9ca..81810ead 100644 --- a/src/test/scala/objects/ProjectileTest.scala +++ b/src/test/scala/objects/ProjectileTest.scala @@ -6,6 +6,7 @@ import net.psforever.objects.avatar.Avatar import net.psforever.objects.ballistics._ import net.psforever.objects.definition.ProjectileDefinition import net.psforever.objects.serverobject.mblocker.Locker +import net.psforever.objects.sourcing.{ObjectSource, PlayerSource, SourceEntry, VehicleSource} import net.psforever.objects.vital.base.{DamageResolution, DamageType} import net.psforever.objects.vital.interaction.DamageInteraction import net.psforever.objects.vital.projectile.ProjectileReason @@ -13,8 +14,8 @@ import net.psforever.types.{PlanetSideGUID, _} import org.specs2.mutable.Specification class ProjectileTest extends Specification { - val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)) - val fury = Vehicle(GlobalDefinitions.fury) + val player: Player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)) + val fury: Vehicle = Vehicle(GlobalDefinitions.fury) "Range" should { "local projectile range" in { @@ -169,7 +170,7 @@ class ProjectileTest extends Specification { o.Definition mustEqual GlobalDefinitions.avatar o.Position mustEqual Vector3.Zero o.Orientation mustEqual Vector3.Zero - o.Velocity mustEqual None + o.Velocity.isEmpty mustEqual true case _ => ko } @@ -185,23 +186,23 @@ class ProjectileTest extends Specification { o.Shields mustEqual 0 o.Position mustEqual Vector3.Zero o.Orientation mustEqual Vector3.Zero - o.Velocity mustEqual None + o.Velocity.isEmpty mustEqual true case _ => ko } } "construct for generic object" in { - val obj = Locker() + val obj = Tool(GlobalDefinitions.suppressor) + obj.GUID = PlanetSideGUID(1) SourceEntry(obj) match { case o: ObjectSource => - o.obj mustEqual obj - o.Name mustEqual "Mb Locker" + o.Name mustEqual "Suppressor" o.Faction mustEqual PlanetSideEmpire.NEUTRAL - o.Definition mustEqual GlobalDefinitions.mb_locker + o.Definition mustEqual GlobalDefinitions.suppressor o.Position mustEqual Vector3.Zero o.Orientation mustEqual Vector3.Zero - o.Velocity mustEqual None + o.Velocity.isEmpty mustEqual true case _ => ko } @@ -210,12 +211,10 @@ class ProjectileTest extends Specification { "contain timely information" in { val obj = Player(Avatar(0, "TestCharacter-alt", PlanetSideEmpire.TR, CharacterSex.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) obj.Velocity = Some(Vector3(1.1f, 2.2f, 3.3f)) val sobj = SourceEntry(obj) - obj.VehicleSeated = None obj.Position = Vector3.Zero obj.Orientation = Vector3.Zero obj.Velocity = None @@ -225,12 +224,11 @@ class ProjectileTest extends Specification { case o: PlayerSource => o.Name mustEqual "TestCharacter-alt" o.Faction mustEqual PlanetSideEmpire.TR - o.Seated mustEqual true o.ExoSuit mustEqual ExoSuitType.Standard o.Definition mustEqual GlobalDefinitions.avatar o.Position mustEqual Vector3(1.2f, 3.4f, 5.6f) o.Orientation mustEqual Vector3(2.1f, 4.3f, 6.5f) - o.Velocity mustEqual Some(Vector3(1.1f, 2.2f, 3.3f)) + o.Velocity.contains(Vector3(1.1f, 2.2f, 3.3f)) mustEqual true case _ => ko } diff --git a/src/test/scala/objects/ResourceSiloTest.scala b/src/test/scala/objects/ResourceSiloTest.scala index a51e4db1..401bdc7f 100644 --- a/src/test/scala/objects/ResourceSiloTest.scala +++ b/src/test/scala/objects/ResourceSiloTest.scala @@ -150,7 +150,6 @@ class ResourceSiloControlStartupMessageSomeTest extends ActorTest { class ResourceSiloControlUseTest extends FreedContextActorTest { import akka.actor.typed.scaladsl.adapter._ - system.spawn(InterstellarClusterService(Nil), InterstellarClusterService.InterstellarClusterServiceKey.id) ServiceManager.boot(system) ! ServiceManager.Register(Props[GalaxyService](), "galaxy") expectNoMessage(1000 milliseconds) var buildingMap = new TrieMap[Int, Building]() @@ -178,6 +177,7 @@ class ResourceSiloControlUseTest extends FreedContextActorTest { GlobalDefinitions.cryo_facility ) buildingMap += 6 -> building + system.spawn(InterstellarClusterService(Seq(zone)), InterstellarClusterService.InterstellarClusterServiceKey.id) building.Actor = context.spawn(BuildingActor(zone, building), "integ-fac-test-building-control").toClassic building.Invalidate() @@ -372,6 +372,6 @@ class ResourceSiloControlNoUpdateTest extends ActorTest { object ResourceSiloTest { val player = Player( - new Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute) + Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute).copy(stamina = 0) ) } diff --git a/src/test/scala/objects/TelepadRouterTest.scala b/src/test/scala/objects/TelepadRouterTest.scala index 84f1b5a5..9aab4c72 100644 --- a/src/test/scala/objects/TelepadRouterTest.scala +++ b/src/test/scala/objects/TelepadRouterTest.scala @@ -19,6 +19,7 @@ import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.types.{DriveState, PlanetSideGUID, Vector3} +import scala.collection.mutable import scala.collection.mutable.ListBuffer import scala.concurrent.duration._ @@ -28,7 +29,7 @@ class TelepadDeployableNoRouterTest extends ActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) @@ -92,7 +93,7 @@ class TelepadDeployableNoActivationTest extends ActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) @@ -163,7 +164,7 @@ class TelepadDeployableAttemptTest extends ActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) @@ -225,7 +226,7 @@ class TelepadDeployableResponseFromRouterTest extends FreedContextActorTest { val deployableList = new ListBuffer() val guid = new NumberPoolHub(new MaxNumberSource(max = 5)) val zone = new Zone(id = "test", new ZoneMap(name = "test"), zoneNumber = 0) { - private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList), name = "test-zone-deployables") + private val deployables = system.actorOf(Props(classOf[ZoneDeployableActor], this, deployableList, mutable.HashMap[Int, Int]()), name = "test-zone-deployables") override def SetupNumberPools(): Unit = {} GUID(guid) diff --git a/src/test/scala/objects/VehicleControlTest.scala b/src/test/scala/objects/VehicleControlTest.scala index 6e5ba11e..e22f33e2 100644 --- a/src/test/scala/objects/VehicleControlTest.scala +++ b/src/test/scala/objects/VehicleControlTest.scala @@ -1,6 +1,7 @@ // Copyright (c) 2020 PSForever package objects +import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.actor.{ActorRef, Props} import akka.actor.typed.scaladsl.adapter._ import akka.testkit.TestProbe @@ -11,11 +12,12 @@ import net.psforever.objects.ce.DeployedItem import net.psforever.objects._ import net.psforever.objects.guid.NumberPoolHub import net.psforever.objects.guid.source.MaxNumberSource +import net.psforever.objects.serverobject.CommonMessages import net.psforever.objects.serverobject.environment._ import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.vehicles.VehicleLockState -import net.psforever.objects.vehicles.control.{/*CargoCarrierControl, */VehicleControl} -import net.psforever.objects.vital.{VehicleShieldCharge, Vitality} +import net.psforever.objects.vehicles.control.VehicleControl +import net.psforever.objects.vital.{ShieldCharge, Vitality} import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game._ import net.psforever.services.ServiceManager @@ -459,16 +461,16 @@ class VehicleControlShieldsChargingTest extends ActorTest { "charge vehicle shields" in { assert(vehicle.Shields == 0) - assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] })) + assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] })) - vehicle.Actor ! Vehicle.ChargeShields(15) + vehicle.Actor ! CommonMessages.ChargeShields(15, None) val msg = probe.receiveOne(500 milliseconds) assert(msg match { case VehicleServiceMessage(_, VehicleAction.PlanetsideAttribute(_, PlanetSideGUID(10), 68, 15)) => true case _ => false }) assert(vehicle.Shields == 15) - assert(vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] })) + assert(vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] })) } } @@ -486,12 +488,12 @@ class VehicleControlShieldsNotChargingVehicleDeadTest extends ActorTest { vehicle.Health = 0 assert(vehicle.Health == 0) assert(vehicle.Shields == 0) - assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] })) - vehicle.Actor.tell(Vehicle.ChargeShields(15), probe.ref) + assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] })) + vehicle.Actor.tell(CommonMessages.ChargeShields(15, None), probe.ref) probe.expectNoMessage(1 seconds) assert(vehicle.Shields == 0) - assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] })) + assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] })) } } @@ -508,11 +510,11 @@ class VehicleControlShieldsNotChargingVehicleShieldsFullTest extends ActorTest { assert(vehicle.Shields == 0) vehicle.Shields = vehicle.MaxShields assert(vehicle.Shields == vehicle.MaxShields) - assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] })) - vehicle.Actor ! Vehicle.ChargeShields(15) + assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] })) + vehicle.Actor ! CommonMessages.ChargeShields(15, None) probe.expectNoMessage(1 seconds) - assert(!vehicle.History.exists({ p => p.isInstanceOf[VehicleShieldCharge] })) + assert(!vehicle.History.exists({ p => p.isInstanceOf[ShieldCharge] })) } } @@ -528,7 +530,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest { "charge vehicle shields" in { assert(vehicle.Shields == 0) - vehicle.Actor ! Vehicle.ChargeShields(15) + vehicle.Actor ! CommonMessages.ChargeShields(15, None) val msg = probe.receiveOne(200 milliseconds) //assert(msg.isInstanceOf[Vehicle.UpdateShieldsCharge]) assert(msg match { @@ -537,7 +539,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest { }) assert(vehicle.Shields == 15) - vehicle.Actor ! Vehicle.ChargeShields(15) + vehicle.Actor ! CommonMessages.ChargeShields(15, None) probe.expectNoMessage(200 milliseconds) assert(vehicle.Shields == 15) } @@ -566,7 +568,7 @@ class VehicleControlShieldsNotChargingTooEarlyTest extends ActorTest { // val msg = probe.receiveOne(200 milliseconds) // assert(msg.isInstanceOf[Vitality.DamageResolution]) // assert(vehicle.Shields == 0) -// vehicle.Actor.tell(Vehicle.ChargeShields(15), probe.ref) +// vehicle.Actor.tell(CommonMessages.ChargeShields(15, None), probe.ref) // // probe.expectNoMessage(200 milliseconds) // assert(vehicle.Shields == 0) @@ -780,6 +782,7 @@ class VehicleControlInteractWithLavaTest extends ActorTest { }, zoneNumber = 0 ) { + actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref override def SetupNumberPools() = {} GUID(guid) override def LivePlayers = List(player1) @@ -841,6 +844,7 @@ class VehicleControlInteractWithDeathTest extends ActorTest { }, zoneNumber = 0 ) { + actor = ActorTestKit().createTestProbe[ZoneActor.Command]().ref override def SetupNumberPools() = {} GUID(guid) override def LivePlayers = List(player1) diff --git a/src/test/scala/objects/VitalityTest.scala b/src/test/scala/objects/VitalityTest.scala index 9186503b..782cdac0 100644 --- a/src/test/scala/objects/VitalityTest.scala +++ b/src/test/scala/objects/VitalityTest.scala @@ -4,6 +4,8 @@ package objects import net.psforever.objects.ballistics._ import net.psforever.objects._ import net.psforever.objects.avatar.Avatar +import net.psforever.objects.serverobject.terminals.Terminal +import net.psforever.objects.sourcing.{AmenitySource, PlayerSource, SourceEntry, VehicleSource} import net.psforever.objects.vital._ import net.psforever.objects.vital.base.DamageResolution import net.psforever.objects.vital.interaction.DamageInteraction @@ -33,38 +35,40 @@ class VitalityTest extends Specification { Vector3(50, 50, 0) ) val result = resprojectile.calculate()(player) + val term = AmenitySource(new Terminal(GlobalDefinitions.order_terminal) { GUID = PlanetSideGUID(1) }) - player.History(result) //DamageResult, straight-up - player.History(DamageFromProjectile(result)) - player.History(HealFromKit(pSource, 10, GlobalDefinitions.medkit)) - player.History(HealFromTerm(pSource, 10, 0, GlobalDefinitions.order_terminal)) - player.History(HealFromImplant(pSource, 10, ImplantType.AdvancedRegen)) - player.History(HealFromExoSuitChange(pSource, ExoSuitType.Standard)) - player.History(RepairFromTerm(vSource, 10, GlobalDefinitions.order_terminal)) - player.History(VehicleShieldCharge(vSource, 10)) - player.History(PlayerSuicide(PlayerSource(player))) + player.LogActivity(result) //DamageResult, straight-up + player.LogActivity(DamageFromProjectile(result)) + player.LogActivity(HealFromKit(GlobalDefinitions.medkit, 10)) + player.LogActivity(HealFromTerm(term, 10)) + player.LogActivity(HealFromImplant(ImplantType.AdvancedRegen, 10)) + player.LogActivity(RepairFromExoSuitChange(ExoSuitType.Standard, 10)) + player.LogActivity(RepairFromTerm(term, 10)) + player.LogActivity(ShieldCharge(10, Some(vSource))) + player.LogActivity(PlayerSuicide(PlayerSource(player))) ok } "return and clear the former list of vital activities" in { val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)) val pSource = PlayerSource(player) + val term = AmenitySource(new Terminal(GlobalDefinitions.order_terminal) { GUID = PlanetSideGUID(1) }) - player.History(HealFromKit(pSource, 10, GlobalDefinitions.medkit)) - player.History(HealFromTerm(pSource, 10, 0, GlobalDefinitions.order_terminal)) - player.History(HealFromImplant(pSource, 10, ImplantType.AdvancedRegen)) - player.History(HealFromExoSuitChange(pSource, ExoSuitType.Standard)) - player.History(RepairFromTerm(vSource, 10, GlobalDefinitions.order_terminal)) - player.History(VehicleShieldCharge(vSource, 10)) - player.History(PlayerSuicide(PlayerSource(player))) + player.LogActivity(HealFromKit(GlobalDefinitions.medkit, 10)) + player.LogActivity(HealFromTerm(term, 10)) + player.LogActivity(HealFromImplant(ImplantType.AdvancedRegen, 10)) + player.LogActivity(RepairFromExoSuitChange(ExoSuitType.Standard, 10)) + player.LogActivity(RepairFromTerm(term, 10)) + player.LogActivity(ShieldCharge(10, Some(vSource))) + player.LogActivity(PlayerSuicide(PlayerSource(player))) player.History.size mustEqual 7 val list = player.ClearHistory() player.History.size mustEqual 0 list.head.isInstanceOf[PlayerSuicide] mustEqual true - list(1).isInstanceOf[VehicleShieldCharge] mustEqual true + list(1).isInstanceOf[ShieldCharge] mustEqual true list(2).isInstanceOf[RepairFromTerm] mustEqual true - list(3).isInstanceOf[HealFromExoSuitChange] mustEqual true + list(3).isInstanceOf[RepairFromExoSuitChange] mustEqual true list(4).isInstanceOf[HealFromImplant] mustEqual true list(5).isInstanceOf[HealFromTerm] mustEqual true list(6).isInstanceOf[HealFromKit] mustEqual true @@ -84,15 +88,16 @@ class VitalityTest extends Specification { Vector3(50, 50, 0) ) val result = resprojectile.calculate()(player) + val term = AmenitySource(new Terminal(GlobalDefinitions.order_terminal) { GUID = PlanetSideGUID(1) }) - player.History(DamageFromProjectile(result)) - player.History(HealFromKit(pSource, 10, GlobalDefinitions.medkit)) - player.History(HealFromTerm(pSource, 10, 0, GlobalDefinitions.order_terminal)) - player.History(HealFromImplant(pSource, 10, ImplantType.AdvancedRegen)) - player.History(HealFromExoSuitChange(pSource, ExoSuitType.Standard)) - player.History(RepairFromTerm(vSource, 10, GlobalDefinitions.order_terminal)) - player.History(VehicleShieldCharge(vSource, 10)) - player.History(PlayerSuicide(PlayerSource(player))) + player.LogActivity(DamageFromProjectile(result)) + player.LogActivity(HealFromKit(GlobalDefinitions.medkit, 10)) + player.LogActivity(HealFromTerm(term, 10)) + player.LogActivity(HealFromImplant(ImplantType.AdvancedRegen, 10)) + player.LogActivity(RepairFromExoSuitChange(ExoSuitType.Standard, 10)) + player.LogActivity(RepairFromTerm(term, 10)) + player.LogActivity(ShieldCharge(10, Some(vSource))) + player.LogActivity(PlayerSuicide(PlayerSource(player))) player.LastShot match { case Some(resolved_projectile) =>