PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed drowning timing so that oxygen recovery meter displays; check against inside state to block against water interaction; simplified water maps for hossin ceryshen and ascension

Browse source
This commit is contained in:
Fate-JH 2025-12-30 13:45:58 -05:00
parent b8ea569b1c
commit 23a257fed8
3 changed files with 27 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
// Copyright (c) 2020-2024 PSForever // Copyright (c) 2020-2024 PSForever
package net.psforever.objects.serverobject.environment package net.psforever.objects.serverobject.environment
import net.psforever.objects.serverobject.interior.Sidedness
import net.psforever.objects.{PlanetSideGameObject, Player, Vehicle} import net.psforever.objects.{PlanetSideGameObject, Player, Vehicle}
import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.Vitality
import net.psforever.types.Vector3 import net.psforever.types.Vector3
@ -22,8 +23,8 @@ object EnvironmentAttribute {
(obj.Definition.DrownAtMaxDepth || obj.Definition.DisableAtMaxDepth) && (obj.Definition.DrownAtMaxDepth || obj.Definition.DisableAtMaxDepth) &&
canInteractWithPlayersAndVehicles(obj) && canInteractWithPlayersAndVehicles(obj) &&
(obj match { (obj match {
case p: Player => p.VehicleSeated.isEmpty case p: Player => p.VehicleSeated.isEmpty && p.WhichSide == Sidedness.OutsideOf
case v: Vehicle => v.MountedIn.isEmpty case v: Vehicle => v.MountedIn.isEmpty && v.WhichSide == Sidedness.OutsideOf
case _ => false case _ => false
}) })
} }

2
src/main/scala/net/psforever/objects/serverobject/environment/interaction/common/Watery.scala
View file

@ -152,7 +152,7 @@ object Watery {
val oldTimeRemaining: Long = math.max(0, completionTime - System.currentTimeMillis()) val oldTimeRemaining: Long = math.max(0, completionTime - System.currentTimeMillis())
val oldTimeRatio: Float = oldTimeRemaining / oldDuration.toFloat val oldTimeRatio: Float = oldTimeRemaining / oldDuration.toFloat
val percentage: Float = oldTimeRatio * 100 val percentage: Float = oldTimeRatio * 100
val recoveryTime: Long = newDuration * (1f - oldTimeRatio).toLong val recoveryTime: Long = (newDuration * (1f - oldTimeRatio)).toLong
(true, recoveryTime, percentage) (true, recoveryTime, percentage)
case Some(OxygenState.Recovery) => case Some(OxygenState.Recovery) =>
//interrupted while recovering, calculate the progress and keep recovering //interrupted while recovering, calculate the progress and keep recovering

70
src/main/scala/net/psforever/objects/zones/MapInfo.scala
View file

@ -51,34 +51,16 @@ case object MapInfo extends StringEnum[MapInfo] {
scale = MapScale.Dim8192, scale = MapScale.Dim8192,
hotSpotSpan = 80, hotSpotSpan = 80,
environment = { environment = {
//exclude parts of voltan and naum due to their generator rooms being below sealevel List(SeaLevel(EnvironmentAttribute.Water, 11)) ++
val northVoltan = 3562.4844f MapEnvironment.zoneMapEdgeKillPlane(
val southVoltan = 3401.6875f MapScale.Dim8192,
val eastVoltan = 4556.703f (400, 400, 200, 400),
val westVoltan = 4411.6875f List(
val northNaum = 3575.8047f (450, 450, 250, 450, 3),
val southNaum = 3539.5234f (500, 500, 300, 500, 2),
val eastNaum = 5490.6875f (600, 600, 400, 600, 1)
val westNaum = 5427.078f )
List(
Pool(EnvironmentAttribute.Water, 11, 8192, westVoltan, 0, 0), //west of voltan
Pool(EnvironmentAttribute.Water, 11, 8192, westNaum, 0, eastVoltan), //between voltan and naum
Pool(EnvironmentAttribute.Water, 11, 8192, 8192, 0, eastNaum), //east of naum
Pool(EnvironmentAttribute.Water, 11, 8192, eastVoltan, northVoltan, westVoltan), //north of voltan
Pool(EnvironmentAttribute.Water, 11, southVoltan, eastVoltan, 0, westVoltan), //south of voltan
Pool(EnvironmentAttribute.Water, 11, 8192, eastNaum, northNaum, westNaum), //north of naum
Pool(EnvironmentAttribute.Water, 11, southNaum, eastNaum, 0, westNaum) //south of naum
//TODO voltan Killplane
//TODO naum Killplane
) ++ MapEnvironment.zoneMapEdgeKillPlane(
MapScale.Dim8192,
(400, 400, 200, 400),
List(
(450, 450, 250, 450, 3),
(500, 500, 300, 500, 2),
(600, 600, 400, 600, 1)
) )
)
} }
) )
@ -185,8 +167,7 @@ case object MapInfo extends StringEnum[MapInfo] {
hotSpotSpan = 80, hotSpotSpan = 80,
environment = List( environment = List(
SeaLevel(EnvironmentAttribute.Water, 10.03125f), SeaLevel(EnvironmentAttribute.Water, 10.03125f),
Pool(EnvironmentAttribute.Water, 213.03125f, 3116.7266f, 4724.414f, 2685.8281f, 4363.461f), //east side of southwest of tootega Pool(EnvironmentAttribute.Water, 213.03125f, 3116.7266f, 4724.414f, 2685.8281f, 4187.4375f) //southwest of tootega
Pool(EnvironmentAttribute.Water, 213.03125f, 2994.2969f, 4363.461f, 2685.8281f, 4187.4375f), //west side of southwest of tootega
) ++ MapEnvironment.zoneMapEdgeKillPlane( ) ++ MapEnvironment.zoneMapEdgeKillPlane(
MapScale.Dim8192, MapScale.Dim8192,
(400, 400, 400, 400), (400, 400, 400, 400),
@ -265,15 +246,16 @@ case object MapInfo extends StringEnum[MapInfo] {
checksum = 230810349L, checksum = 230810349L,
scale = MapScale.Dim8192, scale = MapScale.Dim8192,
hotSpotSpan = 80, hotSpotSpan = 80,
environment = List(SeaLevel(EnvironmentAttribute.Water, 28)) ++ MapEnvironment.zoneMapEdgeKillPlane( environment = List(SeaLevel(EnvironmentAttribute.Water, 28)) ++
MapScale.Dim8192, MapEnvironment.zoneMapEdgeKillPlane(
(200, 200, 200, 200), MapScale.Dim8192,
List( (200, 200, 200, 200),
(250, 250, 250, 250, 3), List(
(300, 300, 300, 300, 2), (250, 250, 250, 250, 3),
(400, 400, 400, 400, 1) (300, 300, 300, 300, 2),
(400, 400, 400, 400, 1)
)
) )
)
) )
case object Map11 case object Map11
@ -370,13 +352,13 @@ case object MapInfo extends StringEnum[MapInfo] {
scale = MapScale.Dim2560, scale = MapScale.Dim2560,
hotSpotSpan = 80, hotSpotSpan = 80,
environment = List( environment = List(
SeaLevel(EnvironmentAttribute.Death, 10),
Pool(EnvironmentAttribute.Water, 194.89062f, 1763.4141f, 1415.125f, 1333.9531f, 1280.4609f), //east, northern pool Pool(EnvironmentAttribute.Water, 194.89062f, 1763.4141f, 1415.125f, 1333.9531f, 1280.4609f), //east, northern pool
Pool(EnvironmentAttribute.Water, 192.40625f, 1717.5703f, 1219.3359f, 1572.8828f, 1036.1328f), //bottom, northern pool Pool(EnvironmentAttribute.Water, 192.40625f, 1717.5703f, 1219.3359f, 1572.8828f, 1036.1328f), //bottom, northern pool
Pool(EnvironmentAttribute.Water, 192.32812f, 1966.1562f, 1252.7344f, 1889.8047f, 1148.5312f), //top, northern pool Pool(EnvironmentAttribute.Water, 192.32812f, 1966.1562f, 1252.7344f, 1889.8047f, 1148.5312f), //top, northern pool
Pool(EnvironmentAttribute.Water, 191.65625f, 1869.1484f, 1195.6406f, 1743.8125f, 1050.7344f), //middle, northern pool Pool(EnvironmentAttribute.Water, 191.65625f, 1869.1484f, 1195.6406f, 1743.8125f, 1050.7344f), //middle, northern pool
Pool(EnvironmentAttribute.Water, 183.98438f, 914.33594f, 1369.5f, 626.03906f, 666.3047f), //upper southern pools Pool(EnvironmentAttribute.Water, 183.98438f, 914.33594f, 1369.5f, 626.03906f, 666.3047f), //upper southern pools
Pool(EnvironmentAttribute.Water, 182.96875f, 580.7578f, 913.52344f, 520.4531f, 843.97656f), //lowest southern pool Pool(EnvironmentAttribute.Water, 182.96875f, 580.7578f, 913.52344f, 520.4531f, 843.97656f) //lowest southern pool
SeaLevel(EnvironmentAttribute.Death, 10)
) )
) )
@ -449,14 +431,8 @@ case object MapInfo extends StringEnum[MapInfo] {
checksum = 3654267088L, checksum = 3654267088L,
scale = MapScale.Dim4096, scale = MapScale.Dim4096,
hotSpotSpan = 80, hotSpotSpan = 80,
environment = List( environment = List(SeaLevel(EnvironmentAttribute.Water, 3.5f)) ++
Pool(EnvironmentAttribute.Water, 3.5f, 2867f, 1228f, 1128f, 0f), //west MapEnvironment.dim4096MapEdgeKillPlanes
Pool(EnvironmentAttribute.Water, 3.5f, 4096f, 4096f, 2867f, 0f), //north
Pool(EnvironmentAttribute.Water, 3.5f, 2867f, 4096f, 1227f, 2900f), //east
Pool(EnvironmentAttribute.Water, 3.5f, 1227f, 4096f, 0f, 2000f), //southeast
Pool(EnvironmentAttribute.Water, 3.5f, 1128f, 2000f, 0f, 0f), //southwest
Pool(EnvironmentAttribute.Death, 0.5f, 2867f, 2900f, 1128f, 1228f), //central, kill
) ++ MapEnvironment.dim4096MapEdgeKillPlanes
) )
case object Map99 case object Map99