PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-20 02:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vary the testing depth for water interaction

Browse source
This commit is contained in:
Fate-JH 2024-09-03 00:09:24 -04:00
parent 17914548c5
commit 5db7a00f4a
4 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/net/psforever/objects/avatar/interaction/WithWater.scala
View file

@ -307,6 +307,6 @@ object WithWater {
/** special environmental trait to queue actions independent from the primary wading test */
case object WaterAction extends EnvironmentTrait {
override def canInteractWith(obj: PlanetSideGameObject): Boolean = false
override def testingDepth: Float = Float.PositiveInfinity
override def testingDepth(obj: PlanetSideGameObject): Float = Float.PositiveInfinity
}
}

25
src/main/scala/net/psforever/objects/serverobject/environment/EnvironmentAttribute.scala
View file

@ -11,7 +11,7 @@ import net.psforever.types.Vector3
abstract class EnvironmentTrait {
def canInteractWith(obj: PlanetSideGameObject): Boolean
def testingDepth: Float
def testingDepth(obj: PlanetSideGameObject): Float
}
object EnvironmentAttribute {
@ -28,21 +28,32 @@ object EnvironmentAttribute {
})
}
def testingDepth: Float = 0.2f
def testingDepth(obj: PlanetSideGameObject): Float = {
obj match {
case v: Vehicle if v.Flying.nonEmpty =>
0f
case _: Vehicle if !obj.Definition.DrownAtMaxDepth =>
obj.Definition.MaxDepth * 0.9f
case _: Vehicle =>
obj.Definition.MaxDepth * 0.6f
case _ =>
0.2f
}
}
}
case object Lava extends EnvironmentTrait {
/** lava can only interact with anything capable of registering damage */
def canInteractWith(obj: PlanetSideGameObject): Boolean = canInteractWithDamagingFields(obj)
val testingDepth: Float = 0f
def testingDepth(obj: _root_.net.psforever.objects.PlanetSideGameObject): Float = 0f
}
case object Death extends EnvironmentTrait {
/** death can only interact with anything capable of registering damage */
def canInteractWith(obj: PlanetSideGameObject): Boolean = canInteractWithDamagingFields(obj)
val testingDepth: Float = 0f
def testingDepth(obj: _root_.net.psforever.objects.PlanetSideGameObject): Float = 0f
}
case object GantryDenialField
@ -55,7 +66,7 @@ object EnvironmentAttribute {
}
}
val testingDepth: Float = 0f
def testingDepth(obj: _root_.net.psforever.objects.PlanetSideGameObject): Float = 0f
}
case object MovementFieldTrigger
@ -63,7 +74,7 @@ object EnvironmentAttribute {
/** only interact with living player characters or vehicles */
def canInteractWith(obj: PlanetSideGameObject): Boolean = canInteractWithPlayersAndVehicles(obj)
val testingDepth: Float = 0f
def testingDepth(obj: _root_.net.psforever.objects.PlanetSideGameObject): Float = 0f
}
case object InteriorField
@ -71,7 +82,7 @@ object EnvironmentAttribute {
/** only interact with living player characters or vehicles */
def canInteractWith(obj: PlanetSideGameObject): Boolean = canInteractWithPlayersAndVehicles(obj)
val testingDepth: Float = 0f
def testingDepth(obj: _root_.net.psforever.objects.PlanetSideGameObject): Float = 0f
}
/**

4
src/main/scala/net/psforever/objects/serverobject/environment/interaction/InteractWithEnvironment.scala
View file

@ -119,7 +119,7 @@ object InteractWithEnvironment {
sector: SectorPopulation
): Set[PieceOfEnvironment] = {
sector.environmentList
.filter(body => body.attribute.canInteractWith(obj) && body.testInteraction(obj, body.attribute.testingDepth))
.filter(body => body.attribute.canInteractWith(obj) && body.testInteraction(obj, body.attribute.testingDepth(obj)))
.distinctBy(_.attribute)
.toSet
}
@ -136,7 +136,7 @@ object InteractWithEnvironment {
body: PieceOfEnvironment,
obj: PlanetSideServerObject
): Option[PieceOfEnvironment] = {
if ((obj.Zone eq zone) && body.testInteraction(obj, body.attribute.testingDepth)) {
if ((obj.Zone eq zone) && body.testInteraction(obj, body.attribute.testingDepth(obj))) {
Some(body)
} else {
None

2
src/main/scala/net/psforever/objects/vehicles/interaction/WithWater.scala
View file

@ -237,7 +237,7 @@ object WithWater {
/** special environmental trait to queue actions independent from the primary wading test */
case object WaterAction extends EnvironmentTrait {
override def canInteractWith(obj: PlanetSideGameObject): Boolean = false
override def testingDepth: Float = Float.PositiveInfinity
override def testingDepth(obj: PlanetSideGameObject): Float = Float.PositiveInfinity
}
/**