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

wall turrets ignore walking max

Browse source
This commit is contained in:
ScrawnyRonnie 2025-12-06 16:46:34 -05:00
parent 354376882a
commit c4d164e3fb
5 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -586,6 +586,10 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex
if (avatar.lookingForSquad && (sessionLogic.squad.squadUI.isEmpty || sessionLogic.squad.squadUI(player.CharId).index == 0)) {
avatarActor ! AvatarActor.SetLookingForSquad(false)
}
case GenericAction.MaxEnableAutoRun =>
player.maxAutoRunEnabled = true
case GenericAction.MaxDisableAutoRun =>
player.maxAutoRunEnabled = false
case _ =>
log.warn(s"GenericActionMessage: ${player.Name} can't handle $action")
}

1
src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
View file

@ -2221,6 +2221,7 @@ class ZoningOperations(
if (zoningStatus == Zoning.Status.Deconstructing) {
stopDeconstructing()
}
player.maxAutoRunEnabled = false //reset flag in case max ran through a direct gate
sessionLogic.avatarResponse.lastSeenStreamMessage.clear()
upstreamMessageCount = 0
setAvatar = false

1
src/main/scala/net/psforever/objects/Player.scala
View file

@ -89,6 +89,7 @@ class Player(var avatar: Avatar)
var outfit_id: Long = 0
var outfit_window_open: Boolean = false
var outfit_list_open: Boolean = false
var maxAutoRunEnabled: Boolean = false
/** From PlanetsideAttributeMessage */
var PlanetsideAttribute: Array[Long] = Array.ofDim(120)

7
src/main/scala/net/psforever/objects/equipment/EffectTarget.scala
View file

@ -282,8 +282,8 @@ object EffectTarget {
def FacilityTurretValidateMaxTarget(target: PlanetSideGameObject): Boolean =
target match {
case p: Player
if p.ExoSuit == ExoSuitType.MAX && p.VehicleSeated.isEmpty =>
val now = System.currentTimeMillis()
if p.ExoSuit == ExoSuitType.MAX && p.VehicleSeated.isEmpty && p.maxAutoRunEnabled =>
/* val now = System.currentTimeMillis()
val pos = p.Position
val faction = p.Faction
val sector = p.Zone.blockMap.sector(p.Position, range = 51f)
@ -293,7 +293,8 @@ object EffectTarget {
if (radarCloakedAms(sector, pos) || radarCloakedAegis(sector, pos)) false
else if (radarCloakedSensor(sector, pos, faction)) entityTookDamage(p, now) || usedEquipment
else if (radarEnhancedInterlink(sector, pos, faction)) true
else p.isMoving(test = 15.5d)
else p.isMoving(test = 15.5d) */
true
case _ =>
false
}

2
src/main/scala/net/psforever/packet/game/GenericActionMessage.scala
View file

@ -21,6 +21,8 @@ object GenericAction extends IntEnum[GenericAction] {
final case object NewCharacterBasicTrainingPrompt extends GenericAction(value = 14)
final case object MaxAnchorsExtend_RCV extends GenericAction(value = 15)
final case object MaxAnchorsRelease_RCV extends GenericAction(value = 16)
final case object MaxEnableAutoRun extends GenericAction(value = 17)
final case object MaxDisableAutoRun extends GenericAction(value = 18)
final case object MaxSpecialEffect_RCV extends GenericAction(value = 20)
final case object StopMaxSpecialEffect_RCV extends GenericAction(value = 21)
final case object CavernFacilityCapture extends GenericAction(value = 22)