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

Merge pull request #17 from tfarley/pkt-chatmsg

Browse source 
Add ChatMsg decoder and stubbed handler
This commit is contained in:
pschord 2016-07-18 03:00:27 -04:00 committed by GitHub
parent a0194ba7de 8411af17d3
commit 678630fee3
5 changed files with 121 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
View file

@ -339,7 +339,7 @@ object GamePacketOpcode extends Enumeration {
case DismountVehicleMsg => noDecoder(opcode)
case UseItemMessage => noDecoder(opcode)
case MoveItemMessage => noDecoder(opcode)
case ChatMsg => noDecoder(opcode)
case ChatMsg => game.ChatMsg.decode
case CharacterNoRecordMessage => noDecoder(opcode)
// OPCODE 20

4
common/src/main/scala/net/psforever/packet/PSPacket.scala
View file

@ -159,4 +159,8 @@ object PacketHelpers {
def encodedWideString : Codec[String] = variableSizeBytes(encodedStringSize.xmap(
insize => insize*2,
outSize => outSize/2), utf16)
def encodedWideStringAligned(adjustment : Int) : Codec[String] = variableSizeBytes(encodedStringSizeWithPad(adjustment).xmap(
insize => insize*2,
outSize => outSize/2), utf16)
}

26
common/src/main/scala/net/psforever/packet/game/ChatMsg.scala Normal file
View file

@ -0,0 +1,26 @@
// Copyright (c) 2016 PSForever.net to present
package net.psforever.packet.game
import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket}
import net.psforever.types.ChatMessageType
import scodec.Codec
import scodec.codecs._
final case class ChatMsg(channel : ChatMessageType.Value,
unk1 : Boolean,
recipient : String,
contents : String)
extends PlanetSideGamePacket {
type Packet = ChatMsg
def opcode = GamePacketOpcode.ChatMsg
def encode = ChatMsg.encode(this)
}
object ChatMsg extends Marshallable[ChatMsg] {
implicit val codec : Codec[ChatMsg] = (
("messagetype" | ChatMessageType.codec) ::
("unk1" | bool) ::
("recipient" | PacketHelpers.encodedWideStringAligned(7)) ::
("contents" | PacketHelpers.encodedWideString)
).as[ChatMsg]
}

83
common/src/main/scala/net/psforever/types/ChatMessageType.scala Normal file
View file

@ -0,0 +1,83 @@
// Copyright (c) 2016 PSForever.net to present
package net.psforever.types
import net.psforever.packet.PacketHelpers
import scodec.codecs._
/**
* ChatMessageTypes were reversed by:
* Checking the type in the packet upon receipt by server while using slash commands
* Replaying the ChatMsg packet back to the sender after modifying the messagetype value
*
* Some other unchecked commands, if they actually exist as message types:
* Reply (/r), BattleGroup (/bg), CSRReply (/gmreply)
*/
object ChatMessageType extends Enumeration {
type Type = Value
val Unk0, // ??? Appears in top chat pane
Unk1, // ??? Appears in top chat pane
Unk2, // ??? Appears in top chat pane
Broadcast, // /b
Command, // /c
Global, // /comall
SituationReport, // /sitrep
SanctuaryAll, // /comsan
OrbitalStationAll, // No slash command???
SupaiAll, // /comsu
HunhauAll, // /comhu
AdlivunAll, // /comad
ByblosAll, // /comby
AnnwnAll, // /coman
DrugaskanAll, // /comdr
SolsarAll, // /comso
HossinAll, // /comho
CyssorAll, // /comcy
IshundarAll, // /comis
ForseralAll, // /comfo
CeryshenAll, // /comce
EsamirAll, // /comes
OshurAll, // /comos
OshurPrimeAll, // /compr
SearhusAll, // /comse
AmerishAll, // /comam
Local, // /l
Outfit, // /o
Platoon, // /p
SquadLeaders, // /pl
Squad, // /s
SquadCommand, // /sl
Tell, // /t
BlackOps, // No slash command???
CSRBroadcast, // /gmbroadcast
CSRBroadcastNC, // /ncbroadcast
CSRBroadcastTR, // /trbroadcast
CSRBroadcastVS, // /vsbroadcast
CSRWorldBroadcast, // /worldbroadcast || /wb
CSR, // /gmlocal
CSRTell, // /gmtell (actually causes normal /tell 0x20 when not a gm???)
Note, // /note
CSRWorldBroadcastPopup, // /gmpopup
CSRTellTo, // Recipient of /gmtell
TellTo, // Recipient of /t
Unk45, // ??? Looks like local?
Unk46, // ??? This actually causes the client to ping back to the server with some stringified numbers "80 120" (with the same 46 chatmsg causing infinite loop?) - may be incorrect decoding
PopupInstantAction, // Sent when Instant Action invoked
PopupRecallSanctuary, // Sent when Recall To Sanctuary invoked
Unk49, // ???
Unk50, // ???
Unk51, // ???
Unk52, // ???
Unk53, // ???
Unk54, // ???
Unk55, // ???
Unk56, // ???
Unk57, // ???
Unk58, // ???
Unk59, // ???
Unk60, // ???
PopupQuit // Sent when Quit invoked
// Could be more types
= Value
implicit val codec = PacketHelpers.createEnumerationCodec(this, uint8L)
}

7
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -146,6 +146,13 @@ class WorldSessionActor extends Actor with MDCContextAware {
sendResponse(PacketCoding.CreateGamePacket(0, KeepAliveMessage(0)))
case PlayerStateMessageUpstream(_) =>
case msg @ ChatMsg(messagetype, unk1, recipient, contents) =>
log.info("Chat: " + msg)
// TODO: Depending on messagetype, may need to prepend sender's name to contents with proper spacing
// TODO: Just replays the packet straight back to sender; actually needs to be routed to recipients!
sendResponse(PacketCoding.CreateGamePacket(0, ChatMsg(messagetype, unk1, recipient, contents)))
case default => log.debug(s"Unhandled GamePacket ${pkt}")
}