packets RespawnAMSInfoMessage and SquadWaypointEvent, the latter with tests; system of keeping track of deployed AMS vehicles and displaying their data to interested users added through the VehicleService path

pslogin/src/main/scala/WorldSessionActor.scala

@@ -76,6 +76,8 @@ class WorldSessionActor extends Actor with MDCContextAware {
   var deadState : DeadState.Value = DeadState.Dead
   var whenUsedLastKit : Long = 0
 
+  var amsSpawnPoint : Option[SpawnTube] = None
+
   var clientKeepAlive : Cancellable = DefaultCancellable.obj
   var progressBarUpdate : Cancellable = DefaultCancellable.obj
   var reviveTimer : Cancellable = DefaultCancellable.obj
@@ -546,6 +548,27 @@ class WorldSessionActor extends Actor with MDCContextAware {
             }
           }
 
+        case VehicleResponse.UpdateAmsSpawnPoint(list) =>
+          //if(player.isBackpack) {
+            //dismiss old ams spawn point
+            ClearCurrentAmsSpawnPoint()
+            //draw new ams spawn point
+            list
+              .filter(tube => tube.Faction == player.Faction)
+              .sortBy(tube => Vector3.DistanceSquared(tube.Position, player.Position))
+              .headOption match {
+              case Some(tube) =>
+                sendResponse(
+                  DeployableObjectsInfoMessage(
+                    DeploymentAction.Build,
+                    DeployableInfo(tube.GUID, DeployableIcon.AegisShieldGenerator, tube.Position, player.GUID)
+                  )
+                )
+                amsSpawnPoint = Some(tube)
+              case None => ;
+            }
+          //}
+
         case _ => ;
       }
 
@@ -1251,6 +1274,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
       log.info(s"Zone.Lattice.SpawnPoint: spawn point on $zone_id in ${building.Id} @ ${spawn_tube.GUID.guid} selected")
       respawnTimer.cancel
       reviveTimer.cancel
+      ClearCurrentAmsSpawnPoint()
       val sameZone = zone_id == continent.Id
       val backpack = player.isBackpack
       val respawnTime : Long = if(sameZone) { 10 } else { 0 } //s
@@ -1730,6 +1754,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
       deadState = DeadState.Release
       sendResponse(AvatarDeadStateMessage(DeadState.Release, 0, 0, player.Position, player.Faction, true))
       continent.Population ! Zone.Population.Release(avatar)
+      vehicleService ! VehicleServiceMessage(continent.Id, VehicleAction.UpdateAmsSpawnPoint(continent))
       player.VehicleSeated match {
         case None =>
           FriskCorpse(player)
@@ -3989,7 +4014,18 @@ class WorldSessionActor extends Actor with MDCContextAware {
     obj match {
       case vehicle : Vehicle =>
         ReloadVehicleAccessPermissions(vehicle) //TODO we should not have to do this imho
-        sendResponse(PlanetsideAttributeMessage(obj.GUID, 81, 1))
+        //
+        if(obj.Definition == GlobalDefinitions.ams) {
+          obj.DeploymentState match {
+            case DriveState.Deployed =>
+              vehicleService ! VehicleServiceMessage.AMSDeploymentChange(continent)
+              sendResponse(PlanetsideAttributeMessage(obj.GUID, 81, 1))
+            case DriveState.Undeploying =>
+              vehicleService ! VehicleServiceMessage.AMSDeploymentChange(continent)
+              sendResponse(PlanetsideAttributeMessage(obj.GUID, 81, 0))
+            case _ => ;
+          }
+        }
       case _ => ;
     }
   }
@@ -4013,6 +4049,20 @@ class WorldSessionActor extends Actor with MDCContextAware {
     log.error(s"DeployRequest: $obj can not transition to $state - $reason$mobileShift")
   }
 
+  def ClearCurrentAmsSpawnPoint() : Unit = {
+    amsSpawnPoint match {
+      case Some(tube) =>
+        sendResponse(
+          DeployableObjectsInfoMessage(
+            DeploymentAction.Dismiss,
+            DeployableInfo(tube.GUID, DeployableIcon.AegisShieldGenerator, tube.Position, player.GUID)
+          )
+        )
+        amsSpawnPoint = None
+      case None => ;
+    }
+  }
+
   /**
     * For a given continental structure, determine the method of generating server-join client configuration packets.
     * @param continentNumber the zone id

pslogin/src/main/scala/services/vehicle/VehicleAction.scala

@@ -25,4 +25,6 @@ object VehicleAction {
   final case class UnloadVehicle(player_guid : PlanetSideGUID, continent : Zone, vehicle : Vehicle) extends Action
   final case class UnstowEquipment(player_guid : PlanetSideGUID, item_guid : PlanetSideGUID) extends Action
   final case class VehicleState(player_guid : PlanetSideGUID, vehicle_guid : PlanetSideGUID, unk1 : Int, pos : Vector3, ang : Vector3, vel : Option[Vector3], unk2 : Option[Int], unk3 : Int, unk4 : Int, wheel_direction : Int, unk5 : Boolean, unk6 : Boolean) extends Action
+
+  final case class UpdateAmsSpawnPoint(zone : Zone) extends Action
 }

pslogin/src/main/scala/services/vehicle/VehicleResponse.scala

@@ -1,6 +1,7 @@
 // Copyright (c) 2017 PSForever
 package services.vehicle
 
+import net.psforever.objects.serverobject.tube.SpawnTube
 import net.psforever.objects.{PlanetSideGameObject, Vehicle}
 import net.psforever.packet.game.PlanetSideGUID
 import net.psforever.packet.game.objectcreate.ConstructorData
@@ -28,4 +29,6 @@ object VehicleResponse {
   final case class UnloadVehicle(vehicle_guid : PlanetSideGUID) extends Response
   final case class UnstowEquipment(item_guid : PlanetSideGUID) extends Response
   final case class VehicleState(vehicle_guid : PlanetSideGUID, unk1 : Int, pos : Vector3, ang : Vector3, vel : Option[Vector3], unk2 : Option[Int], unk3 : Int, unk4 : Int, wheel_direction : Int, unk5 : Boolean, unk6 : Boolean) extends Response
+
+  final case class UpdateAmsSpawnPoint(list : List[SpawnTube]) extends Response
 }

pslogin/src/main/scala/services/vehicle/VehicleService.scala

@@ -5,6 +5,8 @@ import akka.actor.{Actor, ActorRef, Props}
 import net.psforever.objects.serverobject.pad.VehicleSpawnPad
 import net.psforever.objects.zones.Zone
 import services.vehicle.support.{DeconstructionActor, DelayedDeconstructionActor}
+import net.psforever.types.DriveState
+
 import services.{GenericEventBus, Service}
 
 class VehicleService extends Actor {
@@ -93,6 +95,10 @@ class VehicleService extends Actor {
           VehicleEvents.publish(
             VehicleServiceResponse(s"/$forChannel/Vehicle", player_guid, VehicleResponse.VehicleState(vehicle_guid, unk1, pos, ang, vel, unk2, unk3, unk4, wheel_direction, unk5, unk6))
           )
+
+        //unlike other messages, just return to sender, don't publish
+        case VehicleAction.UpdateAmsSpawnPoint(zone : Zone) =>
+          sender ! VehicleServiceResponse(s"/$forChannel/Vehicle", Service.defaultPlayerGUID, VehicleResponse.UpdateAmsSpawnPoint(AmsSpawnPoints(zone)))
         case _ => ;
     }
 
@@ -113,7 +119,7 @@ class VehicleService extends Actor {
       VehicleEvents.publish(
         VehicleServiceResponse(s"/$zone_id/Vehicle", Service.defaultPlayerGUID, VehicleResponse.UnloadVehicle(vehicle_guid))
       )
-
+      
     //from VehicleSpawnControl
     case VehicleSpawnPad.ConcealPlayer(player_guid, zone_id) =>
       VehicleEvents.publish(
@@ -161,7 +167,23 @@ class VehicleService extends Actor {
       vehicleDelayedDecon ! DelayedDeconstructionActor.UnscheduleDeconstruction(vehicle.GUID)
       vehicleDecon ! DeconstructionActor.RequestDeleteVehicle(vehicle, zone)
 
+    //correspondence from WorldSessionActor
+    case VehicleServiceMessage.AMSDeploymentChange(zone) =>
+      VehicleEvents.publish(
+        VehicleServiceResponse(s"/${zone.Id}/Vehicle", Service.defaultPlayerGUID, VehicleResponse.UpdateAmsSpawnPoint(AmsSpawnPoints(zone)))
+      )
+
     case msg =>
       log.info(s"Unhandled message $msg from $sender")
   }
+
+  import net.psforever.objects.serverobject.tube.SpawnTube
+  def AmsSpawnPoints(zone : Zone) : List[SpawnTube] = {
+    import net.psforever.objects.vehicles.UtilityType
+    import net.psforever.objects.GlobalDefinitions
+    zone.Vehicles
+      .filter(veh => veh.Definition == GlobalDefinitions.ams && veh.DeploymentState == DriveState.Deployed)
+      .flatMap(veh => veh.Utilities.values.filter(util => util.UtilType == UtilityType.ams_respawn_tube) )
+      .map(util => util().asInstanceOf[SpawnTube])
+  }
 }

pslogin/src/main/scala/services/vehicle/VehicleServiceMessage.scala

@@ -13,4 +13,6 @@ object VehicleServiceMessage {
   final case class RevokeActorControl(vehicle : Vehicle)
   final case class RequestDeleteVehicle(vehicle : Vehicle, continent : Zone)
   final case class UnscheduleDeconstruction(vehicle_guid : PlanetSideGUID)
+
+  final case class AMSDeploymentChange(zone : Zone)
 }