From 79d66bbc19d0cf27e6fb3a85fbbb7da7a3944f4e Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Mon, 10 Nov 2025 21:03:46 -0500 Subject: [PATCH 1/3] different llu facility time --- .../services/local/support/HackCaptureActor.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala index 89443524d..857ae7fc4 100644 --- a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala +++ b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala @@ -41,7 +41,13 @@ class HackCaptureActor extends Actor { case HackCaptureActor.StartCaptureTerminalHack(target, zone, unk1, unk2, startTime) => log.trace(s"StartCaptureTerminalHack: ${target.GUID} is hacked") - val duration = target.Definition.FacilityHackTime + val hackingFaction = HackCaptureActor.GetHackingFaction(target).get + val duration = target.Owner match { + case b: Building if b.IsCtfBase && b.Neighbours(hackingFaction).nonEmpty => + 10.minutes + case _ => + target.Definition.FacilityHackTime + } target.HackedBy.map { hackInfo => target.HackedBy = hackInfo.Duration(duration.toMillis) } From de6afa789ccb9a2c2b4ce24c4c5737f93f908811 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Wed, 19 Nov 2025 07:13:53 -0500 Subject: [PATCH 2/3] no motd --- .../net/psforever/actors/session/normal/GeneralLogic.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a51565378..2041d88d6 100644 --- a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala +++ b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala @@ -833,7 +833,7 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex pkt match { case OutfitRequest(_, OutfitRequestAction.Motd(message)) => - SessionOutfitHandlers.HandleOutfitMotd(zones, message, player) + //SessionOutfitHandlers.HandleOutfitMotd(zones, message, player) case OutfitRequest(_, OutfitRequestAction.Ranks(List(r1, r2, r3, r4, r5, r6, r7, r8))) => SessionOutfitHandlers.HandleOutfitRank(zones, List(r1, r2, r3, r4, r5, r6, r7, r8), player) From 5d8d55c482831bae579bcf2062dfdd18b77355ba Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Wed, 19 Nov 2025 08:26:34 -0500 Subject: [PATCH 3/3] normal length --- .../net/psforever/services/local/support/HackCaptureActor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala index 857ae7fc4..4c6203ea2 100644 --- a/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala +++ b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala @@ -44,7 +44,7 @@ class HackCaptureActor extends Actor { val hackingFaction = HackCaptureActor.GetHackingFaction(target).get val duration = target.Owner match { case b: Building if b.IsCtfBase && b.Neighbours(hackingFaction).nonEmpty => - 10.minutes + 15.minutes case _ => target.Definition.FacilityHackTime }