PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-14 07:55:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cc hacking and cep, outfit login time

Browse source
This commit is contained in:
ScrawnyRonnie 2025-09-11 16:00:54 -04:00
parent 0c3c7bcb7f
commit 617d2532f5
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/scala/net/psforever/actors/session/support/SessionAvatarHandlers.scala
View file

@ -82,7 +82,7 @@ class SessionAvatarHandlers(
maxCepList.lift(squadSize - 1).getOrElse(squadSize * maxCepList.head).toLong maxCepList.lift(squadSize - 1).getOrElse(squadSize * maxCepList.head).toLong
} }
val groupContribution: Float = squadUI val groupContribution: Float = squadUI
.map { case (id, _) => (id, squadParticipation.getOrElse(id, 0f) / 10f) } .map { case (id, _) => (id, squadParticipation.getOrElse(id, 0f)) }
.values .values
.max .max
val modifiedExp: Long = (cep.toFloat * groupContribution).toLong val modifiedExp: Long = (cep.toFloat * groupContribution).toLong
@ -115,7 +115,8 @@ class SessionAvatarHandlers(
} }
} }
val modifiedExp = (cep * individualContribution).toLong val modifiedExp = (cep * individualContribution).toLong
exp.ToDatabase.reportFacilityCapture(charId, buildingId, zoneNumber, modifiedExp, expType="bep") val finalBep = math.min(modifiedExp, 2250L) // 2250 max bep for capture
exp.ToDatabase.reportFacilityCapture(charId, buildingId, zoneNumber, finalBep, expType="bep")
avatarActor ! AvatarActor.AwardFacilityCaptureBep(modifiedExp) avatarActor ! AvatarActor.AwardFacilityCaptureBep(modifiedExp)
Some(modifiedExp) Some(modifiedExp)
} }

16
src/main/scala/net/psforever/actors/session/support/SessionOutfitHandlers.scala
View file

@ -13,7 +13,7 @@ import net.psforever.services.chat.OutfitChannel
import net.psforever.types.ChatMessageType import net.psforever.types.ChatMessageType
import net.psforever.util.Config import net.psforever.util.Config
import java.time.LocalDateTime import java.time.{LocalDateTime, ZoneId}
import java.util.concurrent.Executors import java.util.concurrent.Executors
import scala.util.{Failure, Success} import scala.util.{Failure, Success}
@ -61,7 +61,7 @@ object SessionOutfitHandlers {
case _ => case _ =>
createNewOutfit(validName, player.Faction.id, player.CharId).map { outfit => createNewOutfit(validName, player.Faction.id, player.CharId).map { outfit =>
val seconds: Long = val seconds: Long =
outfit.created.atZone(java.time.ZoneOffset.UTC).toInstant.toEpochMilli / 1000 outfit.created.atZone(ZoneId.systemDefault()).toInstant.toEpochMilli / 1000
PlayerControl.sendResponse(player.Zone, player.Name, PlayerControl.sendResponse(player.Zone, player.Name,
OutfitEvent(outfit.id, Update( OutfitEvent(outfit.id, Update(
@ -151,7 +151,7 @@ object SessionOutfitHandlers {
OutfitMemberEventAction.Update(invited.Name, 0, 0, 0, OutfitMemberEventAction.Update(invited.Name, 0, 0, 0,
OutfitMemberEventAction.PacketType.Padding, 0))) OutfitMemberEventAction.PacketType.Padding, 0)))
val seconds: Long = outfit.created.atZone(java.time.ZoneOffset.UTC).toInstant.toEpochMilli / 1000 val seconds: Long = outfit.created.atZone(ZoneId.systemDefault()).toInstant.toEpochMilli / 1000
PlayerControl.sendResponse(invited.Zone, invited.Name, PlayerControl.sendResponse(invited.Zone, invited.Name,
OutfitEvent(outfitId, Initial(OutfitInfo( OutfitEvent(outfitId, Initial(OutfitInfo(
outfit.name, points, points, memberCount, outfit.name, points, points, memberCount,
@ -372,7 +372,7 @@ object SessionOutfitHandlers {
members <- membersF members <- membersF
} yield { } yield {
outfitOpt.foreach { outfit => outfitOpt.foreach { outfit =>
val seconds: Long = outfit.created.atZone(java.time.ZoneOffset.UTC).toInstant.toEpochMilli / 1000 val seconds: Long = outfit.created.atZone(ZoneId.systemDefault()).toInstant.toEpochMilli / 1000
PlayerControl.sendResponse(player.Zone, player.Name, PlayerControl.sendResponse(player.Zone, player.Name,
OutfitEvent(outfit.id, Initial(OutfitInfo( OutfitEvent(outfit.id, Initial(OutfitInfo(
@ -397,7 +397,7 @@ object SessionOutfitHandlers {
val lastLogin = findPlayerByIdForOutfitAction(zones, avatarId, player) match { val lastLogin = findPlayerByIdForOutfitAction(zones, avatarId, player) match {
case Some(_) => 0L case Some(_) => 0L
case None if player.Name == avatarName => 0L case None if player.Name == avatarName => 0L
case None => (System.currentTimeMillis() - login.atZone(java.time.ZoneOffset.UTC).toInstant.toEpochMilli) / 1000 case None => (System.currentTimeMillis() - login.atZone(ZoneId.systemDefault()).toInstant.toEpochMilli) / 1000
} }
PlayerControl.sendResponse(player.Zone, player.Name, PlayerControl.sendResponse(player.Zone, player.Name,
OutfitMemberEvent(outfit.id, avatarId, OutfitMemberEvent(outfit.id, avatarId,
@ -477,7 +477,7 @@ object SessionOutfitHandlers {
unk10 = 0, unk10 = 0,
unk11 = true, unk11 = true,
unk12 = 0, unk12 = 0,
created_timestamp = outfit.created.atZone(java.time.ZoneOffset.UTC).toInstant.toEpochMilli / 1000, created_timestamp = outfit.created.atZone(ZoneId.systemDefault()).toInstant.toEpochMilli / 1000,
unk23 = 0, unk23 = 0,
unk24 = 0, unk24 = 0,
unk25 = 0 unk25 = 0
@ -542,7 +542,7 @@ object SessionOutfitHandlers {
unk10 = 0, unk10 = 0,
unk11 = true, unk11 = true,
unk12 = 0, unk12 = 0,
created_timestamp = outfit.created.atZone(java.time.ZoneOffset.UTC).toInstant.toEpochMilli / 1000, created_timestamp = outfit.created.atZone(ZoneId.systemDefault()).toInstant.toEpochMilli / 1000,
unk23 = 0, unk23 = 0,
unk24 = 0, unk24 = 0,
unk25 = 0 unk25 = 0
@ -595,7 +595,7 @@ object SessionOutfitHandlers {
} yield (outfitOpt, memberCount, points)) } yield (outfitOpt, memberCount, points))
.map { .map {
case (Some(outfit), memberCount, points) => case (Some(outfit), memberCount, points) =>
val seconds: Long = outfit.created.atZone(java.time.ZoneOffset.UTC).toInstant.toEpochMilli / 1000 val seconds: Long = outfit.created.atZone(ZoneId.systemDefault()).toInstant.toEpochMilli / 1000
PlayerControl.sendResponse(player.Zone, player.Name, PlayerControl.sendResponse(player.Zone, player.Name,
OutfitEvent(outfitId, Update(OutfitInfo( OutfitEvent(outfitId, Update(OutfitInfo(

8
src/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala
View file

@ -1,7 +1,7 @@
// Copyright (c) 2020 PSForever // Copyright (c) 2020 PSForever
package net.psforever.objects.serverobject.hackable package net.psforever.objects.serverobject.hackable
import net.psforever.objects.serverobject.structures.{Building, WarpGate} import net.psforever.objects.serverobject.structures.{Building, StructureType, WarpGate}
import net.psforever.objects.serverobject.terminals.capture.CaptureTerminal import net.psforever.objects.serverobject.terminals.capture.CaptureTerminal
import net.psforever.objects.{Player, Vehicle} import net.psforever.objects.{Player, Vehicle}
import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject}
@ -148,9 +148,11 @@ object GenericHackables {
*/ */
def EndHackProgress(target: PlanetSideServerObject, hacker: Player): Boolean = { def EndHackProgress(target: PlanetSideServerObject, hacker: Player): Boolean = {
val building = target.asInstanceOf[CaptureTerminal].Owner.asInstanceOf[Building] val building = target.asInstanceOf[CaptureTerminal].Owner.asInstanceOf[Building]
if (building.Faction == PlanetSideEmpire.NEUTRAL) { if (building.Faction == PlanetSideEmpire.NEUTRAL || building.BuildingType == StructureType.Tower
|| building.Faction == hacker.Faction) {
false false
} else { }
else {
val stopHackingCount = building.Neighbours match { val stopHackingCount = building.Neighbours match {
case Some(neighbors) => case Some(neighbors) =>
neighbors.count { neighbors.count {