PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-15 08:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1275 from ScrawnyRonnie/multi-kill

Browse source 
Multikill Rewards
This commit is contained in:
ScrawnyRonnie 2025-06-19 07:08:50 -04:00 • committed by GitHub
commit 4d21b15953
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main/scala/net/psforever/actors/session/AvatarActor.scala
View file

@ -946,12 +946,16 @@ object AvatarActor {
def setBepOnly(avatarId: Long, bep: Long): Future[Long] = { def setBepOnly(avatarId: Long, bep: Long): Future[Long] = {
import ctx._ import ctx._
import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.ExecutionContext.Implicits.global
val out: Promise[Long] = Promise() ctx.transaction { implicit ec =>
val result = ctx.run(query[persistence.Avatar].filter(_.id == lift(avatarId)).update(_.bep -> lift(bep))) for {
result.onComplete { _ => currBep <- ctx.run(query[persistence.Avatar].filter(_.id == lift(avatarId)).map(_.bep))
out.completeWith(Future(bep)) .map(_.headOption.getOrElse(0L))
newBep = currBep + bep
_ <- ctx.run(query[persistence.Avatar].filter(_.id == lift(avatarId)).update(_.bep -> lift(newBep)))
} yield newBep
} }
out.future
} }
def loadExperienceDebt(avatarId: Long): Future[Long] = { def loadExperienceDebt(avatarId: Long): Future[Long] = {
@ -1843,7 +1847,7 @@ class AvatarActor(
implantTimers.foreach(_.cancel()) implantTimers.foreach(_.cancel())
supportExperienceTimer.cancel() supportExperienceTimer.cancel()
if (supportExperiencePool > 0) { if (supportExperiencePool > 0) {
AvatarActor.setBepOnly(avatar.id, avatar.bep + supportExperiencePool) AvatarActor.setBepOnly(avatar.id, supportExperiencePool)
} }
AvatarActor.saveAvatarData(avatar) AvatarActor.saveAvatarData(avatar)
saveLockerFunc() saveLockerFunc()
@ -2882,7 +2886,7 @@ class AvatarActor(
def setBep(bep: Long, modifier: ExperienceType): Unit = { def setBep(bep: Long, modifier: ExperienceType): Unit = {
import ctx._ import ctx._
AvatarActor.setBepOnly(avatar.id, bep).onComplete { AvatarActor.setBepOnly(avatar.id, bep).onComplete {
case Success(_) => case Success(newBep) =>
val sess = session.get val sess = session.get
val zone = sess.zone val zone = sess.zone
val zoneId = zone.id val zoneId = zone.id
@ -2891,10 +2895,10 @@ class AvatarActor(
val pguid = player.GUID val pguid = player.GUID
val localModifier = modifier val localModifier = modifier
val current = BattleRank.withExperience(avatar.bep).value val current = BattleRank.withExperience(avatar.bep).value
val next = BattleRank.withExperience(bep).value val next = BattleRank.withExperience(newBep).value
val br24 = BattleRank.BR24.value val br24 = BattleRank.BR24.value
sessionActor ! SessionActor.SendResponse(BattleExperienceMessage(pguid, bep, localModifier)) sessionActor ! SessionActor.SendResponse(BattleExperienceMessage(pguid, newBep, localModifier))
events ! AvatarServiceMessage(zoneId, AvatarAction.PlanetsideAttributeToAll(pguid, 17, bep)) events ! AvatarServiceMessage(zoneId, AvatarAction.PlanetsideAttributeToAll(pguid, 17, newBep))
if (current < br24 && next >= br24 || current >= br24 && next < br24) { if (current < br24 && next >= br24 || current >= br24 && next < br24) {
setCosmetics(Set()).onComplete { _ => setCosmetics(Set()).onComplete { _ =>
val evts = events val evts = events
@ -2906,7 +2910,7 @@ class AvatarActor(
// when the level is reduced, take away any implants over the implant slot limit // when the level is reduced, take away any implants over the implant slot limit
val implants = avatar.implants.zipWithIndex.map { val implants = avatar.implants.zipWithIndex.map {
case (implant, index) => case (implant, index) =>
if (index >= BattleRank.withExperience(bep).implantSlots && implant.isDefined) { if (index >= BattleRank.withExperience(newBep).implantSlots && implant.isDefined) {
ctx ctx
.run( .run(
query[persistence.Implant] query[persistence.Implant]
@ -2925,7 +2929,7 @@ class AvatarActor(
implant implant
} }
} }
avatar = avatar.copy(bep = bep, implants = implants) avatar = avatar.copy(bep = newBep, implants = implants)
case Failure(exception) => case Failure(exception) =>
log.error(exception)("db failure") log.error(exception)("db failure")
} }
@ -2948,11 +2952,11 @@ class AvatarActor(
} }
def awardSupportExperience(bep: Long, previousDelay: Long): Unit = { def awardSupportExperience(bep: Long, previousDelay: Long): Unit = {
setBep(avatar.bep + bep, ExperienceType.Support) setBep(bep, ExperienceType.Support)
} }
def actuallyAwardSupportExperience(bep: Long, delayBy: Long): Unit = { def actuallyAwardSupportExperience(bep: Long, delayBy: Long): Unit = {
setBep(avatar.bep + bep, ExperienceType.Support) setBep(bep, ExperienceType.Support)
supportExperiencePool = supportExperiencePool - bep supportExperiencePool = supportExperiencePool - bep
if (supportExperiencePool > 0) { if (supportExperiencePool > 0) {
resetSupportExperienceTimer(bep, delayBy) resetSupportExperienceTimer(bep, delayBy)
@ -2986,7 +2990,7 @@ class AvatarActor(
} }
private def setBepAction(modifier: ExperienceType)(value: Long): Unit = { private def setBepAction(modifier: ExperienceType)(value: Long): Unit = {
setBep(avatar.bep + value, modifier) setBep(value, modifier)
} }
private def setSupportAction(value: Long): Unit = { private def setSupportAction(value: Long): Unit = {
@ -3037,7 +3041,7 @@ class AvatarActor(
) )
} }
if (exp > 0L) { if (exp > 0L) {
setBep(avatar.bep + exp, msg) setBep(exp, msg)
zone.actor ! ZoneActor.RewardOurSupporters(playerSource, historyTranscript, killStat, exp) zone.actor ! ZoneActor.RewardOurSupporters(playerSource, historyTranscript, killStat, exp)
zone.AvatarEvents ! AvatarServiceMessage( zone.AvatarEvents ! AvatarServiceMessage(
player.Name, AvatarAction.ShareKillExperienceWithSquad(player, exp)) player.Name, AvatarAction.ShareKillExperienceWithSquad(player, exp))

2
src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala
View file

@ -92,7 +92,7 @@ class CaptureFlagManager(zone: Zone) extends Actor {
case CaptureFlagLostReasonEnum.Resecured => case CaptureFlagLostReasonEnum.Resecured =>
CaptureFlagManager.ChatBroadcast( CaptureFlagManager.ChatBroadcast(
zone, zone,
CaptureFlagChatMessageStrings.CTF_Failed_SourceResecured(flag.Owner.asInstanceOf[Building].Name, flag.Faction) CaptureFlagChatMessageStrings.CTF_Failed_SourceResecured(flag.Owner.asInstanceOf[Building].Name, flag.Owner.asInstanceOf[Building].Faction)
) )
case CaptureFlagLostReasonEnum.TimedOut => case CaptureFlagLostReasonEnum.TimedOut =>
val building = flag.Owner.asInstanceOf[Building] val building = flag.Owner.asInstanceOf[Building]