PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-06 21:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge some parts of PTSv3

Browse source
This commit is contained in:
Mazo 2020-05-05 22:25:37 +01:00
parent 61360d97e0
commit 58e64fd789
7 changed files with 87 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/src/main/scala/net/psforever/objects/Player.scala
View file

@ -55,13 +55,8 @@ class Player(private val core : Avatar) extends PlanetSideServerObject
Continent = "home2" //the zone id
var spectator : Boolean = false
var silenced : Boolean = false
var firstLoad : Boolean = false
def FirstLoad : Boolean = firstLoad
def FirstLoad_=(status : Boolean) : Boolean = {
firstLoad = status
FirstLoad
}
var death_by : Int = 0
var lastSeenStreamMessage : Array[Long] = Array.fill[Long](65535)(0L)
var lastShotSeq_time : Int = -1

2
common/src/main/scala/services/avatar/support/CorpseRemovalActor.scala
View file

@ -9,7 +9,7 @@ import services.avatar.{AvatarAction, AvatarServiceMessage}
import scala.concurrent.duration._
class CorpseRemovalActor extends RemoverActor {
final val FirstStandardDuration : FiniteDuration = 3 minutes
final val FirstStandardDuration : FiniteDuration = 1 minute
final val SecondStandardDuration : FiniteDuration = 500 milliseconds

2
common/src/main/scala/services/chat/ChatAction.scala
View file

@ -14,5 +14,7 @@ object ChatAction {
final case class Voice(player_guid : PlanetSideGUID, player_name : String, continent : Zone, player_pos : Vector3, player_faction : PlanetSideEmpire.Value, msg : ChatMsg) extends Action
final case class Note(player_guid : PlanetSideGUID, player_name : String, msg : ChatMsg) extends Action
final case class Squad(player_guid : PlanetSideGUID, player_name : String, continent : Zone, player_pos : Vector3, player_faction : PlanetSideEmpire.Value, msg : ChatMsg) extends Action
final case class Platoon(player_guid : PlanetSideGUID, player_name : String, continent : Zone, player_pos : Vector3, player_faction : PlanetSideEmpire.Value, msg : ChatMsg) extends Action
final case class Command(player_guid : PlanetSideGUID, player_name : String, continent : Zone, player_pos : Vector3, player_faction : PlanetSideEmpire.Value, msg : ChatMsg) extends Action
final case class GM(player_guid : PlanetSideGUID, player_name : String, msg : ChatMsg) extends Action
}

2
common/src/main/scala/services/chat/ChatResponse.scala
View file

@ -13,6 +13,8 @@ object ChatResponse {
final case class Voice(messageType : ChatMessageType.Value, wideContents : Boolean, recipient : String, contents : String, note : Option[String]) extends Response
final case class Unk45(sender : String, messageType : ChatMessageType.Value, wideContents : Boolean, recipient : String, contents : String, note : Option[String]) extends Response
final case class Squad(sender : String, messageType : ChatMessageType.Value, wideContents : Boolean, recipient : String, contents : String, note : Option[String]) extends Response
final case class Platoon(sender : String, messageType : ChatMessageType.Value, wideContents : Boolean, recipient : String, contents : String, note : Option[String]) extends Response
final case class Command(sender : String, messageType : ChatMessageType.Value, wideContents : Boolean, recipient : String, contents : String, note : Option[String]) extends Response
final case class Text(toChannel : String, avatar_guid : PlanetSideGUID, personal : Int, messageType : ChatMessageType.Value, wideContents : Boolean, recipient : String, contents : String, note : Option[String])
}

8
common/src/main/scala/services/chat/ChatService.scala
View file

@ -80,6 +80,14 @@ class ChatService extends Actor {
ChatEvents.publish(
ChatServiceResponse(s"/Chat/$forChannel", player_guid, player_name, cont, player_pos, player_faction, 2, ChatMsg(ChatMessageType.CMT_SQUAD,msg.wideContents,player_name,msg.contents,None))
)
case ChatAction.Platoon(player_guid, player_name, cont, player_pos, player_faction, msg) => // platoon
ChatEvents.publish(
ChatServiceResponse(s"/Chat/$forChannel", player_guid, player_name, cont, player_pos, player_faction, 2, ChatMsg(ChatMessageType.CMT_PLATOON,msg.wideContents,player_name,msg.contents,None))
)
case ChatAction.Command(player_guid, player_name, cont, player_pos, player_faction, msg) => // command
ChatEvents.publish(
ChatServiceResponse(s"/Chat/$forChannel", player_guid, player_name, cont, player_pos, player_faction, 2, ChatMsg(ChatMessageType.CMT_COMMAND,msg.wideContents,player_name,msg.contents,None))
)
case ChatAction.GM(player_guid, player_name, msg) => // GM
msg.messageType match {
case ChatMessageType.CMT_SILENCE =>