PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added other logging filters, include a custom one for suppressing duplicate messages within a time period

Browse source
This commit is contained in:
Jason_DiDonato@yahoo.com 2021-03-25 15:15:51 -04:00
parent 2fbe926725
commit eea549707a
24 changed files with 353 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.sbt
View file

@ -79,7 +79,8 @@ lazy val psforeverSettings = Seq(
"io.circe" %% "circe-generic" % "0.13.0", "io.circe" %% "circe-generic" % "0.13.0",
"io.circe" %% "circe-parser" % "0.13.0", "io.circe" %% "circe-parser" % "0.13.0",
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.1", "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.1",
"org.bouncycastle" % "bcprov-jdk15on" % "1.68" "org.bouncycastle" % "bcprov-jdk15on" % "1.68",
"org.codehaus.janino" % "janino" % "2.6.1"
), ),
// TODO(chord): remove exclusion when SessionActor is refactored: https://github.com/psforever/PSF-LoginServer/issues/279 // TODO(chord): remove exclusion when SessionActor is refactored: https://github.com/psforever/PSF-LoginServer/issues/279
coverageExcludedPackages := "net\\.psforever\\.actors\\.session\\.SessionActor.*" coverageExcludedPackages := "net\\.psforever\\.actors\\.session\\.SessionActor.*"

35
config/logback.xml
View file

@ -14,12 +14,24 @@
<file>logs/psforever-general_${bySecond}.log</file> <file>logs/psforever-general_${bySecond}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/psforever-general_%d{yyyy-MM-dd}.gz</fileNamePattern> <fileNamePattern>logs/psforever-general_%d{yyyy-MM-dd}.gz</fileNamePattern>
<maxHistory>40</maxHistory> <maxHistory>60</maxHistory>
<totalSizeCap>10GB</totalSizeCap> <totalSizeCap>10GB</totalSizeCap>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>%date{ISO8601} %5level "%X" %logger{35} - %msg%n</pattern> <pattern>%date{ISO8601} %5level %logger{35} - %msg%n</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
<evaluator>
<matcher>
<Name>encrypted</Name>
<!-- occurs during latency or relogging complications; the messages are useless -->
<regex>Unexpected packet type EncryptedPacket</regex>
</matcher>
<expression>encrypted.matches(formattedMessage)</expression>
</evaluator>
<OnMatch>DENY</OnMatch>
<OnMismatch>NEUTRAL</OnMismatch>
</filter>
<filter class="net.psforever.filters.LoggerPrefixFilter"> <filter class="net.psforever.filters.LoggerPrefixFilter">
<!-- <!--
c.g.j.s.d.p.c.PostgreSQLConnectionHandler c.g.j.s.d.p.c.PostgreSQLConnectionHandler
@ -40,13 +52,16 @@
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>INFO</level> <level>INFO</level>
</filter> </filter>
<filter class="net.psforever.filters.ApplyCooldownToDuplicateLoggingFilter">
<cooldown>5000</cooldown>
</filter>
</appender> </appender>
<appender name="FILE-DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE-DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/psforever-debug_${bySecond}.log</file> <file>logs/psforever-debug_${bySecond}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/psforever-debug_%d{yyyy-MM-dd}.gz</fileNamePattern> <fileNamePattern>logs/psforever-debug_%d{yyyy-MM-dd}.gz</fileNamePattern>
<maxHistory>40</maxHistory> <maxHistory>60</maxHistory>
<totalSizeCap>10GB</totalSizeCap> <totalSizeCap>10GB</totalSizeCap>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
@ -63,8 +78,8 @@
</filter> </filter>
<filter class="net.psforever.filters.LoggerPrefixFilter"> <filter class="net.psforever.filters.LoggerPrefixFilter">
<!-- <!--
c.g.j.s.d.p.PostgreSQLConnection?
c.g.j.s.d.p.c.PostgreSQLConnectionHandler c.g.j.s.d.p.c.PostgreSQLConnectionHandler
consider: c.g.j.s.d.p.PostgreSQLConnection?
--> -->
<prefix>com.github.jasync.sql.db.postgresql.codec</prefix> <prefix>com.github.jasync.sql.db.postgresql.codec</prefix>
</filter> </filter>
@ -88,6 +103,18 @@
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level> <level>WARN</level>
</filter> </filter>
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
<evaluator>
<matcher>
<Name>encrypted</Name>
<!-- occurs during logging or relogging complications; the messages are useless -->
<regex>Unexpected packet type EncryptedPacket</regex>
</matcher>
<expression>encrypted.matches(formattedMessage)</expression>
</evaluator>
<OnMatch>DENY</OnMatch>
<OnMismatch>NEUTRAL</OnMismatch>
</filter>
</appender> </appender>
<root level="TRACE"> <root level="TRACE">

77
server/src/main/java/net/psforever/filters/ApplyCooldownToDuplicateLoggingFilter.java Normal file
View file

@ -0,0 +1,77 @@
// Copyright (c) 2021 PSForever
package net.psforever.filters;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/**
* Disrupts a variety of logging messages that would otherwise repeat within a certain frame of time.
* Until there is a significant break in time between the logging of the duplicated messages,
* those messages are denied logging.
* Only exact matches via hash are denied.
* Be aware of the pitfalls of default `String` hash code.
*/
public class ApplyCooldownToDuplicateLoggingFilter extends Filter<ILoggingEvent> {
private long cooldown;
private ConcurrentHashMap<String, Long> messageMap;
private long cleaning = 900000L; //default: 15min
private ScheduledExecutorService housecleaning;
@Override
public FilterReply decide(ILoggingEvent event) {
String msg = event.getMessage();
long currTime = System.currentTimeMillis();
Long previousTime = messageMap.put(msg, currTime);
if (previousTime != null && previousTime + cooldown > currTime) {
return FilterReply.DENY;
} else {
return FilterReply.NEUTRAL;
}
}
public void setCooldown(Long duration) {
this.cooldown = duration;
}
public void setCleaning(Long duration) {
this.cleaning = duration;
}
@Override
public void start() {
if (this.cooldown != 0L) {
messageMap = new ConcurrentHashMap<>(1000);
housecleaning = Executors.newScheduledThreadPool(1);
Runnable task = () -> {
//being "concurrent" should be enough
//the worst that can happen is two of the same message back-to-back in the log once in a while
if (!messageMap.isEmpty()) {
long currTime = System.currentTimeMillis();
Iterator<String> oldLogMessages = messageMap.entrySet().stream()
.filter( entry -> entry.getValue() + cooldown < currTime )
.map( Map.Entry::getKey )
.iterator();
oldLogMessages.forEachRemaining(key -> messageMap.remove(key));
}
};
housecleaning.scheduleWithFixedDelay(task, cleaning, cleaning, TimeUnit.MILLISECONDS);
super.start();
}
}
@Override
public void stop() {
housecleaning.shutdown();
messageMap.clear();
messageMap = null;
super.stop();
}
}

5
server/src/main/java/net/psforever/filters/LoggerPrefixFilter.java
View file

@ -9,7 +9,9 @@ import ch.qos.logback.core.spi.FilterReply;
* Disrupts a variety of logging messages that originate from specific loggers. * Disrupts a variety of logging messages that originate from specific loggers.
* A comparison of the prefix text of the logger handling the event is performed, * A comparison of the prefix text of the logger handling the event is performed,
* with a positive match denying that event being appended. * with a positive match denying that event being appended.
* The full prefix must be provided, as the is occasionally appear in an abbreviated form. * The full prefix must be provided, as the filter uses the fully authenticated name
* and the logger occasionally displays an abbreviated form for longer names,
* e.g., "i.g.context.jasync ..." instead of "io.getquill.context.jasync ...".
*/ */
public class LoggerPrefixFilter extends Filter<ILoggingEvent> { public class LoggerPrefixFilter extends Filter<ILoggingEvent> {
private String prefix; private String prefix;
@ -27,6 +29,7 @@ public class LoggerPrefixFilter extends Filter<ILoggingEvent> {
this.prefix = name; this.prefix = name;
} }
@Override
public void start() { public void start() {
if (this.prefix != null) { if (this.prefix != null) {
super.start(); super.start();

2
src/main/scala/net/psforever/actors/net/LoginActor.scala
View file

@ -196,7 +196,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
} }
def loginPwdFailureResponse(username: String, newToken: String) = { def loginPwdFailureResponse(username: String, newToken: String) = {
log.info(s"Failed login to account $username") log.warn(s"Failed login to account $username")
middlewareActor ! MiddlewareActor.Send( middlewareActor ! MiddlewareActor.Send(
LoginRespMessage( LoginRespMessage(
newToken, newToken,

2
src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
View file

@ -295,7 +295,7 @@ class MiddlewareActor(
Behaviors.same Behaviors.same
case _: ChangeFireModeMessage => case _: ChangeFireModeMessage =>
log.trace(s"What is this packet that just arrived? ${msg.toString}") log.trace(s"What is this packet that just arrived? $msg")
//ignore //ignore
Behaviors.same Behaviors.same

4
src/main/scala/net/psforever/actors/session/AvatarActor.scala
View file

@ -326,7 +326,7 @@ class AvatarActor(
result.onComplete { result.onComplete {
case Success(_) => case Success(_) =>
log.debug(s"created character ${name} for account ${account.name}") log.debug(s"AvatarActor: created character ${name} for account ${account.name}")
sessionActor ! SessionActor.SendResponse(ActionResultMessage.Pass) sessionActor ! SessionActor.SendResponse(ActionResultMessage.Pass)
sendAvatars(account) sendAvatars(account)
case Failure(e) => log.error(e)("db failure") case Failure(e) => log.error(e)("db failure")
@ -353,7 +353,7 @@ class AvatarActor(
result.onComplete { result.onComplete {
case Success(_) => case Success(_) =>
log.debug(s"avatar $id deleted") log.debug(s"AvatarActor: avatar $id deleted")
sessionActor ! SessionActor.SendResponse(ActionResultMessage.Pass) sessionActor ! SessionActor.SendResponse(ActionResultMessage.Pass)
sendAvatars(account) sendAvatars(account)
case Failure(e) => log.error(e)("db failure") case Failure(e) => log.error(e)("db failure")

370
src/main/scala/net/psforever/actors/session/SessionActor.scala
View file

@ -354,12 +354,17 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
None None
} }
case Some(obj) if obj.HasGUID && obj.GUID != id.get =>
log.error(s"ValidObject: ${player.Name} found an object that isn't the one ${player.Sex.pronounSubject} thought it was in zone ${continent.id}")
log.debug(s"ValidObject: potentially fatal error in ${continent.id} - requested ${id.get}, got ${obj.Definition.Name} with ${obj.GUID}; GUID mismatch")
None
case out @ Some(obj) if obj.HasGUID => case out @ Some(obj) if obj.HasGUID =>
out out
case None if id.nonEmpty && id.get != PlanetSideGUID(0) => case None if id.nonEmpty && id.get != PlanetSideGUID(0) =>
//delete stale entity reference from client //delete stale entity reference from client
log.warn(s"${player.Name} has an invalid reference to GUID ${id.get.guid} in zone ${continent.id}") log.error(s"${player.Name} has an invalid reference to GUID ${id.get.guid} in zone ${continent.id}")
sendResponse(ObjectDeleteMessage(id.get, 0)) sendResponse(ObjectDeleteMessage(id.get, 0))
None None
@ -419,8 +424,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case SetSpeed(speed) => case SetSpeed(speed) =>
session = session.copy(speed = speed) session = session.copy(speed = speed)
case SetFlying(flying) => case SetFlying(_flying) =>
session = session.copy(flying = flying) session = session.copy(flying = _flying)
case SetSpectator(spectator) => case SetSpectator(spectator) =>
session.player.spectator = spectator session.player.spectator = spectator
@ -703,7 +708,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
ourMember.ZoneId, ourMember.ZoneId,
unk7 = 0 unk7 = 0
) )
) //repeat of our entry )
val playerGuid = player.GUID val playerGuid = player.GUID
//turn lfs off //turn lfs off
val factionChannel = s"${player.Faction}" val factionChannel = s"${player.Faction}"
@ -932,7 +937,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
case Zone.Population.PlayerHasLeft(zone, None) => case Zone.Population.PlayerHasLeft(zone, None) =>
log.trace(s"${avatar.name} does not have a body on ${zone.id}") log.trace(s"PlayerHasLeft: ${avatar.name} does not have a body on ${zone.id}")
case Zone.Population.PlayerHasLeft(zone, Some(tplayer)) => case Zone.Population.PlayerHasLeft(zone, Some(tplayer)) =>
if (tplayer.isAlive) { if (tplayer.isAlive) {
@ -955,8 +960,10 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
cluster ! ICS.GetInstantActionSpawnPoint(player.Faction, context.self) cluster ! ICS.GetInstantActionSpawnPoint(player.Faction, context.self)
}) })
case _ => case ztype =>
log.warn(s"SpawnPointResponse: ${player.Name}'s zoning was not in order at the time a response was received; attempting to guess what ${player.Sex.pronounSubject} wants to do") if (ztype != Zoning.Method.None) {
log.warn(s"SpawnPointResponse: ${player.Name}'s zoning was not in order at the time a response was received; attempting to guess what ${player.Sex.pronounSubject} wants to do")
}
val previousZoningType = zoningType val previousZoningType = zoningType
CancelZoningProcess() CancelZoningProcess()
PlayerActionsToCancel() PlayerActionsToCancel()
@ -1195,7 +1202,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case Zone.Nowhere => case Zone.Nowhere =>
RequestSanctuaryZoneSpawn(player, currentZone = 0) RequestSanctuaryZoneSpawn(player, currentZone = 0)
case zone => case zone =>
log.trace(s"zone ${zone.id} will now load for ${player.Name}") log.trace(s"ZoneResponse: zone ${zone.id} will now load for ${player.Name}")
loadConfZone = true loadConfZone = true
val oldZone = continent val oldZone = continent
session = session.copy(zone = zone) session = session.copy(zone = zone)
@ -1219,7 +1226,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
case ICS.ZoneResponse(zone) => case ICS.ZoneResponse(zone) =>
log.trace(s"Zone ${zone.get.id} will now load for ${player.Name}") log.trace(s"ZoneResponse: zone ${zone.get.id} will now load for ${player.Name}")
loadConfZone = true loadConfZone = true
val oldZone = session.zone val oldZone = session.zone
session = session.copy(zone = zone.get) session = session.copy(zone = zone.get)
@ -1240,7 +1247,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case NewPlayerLoaded(tplayer) => case NewPlayerLoaded(tplayer) =>
//new zone //new zone
log.info(s"Player ${tplayer.Name} has spawned into ${tplayer.Zone.id}") log.info(s"${tplayer.Name} has spawned into ${session.zone.id}")
tplayer.avatar = avatar tplayer.avatar = avatar
session = session.copy(player = tplayer) session = session.copy(player = tplayer)
avatarActor ! AvatarActor.CreateImplants() avatarActor ! AvatarActor.CreateImplants()
@ -1517,10 +1524,10 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
_: Int, _: Int,
_: Option[Equipment] _: Option[Equipment]
) => ) =>
log.trace(s"$msg") log.debug(s"ItemPutInSlot: $msg")
case msg @ Containable.CanNotPutItemInSlot(_: PlanetSideServerObject with Container, _: Equipment, _: Int) => case msg @ Containable.CanNotPutItemInSlot(_: PlanetSideServerObject with Container, _: Equipment, _: Int) =>
log.trace(s"$msg") log.debug(s"CanNotPutItemInSlot: $msg")
case default => case default =>
log.warn(s"Invalid packet class received: $default from ${sender()}") log.warn(s"Invalid packet class received: $default from ${sender()}")
@ -1629,6 +1636,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
* @param spawnPosition the destination drop position * @param spawnPosition the destination drop position
*/ */
def LoadZoneLaunchDroppod(zone: Zone, spawnPosition: Vector3): Unit = { def LoadZoneLaunchDroppod(zone: Zone, spawnPosition: Vector3): Unit = {
log.info(s"${player.Name} is launching to ${zone.id} in ${player.Sex.possessive} droppod")
CancelZoningProcess() CancelZoningProcess()
PlayerActionsToCancel() PlayerActionsToCancel()
CancelAllProximityUnits() CancelAllProximityUnits()
@ -1707,6 +1715,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case AvatarResponse.Revive(target_guid) => case AvatarResponse.Revive(target_guid) =>
if (tplayer_guid == target_guid) { if (tplayer_guid == target_guid) {
log.info(s"No time for rest, ${player.Name}. Back on your feet!")
reviveTimer.cancel() reviveTimer.cancel()
deadState = DeadState.Alive deadState = DeadState.Alive
player.Revive player.Revive
@ -1982,14 +1991,16 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case AvatarResponse.WeaponDryFire(weapon_guid) => case AvatarResponse.WeaponDryFire(weapon_guid) =>
if (tplayer_guid != guid) { if (tplayer_guid != guid) {
// Check that the magazine is still empty before sending WeaponDryFireMessage
// As it could have been reloaded since the packet was dispatched, which would make other clients not see it firing
continent.GUID(weapon_guid) match { continent.GUID(weapon_guid) match {
case Some(tool: Tool) => case Some(tool: Tool) =>
// check that the magazine is still empty before sending WeaponDryFireMessage
// if it has been reloaded since then, other clients not see it firing
if (tool.Magazine == 0) { if (tool.Magazine == 0) {
sendResponse(WeaponDryFireMessage(weapon_guid)) sendResponse(WeaponDryFireMessage(weapon_guid))
} }
case _ => ; case Some(_) =>
sendResponse(WeaponDryFireMessage(weapon_guid))
case None => ;
} }
} }
@ -2124,7 +2135,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
/** /**
* Enforce constraints on bulk purchases as determined by a given player's previous purchase times and hard acquisition delays. * Enforce constraints on bulk purchases as determined by a given player's previous purchase times and hard acquisition delays.
* Intended to assist in sanitizing loadout information from the perspectvie of the player, or target owner. * Intended to assist in sanitizing loadout information from the perspective of the player, or target owner.
* The equipment is expected to be unregistered and already fitted to their ultimate slot in the target container. * The equipment is expected to be unregistered and already fitted to their ultimate slot in the target container.
* @param player the player whose purchasing constraints are to be tested * @param player the player whose purchasing constraints are to be tested
* @param target the location in which the equipment will be stowed * @param target the location in which the equipment will be stowed
@ -2200,14 +2211,14 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case LocalResponse.DoorCloses(door_guid) => //door closes for everyone case LocalResponse.DoorCloses(door_guid) => //door closes for everyone
sendResponse(GenericObjectStateMsg(door_guid, 17)) sendResponse(GenericObjectStateMsg(door_guid, 17))
case LocalResponse.EliminateDeployable(obj: TurretDeployable, guid, pos) => case LocalResponse.EliminateDeployable(obj: TurretDeployable, dguid, pos) =>
if (obj.Destroyed) { if (obj.Destroyed) {
DeconstructDeployable(obj, guid, pos) DeconstructDeployable(obj, dguid, pos)
} else { } else {
obj.Destroyed = true obj.Destroyed = true
DeconstructDeployable( DeconstructDeployable(
obj, obj,
guid, dguid,
pos, pos,
obj.Orientation, obj.Orientation,
if (obj.MountPoints.isEmpty) 2 if (obj.MountPoints.isEmpty) 2
@ -2215,28 +2226,28 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
) )
} }
case LocalResponse.EliminateDeployable(obj: ExplosiveDeployable, guid, pos) => case LocalResponse.EliminateDeployable(obj: ExplosiveDeployable, dguid, pos) =>
if (obj.Destroyed || obj.Jammed || obj.Health == 0) { if (obj.Destroyed || obj.Jammed || obj.Health == 0) {
DeconstructDeployable(obj, guid, pos) DeconstructDeployable(obj, dguid, pos)
} else { } else {
obj.Destroyed = true obj.Destroyed = true
DeconstructDeployable(obj, guid, pos, obj.Orientation, 2) DeconstructDeployable(obj, dguid, pos, obj.Orientation, 2)
} }
case LocalResponse.EliminateDeployable(obj: ComplexDeployable, guid, pos) => case LocalResponse.EliminateDeployable(obj: ComplexDeployable, dguid, pos) =>
if (obj.Destroyed) { if (obj.Destroyed) {
DeconstructDeployable(obj, guid, pos) DeconstructDeployable(obj, dguid, pos)
} else { } else {
obj.Destroyed = true obj.Destroyed = true
DeconstructDeployable(obj, guid, pos, obj.Orientation, 1) DeconstructDeployable(obj, dguid, pos, obj.Orientation, 1)
} }
case LocalResponse.EliminateDeployable(obj: TelepadDeployable, guid, pos) => case LocalResponse.EliminateDeployable(obj: TelepadDeployable, dguid, pos) =>
//if active, deactivate //if active, deactivate
if (obj.Active) { if (obj.Active) {
obj.Active = false obj.Active = false
sendResponse(GenericObjectActionMessage(guid, 29)) sendResponse(GenericObjectActionMessage(dguid, 29))
sendResponse(GenericObjectActionMessage(guid, 30)) sendResponse(GenericObjectActionMessage(dguid, 30))
} }
//determine if no replacement teleport system exists //determine if no replacement teleport system exists
continent.GUID(obj.Router) match { continent.GUID(obj.Router) match {
@ -2245,7 +2256,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
if ( if (
router.Utility(UtilityType.internal_router_telepad_deployable) match { router.Utility(UtilityType.internal_router_telepad_deployable) match {
case Some(internalTelepad: Utility.InternalTelepad) => case Some(internalTelepad: Utility.InternalTelepad) =>
internalTelepad.Telepad.contains(guid) //same telepad internalTelepad.Telepad.contains(dguid) //same telepad
case _ => true case _ => true
} }
) { ) {
@ -2256,22 +2267,22 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
//standard deployable elimination behavior //standard deployable elimination behavior
if (obj.Destroyed) { if (obj.Destroyed) {
DeconstructDeployable(obj, guid, pos) DeconstructDeployable(obj, dguid, pos)
} else { } else {
obj.Destroyed = true obj.Destroyed = true
DeconstructDeployable(obj, guid, pos, obj.Orientation, 2) DeconstructDeployable(obj, dguid, pos, obj.Orientation, 2)
} }
case LocalResponse.EliminateDeployable(obj, guid, pos) => case LocalResponse.EliminateDeployable(obj, dguid, pos) =>
if (obj.Destroyed) { if (obj.Destroyed) {
DeconstructDeployable(obj, guid, pos) DeconstructDeployable(obj, dguid, pos)
} else { } else {
obj.Destroyed = true obj.Destroyed = true
DeconstructDeployable(obj, guid, pos, obj.Orientation, 2) DeconstructDeployable(obj, dguid, pos, obj.Orientation, 2)
} }
case LocalResponse.SendHackMessageHackCleared(target_guid, unk1, unk2) => case LocalResponse.SendHackMessageHackCleared(target_guid, unk1, unk2) =>
log.trace(s"Clearing hack for ${target_guid}") //log.trace(s"Clearing hack for $target_guid")
case LocalResponse.HackObject(target_guid, unk1, unk2) => case LocalResponse.HackObject(target_guid, unk1, unk2) =>
HackObject(target_guid, unk1, unk2) HackObject(target_guid, unk1, unk2)
@ -2413,6 +2424,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case Mountable.CanMount(obj: FacilityTurret, seat_number, mount_point) => case Mountable.CanMount(obj: FacilityTurret, seat_number, mount_point) =>
CancelZoningProcessWithDescriptiveReason("cancel_mount") CancelZoningProcessWithDescriptiveReason("cancel_mount")
if (!obj.isUpgrading) { if (!obj.isUpgrading) {
log.info(s"${player.Name} mounts ${obj.Definition.Name}")
if (obj.Definition == GlobalDefinitions.vanu_sentry_turret) { if (obj.Definition == GlobalDefinitions.vanu_sentry_turret) {
obj.Zone.LocalEvents ! LocalServiceMessage(obj.Zone.id, LocalAction.SetEmpire(obj.GUID, player.Faction)) obj.Zone.LocalEvents ! LocalServiceMessage(obj.Zone.id, LocalAction.SetEmpire(obj.GUID, player.Faction))
} }
@ -2458,6 +2470,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
else { else {
//get ready for orbital drop //get ready for orbital drop
DismountAction(tplayer, obj, seat_num) DismountAction(tplayer, obj, seat_num)
log.info(s"${player.Name} is prepped for dropping")
//DismountAction(...) uses vehicle service, so use that service to coordinate the remainder of the messages //DismountAction(...) uses vehicle service, so use that service to coordinate the remainder of the messages
continent.VehicleEvents ! VehicleServiceMessage( continent.VehicleEvents ! VehicleServiceMessage(
player.Name, player.Name,
@ -2698,8 +2711,9 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
) )
} }
case VehicleResponse.KickPassenger(seat_num, wasKickedByDriver, vehicle_guid) => case VehicleResponse.KickPassenger(_, wasKickedByDriver, vehicle_guid) =>
// seat_num seems to be correct if passenger is kicked manually by driver, but always seems to return 4 if user is kicked by mount permissions //seat number (first field) seems to be correct if passenger is kicked manually by driver
//but always seems to return 4 if user is kicked by mount permissions changing
sendResponse(DismountVehicleMsg(guid, BailType.Kicked, wasKickedByDriver)) sendResponse(DismountVehicleMsg(guid, BailType.Kicked, wasKickedByDriver))
player.VehicleSeated = None player.VehicleSeated = None
if (tplayer_guid == guid) { if (tplayer_guid == guid) {
@ -2858,14 +2872,14 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
DriverVehicleControl(vehicle, vehicle.Definition.AutoPilotSpeed2) DriverVehicleControl(vehicle, vehicle.Definition.AutoPilotSpeed2)
case VehicleResponse.PeriodicReminder(cause, data) => case VehicleResponse.PeriodicReminder(cause, data) =>
val msg: String = (cause match { val msg: String = cause match {
case VehicleSpawnPad.Reminders.Blocked => case VehicleSpawnPad.Reminders.Blocked =>
s"The vehicle spawn where you placed your order is blocked. ${data.getOrElse("")}" s"The vehicle spawn where you placed your order is blocked. ${data.getOrElse("")}"
case VehicleSpawnPad.Reminders.Queue => case VehicleSpawnPad.Reminders.Queue =>
s"Your position in the vehicle spawn queue is ${data.getOrElse("last")}." s"Your position in the vehicle spawn queue is ${data.getOrElse("dead last")}."
case VehicleSpawnPad.Reminders.Cancelled => case VehicleSpawnPad.Reminders.Cancelled =>
"Your vehicle order has been cancelled." "Your vehicle order has been cancelled."
}) }
sendResponse(ChatMsg(ChatMessageType.CMT_OPEN, true, "", msg, None)) sendResponse(ChatMsg(ChatMessageType.CMT_OPEN, true, "", msg, None))
case VehicleResponse.ChangeLoadout(target, old_weapons, added_weapons, old_inventory, new_inventory) => case VehicleResponse.ChangeLoadout(target, old_weapons, added_weapons, old_inventory, new_inventory) =>
@ -2875,23 +2889,23 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
if (player.avatar.vehicle.contains(target)) { if (player.avatar.vehicle.contains(target)) {
//owner: must unregister old equipment, and register and install new equipment //owner: must unregister old equipment, and register and install new equipment
(old_weapons ++ old_inventory).foreach { (old_weapons ++ old_inventory).foreach {
case (obj, guid) => case (obj, eguid) =>
sendResponse(ObjectDeleteMessage(guid, 0)) sendResponse(ObjectDeleteMessage(eguid, 0))
continent.tasks ! GUIDTask.UnregisterEquipment(obj)(continent.GUID) continent.tasks ! GUIDTask.UnregisterEquipment(obj)(continent.GUID)
} }
ApplyPurchaseTimersBeforePackingLoadout(player, vehicle, added_weapons ++ new_inventory) ApplyPurchaseTimersBeforePackingLoadout(player, vehicle, added_weapons ++ new_inventory)
} else if (accessedContainer.contains(target)) { } else if (accessedContainer.contains(target)) {
//external participant: observe changes to equipment //external participant: observe changes to equipment
(old_weapons ++ old_inventory).foreach { case (_, guid) => sendResponse(ObjectDeleteMessage(guid, 0)) } (old_weapons ++ old_inventory).foreach { case (_, eguid) => sendResponse(ObjectDeleteMessage(eguid, 0)) }
} }
vehicle.PassengerInSeat(player) match { vehicle.PassengerInSeat(player) match {
case Some(seatNum) => case Some(seatNum) =>
//participant: observe changes to equipment //participant: observe changes to equipment
(old_weapons ++ old_inventory).foreach { case (_, guid) => sendResponse(ObjectDeleteMessage(guid, 0)) } (old_weapons ++ old_inventory).foreach { case (_, eguid) => sendResponse(ObjectDeleteMessage(eguid, 0)) }
UpdateWeaponAtSeatPosition(vehicle, seatNum) UpdateWeaponAtSeatPosition(vehicle, seatNum)
case None => case None =>
//observer: observe changes to external equipment //observer: observe changes to external equipment
old_weapons.foreach { case (_, guid) => sendResponse(ObjectDeleteMessage(guid, 0)) } old_weapons.foreach { case (_, eguid) => sendResponse(ObjectDeleteMessage(eguid, 0)) }
} }
case _ => ; case _ => ;
} }
@ -3030,8 +3044,9 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
player.Actor ! JammableUnit.ClearJammeredStatus() player.Actor ! JammableUnit.ClearJammeredStatus()
player.Actor ! JammableUnit.ClearJammeredSound() player.Actor ! JammableUnit.ClearJammeredSound()
} }
// TODO only when respawning after death if (deadState != DeadState.Alive) {
avatarActor ! AvatarActor.ResetImplants() avatarActor ! AvatarActor.ResetImplants()
}
sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 82, 0)) sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 82, 0))
//TODO if Medkit does not have shortcut, add to a free slot or write over slot 64 //TODO if Medkit does not have shortcut, add to a free slot or write over slot 64
@ -3060,6 +3075,9 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
//TODO 30 for a new character only? //TODO 30 for a new character only?
sendResponse(AvatarStatisticsMessage(2, Statistics(0L))) sendResponse(AvatarStatisticsMessage(2, Statistics(0L)))
}) })
if (tplayer.ExoSuit == ExoSuitType.MAX) {
sendResponse(PlanetsideAttributeMessage(guid, 7, tplayer.Capacitor.toLong))
}
//AvatarAwardMessage //AvatarAwardMessage
//DisplayAwardMessage //DisplayAwardMessage
sendResponse(PlanetsideStringAttributeMessage(guid, 0, "Outfit Name")) sendResponse(PlanetsideStringAttributeMessage(guid, 0, "Outfit Name"))
@ -3089,8 +3107,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
avatarActor ! AvatarActor.SetVehicle(None) avatarActor ! AvatarActor.SetVehicle(None)
} }
GetVehicleAndSeat() match { GetVehicleAndSeat() match {
//we're falling
case (Some(vehicle), _) if vehicle.Definition == GlobalDefinitions.droppod => case (Some(vehicle), _) if vehicle.Definition == GlobalDefinitions.droppod =>
//we're falling
sendResponse( sendResponse(
DroppodFreefallingMessage( DroppodFreefallingMessage(
vehicle.GUID, vehicle.GUID,
@ -3154,7 +3172,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
/** /**
* These messages are dispatched when first starting up the client and connecting to the server for the first time. * These messages are dispatched when first starting up the client and connecting to the server for the first time.
* While many of thee messages will be reused for other situations, they appear in this order only during startup. * While many of these messages will be reused for other situations, they appear in this order only during startup.
*/ */
def FirstTimeSquadSetup(): Unit = { def FirstTimeSquadSetup(): Unit = {
sendResponse(SquadDetailDefinitionUpdateMessage.Init) sendResponse(SquadDetailDefinitionUpdateMessage.Init)
@ -3263,7 +3281,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
accountIntermediary ! RetrieveAccountData(token) accountIntermediary ! RetrieveAccountData(token)
case msg @ MountVehicleCargoMsg(player_guid, cargo_guid, carrier_guid, unk4) => case msg @ MountVehicleCargoMsg(player_guid, cargo_guid, carrier_guid, unk4) =>
log.trace(msg.toString) log.debug(s"MountVehicleCargoMsg: $msg")
(continent.GUID(cargo_guid), continent.GUID(carrier_guid)) match { (continent.GUID(cargo_guid), continent.GUID(carrier_guid)) match {
case (Some(cargo: Vehicle), Some(carrier: Vehicle)) => case (Some(cargo: Vehicle), Some(carrier: Vehicle)) =>
carrier.CargoHolds.find({ case (_, hold) => !hold.isOccupied }) match { carrier.CargoHolds.find({ case (_, hold) => !hold.isOccupied }) match {
@ -3282,7 +3300,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
case msg @ DismountVehicleCargoMsg(player_guid, cargo_guid, bailed, requestedByPassenger, kicked) => case msg @ DismountVehicleCargoMsg(player_guid, cargo_guid, bailed, requestedByPassenger, kicked) =>
log.trace(msg.toString) log.debug(s"DismountVehicleCargoMsg: $msg")
//when kicked by carrier driver, player_guid will be PlanetSideGUID(0) //when kicked by carrier driver, player_guid will be PlanetSideGUID(0)
//when exiting of the cargo vehicle driver's own accord, player_guid will be the cargo vehicle driver //when exiting of the cargo vehicle driver's own accord, player_guid will be the cargo vehicle driver
continent.GUID(cargo_guid) match { continent.GUID(cargo_guid) match {
@ -3310,7 +3328,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
keepAliveFunc() keepAliveFunc()
case msg @ BeginZoningMessage() => case msg @ BeginZoningMessage() =>
log.trace("Reticulating splines ...") log.trace(s"BeginZoningMessage: ${player.Name} is reticulating ${continent.id}'s splines ...")
zoneLoaded = None zoneLoaded = None
val continentId = continent.id val continentId = continent.id
val faction = player.Faction val faction = player.Faction
@ -3939,7 +3957,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
chatActor ! ChatActor.Message(msg) chatActor ! ChatActor.Message(msg)
case _ : VoiceHostRequest => case _ : VoiceHostRequest =>
log.trace(s"${player.Name} requested in-game voice chat.") log.trace(s"VoiceHostRequest: ${player.Name} requested in-game voice chat.")
sendResponse(VoiceHostKill()) sendResponse(VoiceHostKill())
sendResponse( sendResponse(
ChatMsg(ChatMessageType.CMT_OPEN, false, "", "Try our Discord at https://discord.gg/0nRe5TNbTYoUruA4", None) ChatMsg(ChatMessageType.CMT_OPEN, false, "", "Try our Discord at https://discord.gg/0nRe5TNbTYoUruA4", None)
@ -3952,7 +3970,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
FindContainedEquipment match { FindContainedEquipment match {
case (Some(_), Some(obj: ConstructionItem)) => case (Some(_), Some(obj: ConstructionItem)) =>
PerformConstructionItemAmmoChange(obj, obj.AmmoTypeIndex) PerformConstructionItemAmmoChange(obj, obj.AmmoTypeIndex)
case (Some(obj), Some(tool: Tool)) => case (Some(obj: PlanetSideServerObject), Some(tool: Tool)) =>
PerformToolAmmoChange(tool, obj) PerformToolAmmoChange(tool, obj)
case (_, Some(obj)) => case (_, Some(obj)) =>
log.warn(s"ChangeAmmo: the ${obj.Definition.Name} in ${player.Name}'s hands does not contain ammunition") log.warn(s"ChangeAmmo: the ${obj.Definition.Name} in ${player.Name}'s hands does not contain ammunition")
@ -4168,16 +4186,17 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
xs.map(_.obj.asInstanceOf[AmmoBox].Capacity).sum xs.map(_.obj.asInstanceOf[AmmoBox].Capacity).sum
} }
val sumReloadValue: Int = box.Capacity + tailReloadValue val sumReloadValue: Int = box.Capacity + tailReloadValue
val actualReloadValue = (if (sumReloadValue <= reloadValue) { val actualReloadValue = if (sumReloadValue <= reloadValue) {
deleteFunc(box) deleteFunc(box)
sumReloadValue sumReloadValue
} else { } else {
modifyFunc(box, reloadValue - tailReloadValue) modifyFunc(box, reloadValue - tailReloadValue)
reloadValue reloadValue
}) + currentMagazine }
log.info(s"${player.Name} successfully reloaded $actualReloadValue ${tool.AmmoType} into $tool") val finalReloadValue = actualReloadValue + currentMagazine
tool.Magazine = actualReloadValue log.info(s"${player.Name} successfully reloaded $reloadValue ${tool.AmmoType} into ${tool.Definition.Name}")
sendResponse(ReloadMessage(item_guid, actualReloadValue, unk1)) tool.Magazine = finalReloadValue
sendResponse(ReloadMessage(item_guid, finalReloadValue, unk1))
continent.AvatarEvents ! AvatarServiceMessage( continent.AvatarEvents ! AvatarServiceMessage(
continent.id, continent.id,
AvatarAction.Reload(player.GUID, item_guid) AvatarAction.Reload(player.GUID, item_guid)
@ -4241,7 +4260,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
continent.zipLinePaths.find(x => x.PathId == path_id) match { continent.zipLinePaths.find(x => x.PathId == path_id) match {
case Some(x) => (x.IsTeleporter, Some(x)) case Some(x) => (x.IsTeleporter, Some(x))
case _ => case _ =>
log.warn(s"$player.Name} couldn't find a zipline path $path_id in zone ${continent.id}") log.warn(s"${player.Name} couldn't find a zipline path $path_id in zone ${continent.id}")
(false, None) (false, None)
} }
if (isTeleporter) { if (isTeleporter) {
@ -4265,7 +4284,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
sendResponse(ZipLineMessage(player_guid, forwards, action, 0, pos)) sendResponse(ZipLineMessage(player_guid, forwards, action, 0, pos))
case _ => case _ =>
log.warn( log.warn(
s"${player.Name} tried to do something with a zipline but can't handle it. forwards: ${forwards} action: ${action} path_id: ${path_id} zone: ${continent.Number} / ${continent.id}" s"${player.Name} tried to do something with a zipline but can't handle it. forwards: $forwards action: $action path_id: $path_id zone: ${continent.Number} / ${continent.id}"
) )
} }
} }
@ -4720,6 +4739,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
(!obj.PermissionGroup(AccessPermissionGroup.Trunk.id).contains(VehicleLockState.Locked) || obj.Owner (!obj.PermissionGroup(AccessPermissionGroup.Trunk.id).contains(VehicleLockState.Locked) || obj.Owner
.contains(player.GUID)) .contains(player.GUID))
) { ) {
log.info(s"${player.Name} is looking in the ${obj.Definition.Name}'s trunk")
CancelZoningProcessWithDescriptiveReason("cancel_use") CancelZoningProcessWithDescriptiveReason("cancel_use")
obj.AccessingTrunk = player.GUID obj.AccessingTrunk = player.GUID
AccessContainer(obj) AccessContainer(obj)
@ -4763,6 +4783,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
) { ) {
FindLocalVehicle match { FindLocalVehicle match {
case Some(vehicle) => case Some(vehicle) =>
log.info(s"${player.Name} is accessing a ${terminal.Definition.Name} for ${player.Sex.possessive} ${vehicle.Definition.Name}")
sendResponse( sendResponse(
UseItemMessage( UseItemMessage(
avatar_guid, avatar_guid,
@ -4798,12 +4819,14 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
} else if (tdef == GlobalDefinitions.teleportpad_terminal) { } else if (tdef == GlobalDefinitions.teleportpad_terminal) {
//explicit request //explicit request
log.info(s"${player.Name} is purchasing a router telepad")
CancelZoningProcessWithDescriptiveReason("cancel_use") CancelZoningProcessWithDescriptiveReason("cancel_use")
terminal.Actor ! Terminal.Request( terminal.Actor ! Terminal.Request(
player, player,
ItemTransactionMessage(object_guid, TransactionType.Buy, 0, "router_telepad", 0, PlanetSideGUID(0)) ItemTransactionMessage(object_guid, TransactionType.Buy, 0, "router_telepad", 0, PlanetSideGUID(0))
) )
} else { } else {
log.info(s"${player.Name} is accessing a ${terminal.Definition.Name}")
CancelZoningProcessWithDescriptiveReason("cancel_use") CancelZoningProcessWithDescriptiveReason("cancel_use")
sendResponse( sendResponse(
UseItemMessage( UseItemMessage(
@ -4832,6 +4855,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
obj.Actor ! CommonMessages.Use(player, Some(item)) obj.Actor ! CommonMessages.Use(player, Some(item))
case None if player.Faction == obj.Faction => case None if player.Faction == obj.Faction =>
//deconstruction //deconstruction
log.info(s"${player.Name} is deconstructing at the ${obj.Owner.Definition.Name}'s spawns")
CancelZoningProcessWithDescriptiveReason("cancel_use") CancelZoningProcessWithDescriptiveReason("cancel_use")
PlayerActionsToCancel() PlayerActionsToCancel()
CancelAllProximityUnits() CancelAllProximityUnits()
@ -4918,7 +4942,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case Some(obj) => case Some(obj) =>
CancelZoningProcessWithDescriptiveReason("cancel_use") CancelZoningProcessWithDescriptiveReason("cancel_use")
log.warn(s"UseItem: ${player.Name} don't know how to handle $obj") log.warn(s"UseItem: ${player.Name} does not know how to handle $obj")
case None => case None =>
log.error(s"UseItem: ${player.Name} can not find object $object_guid") log.error(s"UseItem: ${player.Name} can not find object $object_guid")
@ -5105,8 +5129,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case msg @ ItemTransactionMessage(terminal_guid, transaction_type, _, _, _, _) => case msg @ ItemTransactionMessage(terminal_guid, transaction_type, _, _, _, _) =>
continent.GUID(terminal_guid) match { continent.GUID(terminal_guid) match {
case Some(term: Terminal) => case Some(term: Terminal) =>
log.info(s"${player.Name} is using a terminal")
if (lastTerminalOrderFulfillment) { if (lastTerminalOrderFulfillment) {
log.trace(s"ItemTransactionMessage: ${player.Name} is submitting an order")
lastTerminalOrderFulfillment = false lastTerminalOrderFulfillment = false
CancelZoningProcessWithDescriptiveReason("cancel_use") CancelZoningProcessWithDescriptiveReason("cancel_use")
term.Actor ! Terminal.Request(player, msg) term.Actor ! Terminal.Request(player, msg)
@ -5129,16 +5153,14 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case msg @ WeaponDelayFireMessage(seq_time, weapon_guid) => ; case msg @ WeaponDelayFireMessage(seq_time, weapon_guid) => ;
case msg @ WeaponDryFireMessage(weapon_guid) => case msg @ WeaponDryFireMessage(weapon_guid) =>
FindWeapon match { FindWeapon.orElse { continent.GUID(weapon_guid) } match {
case Some(tool: Tool) => case Some(_: Equipment) =>
continent.AvatarEvents ! AvatarServiceMessage( continent.AvatarEvents ! AvatarServiceMessage(
continent.id, continent.id,
AvatarAction.WeaponDryFire(player.GUID, weapon_guid) AvatarAction.WeaponDryFire(player.GUID, weapon_guid)
) )
case Some(_) => case _ =>
log.warn(s"WeaponDryFire: ${player.Name}'s weapon ${weapon_guid.guid} does not seem to be a weapon") log.warn(s"WeaponDryFire: ${player.Name}'s weapon ${weapon_guid.guid} is either not a weapon or does not exist")
case None =>
log.error(s"WeaponDryFire: ${player.Name}'s weapon ${weapon_guid.guid} does not seem to exist")
} }
case msg @ WeaponFireMessage( case msg @ WeaponFireMessage(
@ -5182,7 +5204,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
unk3, unk3,
unk4 unk4
) => ) =>
log.trace(s"${player.Name} hits with $msg") log.trace(s"${player.Name} lands a hit - $msg")
//find defined projectile //find defined projectile
FindProjectileEntry(projectile_guid) match { FindProjectileEntry(projectile_guid) match {
case Some(projectile) => case Some(projectile) =>
@ -5257,7 +5279,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
unk4, unk4,
targets targets
) => ) =>
log.trace(s"${player.Name} splashes with $msg") log.trace(s"${player.Name} splashes some targets - $msg")
FindProjectileEntry(projectile_guid) match { FindProjectileEntry(projectile_guid) match {
case Some(projectile) => case Some(projectile) =>
val profile = projectile.profile val profile = projectile.profile
@ -5318,7 +5340,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
case msg @ LashMessage(seq_time, killer_guid, victim_guid, projectile_guid, hit_pos, unk1) => case msg @ LashMessage(seq_time, killer_guid, victim_guid, projectile_guid, hit_pos, unk1) =>
log.trace(s"${player.Name} lashes with $msg") log.trace(s"${player.Name} lashes some targets - $msg")
ValidObject(victim_guid) match { ValidObject(victim_guid) match {
case Some(target: PlanetSideGameObject with FactionAffinity with Vitality) => case Some(target: PlanetSideGameObject with FactionAffinity with Vitality) =>
CheckForHitPositionDiscrepancy(projectile_guid, hit_pos, target) CheckForHitPositionDiscrepancy(projectile_guid, hit_pos, target)
@ -5488,7 +5510,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
case msg @ AvatarGrenadeStateMessage(player_guid, state) => case msg @ AvatarGrenadeStateMessage(player_guid, state) =>
log.debug(s"${player.Name} lofts his grenade high ... $msg") //TODO I thought I had this working? //TODO I thought I had this working?
log.info(s"${player.Name} has $state ${player.Sex.possessive} grenade")
case msg @ SquadDefinitionActionMessage(u1, u2, action) => case msg @ SquadDefinitionActionMessage(u1, u2, action) =>
squadService ! SquadServiceMessage(player, continent, SquadServiceAction.Definition(u1, u2, action)) squadService ! SquadServiceMessage(player, continent, SquadServiceAction.Definition(u1, u2, action))
@ -5504,7 +5527,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
squadService ! SquadServiceMessage(player, continent, SquadServiceAction.Waypoint(request, wtype, unk, info)) squadService ! SquadServiceMessage(player, continent, SquadServiceAction.Waypoint(request, wtype, unk, info))
case msg @ GenericCollisionMsg(u1, p, t, php, thp, pv, tv, ppos, tpos, u2, u3, u4) => case msg @ GenericCollisionMsg(u1, p, t, php, thp, pv, tv, ppos, tpos, u2, u3, u4) =>
log.info(s"${player.Name} would be in intense and excruciating pain right now if collison worked") log.info(s"${player.Name} would be in intense and excruciating pain right now if collision worked")
case msg @ BugReportMessage( case msg @ BugReportMessage(
version_major, version_major,
@ -5518,7 +5541,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
summary, summary,
desc desc
) => ) =>
log.warn(s"${player.Name} filed a $msg") log.warn(s"${player.Name} filed a bug report")
log.debug(s"$msg") log.debug(s"$msg")
case msg @ BindPlayerMessage(action, bindDesc, unk1, logging, unk2, unk3, unk4, pos) => case msg @ BindPlayerMessage(action, bindDesc, unk1, logging, unk2, unk3, unk4, pos) =>
@ -5532,7 +5555,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
vehicle.PermissionGroup(attribute_type, attribute_value) match { vehicle.PermissionGroup(attribute_type, attribute_value) match {
case Some(allow) => case Some(allow) =>
val group = AccessPermissionGroup(attribute_type - 10) val group = AccessPermissionGroup(attribute_type - 10)
log.info(s"${player.Name} changed ${vehicle.Definition.Name}'s access permission $group changed to $allow") log.info(s"${player.Name} changed ${vehicle.Definition.Name}'s access permission $group to $allow")
continent.VehicleEvents ! VehicleServiceMessage( continent.VehicleEvents ! VehicleServiceMessage(
continent.id, continent.id,
VehicleAction.SeatPermissions(player.GUID, vehicle.GUID, attribute_type, attribute_value) VehicleAction.SeatPermissions(player.GUID, vehicle.GUID, attribute_type, attribute_value)
@ -5570,10 +5593,10 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case None => ; case None => ;
} }
} else { } else {
log.warn(s"Vehicle attributes: unsupported change on vehicle $object_guid - $attribute_type, ${player.Name}") log.warn(s"PlanetsideAttribute: vehicle attributes - unsupported change on vehicle $object_guid - $attribute_type, ${player.Name}")
} }
} else { } else {
log.warn(s"PlanetsideAttributeMessage: vehicle attributes - ${player.Name} does not own vehicle ${vehicle.GUID} and can not change it") log.warn(s"PlanetsideAttribute: vehicle attributes - ${player.Name} does not own vehicle ${vehicle.GUID} and can not change it")
} }
// Cosmetics options // Cosmetics options
@ -5581,7 +5604,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
avatarActor ! AvatarActor.SetCosmetics(Cosmetic.valuesFromAttributeValue(attribute_value)) avatarActor ! AvatarActor.SetCosmetics(Cosmetic.valuesFromAttributeValue(attribute_value))
case _ => case _ =>
log.warn(s"PlanetsideAttributeMessage: echoing unknown attributes behavior $attribute_type back to ${player.Name}") log.warn(s"PlanetsideAttribute: echoing unknown attributes behavior $attribute_type back to ${player.Name}")
sendResponse(PlanetsideAttributeMessage(object_guid, attribute_type, attribute_value)) sendResponse(PlanetsideAttributeMessage(object_guid, attribute_type, attribute_value))
} }
@ -5605,7 +5628,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case msg @ BattleplanMessage(char_id, player_name, zone_id, diagrams) => case msg @ BattleplanMessage(char_id, player_name, zone_id, diagrams) =>
val lament: String = s"${player.Name} has a brilliant idea that no one will ever see" val lament: String = s"${player.Name} has a brilliant idea that no one will ever see"
log.info(lament) log.info(lament)
log.debug(s"BattleplanMessage: $lament - $msg") log.debug(s"Battleplan: $lament - $msg")
case msg @ CreateShortcutMessage(player_guid, slot, unk, add, shortcut) => ; case msg @ CreateShortcutMessage(player_guid, slot, unk, add, shortcut) => ;
@ -5626,7 +5649,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
Some(TargetInfo(player.GUID, health, armor)) Some(TargetInfo(player.GUID, health, armor))
case _ => case _ =>
log.warn(s"TargetingImplantRequest: The target info that ${player.Name} requested for guid ${x.target_guid} is not for a player") log.warn(s"TargetingImplantRequest: the info that ${player.Name} requested for target ${x.target_guid} is not for a player")
None None
} }
}) })
@ -6144,7 +6167,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
* Common preparation for disengaging from a corpse. * Common preparation for disengaging from a corpse.
* Leave the corpse-specific group that was used for shared updates. * Leave the corpse-specific group that was used for shared updates.
* Deconstruct every object in the backpack's inventory. * Deconstruct every object in the backpack's inventory.
* @param vehicle the vehicle * @param tplayer the corpse
*/ */
def UnaccessCorpseContainer(tplayer: Player): Unit = { def UnaccessCorpseContainer(tplayer: Player): Unit = {
accessedContainer = None accessedContainer = None
@ -6303,7 +6326,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
* @param tool na * @param tool na
* @param obj na * @param obj na
*/ */
def PerformToolAmmoChange(tool: Tool, obj: PlanetSideGameObject with Container): Unit = { def PerformToolAmmoChange(tool: Tool, obj: PlanetSideServerObject with Container): Unit = {
val originalAmmoType = tool.AmmoType val originalAmmoType = tool.AmmoType
do { do {
val requestedAmmoType = tool.NextAmmoType val requestedAmmoType = tool.NextAmmoType
@ -6313,23 +6336,14 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case Nil => ; case Nil => ;
case x :: xs => case x :: xs =>
val (deleteFunc, modifyFunc): (Equipment => Future[Any], (AmmoBox, Int) => Unit) = obj match { val (deleteFunc, modifyFunc): (Equipment => Future[Any], (AmmoBox, Int) => Unit) = obj match {
case (veh: Vehicle) => case veh: Vehicle =>
(RemoveOldEquipmentFromInventory(veh), ModifyAmmunitionInVehicle(veh)) (RemoveOldEquipmentFromInventory(veh), ModifyAmmunitionInVehicle(veh))
case o: PlanetSideServerObject with Container =>
(RemoveOldEquipmentFromInventory(o), ModifyAmmunition(o))
case _ => case _ =>
throw new Exception( (RemoveOldEquipmentFromInventory(obj), ModifyAmmunition(obj))
"PerformToolAmmoChange: (remove/modify) should be a server object, not a regular game object"
)
}
val (stowNewFunc, stowFunc): (Equipment => TaskResolver.GiveTask, Equipment => Future[Any]) = obj match {
case o: PlanetSideServerObject with Container =>
(PutNewEquipmentInInventoryOrDrop(o), PutEquipmentInInventoryOrDrop(o))
case _ =>
throw new Exception(
"PerformToolAmmoChange: (new/put) should be a server object, not a regular game object"
)
} }
val (stowNewFunc, stowFunc): (Equipment => TaskResolver.GiveTask, Equipment => Future[Any]) =
(PutNewEquipmentInInventoryOrDrop(obj), PutEquipmentInInventoryOrDrop(obj))
xs.foreach(item => { xs.foreach(item => {
obj.Inventory -= x.start obj.Inventory -= x.start
deleteFunc(item.obj) deleteFunc(item.obj)
@ -6339,7 +6353,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val box = x.obj.asInstanceOf[AmmoBox] val box = x.obj.asInstanceOf[AmmoBox]
val originalBoxCapacity = box.Capacity val originalBoxCapacity = box.Capacity
val tailReloadValue: Int = if (xs.isEmpty) { 0 } val tailReloadValue: Int = if (xs.isEmpty) { 0 }
else { xs.map(_.obj.asInstanceOf[AmmoBox].Capacity).reduceLeft(_ + _) } else { xs.map(_.obj.asInstanceOf[AmmoBox].Capacity).sum }
val sumReloadValue: Int = originalBoxCapacity + tailReloadValue val sumReloadValue: Int = originalBoxCapacity + tailReloadValue
val previousBox = tool.AmmoSlot.Box //current magazine in tool val previousBox = tool.AmmoSlot.Box //current magazine in tool
sendResponse(ObjectDetachMessage(tool.GUID, previousBox.GUID, Vector3.Zero, 0f)) sendResponse(ObjectDetachMessage(tool.GUID, previousBox.GUID, Vector3.Zero, 0f))
@ -6374,7 +6388,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} else { } else {
val splitReloadAmmo: Int = sumReloadValue - fullMagazine val splitReloadAmmo: Int = sumReloadValue - fullMagazine
log.trace( log.trace(
s"${player.Name} takes ${originalBoxCapacity - splitReloadAmmo} from a box of $originalBoxCapacity $requestedAmmoType ammo" s"PerformToolAmmoChange: ${player.Name} takes ${originalBoxCapacity - splitReloadAmmo} from a box of $originalBoxCapacity $requestedAmmoType ammo"
) )
val boxForInventory = AmmoBox(box.Definition, splitReloadAmmo) val boxForInventory = AmmoBox(box.Definition, splitReloadAmmo)
continent.tasks ! stowNewFunc(boxForInventory) continent.tasks ! stowNewFunc(boxForInventory)
@ -6383,7 +6397,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
sendResponse( sendResponse(
InventoryStateMessage(box.GUID, tool.GUID, box.Capacity) InventoryStateMessage(box.GUID, tool.GUID, box.Capacity)
) //should work for both players and vehicles ) //should work for both players and vehicles
log.info(s"${player.Name} loads ${box.Capacity} $requestedAmmoType into ${tool.GUID} in $ammoSlotIndex") log.info(s"${player.Name} loads ${box.Capacity} $requestedAmmoType into the ${tool.Definition.Name}")
if (previousBox.Capacity > 0) { if (previousBox.Capacity > 0) {
//divide capacity across other existing and not full boxes of that ammo type //divide capacity across other existing and not full boxes of that ammo type
var capacity = previousBox.Capacity var capacity = previousBox.Capacity
@ -6420,9 +6434,9 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
AmmoBox.Split(previousBox) match { AmmoBox.Split(previousBox) match {
case Nil | List(_) => ; //done (the former case is technically not possible) case Nil | List(_) => ; //done (the former case is technically not possible)
case _ :: xs => case _ :: toUpdate =>
modifyFunc(previousBox, 0) //update to changed capacity value modifyFunc(previousBox, 0) //update to changed capacity value
xs.foreach(box => { continent.tasks ! stowNewFunc(box) }) toUpdate.foreach(box => { continent.tasks ! stowNewFunc(box) })
} }
} else { } else {
continent.tasks ! GUIDTask.UnregisterObjectTask(previousBox)(continent.GUID) continent.tasks ! GUIDTask.UnregisterObjectTask(previousBox)(continent.GUID)
@ -6459,8 +6473,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
def NewItemDrop(obj: PlanetSideServerObject with Container, zone: Zone)(item: Equipment): TaskResolver.GiveTask = { def NewItemDrop(obj: PlanetSideServerObject with Container, zone: Zone)(item: Equipment): TaskResolver.GiveTask = {
TaskResolver.GiveTask( TaskResolver.GiveTask(
new Task() { new Task() {
private val localItem = item private val localItem = item
private val localFunc: (Equipment) => Unit = NormalItemDrop(obj, zone) private val localFunc: Equipment => Unit = NormalItemDrop(obj, zone)
override def Description: String = s"dropping a new ${localItem.Definition.Name} on the ground" override def Description: String = s"dropping a new ${localItem.Definition.Name} on the ground"
@ -6925,11 +6939,13 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
zone.id, zone.id,
VehicleAction.UnloadVehicle(player.GUID, vehicle, vehicleToDelete) VehicleAction.UnloadVehicle(player.GUID, vehicle, vehicleToDelete)
) )
log.trace( log.debug(
s"AvatarCreate: cleaning up ghost of transitioning vehicle ${vehicle.Definition.Name}@${vehicleToDelete.guid} in zone ${zone.id}" s"AvatarCreate: cleaning up ghost of transitioning vehicle ${vehicle.Definition.Name}@${vehicleToDelete.guid} in zone ${zone.id}"
) )
} }
Vehicles.ReloadAccessPermissions(vehicle, player.Name) Vehicles.ReloadAccessPermissions(vehicle, player.Name)
log.debug(s"AvatarCreate (vehicle): ${player.Name}'s ${vehicle.Definition.Name}")
log.trace(s"AvatarCreate (vehicle): ${player.Name}'s ${vehicle.Definition.Name} - $vguid -> $vdata")
AvatarCreateInVehicle(player, vehicle, seat) AvatarCreateInVehicle(player, vehicle, seat)
case _ => case _ =>
@ -6942,8 +6958,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
continent.id, continent.id,
AvatarAction.LoadPlayer(guid, ObjectClass.avatar, guid, packet.ConstructorData(player).get, None) AvatarAction.LoadPlayer(guid, ObjectClass.avatar, guid, packet.ConstructorData(player).get, None)
) )
log.trace(s"AvatarCreate: $guid -> $data") log.debug(s"AvatarCreate: ${player.Name}")
log.trace(s"AvatarCreate: ${player.Name}") log.trace(s"AvatarCreate: ${player.Name} - $guid -> $data")
} }
continent.Population ! Zone.Population.Spawn(avatar, player, avatarActor) continent.Population ! Zone.Population.Spawn(avatar, player, avatarActor)
//cautious redundancy //cautious redundancy
@ -7038,6 +7054,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
tplayer.VehicleSeated = None tplayer.VehicleSeated = None
val pdata = pdef.Packet.DetailedConstructorData(tplayer).get val pdata = pdef.Packet.DetailedConstructorData(tplayer).get
tplayer.VehicleSeated = vguid tplayer.VehicleSeated = vguid
log.debug(s"AvatarCreateInVehicle: ${player.Name}")
log.trace(s"AvatarCreateInVehicle: ${player.Name} - $pguid -> $pdata")
sendResponse(ObjectCreateDetailedMessage(pdef.ObjectId, pguid, pdata)) sendResponse(ObjectCreateDetailedMessage(pdef.ObjectId, pguid, pdata))
if (seat == 0 || vehicle.WeaponControlledFromSeat(seat).nonEmpty) { if (seat == 0 || vehicle.WeaponControlledFromSeat(seat).nonEmpty) {
sendResponse(ObjectAttachMessage(vguid, pguid, seat)) sendResponse(ObjectAttachMessage(vguid, pguid, seat))
@ -7057,7 +7075,6 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
Some(ObjectCreateMessageParent(vguid, seat)) Some(ObjectCreateMessageParent(vguid, seat))
) )
) )
log.trace(s"AvatarCreateInVehicle: $pguid -> pdata")
} }
/** /**
@ -7097,7 +7114,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val seat = vehicle.Seats(0) val seat = vehicle.Seats(0)
seat.unmount(player) seat.unmount(player)
val _vdata = vdef.Packet.ConstructorData(vehicle).get val _vdata = vdef.Packet.ConstructorData(vehicle).get
sendResponse(ObjectCreateMessage(vehicle.Definition.ObjectId, vguid, vdata)) sendResponse(ObjectCreateMessage(vehicle.Definition.ObjectId, vguid, _vdata))
seat.mount(player) seat.mount(player)
_vdata _vdata
} else { } else {
@ -7106,7 +7123,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
_vdata _vdata
} }
Vehicles.ReloadAccessPermissions(vehicle, continent.id) Vehicles.ReloadAccessPermissions(vehicle, continent.id)
log.trace(s"AvatarCreate (vehicle): $vguid -> $vdata") log.debug(s"AvatarCreate (vehicle): ${player.Name}'s ${vehicle.Definition.Name}")
log.trace(s"AvatarCreate (vehicle): ${player.Name}'s ${vehicle.Definition.Name} - $vguid -> $vdata")
val pdef = player.avatar.definition val pdef = player.avatar.definition
val pguid = player.GUID val pguid = player.GUID
val parent = ObjectCreateMessageParent(vguid, seat) val parent = ObjectCreateMessageParent(vguid, seat)
@ -7114,7 +7132,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val pdata = pdef.Packet.DetailedConstructorData(player).get val pdata = pdef.Packet.DetailedConstructorData(player).get
player.VehicleSeated = vguid player.VehicleSeated = vguid
sendResponse(ObjectCreateDetailedMessage(pdef.ObjectId, pguid, pdata)) sendResponse(ObjectCreateDetailedMessage(pdef.ObjectId, pguid, pdata))
log.trace(s"AvatarRejoin: $pguid -> $pdata") log.debug(s"AvatarRejoin: ${player.Name} - $pguid -> $pdata")
if (seat == 0 || vehicle.WeaponControlledFromSeat(seat).nonEmpty) { if (seat == 0 || vehicle.WeaponControlledFromSeat(seat).nonEmpty) {
sendResponse(ObjectAttachMessage(vguid, pguid, seat)) sendResponse(ObjectAttachMessage(vguid, pguid, seat))
AccessContainer(vehicle) AccessContainer(vehicle)
@ -7123,7 +7141,6 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
interimUngunnedVehicle = Some(vguid) interimUngunnedVehicle = Some(vguid)
interimUngunnedVehicleSeat = Some(seat) interimUngunnedVehicleSeat = Some(seat)
} }
log.info(s"AvatarRejoin: ${player.Name} in ${vehicle.Definition.Name}")
case _ => case _ =>
player.VehicleSeated = None player.VehicleSeated = None
@ -7131,8 +7148,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val data = packet.DetailedConstructorData(player).get val data = packet.DetailedConstructorData(player).get
val guid = player.GUID val guid = player.GUID
sendResponse(ObjectCreateDetailedMessage(ObjectClass.avatar, guid, data)) sendResponse(ObjectCreateDetailedMessage(ObjectClass.avatar, guid, data))
log.trace(s"AvatarRejoin: $guid -> $data") log.debug(s"AvatarRejoin: ${player.Name} - $guid -> $data")
log.trace(s"AvatarRejoin: ${player.Name}")
} }
//cautious redundancy //cautious redundancy
deadState = DeadState.Alive deadState = DeadState.Alive
@ -7157,6 +7173,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val obj = Player.Respawn(tplayer) val obj = Player.Respawn(tplayer)
DefinitionUtil.applyDefaultLoadout(obj) DefinitionUtil.applyDefaultLoadout(obj)
obj.death_by = tplayer.death_by obj.death_by = tplayer.death_by
obj.silenced = tplayer.silenced
obj obj
} }
@ -7301,26 +7318,25 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
*/ */
def RequestSanctuaryZoneSpawn(tplayer: Player, currentZone: Int): Unit = { def RequestSanctuaryZoneSpawn(tplayer: Player, currentZone: Int): Unit = {
if (currentZone == Zones.sanctuaryZoneNumber(tplayer.Faction)) { if (currentZone == Zones.sanctuaryZoneNumber(tplayer.Faction)) {
log.error(s"RequestSanctuaryZoneSpawn: ${player.Name} is already in faction Sanctuary zone.") log.error(s"RequestSanctuaryZoneSpawn: ${player.Name} is already in faction sanctuary zone.")
sendResponse(DisconnectMessage("RequestSanctuaryZoneSpawn called for player already in sanctuary.")) sendResponse(DisconnectMessage("RequestSanctuaryZoneSpawn: player is already in sanctuary."))
return } else {
} continent.GUID(player.VehicleSeated) match {
case Some(obj : Vehicle) if !obj.Destroyed =>
continent.GUID(player.VehicleSeated) match { cluster ! ICS.GetRandomSpawnPoint(
case Some(obj: Vehicle) if !obj.Destroyed => Zones.sanctuaryZoneNumber(player.Faction),
cluster ! ICS.GetRandomSpawnPoint( player.Faction,
Zones.sanctuaryZoneNumber(player.Faction), Seq(SpawnGroup.WarpGate),
player.Faction, context.self
Seq(SpawnGroup.WarpGate), )
context.self case _ =>
) cluster ! ICS.GetRandomSpawnPoint(
case _ => Zones.sanctuaryZoneNumber(player.Faction),
cluster ! ICS.GetRandomSpawnPoint( player.Faction,
Zones.sanctuaryZoneNumber(player.Faction), Seq(SpawnGroup.Sanctuary),
player.Faction, context.self
Seq(SpawnGroup.Sanctuary), )
context.self }
)
} }
} }
@ -7372,7 +7388,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case _: Vehicle => case _: Vehicle =>
terminal.Actor ! CommonMessages.Use(player, Some((target, continent.VehicleEvents))) terminal.Actor ! CommonMessages.Use(player, Some((target, continent.VehicleEvents)))
case _ => case _ =>
log.error(s"StartUsingProximityUnit: can not deal with target $target") log.error(s"StartUsingProximityUnit: ${player.Name}, this ${terminal.Definition.Name} can not deal with target $target")
} }
terminal.Definition match { terminal.Definition match {
case GlobalDefinitions.adv_med_terminal | GlobalDefinitions.medical_terminal => case GlobalDefinitions.adv_med_terminal | GlobalDefinitions.medical_terminal =>
@ -7633,7 +7649,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
if (0 <= index && index < projectiles.length) { if (0 <= index && index < projectiles.length) {
projectiles(index) projectiles(index)
} else { } else {
log.warn(s"ResolveProjectile: expected projectile, but ${projectile_guid.guid} not found") log.trace(s"ResolveProjectile: ${player.Name} expected projectile, but ${projectile_guid.guid} not found")
None None
} }
} }
@ -7655,7 +7671,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
case Some(projectile) => case Some(projectile) =>
ResolveProjectileInteraction(projectile, resolution, target, pos) ResolveProjectileInteraction(projectile, resolution, target, pos)
case None => case None =>
log.warn(s"ResolveProjectile: expected projectile, but ${projectile_guid.guid} not found") log.trace(s"ResolveProjectile: ${player.Name} expected projectile, but ${projectile_guid.guid} not found")
None None
} }
} }
@ -7695,7 +7711,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
pos: Vector3 pos: Vector3
): Option[DamageInteraction] = { ): Option[DamageInteraction] = {
if (projectile.isMiss) { if (projectile.isMiss) {
log.error("expected projectile was already counted as a missed shot; can not resolve any further") log.warn("expected projectile was already counted as a missed shot; can not resolve any further")
None None
} else { } else {
projectile.Resolve() projectile.Resolve()
@ -7744,7 +7760,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
def DismountAction(tplayer: Player, obj: PlanetSideGameObject with Mountable, seatNum: Int): Unit = { def DismountAction(tplayer: Player, obj: PlanetSideGameObject with Mountable, seatNum: Int): Unit = {
val player_guid: PlanetSideGUID = tplayer.GUID val player_guid: PlanetSideGUID = tplayer.GUID
log.info( log.info(
s"${tplayer.Name} dismounts a ${obj.Definition.asInstanceOf[ObjectDefinition].Name} from seat $seatNum" s"${tplayer.Name} dismounts a ${obj.Definition.asInstanceOf[ObjectDefinition].Name} from seat #$seatNum"
) )
keepAliveFunc = NormalKeepAlive keepAliveFunc = NormalKeepAlive
sendResponse(DismountVehicleMsg(player_guid, BailType.Normal, wasKickedByDriver = false)) sendResponse(DismountVehicleMsg(player_guid, BailType.Normal, wasKickedByDriver = false))
@ -7770,13 +7786,16 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val func = data.calculate() val func = data.calculate()
target match { target match {
case obj: Player if obj.CanDamage && obj.Actor != Default.Actor => case obj: Player if obj.CanDamage && obj.Actor != Default.Actor =>
log.info(s"${player.Name} is attacking ${obj.Name}")
// auto kick players damaging spectators // auto kick players damaging spectators
if (obj.spectator && obj != player) { if (obj.spectator && obj != player) {
AdministrativeKick(player) AdministrativeKick(player)
} else { } else {
obj.Actor ! Vitality.Damage(func) obj.Actor ! Vitality.Damage(func)
} }
case obj: Vehicle if obj.CanDamage => obj.Actor ! Vitality.Damage(func) case obj: Vehicle if obj.CanDamage =>
log.info(s"${player.Name} is attacking ${obj.OwnerName.getOrElse("someone")}'s ${obj.Definition.Name}")
obj.Actor ! Vitality.Damage(func)
case obj: Amenity if obj.CanDamage => obj.Actor ! Vitality.Damage(func) case obj: Amenity if obj.CanDamage => obj.Actor ! Vitality.Damage(func)
case obj: ComplexDeployable if obj.CanDamage => obj.Actor ! Vitality.Damage(func) case obj: ComplexDeployable if obj.CanDamage => obj.Actor ! Vitality.Damage(func)
@ -7921,11 +7940,11 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
def NextConstructionItemFireMode(obj: ConstructionItem, originalModeIndex: Int): ConstructionFireMode = { def NextConstructionItemFireMode(obj: ConstructionItem, originalModeIndex: Int): ConstructionFireMode = {
do { do {
obj.NextFireMode obj.NextFireMode
if (!ConstructionItemPermissionComparison(player.avatar.certifications, obj.ModePermissions)) { if (!Deployables.constructionItemPermissionComparison(player.avatar.certifications, obj.ModePermissions)) {
PerformConstructionItemAmmoChange(obj, obj.AmmoTypeIndex) PerformConstructionItemAmmoChange(obj, obj.AmmoTypeIndex)
} }
sendResponse(ChangeFireModeMessage(obj.GUID, obj.FireModeIndex)) sendResponse(ChangeFireModeMessage(obj.GUID, obj.FireModeIndex))
} while (!ConstructionItemPermissionComparison( } while (!Deployables.constructionItemPermissionComparison(
player.avatar.certifications, player.avatar.certifications,
obj.ModePermissions obj.ModePermissions
) && originalModeIndex != obj.FireModeIndex) ) && originalModeIndex != obj.FireModeIndex)
@ -7944,7 +7963,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
def PerformConstructionItemAmmoChange(obj: ConstructionItem, originalAmmoIndex: Int): Unit = { def PerformConstructionItemAmmoChange(obj: ConstructionItem, originalAmmoIndex: Int): Unit = {
do { do {
obj.NextAmmoType obj.NextAmmoType
} while (!ConstructionItemPermissionComparison( } while (!Deployables.constructionItemPermissionComparison(
player.avatar.certifications, player.avatar.certifications,
obj.ModePermissions obj.ModePermissions
) && originalAmmoIndex != obj.AmmoTypeIndex) ) && originalAmmoIndex != obj.AmmoTypeIndex)
@ -7954,35 +7973,6 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
sendResponse(ChangeAmmoMessage(obj.GUID, obj.AmmoTypeIndex)) sendResponse(ChangeAmmoMessage(obj.GUID, obj.AmmoTypeIndex))
} }
/**
* Compare sets of certifications to determine if
* the requested `Engineering`-like certification requirements of the one group can be found in a another group.
* @see `CertificationType`
* @param sample the certifications to be compared against
* @param test the desired certifications
* @return `true`, if the desired certification requirements are met; `false`, otherwise
*/
def ConstructionItemPermissionComparison(
sample: Set[Certification],
test: Set[Certification]
): Boolean = {
import Certification._
val engineeringCerts: Set[Certification] = Set(AssaultEngineering, FortificationEngineering)
val testDiff: Set[Certification] = test diff (engineeringCerts ++ Set(AdvancedEngineering))
//substitute `AssaultEngineering` and `FortificationEngineering` for `AdvancedEngineering`
val sampleIntersect = if (sample contains AdvancedEngineering) {
engineeringCerts
} else {
sample intersect engineeringCerts
}
val testIntersect = if (test contains AdvancedEngineering) {
engineeringCerts
} else {
test intersect engineeringCerts
}
(sample intersect testDiff equals testDiff) && (sampleIntersect intersect testIntersect equals testIntersect)
}
/** /**
* Common actions related to constructing a new `Deployable` object in the game environment.<br> * Common actions related to constructing a new `Deployable` object in the game environment.<br>
* <br> * <br>
@ -8159,7 +8149,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val definition = tool.Definition val definition = tool.Definition
if (player.Slot(index).Equipment.isEmpty) { if (player.Slot(index).Equipment.isEmpty) {
FindEquipmentStock(player, { (e) => e.Definition == definition }, 1) match { FindEquipmentStock(player, { e => e.Definition == definition }, 1) match {
case x :: _ => case x :: _ =>
val guid = player.GUID val guid = player.GUID
val obj = x.obj.asInstanceOf[ConstructionItem] val obj = x.obj.asInstanceOf[ConstructionItem]
@ -8351,9 +8341,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
* does not factor in any time required for loading zone or game objects * does not factor in any time required for loading zone or game objects
*/ */
def LoadZonePhysicalSpawnPoint(zoneId: String, pos: Vector3, ori: Vector3, respawnTime: FiniteDuration): Unit = { def LoadZonePhysicalSpawnPoint(zoneId: String, pos: Vector3, ori: Vector3, respawnTime: FiniteDuration): Unit = {
val msg = s"${player.Name} will load in zone $zoneId at position $pos in $respawnTime" log.info(s"${player.Name} will load in zone $zoneId at position $pos in $respawnTime")
log.info(msg)
log.debug(s"LoadZonePhysicalSpawnPoint: $msg")
respawnTimer.cancel() respawnTimer.cancel()
reviveTimer.cancel() reviveTimer.cancel()
deadState = DeadState.RespawnTime deadState = DeadState.RespawnTime
@ -8417,9 +8405,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
* @param zoneId the zone in which the player will be placed * @param zoneId the zone in which the player will be placed
*/ */
def LoadZoneAsPlayer(targetPlayer: Player, zoneId: String): Unit = { def LoadZoneAsPlayer(targetPlayer: Player, zoneId: String): Unit = {
val msg: String = s"${targetPlayer.avatar.name} loading into $zoneId" log.debug(s"LoadZoneAsPlayer: ${targetPlayer.avatar.name} loading into $zoneId")
log.info(msg)
log.debug(s"LoadZoneAsPlayer: $msg")
if (!zoneReload && zoneId == continent.id) { if (!zoneReload && zoneId == continent.id) {
if (player.isBackpack) { // important! test the actor-wide player ref, not the parameter if (player.isBackpack) { // important! test the actor-wide player ref, not the parameter
// respawning from unregistered player // respawning from unregistered player
@ -8500,7 +8486,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
* @return a tuple composed of an `ActorRef` destination and a message to send to that destination * @return a tuple composed of an `ActorRef` destination and a message to send to that destination
*/ */
def LoadZoneInVehicleAsDriver(vehicle: Vehicle, zoneId: String): Unit = { def LoadZoneInVehicleAsDriver(vehicle: Vehicle, zoneId: String): Unit = {
val msg: String = s"${player.Name} loading into $zoneId, driving a ${vehicle.Definition.Name}" val msg: String = s"${player.Name} is driving a ${vehicle.Definition.Name}"
log.info(msg) log.info(msg)
log.debug(s"LoadZoneInVehicleAsDriver: $msg") log.debug(s"LoadZoneInVehicleAsDriver: $msg")
val manifest = vehicle.PrepareGatingManifest() val manifest = vehicle.PrepareGatingManifest()
@ -8593,7 +8579,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
* @return a tuple composed of an `ActorRef` destination and a message to send to that destination * @return a tuple composed of an `ActorRef` destination and a message to send to that destination
*/ */
def LoadZoneInVehicleAsPassenger(vehicle: Vehicle, zoneId: String): Unit = { def LoadZoneInVehicleAsPassenger(vehicle: Vehicle, zoneId: String): Unit = {
val msg: String = s"${player.Name} loading into $zoneId as the passenger of a ${vehicle.Definition.Name}" val msg: String = s"${player.Name} is the passenger of a ${vehicle.Definition.Name}"
log.info(msg) log.info(msg)
log.debug(s"LoadZoneInVehicleAsPassenger: $msg") log.debug(s"LoadZoneInVehicleAsPassenger: $msg")
if (!zoneReload && zoneId == continent.id) { if (!zoneReload && zoneId == continent.id) {
@ -9177,7 +9163,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
if (hitPositionDiscrepancy > Config.app.antiCheat.hitPositionDiscrepancyThreshold) { if (hitPositionDiscrepancy > Config.app.antiCheat.hitPositionDiscrepancyThreshold) {
// If the target position on the server does not match the position where the projectile landed within reason there may be foul play // If the target position on the server does not match the position where the projectile landed within reason there may be foul play
log.warn( log.warn(
s"Shot guid $projectile_guid has hit location discrepancy with target location. Target: ${target.Position} Reported: $hitPos, Distance: $hitPositionDiscrepancy / ${math.sqrt(hitPositionDiscrepancy).toFloat}; suspect" s"${player.Name}'s shot #${projectile_guid.guid} has hit discrepancy with target. Target: ${target.Position}, Reported: $hitPos, Distance: $hitPositionDiscrepancy / ${math.sqrt(hitPositionDiscrepancy).toFloat}; suspect"
) )
} }
} }
@ -9297,6 +9283,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
} }
def AdministrativeKick(tplayer: Player) = { def AdministrativeKick(tplayer: Player) = {
log.warn(s"${tplayer.Name} has been kicked by ${player.Name}")
tplayer.death_by = -1 tplayer.death_by = -1
accountPersistence ! AccountPersistenceService.Kick(tplayer.Name) accountPersistence ! AccountPersistenceService.Kick(tplayer.Name)
//get out of that vehicle //get out of that vehicle
@ -9314,8 +9301,11 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
def KickedByAdministration(): Unit = { def KickedByAdministration(): Unit = {
sendResponse(DisconnectMessage("@kick_w")) sendResponse(DisconnectMessage("@kick_w"))
Thread.sleep(300) context.system.scheduler.scheduleOnce(
middlewareActor ! MiddlewareActor.Teardown() delay = 300 milliseconds,
middlewareActor.toClassic,
MiddlewareActor.Teardown()
)
} }
def ImmediateDisconnect(): Unit = { def ImmediateDisconnect(): Unit = {
@ -9382,7 +9372,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
projectiles(projectileIndex) = Some(projectile.quality(initialQuality)) projectiles(projectileIndex) = Some(projectile.quality(initialQuality))
if (projectile_info.ExistsOnRemoteClients) { if (projectile_info.ExistsOnRemoteClients) {
log.trace( log.trace(
s"WeaponFireMessage: ${projectile_info.Name} is a remote projectile" s"WeaponFireMessage: ${player.Name}'s ${projectile_info.Name} is a remote projectile"
) )
continent.tasks ! (if (projectile.HasGUID) { continent.tasks ! (if (projectile.HasGUID) {
continent.AvatarEvents ! AvatarServiceMessage( continent.AvatarEvents ! AvatarServiceMessage(

32
src/main/scala/net/psforever/objects/Deployables.scala
View file

@ -2,7 +2,7 @@
package net.psforever.objects package net.psforever.objects
import akka.actor.ActorRef import akka.actor.ActorRef
import net.psforever.objects.avatar.Avatar import net.psforever.objects.avatar.{Avatar, Certification}
import scala.concurrent.duration._ import scala.concurrent.duration._
import net.psforever.objects.ce.{Deployable, DeployedItem} import net.psforever.objects.ce.{Deployable, DeployedItem}
@ -13,7 +13,7 @@ import net.psforever.services.RemoverActor
import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage}
object Deployables { object Deployables {
private val log = org.log4s.getLogger("Deployables") //private val log = org.log4s.getLogger("Deployables")
object Make { object Make {
def apply(item: DeployedItem.Value): () => PlanetSideGameObject with Deployable = cemap(item) def apply(item: DeployedItem.Value): () => PlanetSideGameObject with Deployable = cemap(item)
@ -139,4 +139,32 @@ object Deployables {
avatar.deployables.UpdateUI() avatar.deployables.UpdateUI()
} }
/**
* Compare sets of certifications to determine if
* the requested `Engineering`-like certification requirements of the one group can be found in a another group.
* @see `CertificationType`
* @param sample the certifications to be compared against
* @param test the desired certifications
* @return `true`, if the desired certification requirements are met; `false`, otherwise
*/
def constructionItemPermissionComparison(
sample: Set[Certification],
test: Set[Certification]
): Boolean = {
import Certification._
val engineeringCerts: Set[Certification] = Set(AssaultEngineering, FortificationEngineering)
val testDiff: Set[Certification] = test diff (engineeringCerts ++ Set(AdvancedEngineering))
//substitute `AssaultEngineering` and `FortificationEngineering` for `AdvancedEngineering`
val sampleIntersect = if (sample contains AdvancedEngineering) {
engineeringCerts
} else {
sample intersect engineeringCerts
}
val testIntersect = if (test contains AdvancedEngineering) {
engineeringCerts
} else {
test intersect engineeringCerts
}
(sample intersect testDiff equals testDiff) && (sampleIntersect intersect testIntersect equals testIntersect)
}
} }

2
src/main/scala/net/psforever/objects/Vehicles.scala
View file

@ -226,7 +226,7 @@ object Vehicles {
* @param unk na; used by `HackMessage` as `unk5` * @param unk na; used by `HackMessage` as `unk5`
*/ */
def FinishHackingVehicle(target: Vehicle, hacker: Player, unk: Long)(): Unit = { def FinishHackingVehicle(target: Vehicle, hacker: Player, unk: Long)(): Unit = {
log.info(s"Vehicle ${target.Definition.Name}#${target.GUID.guid} has been jacked by ${hacker.Name}") log.info(s"${hacker.Name} has jacked a ${target.Definition.Name}")
val zone = target.Zone val zone = target.Zone
// Forcefully dismount any cargo // Forcefully dismount any cargo
target.CargoHolds.values.foreach(cargoHold => { target.CargoHolds.values.foreach(cargoHold => {

2
src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala
View file

@ -24,7 +24,7 @@ class PainboxControl(painbox: Painbox) extends PoweredAmenityControl {
if (painbox.Owner.Continent.matches("c[0-9]")) { if (painbox.Owner.Continent.matches("c[0-9]")) {
//are we in a safe zone? //are we in a safe zone?
// todo: handle non-radius painboxes in caverns properly // todo: handle non-radius painboxes in caverns properly
log.info(s"Skipping initialization of ${painbox.GUID} on ${painbox.Owner.Continent} - ${painbox.Position}") log.debug(s"Skipping initialization of ${painbox.GUID} on ${painbox.Owner.Continent} - ${painbox.Position}")
disabled = true disabled = true
} else { } else {
if (painbox.Definition.HasNearestDoorDependency) { if (painbox.Definition.HasNearestDoorDependency) {

2
src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala
View file

@ -99,7 +99,7 @@ class ResourceSiloControl(resourceSilo: ResourceSilo)
// Only send updated capacitor display value to all clients if it has actually changed // Only send updated capacitor display value to all clients if it has actually changed
if (resourceSilo.CapacitorDisplay != siloDisplayBeforeChange) { if (resourceSilo.CapacitorDisplay != siloDisplayBeforeChange) {
log.trace( log.trace(
s"Silo ${resourceSilo.GUID} NTU bar level has changed from $siloDisplayBeforeChange to ${resourceSilo.CapacitorDisplay}" s"UpdateChargeLevel: silo ${resourceSilo.GUID} NTU bar level has changed from $siloDisplayBeforeChange to ${resourceSilo.CapacitorDisplay}"
) )
zone.AvatarEvents ! AvatarServiceMessage( zone.AvatarEvents ! AvatarServiceMessage(
zone.id, zone.id,

2
src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala
View file

@ -23,7 +23,7 @@ object CaptureTerminals {
def FinishHackingCaptureConsole(target: CaptureTerminal, hackingPlayer: Player, unk: Long)(): Unit = { def FinishHackingCaptureConsole(target: CaptureTerminal, hackingPlayer: Player, unk: Long)(): Unit = {
import akka.pattern.ask import akka.pattern.ask
import scala.concurrent.duration._ import scala.concurrent.duration._
log.info(s"${hackingPlayer.toString} Hacked a ${target.toString}") log.info(s"${hackingPlayer.toString} hacked a ${target.Definition.Name}")
// Wait for the target actor to set the HackedBy property // Wait for the target actor to set the HackedBy property
import scala.concurrent.ExecutionContext.Implicits.global 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))(1 second).mapTo[Boolean].onComplete {

2
src/main/scala/net/psforever/objects/serverobject/terminals/capture/CaptureTerminals.scala
View file

@ -23,7 +23,7 @@ object CaptureTerminals {
import akka.pattern.ask import akka.pattern.ask
import scala.concurrent.duration._ import scala.concurrent.duration._
log.info(s"${hackingPlayer.toString} Hacked a ${target.toString}") log.info(s"${hackingPlayer.toString} hacked a ${target.Definition.Name}")
// Wait for the target actor to set the HackedBy property // Wait for the target actor to set the HackedBy property
import scala.concurrent.ExecutionContext.Implicits.global 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))(1 second).mapTo[Boolean].onComplete {

2
src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala
View file

@ -46,7 +46,7 @@ object WeaponTurrets {
* @param upgrade the upgrade being applied to the turret (usually, it's weapon system) * @param upgrade the upgrade being applied to the turret (usually, it's weapon system)
*/ */
def FinishUpgradingMannedTurret(target: FacilityTurret, upgrade: TurretUpgrade.Value): Unit = { def FinishUpgradingMannedTurret(target: FacilityTurret, upgrade: TurretUpgrade.Value): Unit = {
log.info(s"Converting manned wall turret weapon to $upgrade") log.info(s"Manned wall turret weapon being converted to $upgrade")
val zone = target.Zone val zone = target.Zone
val events = zone.VehicleEvents val events = zone.VehicleEvents
events ! VehicleServiceMessage.TurretUpgrade(TurretUpgrader.ClearSpecific(List(target), zone)) events ! VehicleServiceMessage.TurretUpgrade(TurretUpgrader.ClearSpecific(List(target), zone))

9
src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala
View file

@ -147,7 +147,7 @@ object CargoBehavior {
) )
if (distance <= 64) { if (distance <= 64) {
//cargo vehicle is close enough to assume to be physically within the carrier's hold; mount it //cargo vehicle is close enough to assume to be physically within the carrier's hold; mount it
log.info(s"HandleCheckCargoMounting: mounting cargo vehicle in carrier at distance of $distance") log.debug(s"HandleCheckCargoMounting: mounting cargo vehicle in carrier at distance of $distance")
cargo.MountedIn = carrierGUID cargo.MountedIn = carrierGUID
hold.mount(cargo) hold.mount(cargo)
cargo.Velocity = None cargo.Velocity = None
@ -163,7 +163,7 @@ object CargoBehavior {
false false
} else if (distance > 625 || iteration >= 40) { } else if (distance > 625 || iteration >= 40) {
//vehicles moved too far away or took too long to get into proper position; abort mounting //vehicles moved too far away or took too long to get into proper position; abort mounting
log.info( log.debug(
"HandleCheckCargoMounting: cargo vehicle is too far away or didn't mount within allocated time - aborting" "HandleCheckCargoMounting: cargo vehicle is too far away or didn't mount within allocated time - aborting"
) )
val cargoDriverGUID = cargo.Seats(0).occupant.get.GUID val cargoDriverGUID = cargo.Seats(0).occupant.get.GUID
@ -261,7 +261,7 @@ object CargoBehavior {
) )
if (distance > 225) { if (distance > 225) {
//cargo vehicle has moved far enough away; close the carrier's hold door //cargo vehicle has moved far enough away; close the carrier's hold door
log.info( log.debug(
s"HandleCheckCargoDismounting: dismount of cargo vehicle from carrier complete at distance of $distance" s"HandleCheckCargoDismounting: dismount of cargo vehicle from carrier complete at distance of $distance"
) )
val cargoDriverGUID = cargo.Seats(0).occupant.get.GUID val cargoDriverGUID = cargo.Seats(0).occupant.get.GUID
@ -401,8 +401,7 @@ object CargoBehavior {
events ! VehicleServiceMessage(zoneId, VehicleAction.SendResponse(GUID0, ejectCargoMsg)) events ! VehicleServiceMessage(zoneId, VehicleAction.SendResponse(GUID0, ejectCargoMsg))
events ! VehicleServiceMessage(zoneId, VehicleAction.SendResponse(GUID0, detachCargoMsg)) events ! VehicleServiceMessage(zoneId, VehicleAction.SendResponse(GUID0, detachCargoMsg))
events ! VehicleServiceMessage(zoneId, VehicleAction.SendResponse(GUID0, resetCargoMsg)) events ! VehicleServiceMessage(zoneId, VehicleAction.SendResponse(GUID0, resetCargoMsg))
log.debug(ejectCargoMsg.toString) log.debug(s"HandleVehicleCargoDismount: eject - $ejectCargoMsg, detach - $detachCargoMsg")
log.debug(detachCargoMsg.toString)
if (driverOpt.isEmpty) { if (driverOpt.isEmpty) {
//TODO cargo should drop like a rock like normal; until then, deconstruct it //TODO cargo should drop like a rock like normal; until then, deconstruct it
cargo.Actor ! Vehicle.Deconstruct() cargo.Actor ! Vehicle.Deconstruct()

4
src/main/scala/net/psforever/services/account/AccountIntermediaryService.scala
View file

@ -25,10 +25,6 @@ class AccountIntermediaryService extends Actor {
private val IPAddressBySessionID = mutable.Map[Long, IPAddress]() private val IPAddressBySessionID = mutable.Map[Long, IPAddress]()
private[this] val log = org.log4s.getLogger private[this] val log = org.log4s.getLogger
override def preStart() = {
log.trace("Starting...")
}
def receive = { def receive = {
// Called by the LoginSessionActor // Called by the LoginSessionActor
case StoreAccountData(token, account) => case StoreAccountData(token, account) =>

1
src/main/scala/net/psforever/services/account/AccountPersistenceService.scala
View file

@ -59,7 +59,6 @@ class AccountPersistenceService extends Actor {
*/ */
override def preStart(): Unit = { override def preStart(): Unit = {
ServiceManager.serviceManager ! ServiceManager.Lookup("squad") ServiceManager.serviceManager ! ServiceManager.Lookup("squad")
log.trace("Awaiting system service hooks ...")
} }
override def postStop(): Unit = { override def postStop(): Unit = {

4
src/main/scala/net/psforever/services/avatar/AvatarService.scala
View file

@ -15,10 +15,6 @@ class AvatarService(zone: Zone) extends Actor {
private[this] val log = org.log4s.getLogger private[this] val log = org.log4s.getLogger
override def preStart() = {
log.trace(s"Awaiting ${zone.id} avatar events ...")
}
val AvatarEvents = new GenericEventBus[AvatarServiceResponse] //AvatarEventBus val AvatarEvents = new GenericEventBus[AvatarServiceResponse] //AvatarEventBus
def receive = { def receive = {

8
src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala
View file

@ -25,7 +25,7 @@ class HackCaptureActor extends Actor {
def receive: Receive = { def receive: Receive = {
case HackCaptureActor.StartCaptureTerminalHack(target, zone, unk1, unk2, startTime) => case HackCaptureActor.StartCaptureTerminalHack(target, zone, unk1, unk2, startTime) =>
log.trace(s"${target.GUID} is hacked.") log.trace(s"StartCaptureTerminalHack: ${target.GUID} is hacked.")
val duration = target.Definition match { val duration = target.Definition match {
case GlobalDefinitions.capture_terminal => case GlobalDefinitions.capture_terminal =>
@ -49,7 +49,7 @@ class HackCaptureActor extends Actor {
hackedObjects.find(_.target == target) match { hackedObjects.find(_.target == target) match {
case Some(_) => case Some(_) =>
log.trace( log.trace(
s"${target.GUID} was already hacked - removing it from the hacked objects list before re-adding it." 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.filterNot(x => x.target == target)
case _ => ; case _ => ;
@ -70,7 +70,7 @@ class HackCaptureActor extends Actor {
val finishedHacks = hackedObjects.filter(x => now - x.hack_timestamp >= x.duration.toNanos) val finishedHacks = hackedObjects.filter(x => now - x.hack_timestamp >= x.duration.toNanos)
hackedObjects = stillHacked hackedObjects = stillHacked
finishedHacks.foreach(entry => { finishedHacks.foreach(entry => {
log.trace(s"Capture terminal hack timeout reached for terminal ${entry.target.GUID}") log.trace(s"ProcessCompleteHacks: capture terminal hack timeout reached for terminal ${entry.target.GUID}")
val hackedByFaction = entry.target.HackedBy.get.hackerFaction val hackedByFaction = entry.target.HackedBy.get.hackerFaction
entry.target.Actor ! CommonMessages.ClearHack() entry.target.Actor ! CommonMessages.ClearHack()
@ -143,7 +143,7 @@ class HackCaptureActor extends Actor {
val short_timeout: FiniteDuration = 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"Still items left in hacked objects list. Checking again in ${short_timeout.toSeconds} seconds") log.trace(s"RestartTimer: still items left in hacked objects list. Checking again in ${short_timeout.toSeconds} seconds")
import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.ExecutionContext.Implicits.global
clearTrigger = context.system.scheduler.scheduleOnce(short_timeout, self, HackCaptureActor.ProcessCompleteHacks()) clearTrigger = context.system.scheduler.scheduleOnce(short_timeout, self, HackCaptureActor.ProcessCompleteHacks())
} }

4
src/main/scala/net/psforever/services/local/support/HackClearActor.scala
View file

@ -84,11 +84,11 @@ class HackClearActor() extends Actor {
val short_timeout: FiniteDuration = math.max(1, hackEntry.duration - (now - hackEntry.time)) nanoseconds val short_timeout: FiniteDuration = math.max(1, hackEntry.duration - (now - hackEntry.time)) nanoseconds
log.debug( log.debug(
s"HackClearActor: Still items left in hacked objects list. Checking again in ${short_timeout.toSeconds} seconds" s"HackClearActor: still items left in hacked objects list. Checking again in ${short_timeout.toSeconds} seconds"
) )
import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.ExecutionContext.Implicits.global
clearTrigger = context.system.scheduler.scheduleOnce(short_timeout, self, HackClearActor.TryClearHacks()) clearTrigger = context.system.scheduler.scheduleOnce(short_timeout, self, HackClearActor.TryClearHacks())
case None => log.debug("HackClearActor: No objects left in hacked objects list. Not rescheduling check.") case None => log.debug("HackClearActor: no objects left in hacked objects list. Not rescheduling check.")
} }
} }

6
src/main/scala/net/psforever/services/properties/PropertyOverrideManager.scala
View file

@ -31,16 +31,16 @@ class PropertyOverrideManager extends Actor {
} }
private def LoadOverridesFromFile(zoneId: Int): Unit = { private def LoadOverridesFromFile(zoneId: Int): Unit = {
val zoneOverrides = LoadFile(s"overrides/game_objects${zoneId}.adb.lst") val zoneOverrides = LoadFile(s"overrides/game_objects$zoneId.adb.lst")
if (zoneOverrides == null) { if (zoneOverrides == null) {
log.debug(s"No overrides found for zone ${zoneId} using filename game_objects${zoneId}.adb.lst") log.debug(s"PropertyOverride: no overrides found for zone $zoneId using filename game_objects$zoneId.adb.lst")
return return
} }
val grouped = zoneOverrides.groupBy(_._1).view.mapValues(_.map(x => (x._2, x._3)).toList).toMap val grouped = zoneOverrides.groupBy(_._1).view.mapValues(_.map(x => (x._2, x._3)).toList).toMap
log.debug(s"Loaded property overrides for zone $zoneId: ${grouped.toString}") log.debug(s"PropertyOverride: loaded property overrides for zone $zoneId: ${grouped.toString}")
overrides += (zoneId -> grouped) overrides += (zoneId -> grouped)
} }

4
src/test/scala/objects/EnvironmentTest.scala
View file

@ -207,13 +207,13 @@ class EnvironmentAttributeTest extends Specification {
"GantryDenialField" should { "GantryDenialField" should {
"interact with players" in { "interact with players" in {
val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute))
obj.Spawn() obj.Spawn()
EnvironmentAttribute.GantryDenialField.canInteractWith(obj) mustEqual true EnvironmentAttribute.GantryDenialField.canInteractWith(obj) mustEqual true
} }
"not interact with dead players" in { "not interact with dead players" in {
val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute)) val obj = Player(Avatar(0, "test", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute))
obj.isAlive mustEqual false obj.isAlive mustEqual false
EnvironmentAttribute.GantryDenialField.canInteractWith(obj) mustEqual false EnvironmentAttribute.GantryDenialField.canInteractWith(obj) mustEqual false
} }

8
src/test/scala/objects/OrbitalShuttleTest.scala
View file

@ -5,13 +5,13 @@ import net.psforever.objects.{GlobalDefinitions, Player, Vehicle}
import net.psforever.objects.avatar.Avatar import net.psforever.objects.avatar.Avatar
import net.psforever.objects.serverobject.shuttle.OrbitalShuttle import net.psforever.objects.serverobject.shuttle.OrbitalShuttle
import net.psforever.objects.vehicles.AccessPermissionGroup import net.psforever.objects.vehicles.AccessPermissionGroup
import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire} import net.psforever.types.{CharacterSex, CharacterVoice, PlanetSideEmpire}
import org.specs2.mutable.Specification import org.specs2.mutable.Specification
class OrbitalShuttleTest extends Specification { class OrbitalShuttleTest extends Specification {
val testAvatar1 = Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute) val testAvatar1 = Avatar(0, "TestCharacter1", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)
val testAvatar2 = Avatar(1, "TestCharacter2", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute) val testAvatar2 = Avatar(1, "TestCharacter2", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)
val testAvatar3 = Avatar(2, "TestCharacter3", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute) val testAvatar3 = Avatar(2, "TestCharacter3", PlanetSideEmpire.TR, CharacterSex.Male, 0, CharacterVoice.Mute)
"OrbitalShuttle" should { "OrbitalShuttle" should {
"construct (proper definition)" in { "construct (proper definition)" in {