unrelated to the oicw, when a csr uses warp with coordinate literals, a reminder to set the sidedness correctly is issued; additionally, when using warp with a poi, the sidedness is set to outside of

This commit is contained in:
Fate-JH 2026-05-12 13:37:27 -04:00
parent d4476636d1
commit 22d1c5af03
2 changed files with 17 additions and 2 deletions

View file

@ -558,9 +558,9 @@ class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) ext
var postUsageMessage: Boolean = false
contents.headOption match {
case Some(side) if side.matches("i|in|inside") =>
session.player.WhichSide = Sidedness.InsideOf
ops.customSetSidednessOfTarget(session.player, Sidedness.InsideOf)
case Some(side) if side.matches("o|out|outside") =>
session.player.WhichSide = Sidedness.OutsideOf
ops.customSetSidednessOfTarget(session.player, Sidedness.OutsideOf)
case Some("check") =>
val whichSide = if (session.player.WhichSide == Sidedness.OutsideOf) {
"outside"

View file

@ -11,6 +11,8 @@ import net.psforever.actors.session.spectator.SpectatorMode
import net.psforever.actors.session.{AvatarActor, SessionActor}
import net.psforever.actors.zone.ZoneActor
import net.psforever.objects.LivePlayerList
import net.psforever.objects.serverobject.interior.{InteriorAware, Sidedness}
import net.psforever.objects.serverobject.mount.Mountable
import net.psforever.objects.sourcing.PlayerSource
import net.psforever.objects.zones.{Zone, ZoneInfo}
import net.psforever.packet.game.TimeOfDayMessage.GetTimeOfDayValue
@ -517,6 +519,7 @@ class ChatOperations(
)
case (Some(zone), Some(gate), false) =>
context.self ! SessionActor.SetZone(zone.zonename, gate)
customSetSidednessOfTarget(session.player, Sidedness.OutsideOf) //todo atm all locations are outside
case (_, None, false) =>
sendResponse(
ChatMsg(UNK_229, wideContents=true, "", "Gate id not defined (use '/zone <zone> -list')", None)
@ -544,6 +547,7 @@ class ChatOperations(
coordinate.isDefined && coordinate.get >= 0 && coordinate.get <= 8191
} =>
context.self ! SessionActor.SetPosition(Vector3(x.toFloat, y.toFloat, z.toFloat))
sendResponse(ChatMsg(ChatMessageType.CMT_QUIT, s"Please ensure that the sidedness of target is correct for destination."))
case (None, Some(waypoint)) if waypoint == "-list" =>
val zone = PointOfInterest.get(session.player.Zone.id)
zone match {
@ -560,6 +564,7 @@ class ChatOperations(
PointOfInterest.getWarpLocation(session.zone.id, waypoint) match {
case Some(location) =>
context.self ! SessionActor.SetPosition(location)
customSetSidednessOfTarget(session.player, Sidedness.OutsideOf) //todo atm all quick locations are outside
case None =>
sendResponse(
ChatMsg(UNK_229, wideContents=true, "", s"unknown location '$waypoint'", None)
@ -1450,6 +1455,16 @@ class ChatOperations(
}
}
def customSetSidednessOfTarget(target: Player, side: Sidedness): Boolean = {
target.WhichSide = side
target.Zone.GUID(player.VehicleSeated) match {
case v: Mountable with InteriorAware =>
v.WhichSide = side
case _ => ()
}
true
}
def commandSetTimeSpeed(session: Session, contents: String): Unit = {
val FloatPattern = """-?\d+(\.\d{1,2})?""".r