From 48f6064cda04bf0275cab4638227f073ae8cdb13 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Thu, 31 Jul 2025 01:14:40 -0400 Subject: [PATCH] Lukewarm Potato (#1285) * removing the cep reward for killing a flag carrier * log flag carrier kill to database as a facility capture event * need to acronym the exp event type, three characters only --- src/main/resources/application.conf | 2 +- .../actors/session/support/GeneralOperations.scala | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 27b1e4a5..20885b9e 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -469,7 +469,7 @@ game { # If a player died while carrying an lattice logic unit, # and satisfies the carrying duration, # award the player who is accredited with the kill command experience. - llu-slayer-credit = 200 + llu-slayer-credit = 0 # The maximum command experience that can be earned in a facility capture based on squad size maximum-per-squad-size = [990, 1980, 3466, 4950, 6436, 7920, 9406, 10890, 12376, 13860] # When the cep has to be capped for squad size, add a small value to the capped value diff --git a/src/main/scala/net/psforever/actors/session/support/GeneralOperations.scala b/src/main/scala/net/psforever/actors/session/support/GeneralOperations.scala index 181a1e74..e72e57a5 100644 --- a/src/main/scala/net/psforever/actors/session/support/GeneralOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/GeneralOperations.scala @@ -15,6 +15,7 @@ import net.psforever.objects.serverobject.turret.FacilityTurret import net.psforever.objects.sourcing.{DeployableSource, PlayerSource, VehicleSource} import net.psforever.objects.vehicles.Utility.InternalTelepad import net.psforever.objects.zones.blockmap.BlockMapEntity +import net.psforever.objects.zones.exp.ToDatabase import net.psforever.services.RemoverActor import net.psforever.services.local.{LocalAction, LocalServiceMessage} @@ -444,6 +445,13 @@ class GeneralOperations( attacker.Name, AvatarAction.AwardCep(attacker.CharId, Config.app.game.experience.cep.lluSlayerCredit) ) + ToDatabase.reportFacilityCapture( + attacker.CharId, + continent.Number, + llu.Owner.GUID.guid, + Config.app.game.experience.cep.lluSlayerCredit, + expType = "lsc" //three characters - "llu slayer credit" + ) } } if (!CaptureFlagManager.ReasonToLoseFlagViolently(continent, Some(guid), player)) {