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

resolutions 1

Browse source
This commit is contained in:
FateJH 2019-12-10 10:11:23 -05:00
parent 7b6063055a
commit 3402ea2155
2 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala
View file

@ -20,7 +20,7 @@ class Building(private val name: String,
private val map_id : Int, private val map_id : Int,
private val zone : Zone, private val zone : Zone,
private val buildingType : StructureType.Value, private val buildingType : StructureType.Value,
private val buildingDefinition : ObjectDefinition) extends PlanetSideServerObject { private val buildingDefinition : ObjectDefinition) extends PlanetSideServerObject
with AmenityOwner { with AmenityOwner {
/** /**
* The map_id is the identifier number used in BuildingInfoUpdateMessage. This is the index that the building appears in the MPO file starting from index 1 * The map_id is the identifier number used in BuildingInfoUpdateMessage. This is the index that the building appears in the MPO file starting from index 1
@ -69,8 +69,6 @@ class Building(private val name: String,
playersInSOI playersInSOI
} }
def Zone : Zone = zone
// Get all lattice neighbours // Get all lattice neighbours
def Neighbours: Option[Set[Building]] = { def Neighbours: Option[Set[Building]] = {
zone.Lattice find this match { zone.Lattice find this match {

43
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -1159,7 +1159,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
if(projectile.profile.ExistsOnRemoteClients) { if(projectile.profile.ExistsOnRemoteClients) {
//spawn projectile on other clients //spawn projectile on other clients
val definition = projectile.Definition val definition = projectile.Definition
avatarService ! AvatarServiceMessage( continent.AvatarEvents ! AvatarServiceMessage(
continent.Id, continent.Id,
AvatarAction.LoadProjectile(player.GUID, definition.ObjectId, projectile_guid, definition.Packet.ConstructorData(projectile).get) AvatarAction.LoadProjectile(player.GUID, definition.ObjectId, projectile_guid, definition.Packet.ConstructorData(projectile).get)
) )
@ -1172,7 +1172,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
case Some(obj : Projectile) if obj.profile.ExistsOnRemoteClients => case Some(obj : Projectile) if obj.profile.ExistsOnRemoteClients =>
//spawn projectile on other clients //spawn projectile on other clients
val definition = obj.Definition val definition = obj.Definition
avatarService ! AvatarServiceMessage( continent.AvatarEvents ! AvatarServiceMessage(
continent.Id, continent.Id,
AvatarAction.LoadProjectile(player.GUID, definition.ObjectId, projectile_guid, definition.Packet.ConstructorData(obj).get) AvatarAction.LoadProjectile(player.GUID, definition.ObjectId, projectile_guid, definition.Packet.ConstructorData(obj).get)
) )
@ -1282,12 +1282,12 @@ class WorldSessionActor extends Actor with MDCContextAware {
val playerGUID = player.GUID val playerGUID = player.GUID
if(damageToHealth > 0) { if(damageToHealth > 0) {
sendResponse(PlanetsideAttributeMessage(playerGUID, 0, health)) sendResponse(PlanetsideAttributeMessage(playerGUID, 0, health))
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(playerGUID, 0, health)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(playerGUID, 0, health))
} }
if(damageToArmor > 0) { if(damageToArmor > 0) {
sendResponse(PlanetsideAttributeMessage(playerGUID, 4, armor)) sendResponse(PlanetsideAttributeMessage(playerGUID, 4, armor))
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(playerGUID, 4, armor)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(playerGUID, 4, armor))
} }
if(damageToCapacitor > 0) { if(damageToCapacitor > 0) {
@ -1659,7 +1659,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
continent.GUID(player.VehicleSeated) match { continent.GUID(player.VehicleSeated) match {
case Some(mountable: Amenity with Mountable) => case Some(mountable: Amenity with Mountable) =>
if(mountable.Owner.GUID == capture_terminal.Owner.GUID) { if(mountable.Owner.GUID == capture_terminal.Owner.GUID) {
vehicleService ! VehicleServiceMessage(continent.Id, VehicleAction.KickPassenger(player.GUID, mountable.Seats.head._1, true, mountable.GUID)) continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.KickPassenger(player.GUID, mountable.Seats.head._1, true, mountable.GUID))
} }
case _ => ; case _ => ;
} }
@ -3919,6 +3919,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
} }
} }
} }
CapacitorTick(jump_thrust)
//if the player lost all stamina this turn (had stamina at the start), do not renew 1 stamina //if the player lost all stamina this turn (had stamina at the start), do not renew 1 stamina
if(!isMoving && (if(player.Stamina > 0) player.Stamina < player.MaxStamina else !hadStaminaBefore)) { if(!isMoving && (if(player.Stamina > 0) player.Stamina < player.MaxStamina else !hadStaminaBefore)) {
player.Stamina = player.Stamina + 1 player.Stamina = player.Stamina + 1
@ -3927,8 +3928,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
else { else {
player.Stamina > 0 player.Stamina > 0
} }
CapacitorTick(jump_thrust)
} }
else { else {
timeDL = 0 timeDL = 0
@ -3941,13 +3940,13 @@ class WorldSessionActor extends Actor with MDCContextAware {
if(implantsAreActive && !hasStaminaAfter) { //implants deactivated at 0 stamina if(implantsAreActive && !hasStaminaAfter) { //implants deactivated at 0 stamina
if(avatar.Implants(0).Active) { if(avatar.Implants(0).Active) {
avatar.Implants(0).Active = false avatar.Implants(0).Active = false
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(player.GUID, 28, avatar.Implant(0).id * 2)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(player.GUID, 28, avatar.Implant(0).id * 2))
sendResponse(AvatarImplantMessage(PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 0, 0)) sendResponse(AvatarImplantMessage(PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 0, 0))
timeDL = 0 timeDL = 0
} }
if(avatar.Implants(1).Active) { if(avatar.Implants(1).Active) {
avatar.Implants(1).Active = false avatar.Implants(1).Active = false
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(player.GUID, 28, avatar.Implant(1).id * 2)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(player.GUID, 28, avatar.Implant(1).id * 2))
sendResponse(AvatarImplantMessage(PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 1, 0)) sendResponse(AvatarImplantMessage(PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 1, 0))
timeSurge = 0 timeSurge = 0
} }
@ -4063,7 +4062,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
projectile.Position = shot_pos projectile.Position = shot_pos
projectile.Orientation = shot_orient projectile.Orientation = shot_orient
projectile.Velocity = shot_vel projectile.Velocity = shot_vel
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileState(player.GUID, projectileGlobalUID, shot_pos, shot_vel, shot_orient, seq, end, target_guid)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileState(player.GUID, projectileGlobalUID, shot_pos, shot_vel, shot_orient, seq, end, target_guid))
case _ if seq == 0 => case _ if seq == 0 =>
/* missing the first packet in the sequence is permissible */ /* missing the first packet in the sequence is permissible */
case _ => case _ =>
@ -4352,7 +4351,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
shooting = Some(item_guid) shooting = Some(item_guid)
//special case - suppress the decimator's alternate fire mode, by projectile //special case - suppress the decimator's alternate fire mode, by projectile
if(tool.Projectile != GlobalDefinitions.phoenix_missile_guided_projectile) { if(tool.Projectile != GlobalDefinitions.phoenix_missile_guided_projectile) {
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Start(player.GUID, item_guid)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Start(player.GUID, item_guid))
} }
} }
else { else {
@ -4383,12 +4382,12 @@ class WorldSessionActor extends Actor with MDCContextAware {
if(tool.Definition == GlobalDefinitions.phoenix && if(tool.Definition == GlobalDefinitions.phoenix &&
tool.Projectile != GlobalDefinitions.phoenix_missile_guided_projectile) { tool.Projectile != GlobalDefinitions.phoenix_missile_guided_projectile) {
//suppress the decimator's alternate fire mode, however //suppress the decimator's alternate fire mode, however
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Start(player.GUID, item_guid)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Start(player.GUID, item_guid))
} }
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Stop(player.GUID, item_guid)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Stop(player.GUID, item_guid))
Some(tool) Some(tool)
case Some(tool) => //permissible, for now case Some(tool) => //permissible, for now
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Stop(player.GUID, item_guid)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ChangeFireState_Stop(player.GUID, item_guid))
Some(tool) Some(tool)
case _ => case _ =>
log.warn(s"ChangeFireState_Stop: received an unexpected message about $item_guid") log.warn(s"ChangeFireState_Stop: received an unexpected message about $item_guid")
@ -4606,7 +4605,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
else { else {
projectile.Miss() projectile.Miss()
if(projectile.profile.ExistsOnRemoteClients && projectile.HasGUID) { if(projectile.profile.ExistsOnRemoteClients && projectile.HasGUID) {
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileExplodes(player.GUID, projectile.GUID, projectile)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileExplodes(player.GUID, projectile.GUID, projectile))
taskResolver ! UnregisterProjectile(projectile) taskResolver ! UnregisterProjectile(projectile)
} }
} }
@ -5548,7 +5547,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
if(projectile_info.ExistsOnRemoteClients) { if(projectile_info.ExistsOnRemoteClients) {
log.trace(s"WeaponFireMessage: ${projectile_info.Name} is a remote projectile") log.trace(s"WeaponFireMessage: ${projectile_info.Name} is a remote projectile")
taskResolver ! (if(projectile.HasGUID) { taskResolver ! (if(projectile.HasGUID) {
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileExplodes(player.GUID, projectile.GUID, projectile)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileExplodes(player.GUID, projectile.GUID, projectile))
ReregisterProjectile(projectile) ReregisterProjectile(projectile)
} }
else { else {
@ -5576,7 +5575,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
if(detectedTargets.nonEmpty) { if(detectedTargets.nonEmpty) {
val mode = 7 + (weapon.Projectile == GlobalDefinitions.wasp_rocket_projectile) val mode = 7 + (weapon.Projectile == GlobalDefinitions.wasp_rocket_projectile)
detectedTargets.foreach { target => detectedTargets.foreach { target =>
avatarService ! AvatarServiceMessage(target, AvatarAction.ProjectileAutoLockAwareness(mode)) continent.AvatarEvents ! AvatarServiceMessage(target, AvatarAction.ProjectileAutoLockAwareness(mode))
} }
} }
case _ => ; case _ => ;
@ -6271,7 +6270,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
TaskResolver.GiveTask( TaskResolver.GiveTask(
new Task() { new Task() {
private val globalProjectile = obj private val globalProjectile = obj
private val localAnnounce = avatarService private val localAnnounce = continent.AvatarEvents
private val localMsg = AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(player.GUID, obj.GUID, 2)) private val localMsg = AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(player.GUID, obj.GUID, 2))
override def isComplete : Task.Resolution.Value = { override def isComplete : Task.Resolution.Value = {
@ -10201,16 +10200,16 @@ class WorldSessionActor extends Actor with MDCContextAware {
case PlanetSideEmpire.NC => if(player.Capacitor > 0) player.UsingSpecial = SpecialExoSuitDefinition.Mode.Shielded case PlanetSideEmpire.NC => if(player.Capacitor > 0) player.UsingSpecial = SpecialExoSuitDefinition.Mode.Shielded
case _ => log.warn(s"Player ${player.Name} tried to use a MAX special ability but their faction doesn't have one") case _ => log.warn(s"Player ${player.Name} tried to use a MAX special ability but their faction doesn't have one")
} }
if(player.UsingSpecial == SpecialExoSuitDefinition.Mode.Overdrive || player.UsingSpecial == SpecialExoSuitDefinition.Mode.Shielded) { if(player.UsingSpecial == SpecialExoSuitDefinition.Mode.Overdrive || player.UsingSpecial == SpecialExoSuitDefinition.Mode.Shielded) {
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttributeToAll(player.GUID, 8, 1)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttributeToAll(player.GUID, 8, 1))
} }
} }
else { else {
player.UsingSpecial = SpecialExoSuitDefinition.Mode.Normal player.UsingSpecial = SpecialExoSuitDefinition.Mode.Normal
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttributeToAll(player.GUID, 8, 0)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttributeToAll(player.GUID, 8, 0))
} }
} }
}
/** /**
* The main purpose of this method is to determine which targets will receive "locked on" warnings from remote projectiles. * The main purpose of this method is to determine which targets will receive "locked on" warnings from remote projectiles.
@ -10267,7 +10266,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
* @param local_index an index of the absolute sequence of the projectile, for internal lists * @param local_index an index of the absolute sequence of the projectile, for internal lists
*/ */
def CleanUpRemoteProjectile(projectile_guid : PlanetSideGUID, projectile : Projectile, local_index : Int) : Unit = { def CleanUpRemoteProjectile(projectile_guid : PlanetSideGUID, projectile : Projectile, local_index : Int) : Unit = {
avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileExplodes(player.GUID, projectile_guid, projectile)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ProjectileExplodes(player.GUID, projectile_guid, projectile))
taskResolver ! UnregisterProjectile(projectile) taskResolver ! UnregisterProjectile(projectile)
projectiles(local_index) match { projectiles(local_index) match {
case Some(obj) if !obj.isResolved => obj.Miss case Some(obj) if !obj.isResolved => obj.Miss