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

completed form of SquadDetailDefinitionUpdate

Browse source
This commit is contained in:
FateJH 2019-07-03 01:55:42 -04:00
parent d9619e4185
commit 2a1b051710
4 changed files with 1901 additions and 1288 deletions
Download patch file Download diff file Expand all files Collapse all files

1927
common/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala
View file

File diff suppressed because it is too large Load diff

2
common/src/main/scala/services/teamwork/SquadResponse.scala
View file

@ -1,7 +1,7 @@
// Copyright (c) 2019 PSForever // Copyright (c) 2019 PSForever
package services.teamwork package services.teamwork
import net.psforever.packet.game.{PlanetSideGUID, PlanetSideZoneID, SquadInfo, SquadPositionDetail} import net.psforever.packet.game._
object SquadResponse { object SquadResponse {
trait Response trait Response

1225
common/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala
View file

File diff suppressed because it is too large Load diff

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

@ -375,11 +375,15 @@ class WorldSessionActor extends Actor with MDCContextAware {
sendResponse( sendResponse(
SquadDetailDefinitionUpdateMessage( SquadDetailDefinitionUpdateMessage(
guid, guid,
member_info.find(_.name == leader).get.char_id, SquadDetail()
leader, .LeaderCharId(member_info.find(_.name == leader).get.char_id.get)
task, .LeaderName(leader)
zone, .Task(task)
member_info .ZoneId(zone)
.Members(
member_info.zipWithIndex.map { case (a, b) => SquadPositionEntry(b, a) }
)
.Complete
) )
) )
case _ => ; case _ => ;
@ -2929,17 +2933,16 @@ class WorldSessionActor extends Actor with MDCContextAware {
PlanetSideZoneID(7), PlanetSideZoneID(7),
4983296, 4983296,
List( List(
SquadPositionEntry(0, SquadPositionDetail2("\\#ff0000 |||||||||||||||||||||||", "", Set(), 0, "")), SquadPositionEntry(0, SquadPositionDetail("\\#ff0000 |||||||||||||||||||||||", "", Set(), 0, "")),
SquadPositionEntry(1, SquadPositionDetail2("\\#ffdc00 C", "", Set(), 0, "")), SquadPositionEntry(1, SquadPositionDetail("\\#ffdc00 C", "", Set(), 0, "")),
SquadPositionEntry(2, SquadPositionDetail2("\\#ffdc00 H", "", Set(), 42644970L, "OpolE")), SquadPositionEntry(2, SquadPositionDetail("\\#ffdc00 H", "", Set(), 42644970L, "OpolE")),
SquadPositionEntry(3, SquadPositionDetail2("\\#ffdc00 I", "", Set(), 41604210L, "BobaF3tt907")), SquadPositionEntry(3, SquadPositionDetail("\\#ffdc00 I", "", Set(), 41604210L, "BobaF3tt907")),
SquadPositionEntry(4, SquadPositionDetail2("\\#ffdc00 N", "", Set(), 0, "")), SquadPositionEntry(4, SquadPositionDetail("\\#ffdc00 N", "", Set(), 0, "")),
SquadPositionEntry(5, SquadPositionDetail2("\\#ffdc00 A", "", Set(), 0, "")), SquadPositionEntry(5, SquadPositionDetail("\\#ffdc00 A", "", Set(), 0, "")),
// SquadPositionEntry(6, SquadPositionDetail2("\\#ff0000 |||||||||||||||||||||||", "", Set(), 0, "")), SquadPositionEntry(6, SquadPositionDetail("\\#ff0000 |||||||||||||||||||||||", "", Set(), 0, "")),
SquadPositionEntry(6, SquadPositionDetail2("\\#ff0000 |||||||||||||||||||||||", "", Set(), 1, "Test")), SquadPositionEntry(7, SquadPositionDetail("\\#9640ff K", "", Set(), 0, "")),
SquadPositionEntry(7, SquadPositionDetail2("\\#9640ff K", "", Set(), 0, "")), SquadPositionEntry(8, SquadPositionDetail("\\#9640ff O", "", Set(), 42771010L ,"HofD")),
SquadPositionEntry(8, SquadPositionDetail2("\\#9640ff O", "", Set(), 42771010L ,"HofD")), SquadPositionEntry(9, SquadPositionDetail("\\#9640ff K", "", Set(), 0, ""))
SquadPositionEntry(9, SquadPositionDetail2("\\#9640ff K", "", Set(), 0, ""))
) )
) )
) )