PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Driverless Vehicles (#814)

Browse source 
* zone load accommodation for vehicles without 'drivers' expressed in the OCM packet

* assurance
This commit is contained in:
Fate-JH 2021-05-10 23:48:50 -04:00 • committed by GitHub
parent e70dd2e2e1
commit 928e7fdf9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1900,6 +1900,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
continent.GUID(mount) match { continent.GUID(mount) match {
case Some(obj: Vehicle) => case Some(obj: Vehicle) =>
ConditionalDriverVehicleControl(obj) ConditionalDriverVehicleControl(obj)
serverVehicleControlVelocity = None
UnaccessContainer(obj) UnaccessContainer(obj)
case _ => ; case _ => ;
} }
@ -2806,7 +2807,6 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
val tplayer_guid = if (player.HasGUID) player.GUID else PlanetSideGUID(0) val tplayer_guid = if (player.HasGUID) player.GUID else PlanetSideGUID(0)
reply match { reply match {
case VehicleResponse.AttachToRails(vehicle_guid, pad_guid) => case VehicleResponse.AttachToRails(vehicle_guid, pad_guid) =>
serverVehicleControlVelocity = Some(0)
sendResponse(ObjectAttachMessage(pad_guid, vehicle_guid, 3)) sendResponse(ObjectAttachMessage(pad_guid, vehicle_guid, 3))
case VehicleResponse.ChildObjectState(object_guid, pitch, yaw) => case VehicleResponse.ChildObjectState(object_guid, pitch, yaw) =>
@ -3675,10 +3675,18 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
sendResponse( sendResponse(
ObjectCreateMessage(vdefinition.ObjectId, vguid, vdefinition.Packet.ConstructorData(vehicle).get) ObjectCreateMessage(vdefinition.ObjectId, vguid, vdefinition.Packet.ConstructorData(vehicle).get)
) )
//occupants other than driver //occupants other than driver (with exceptions)
vehicle.Seats vehicle.Seats
.filter({ case (index, seat) => seat.isOccupied && live.contains(seat.occupant.get) && index > 0 }) .filter {
.foreach({ case (index, seat) =>
seat.isOccupied &&
live.contains(seat.occupant.get) &&
(vehicle.Definition match {
case GlobalDefinitions.orbital_shuttle | GlobalDefinitions.droppod => true
case _ => index > 0
})
}
.foreach {
case (index, seat) => case (index, seat) =>
val targetPlayer = seat.occupant.get val targetPlayer = seat.occupant.get
val targetDefiniton = targetPlayer.avatar.definition val targetDefiniton = targetPlayer.avatar.definition
@ -3690,7 +3698,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
targetDefiniton.Packet.ConstructorData(targetPlayer).get targetDefiniton.Packet.ConstructorData(targetPlayer).get
) )
) )
}) }
}) })
vehicles.collect { vehicles.collect {
case vehicle if vehicle.Faction == faction => case vehicle if vehicle.Faction == faction =>
@ -3702,11 +3710,17 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
//depict any other passengers already in this zone //depict any other passengers already in this zone
val vguid = vehicle.GUID val vguid = vehicle.GUID
vehicle.Seats vehicle.Seats
.filter({ .filter {
case (index, seat) => case (index, seat) =>
seat.isOccupied && !seat.occupant.contains(player) && live.contains(seat.occupant.get) && index > 0 seat.isOccupied &&
}) !seat.occupant.contains(player) &&
.foreach({ live.contains(seat.occupant.get) &&
(vehicle.Definition match {
case GlobalDefinitions.orbital_shuttle => true
case _ => index > 0
})
}
.foreach {
case (index, seat) => case (index, seat) =>
val targetPlayer = seat.occupant.get val targetPlayer = seat.occupant.get
val targetDefinition = targetPlayer.avatar.definition val targetDefinition = targetPlayer.avatar.definition
@ -3718,7 +3732,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
targetDefinition.Packet.ConstructorData(targetPlayer).get targetDefinition.Packet.ConstructorData(targetPlayer).get
) )
) )
}) }
//since we would have only subscribed recently, we need to reload mount access states //since we would have only subscribed recently, we need to reload mount access states
(0 to 3).foreach { group => (0 to 3).foreach { group =>
sendResponse(PlanetsideAttributeMessage(vguid, group + 10, vehicle.PermissionGroup(group).get.id)) sendResponse(PlanetsideAttributeMessage(vguid, group + 10, vehicle.PermissionGroup(group).get.id))