Repeating the Obvious

src/main/scala/net/psforever/actors/session/normal/AvatarHandlerLogic.scala

@@ -3,6 +3,7 @@ package net.psforever.actors.session.normal
 
 import akka.actor.{ActorContext, typed}
 import net.psforever.actors.session.support.AvatarHandlerFunctions
+import net.psforever.objects.serverobject.containable.ContainableBehavior
 import net.psforever.packet.game.{AvatarImplantMessage, CreateShortcutMessage, ImplantAction}
 import net.psforever.types.ImplantType
 
@@ -295,6 +296,17 @@ class AvatarHandlerLogic(val ops: SessionAvatarHandlers, implicit val context: A
           case (_, dguid) => sendResponse(ObjectDeleteMessage(dguid, unk1=0))
         }
         //functionally delete
+        if (delete.size > 1 || delete.nonEmpty && !delete.exists {
+          case (e: Tool, _) => GlobalDefinitions.isMaxArms(e.Definition)
+          case _ => false
+        }) {
+          /*
+          if going x -> max, you will have enough space in max inventory for any displaced holster equipment
+          for max -> max, don't care about the max weapon arm being deleted (allow for 1)
+          for any other x -> x, any deleted equipment will raise this comment
+           */
+          sendResponse(ChatMsg(ChatMessageType.UNK_227, "@ItemsDeconstructed"))
+        }
         delete.foreach { case (obj, _) => TaskWorkflow.execute(GUIDTask.unregisterEquipment(continent.GUID, obj)) }
         //redraw
         if (maxhand) {
@@ -330,13 +342,17 @@ class AvatarHandlerLogic(val ops: SessionAvatarHandlers, implicit val context: A
         }
         DropLeftovers(player)(drop)
 
-      case AvatarResponse.ChangeExosuit(target, armor, exosuit, subtype, slot, _, oldHolsters, holsters, _, _, _, delete) =>
+      case AvatarResponse.ChangeExosuit(target, armor, exosuit, subtype, slot, _, oldHolsters, holsters, _, _, drop, delete) =>
         sendResponse(ArmorChangedMessage(target, exosuit, subtype))
         sendResponse(PlanetsideAttributeMessage(target, attribute_type=4, armor))
         //happening to some other player
         sendResponse(ObjectHeldMessage(target, slot, unk1 = false))
         //cleanup
-        (oldHolsters ++ delete).foreach { case (_, guid) => sendResponse(ObjectDeleteMessage(guid, unk1=0)) }
+        val dropPred = ContainableBehavior.DropPredicate(player)
+        val deleteFromDrop = drop.filterNot(dropPred)
+        (oldHolsters ++ delete ++ deleteFromDrop.map(f =>(f.obj, f.GUID)))
+          .distinctBy(_._2)
+          .foreach { case (_, guid) => sendResponse(ObjectDeleteMessage(guid, unk1=0)) }
         //draw holsters
         holsters.foreach {
           case InventoryItem(obj, index) =>

src/main/scala/net/psforever/actors/session/normal/ChatLogic.scala

@@ -145,8 +145,11 @@ class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) ext
       case (CMT_KICK, _, contents) if gmCommandAllowed =>
         ops.commandKick(session, message, contents)
 
+      case (CMT_REPORTUSER, _, contents) =>
+        ops.commandReportUser(session, message, contents)
+
       case _ =>
-        log.warn(s"Unhandled chat message $message")
+        sendResponse(ChatMsg(ChatMessageType.UNK_227, "@no_permission"))
     }
   }
 

src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala

@@ -162,6 +162,11 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex
         }
       case None => ()
     }
+    //llu destruction check
+    if (player.Carrying.contains(SpecialCarry.CaptureFlag)) {
+      CaptureFlagManager.ReasonToLoseFlagViolently(continent, sessionLogic.general.specialItemSlotGuid, player)
+    }
+    //
     val eagleEye: Boolean = ops.canSeeReallyFar
     val isNotVisible: Boolean = sessionLogic.zoning.zoningStatus == Zoning.Status.Deconstructing ||
       (player.isAlive && sessionLogic.zoning.spawn.deadState == DeadState.RespawnTime)

src/main/scala/net/psforever/actors/session/normal/MountHandlerLogic.scala

@@ -11,6 +11,7 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity
 import net.psforever.objects.serverobject.environment.interaction.ResetAllEnvironmentInteractions
 import net.psforever.objects.serverobject.hackable.GenericHackables
 import net.psforever.objects.serverobject.mount.Mountable
+import net.psforever.objects.serverobject.structures.WarpGate
 import net.psforever.objects.serverobject.terminals.implant.ImplantTerminalMech
 import net.psforever.objects.serverobject.turret.{FacilityTurret, WeaponTurret}
 import net.psforever.objects.vehicles.{AccessPermissionGroup, CargoBehavior}
@@ -19,7 +20,7 @@ import net.psforever.packet.game.{ChatMsg, DelayedPathMountMsg, DismountVehicleC
 import net.psforever.services.Service
 import net.psforever.services.local.{LocalAction, LocalServiceMessage}
 import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage}
-import net.psforever.types.{BailType, ChatMessageType, PlanetSideGUID, Vector3}
+import net.psforever.types.{BailType, ChatMessageType, DriveState, PlanetSideGUID, Vector3}
 
 import scala.concurrent.duration._
 
@@ -71,18 +72,6 @@ class MountHandlerLogic(val ops: SessionMountHandlers, implicit val context: Act
               obj.Actor ! Mountable.TryDismount(player, seat_num, bailType)
               //short-circuit the temporary channel for transferring between zones, the player is no longer doing that
               sessionLogic.zoning.interstellarFerry = None
-              // Deconstruct the vehicle if the driver has bailed out and the vehicle is capable of flight
-              //todo: implement auto landing procedure if the pilot bails but passengers are still present instead of deconstructing the vehicle
-              //todo: continue flight path until aircraft crashes if no passengers present (or no passenger seats), then deconstruct.
-              //todo: kick cargo passengers out. To be added after PR #216 is merged
-              obj match {
-                case v: Vehicle
-                  if bailType == BailType.Bailed &&
-                    v.SeatPermissionGroup(seat_num).contains(AccessPermissionGroup.Driver) &&
-                    v.isFlying =>
-                  v.Actor ! Vehicle.Deconstruct(None) //immediate deconstruction
-                case _ => ()
-              }
 
             case None =>
               dError(s"DismountVehicleMsg: can not find where player ${player.Name}_guid is seated in mountable ${player.VehicleSeated}", player)
@@ -368,18 +357,19 @@ class MountHandlerLogic(val ops: SessionMountHandlers, implicit val context: Act
         DismountAction(tplayer, obj, seatNum)
         obj.Actor ! Vehicle.Deconstruct()
 
+      case Mountable.CanDismount(obj: Vehicle, seatNum, _)
+        if tplayer.GUID == player.GUID &&
+          obj.isFlying &&
+          obj.SeatPermissionGroup(seatNum).contains(AccessPermissionGroup.Driver) =>
+        // Deconstruct the vehicle if the driver has bailed out and the vehicle is capable of flight
+        //todo: implement auto landing procedure if the pilot bails but passengers are still present instead of deconstructing the vehicle
+        //todo: continue flight path until aircraft crashes if no passengers present (or no passenger seats), then deconstruct.
+        //todo: kick cargo passengers out. To be added after PR #216 is merged
+        DismountVehicleAction(tplayer, obj, seatNum)
+        obj.Actor ! Vehicle.Deconstruct(None) //immediate deconstruction
+
       case Mountable.CanDismount(obj: Vehicle, seatNum, _)
         if tplayer.GUID == player.GUID =>
-        //disembarking self
-        log.info(s"${player.Name} dismounts the ${obj.Definition.Name}'s ${
-          obj.SeatPermissionGroup(seatNum) match {
-            case Some(AccessPermissionGroup.Driver) => "driver seat"
-            case Some(seatType) => s"$seatType seat (#$seatNum)"
-            case None => "seat"
-          }
-        }")
-        sessionLogic.vehicles.ConditionalDriverVehicleControl(obj)
-        sessionLogic.general.unaccessContainer(obj)
         DismountVehicleAction(tplayer, obj, seatNum)
 
       case Mountable.CanDismount(obj: Vehicle, seat_num, _) =>
@@ -388,7 +378,7 @@ class MountHandlerLogic(val ops: SessionMountHandlers, implicit val context: Act
           VehicleAction.KickPassenger(tplayer.GUID, seat_num, unk2=true, obj.GUID)
         )
 
-      case Mountable.CanDismount(obj: PlanetSideGameObject with PlanetSideGameObject with Mountable with FactionAffinity with InGameHistory, seatNum, _) =>
+      case Mountable.CanDismount(obj: PlanetSideGameObject with Mountable with FactionAffinity with InGameHistory, seatNum, _) =>
         log.info(s"${tplayer.Name} dismounts a ${obj.Definition.asInstanceOf[ObjectDefinition].Name}")
         DismountAction(tplayer, obj, seatNum)
 
@@ -407,7 +397,38 @@ class MountHandlerLogic(val ops: SessionMountHandlers, implicit val context: Act
       case Mountable.CanNotMount(obj: Mountable, seatNumber) =>
         log.warn(s"MountVehicleMsg: ${tplayer.Name} attempted to mount $obj's seat $seatNumber, but was not allowed")
 
-      case Mountable.CanNotDismount(obj, seatNum) =>
+      case Mountable.CanNotDismount(obj: Vehicle, _, BailType.Normal)
+        if obj.DeploymentState == DriveState.AutoPilot =>
+        sendResponse(ChatMsg(ChatMessageType.UNK_224, "@SA_CannotDismountAtThisTime"))
+
+      case Mountable.CanNotDismount(obj: Vehicle, _, BailType.Bailed)
+        if obj.Definition == GlobalDefinitions.droppod =>
+        sendResponse(ChatMsg(ChatMessageType.UNK_224, "@CannotBailFromDroppod"))
+
+      case Mountable.CanNotDismount(obj: Vehicle, _, BailType.Bailed)
+        if obj.DeploymentState == DriveState.AutoPilot =>
+        sendResponse(ChatMsg(ChatMessageType.UNK_224, "@SA_CannotBailAtThisTime"))
+
+      case Mountable.CanNotDismount(obj: Vehicle, _, BailType.Bailed)
+        if {
+          continent
+            .blockMap
+            .sector(obj)
+            .buildingList
+            .exists {
+              case wg: WarpGate =>
+                Vector3.DistanceSquared(obj.Position, wg.Position) < math.pow(wg.Definition.SOIRadius, 2)
+              case _ =>
+                false
+            }
+        } =>
+        sendResponse(ChatMsg(ChatMessageType.UNK_227, "@Vehicle_CannotBailInWarpgateEnvelope"))
+
+      case Mountable.CanNotDismount(obj: Vehicle, _, _)
+        if obj.isMoving(test = 1f) =>
+        sendResponse(ChatMsg(ChatMessageType.UNK_224, "@TooFastToDismount"))
+
+      case Mountable.CanNotDismount(obj, seatNum, _) =>
         log.warn(s"DismountVehicleMsg: ${tplayer.Name} attempted to dismount $obj's mount $seatNum, but was not allowed")
     }
   }
@@ -465,7 +486,17 @@ class MountHandlerLogic(val ops: SessionMountHandlers, implicit val context: Act
    * @param obj the mountable object
    * @param seatNum the mount out of which which the player is disembarking
    */
-  private def DismountVehicleAction(tplayer: Player, obj: PlanetSideGameObject with FactionAffinity with InGameHistory, seatNum: Int): Unit = {
+  private def DismountVehicleAction(tplayer: Player, obj: Vehicle, seatNum: Int): Unit = {
+    //disembarking self
+    log.info(s"${player.Name} dismounts the ${obj.Definition.Name}'s ${
+      obj.SeatPermissionGroup(seatNum) match {
+        case Some(AccessPermissionGroup.Driver) => "driver seat"
+        case Some(seatType) => s"$seatType seat (#$seatNum)"
+        case None => "seat"
+      }
+    }")
+    sessionLogic.vehicles.ConditionalDriverVehicleControl(obj)
+    sessionLogic.general.unaccessContainer(obj)
     DismountAction(tplayer, obj, seatNum)
     //until vehicles maintain synchronized momentum without a driver
     obj match {

src/main/scala/net/psforever/actors/session/normal/VehicleHandlerLogic.scala

@@ -4,6 +4,7 @@ package net.psforever.actors.session.normal
 import akka.actor.{ActorContext, ActorRef, typed}
 import net.psforever.actors.session.AvatarActor
 import net.psforever.actors.session.support.{SessionData, SessionVehicleHandlers, VehicleHandlerFunctions}
+import net.psforever.objects.avatar.SpecialCarry
 import net.psforever.objects.{GlobalDefinitions, Player, Tool, Vehicle, Vehicles}
 import net.psforever.objects.equipment.{Equipment, JammableMountedWeapons, JammableUnit}
 import net.psforever.objects.guid.{GUIDTask, TaskWorkflow}
@@ -12,6 +13,7 @@ import net.psforever.objects.serverobject.pad.VehicleSpawnPad
 import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent
 import net.psforever.packet.game.{ChangeAmmoMessage, ChangeFireStateMessage_Start, ChangeFireStateMessage_Stop, ChatMsg, ChildObjectStateMessage, DeadState, DeployRequestMessage, DismountVehicleMsg, FrameVehicleStateMessage, GenericObjectActionMessage, HitHint, InventoryStateMessage, ObjectAttachMessage, ObjectCreateDetailedMessage, ObjectCreateMessage, ObjectDeleteMessage, ObjectDetachMessage, PlanetsideAttributeMessage, ReloadMessage, ServerVehicleOverrideMsg, VehicleStateMessage, WeaponDryFireMessage}
 import net.psforever.services.Service
+import net.psforever.services.local.support.CaptureFlagManager
 import net.psforever.services.vehicle.{VehicleResponse, VehicleServiceResponse}
 import net.psforever.types.{BailType, ChatMessageType, PlanetSideGUID, Vector3}
 
@@ -62,6 +64,14 @@ class VehicleHandlerLogic(val ops: SessionVehicleHandlers, implicit val context:
         player.Orientation = orient
         player.Velocity = vel
         sessionLogic.updateLocalBlockMap(pos)
+        //llu destruction check
+        if (player.Carrying.contains(SpecialCarry.CaptureFlag)) {
+          continent
+            .GUID(player.VehicleSeated)
+            .collect { case vehicle: Vehicle =>
+              CaptureFlagManager.ReasonToLoseFlagViolently(continent, sessionLogic.general.specialItemSlotGuid, vehicle)
+            }
+        }
 
       case VehicleResponse.VehicleState(
       vehicleGuid,
@@ -199,6 +209,9 @@ class VehicleHandlerLogic(val ops: SessionVehicleHandlers, implicit val context:
         avatarActor ! AvatarActor.SetVehicle(Some(vehicleGuid))
         sendResponse(PlanetsideAttributeMessage(resolvedPlayerGuid, attribute_type=21, vehicleGuid))
 
+      case VehicleResponse.LoseOwnership(_, vehicleGuid) =>
+        ops.announceAmsDecay(vehicleGuid,msg = "@ams_decaystarted")
+
       case VehicleResponse.PlanetsideAttribute(vehicleGuid, attributeType, attributeValue) if isNotSameTarget =>
         sendResponse(PlanetsideAttributeMessage(vehicleGuid, attributeType, attributeValue))
 
@@ -217,6 +230,16 @@ class VehicleHandlerLogic(val ops: SessionVehicleHandlers, implicit val context:
 
       case VehicleResponse.UnloadVehicle(_, vehicleGuid) =>
         sendResponse(ObjectDeleteMessage(vehicleGuid, unk1=0))
+        if (sessionLogic.zoning.spawn.prevSpawnPoint.map(_.Owner).exists {
+          case ams: Vehicle =>
+            ams.GUID == vehicleGuid &&
+              ams.OwnerGuid.isEmpty
+          case _ =>
+            false
+        }) {
+          sessionLogic.zoning.spawn.prevSpawnPoint = None
+          sendResponse(ChatMsg(ChatMessageType.UNK_229, "@ams_decayed"))
+        }
 
       case VehicleResponse.UnstowEquipment(itemGuid) if isNotSameTarget =>
         //TODO prefer ObjectDetachMessage, but how to force ammo pools to update properly?
@@ -308,13 +331,13 @@ class VehicleHandlerLogic(val ops: SessionVehicleHandlers, implicit val context:
         sessionLogic.vehicles.ServerVehicleOverrideStop(vehicle)
 
       case VehicleResponse.PeriodicReminder(VehicleSpawnPad.Reminders.Blocked, data) =>
-        sendResponse(ChatMsg(
-          ChatMessageType.CMT_OPEN,
-          wideContents=true,
-          recipient="",
-          s"The vehicle spawn where you placed your order is blocked. ${data.getOrElse("")}",
-          note=None
-        ))
+        val str = s"${data.getOrElse("The vehicle spawn pad where you placed your order is blocked.")}"
+        val msg = if (str.contains("@")) {
+          ChatMsg(ChatMessageType.UNK_229, str)
+        } else {
+          ChatMsg(ChatMessageType.CMT_OPEN, wideContents = true, recipient = "", str, note = None)
+        }
+        sendResponse(msg)
 
       case VehicleResponse.PeriodicReminder(_, data) =>
         val (isType, flag, msg): (ChatMessageType, Boolean, String) = data match {

src/main/scala/net/psforever/actors/session/normal/VehicleLogic.scala

@@ -10,9 +10,9 @@ import net.psforever.objects.serverobject.deploy.Deployment
 import net.psforever.objects.serverobject.mount.Mountable
 import net.psforever.objects.vehicles.control.BfrFlight
 import net.psforever.objects.zones.Zone
-import net.psforever.packet.game.{ChildObjectStateMessage, DeployRequestMessage, FrameVehicleStateMessage, VehicleStateMessage, VehicleSubStateMessage}
+import net.psforever.packet.game.{ChatMsg, ChildObjectStateMessage, DeployRequestMessage, FrameVehicleStateMessage, VehicleStateMessage, VehicleSubStateMessage}
 import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage}
-import net.psforever.types.{DriveState, Vector3}
+import net.psforever.types.{ChatMessageType, DriveState, Vector3}
 
 object VehicleLogic {
   def apply(ops: VehicleOperations): VehicleLogic = {
@@ -70,6 +70,7 @@ class VehicleLogic(val ops: VehicleOperations, implicit val context: ActorContex
           obj.Velocity = None
           obj.Flying = None
         }
+        //
         continent.VehicleEvents ! VehicleServiceMessage(
           continent.id,
           VehicleAction.VehicleState(
@@ -303,6 +304,7 @@ class VehicleLogic(val ops: VehicleOperations, implicit val context: ActorContex
       log.trace(s"DeployRequest: $obj transitioning to deploy state")
     } else if (state == DriveState.Deployed) {
       log.trace(s"DeployRequest: $obj has been Deployed")
+      sendResponse(ChatMsg(ChatMessageType.UNK_227, "@DeployingMessage"))
     } else {
       CanNotChangeDeployment(obj, state, "incorrect deploy state")
     }
@@ -313,6 +315,7 @@ class VehicleLogic(val ops: VehicleOperations, implicit val context: ActorContex
       log.trace(s"DeployRequest: $obj transitioning to undeploy state")
     } else if (state == DriveState.Mobile) {
       log.trace(s"DeployRequest: $obj is Mobile")
+      sendResponse(ChatMsg(ChatMessageType.UNK_227, "@UndeployingMessage"))
     } else {
       CanNotChangeDeployment(obj, state, "incorrect undeploy state")
     }

src/main/scala/net/psforever/actors/session/spectator/ChatLogic.scala

@@ -85,7 +85,11 @@ class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) ext
       case (CMT_WARP, _, contents) =>
         ops.commandWarp(session, message, contents)
 
-      case _ => ()
+      case (CMT_REPORTUSER, _, contents) =>
+        ops.commandReportUser(session, message, contents)
+
+      case _ =>
+        sendResponse(ChatMsg(ChatMessageType.UNK_227, "@no_permission"))
     }
   }
 

src/main/scala/net/psforever/actors/session/spectator/MountHandlerLogic.scala

@@ -203,9 +203,9 @@ class MountHandlerLogic(val ops: SessionMountHandlers, implicit val context: Act
       case Mountable.CanDismount(obj: PlanetSideGameObject with PlanetSideGameObject with Mountable with FactionAffinity with InGameHistory, seatNum, _) =>
         DismountAction(tplayer, obj, seatNum)
 
-      case Mountable.CanDismount(obj: Mountable, _, _) => ()
+      case Mountable.CanDismount(_: Mountable, _, _) => ()
 
-      case Mountable.CanNotDismount(obj: Vehicle, seatNum) =>
+      case Mountable.CanNotDismount(obj: Vehicle, _, _) =>
         obj.Actor ! Vehicle.Deconstruct()
 
       case _ => ()

src/main/scala/net/psforever/actors/session/spectator/VehicleLogic.scala

@@ -279,11 +279,7 @@ class VehicleLogic(val ops: VehicleOperations, implicit val context: ActorContex
 
   def handleCanDeploy(obj: Deployment.DeploymentObject, state: DriveState.Value): Unit = { /* intentionally blank */ }
 
-  def handleCanUndeploy(obj: Deployment.DeploymentObject, state: DriveState.Value): Unit = {
-    if (state != DriveState.Undeploying && state != DriveState.Mobile) {
-      CanNotChangeDeployment(obj, state, "incorrect undeploy state")
-    }
-  }
+  def handleCanUndeploy(obj: Deployment.DeploymentObject, state: DriveState.Value): Unit = { /* intentionally blank */ }
 
   def handleCanNotChangeDeployment(obj: Deployment.DeploymentObject, state: DriveState.Value, reason: String): Unit = {
     if (Deployment.CheckForDeployState(state) && !Deployment.AngleCheck(obj)) {