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

retain sidedness on player relog

Browse source
This commit is contained in:
Fate-JH 2026-04-27 17:25:30 -04:00
parent 927c062a5a
commit 9f2c170cf5
5 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/src/main/resources/db/migration/V017__Sidedness.sql Normal file
View file

@ -0,0 +1,3 @@
/* New */
ALTER TABLE savedplayer
ADD COLUMN sidedness BOOLEAN NOT NULL DEFAULT FALSE;

10
src/main/scala/net/psforever/actors/session/AvatarActor.scala
View file

@ -43,6 +43,7 @@ import net.psforever.objects.equipment.{Equipment, EquipmentSlot}
import net.psforever.objects.inventory.{Container, InventoryItem}
import net.psforever.objects.loadouts.{InfantryLoadout, Loadout, VehicleLoadout}
import net.psforever.objects.locker.LockerContainer
import net.psforever.objects.serverobject.interior.Sidedness
import net.psforever.objects.sourcing.{PlayerSource,SourceWithHealthEntry}
import net.psforever.objects.vital.{DamagingActivity, HealFromImplant, HealingActivity, SpawningActivity}
import net.psforever.packet.game.objectcreate.{BasicCharacterData, ObjectClass, RibbonBars}
@ -739,6 +740,7 @@ object AvatarActor {
_.py -> lift(0),
_.pz -> lift(0),
_.orientation -> lift(0),
_.sidedness -> lift(false),
_.zoneNum -> lift(0),
_.health -> lift(0),
_.armor -> lift(0),
@ -746,7 +748,7 @@ object AvatarActor {
_.loadout -> lift("")
)
)
out.completeWith(Future(persistence.Savedplayer(avatarId, 0, 0, 0, 0, 0, 0, 0, 0, "")))
out.completeWith(Future(persistence.Savedplayer(avatarId, 0, 0, 0, 0, false, 0, 0, 0, 0, "")))
}
out.future
}
@ -826,6 +828,7 @@ object AvatarActor {
_.py -> lift((position.y * 1000).toInt),
_.pz -> lift((position.z * 1000).toInt),
_.orientation -> lift((player.Orientation.z * 1000).toInt),
_.sidedness -> lift(Sidedness.equals(player.WhichSide, Sidedness.InsideOf)),
_.zoneNum -> lift(player.Zone.Number),
_.health -> lift(health),
_.armor -> lift(player.Armor),
@ -865,6 +868,7 @@ object AvatarActor {
_.py -> lift((position.y * 1000).toInt),
_.pz -> lift((position.z * 1000).toInt),
_.orientation -> lift((player.Orientation.z * 1000).toInt),
_.sidedness -> lift(player.WhichSide == Sidedness.InsideOf),
_.zoneNum -> lift(player.Zone.Number)
)
)
@ -2195,14 +2199,14 @@ class AvatarActor(
val player = new Player(avatar)
val zoneNum = saveOpt
.collect {
case persistence.Savedplayer(_, _, _, _, _, zoneNum, _, _, exosuitNum, loadout) =>
case persistence.Savedplayer(_, _, _, _, _, _, inZoneNum, _, _, exosuitNum, loadout) =>
val exo = ExoSuitType(exosuitNum)
player.ExoSuit = exo
AvatarActor.buildHolsterEquipmentFromClob(player, loadout, log)
if (exo == ExoSuitType.MAX) {
player.DrawnSlot = 0 //max arm up
}
zoneNum
inZoneNum
}
.getOrElse {
player.ExoSuit = ExoSuitType.Standard

30
src/main/scala/net/psforever/actors/session/csr/ChatLogic.scala
View file

@ -11,6 +11,7 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity
import net.psforever.objects.serverobject.dome.ForceDomeControl
import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject}
import net.psforever.objects.serverobject.hackable.Hackable
import net.psforever.objects.serverobject.interior.Sidedness
import net.psforever.objects.serverobject.structures.Building
import net.psforever.objects.zones.Zone
import net.psforever.packet.game.{ChatMsg, SetChatFilterMessage}
@ -229,6 +230,7 @@ class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) ext
case "setempire" => customCommandSetEmpire(params)
case "weaponlock" => customCommandZoneWeaponUnlock(session, params)
case "forcedome" => customForceDomeCommand(session, params)
case "setside" => customSetSidedness(session, params)
case _ =>
// command was not handled
sendResponse(
@ -546,6 +548,34 @@ class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) ext
true
}
private def customSetSidedness(session: Session, contents: Seq[String]): Boolean = {
var postUsageMessage: Boolean = false
contents.headOption match {
case Some(side) if side.matches("i|in|inside") =>
session.player.WhichSide = Sidedness.InsideOf
case Some(side) if side.matches("o|out|outside") =>
session.player.WhichSide = Sidedness.OutsideOf
case Some("check") =>
val whichSide = if (session.player.WhichSide == Sidedness.OutsideOf) {
"outside"
} else {
"inside"
}
sendResponse(ChatMsg(ChatMessageType.UNK_227, s"You are $whichSide."))
case Some("help") | Some("usage") =>
postUsageMessage = true
case Some(token) =>
sendResponse(ChatMsg(ChatMessageType.UNK_227, s"unknown command - $token"))
postUsageMessage = true
case None =>
postUsageMessage = true
}
if (postUsageMessage) {
sendResponse(ChatMsg(ChatMessageType.UNK_227, "!setside i[n[side]]|o[ut[side]]|check"))
}
true
}
private def customCommandOnOffStateOrNone(stateOpt: Option[String]): Option[Boolean] = {
stateOpt match {
case None =>

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

@ -2080,6 +2080,7 @@ class ZoningOperations(
val position = Vector3(results.px * 0.001f, results.py * 0.001f, results.pz * 0.001f)
player.Position = position
player.Orientation = Vector3(0f, 0f, results.orientation * 0.001f)
player.WhichSide = if (results.sidedness) Sidedness.InsideOf else Sidedness.OutsideOf
/*
@reset_sanctuary=You have been returned to the sanctuary because you played another character.
*/

1
src/main/scala/net/psforever/persistence/SavedCharacter.scala
View file

@ -9,6 +9,7 @@ case class Savedplayer(
py: Int, //Position.y * 1000
pz: Int, //Position.z * 1000
orientation: Int, //Orientation.z * 1000
sidedness: Boolean,
zoneNum: Int,
health: Int,
armor: Int,