From 5dd849beca1c5d27e2b92f5b3aace40f5c4baa11 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Tue, 12 Aug 2025 16:54:04 -0400 Subject: [PATCH] capture xp for squads --- .../session/support/SessionAvatarHandlers.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala b/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala index 37e2d03da..c00b4a835 100644 --- a/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala +++ b/src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala @@ -56,14 +56,14 @@ class SessionAvatarHandlers( } def facilityCaptureRewards(buildingId: Int, zoneNumber: Int, cep: Long): Unit = { - //TODO squad services deactivated, participation trophy rewards for now - 11-20-2023 //must be in a squad to earn experience + val delay = continent.Building(buildingId).map(building => building.CaptureTerminal.get.Definition.FacilityHackTime.toSeconds / 6) val charId = player.CharId - /*val squadUI = sessionLogic.squad.squadUI + val squadUI = sessionLogic.squad.squadUI val participation = continent .Building(buildingId) .map { building => - building.Participation.PlayerContribution() + building.Participation.PlayerContribution(delay.getOrElse(100)) } squadUI .find { _._1 == charId } @@ -117,10 +117,7 @@ class SessionAvatarHandlers( exp.ToDatabase.reportFacilityCapture(charId, buildingId, zoneNumber, modifiedExp, expType="bep") avatarActor ! AvatarActor.AwardFacilityCaptureBep(modifiedExp) Some(modifiedExp) - }*/ - //if not in squad (temporary) - exp.ToDatabase.reportFacilityCapture(charId, zoneNumber, buildingId, cep, expType="bep") - avatarActor ! AvatarActor.AwardFacilityCaptureBep(cep) + } } /**