PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lukewarm Potato (#1285)

Browse source 
* 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
This commit is contained in:
Fate-JH 2025-07-31 01:14:40 -04:00 committed by GitHub
parent c1d9f679b2
commit bb858203e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/resources/application.conf
View file

@ -469,7 +469,7 @@ game {
# If a player died while carrying an lattice logic unit, # If a player died while carrying an lattice logic unit,
# and satisfies the carrying duration, # and satisfies the carrying duration,
# award the player who is accredited with the kill command experience. # 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 # 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] 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 # When the cep has to be capped for squad size, add a small value to the capped value

8
src/main/scala/net/psforever/actors/session/support/GeneralOperations.scala
View file

@ -15,6 +15,7 @@ import net.psforever.objects.serverobject.turret.FacilityTurret
import net.psforever.objects.sourcing.{DeployableSource, PlayerSource, VehicleSource} import net.psforever.objects.sourcing.{DeployableSource, PlayerSource, VehicleSource}
import net.psforever.objects.vehicles.Utility.InternalTelepad import net.psforever.objects.vehicles.Utility.InternalTelepad
import net.psforever.objects.zones.blockmap.BlockMapEntity import net.psforever.objects.zones.blockmap.BlockMapEntity
import net.psforever.objects.zones.exp.ToDatabase
import net.psforever.services.RemoverActor import net.psforever.services.RemoverActor
import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage}
@ -444,6 +445,13 @@ class GeneralOperations(
attacker.Name, attacker.Name,
AvatarAction.AwardCep(attacker.CharId, Config.app.game.experience.cep.lluSlayerCredit) 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)) { if (!CaptureFlagManager.ReasonToLoseFlagViolently(continent, Some(guid), player)) {