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

the cookie-cutter solution (#1047)

Browse source
This commit is contained in:
Fate-JH 2023-03-06 14:16:13 -05:00 committed by GitHub
parent abdbb19af1
commit 36c7a1e520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ package net.psforever.objects.zones
import enumeratum.values.{StringEnum, StringEnumEntry} import enumeratum.values.{StringEnum, StringEnumEntry}
import net.psforever.objects.{PlanetSideGameObject, Player, Vehicle} import net.psforever.objects.{PlanetSideGameObject, Player, Vehicle}
import net.psforever.objects.serverobject.environment._ import net.psforever.objects.serverobject.environment.{Pool, _}
import net.psforever.packet.game.{ChatMsg, OffshoreVehicleMessage} import net.psforever.packet.game.{ChatMsg, OffshoreVehicleMessage}
import net.psforever.services.Service import net.psforever.services.Service
import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage}
@ -433,8 +433,14 @@ case object MapInfo extends StringEnum[MapInfo] {
checksum = 3654267088L, checksum = 3654267088L,
scale = MapScale.Dim4096, scale = MapScale.Dim4096,
hotSpotSpan = 80, hotSpotSpan = 80,
environment = List(SeaLevel(EnvironmentAttribute.Water, 3.5f)) ++ environment = List(
MapEnvironment.dim4096MapEdgeKillPlanes Pool(EnvironmentAttribute.Water, 3.5f, 2867f, 1228f, 1128f, 0f), //west
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