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

wrong name

Browse source
This commit is contained in:
ScrawnyRonnie 2025-07-19 22:10:07 -04:00 committed by Fate-JH
parent d74812cd81
commit 694a3195e3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala
View file

@ -363,7 +363,7 @@ class WeaponAndProjectileOperations(
val cr = player.avatar.cr.value val cr = player.avatar.cr.value
val strikeType = playerFaction match { val strikeType = playerFaction match {
case PlanetSideEmpire.NC => case PlanetSideEmpire.NC =>
if (cr == 4) {"explosion_bluedeath_nc"} else {"explosion_bluedeath_nc_lrg"} if (cr == 4) {"explosion_bluedeath"} else {"explosion_bluedeath_lrg"}
case PlanetSideEmpire.TR => case PlanetSideEmpire.TR =>
if (cr == 4) {"explosion_bluedeath_tr"} else {"explosion_bluedeath_tr_lrg"} if (cr == 4) {"explosion_bluedeath_tr"} else {"explosion_bluedeath_tr_lrg"}
case PlanetSideEmpire.VS => case PlanetSideEmpire.VS =>

2
src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
View file

@ -362,7 +362,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm
log.info(s"${player.Name} has put ${player.Sex.possessive} ${holsteredEquipment.Definition.Name} down") log.info(s"${player.Name} has put ${player.Sex.possessive} ${holsteredEquipment.Definition.Name} down")
//make sure the player didn't just initialte an orbital strike. If not (the if below is true), make sure waypoint is removed //make sure the player didn't just initialte an orbital strike. If not (the if below is true), make sure waypoint is removed
if (holsteredEquipment.Definition == GlobalDefinitions.command_detonater && player.avatar.cr.value > 3 && if (holsteredEquipment.Definition == GlobalDefinitions.command_detonater && player.avatar.cr.value > 3 &&
!player.avatar.cooldowns.purchase.exists(os => os._1 == "orbital_strike" && Seconds.secondsBetween(os._2, LocalDateTime.now()).getSeconds < 10)) { !player.avatar.cooldowns.purchase.exists(os => os._1 == "orbital_strike" && Seconds.secondsBetween(os._2, LocalDateTime.now()).getSeconds < 12)) {
player.Zone.LocalEvents ! LocalServiceMessage(s"${player.Faction}", LocalAction.SendPacket(OrbitalStrikeWaypointMessage(player.GUID, None))) player.Zone.LocalEvents ! LocalServiceMessage(s"${player.Faction}", LocalAction.SendPacket(OrbitalStrikeWaypointMessage(player.GUID, None)))
} }
case None => case None =>