From de93b4c01b23b290ae0e6d7a5c848e41788470cd Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Mon, 19 Aug 2024 21:47:41 -0400 Subject: [PATCH] message when inventory is full (assumes player inventory destination, but item winds up in hand due to lack of space, but it works) --- .../actors/session/normal/GeneralLogic.scala | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala index 0cf731891..d0a6e8e96 100644 --- a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala +++ b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala @@ -118,9 +118,11 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex } } ops.fallHeightTracker(pos.z) -// if (isCrouching && !player.Crouching) { -// //dev stuff goes here -// } + if (isCrouching && !player.Crouching) { + //dev stuff goes here + sendResponse(ChatMsg(ChatMessageType.UNK_229, "@PadDeconstruct_secsA^23~")) + sendResponse(ChatMsg(ChatMessageType.UNK_227, "@InventoryPickupNoRoom")) + } player.Position = pos player.Velocity = vel player.Orientation = Vector3(player.Orientation.x, pitch, yaw) @@ -1450,10 +1452,6 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex val drainAmount = player.ExoSuitDef.CapacitorDrainPerSecond.toFloat * timeDiff player.Capacitor -= drainAmount sendResponse(PlanetsideAttributeMessage(player.GUID, 7, player.Capacitor.toInt)) - if (player.Capacitor <= 0 && player.UsingSpecial == SpecialExoSuitDefinition.Mode.Shielded) { - ops.toggleMaxSpecialState(enable = false) - sendResponse(ChatMsg(ChatMessageType.UNK_227, "@ArmorShieldOff")) - } } else if (player.Capacitor < player.ExoSuitDef.MaxCapacitor) { if (player.Faction != PlanetSideEmpire.VS) { ops.toggleMaxSpecialState(enable = false)