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

actual br and cr (mostly)

Browse source
This commit is contained in:
ScrawnyRonnie 2024-01-01 13:03:24 -05:00
parent 3c508d34e8
commit 1f6e3d741e
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/scala/net/psforever/services/teamwork/SquadService.scala
View file

@ -950,6 +950,7 @@ class SquadService extends Actor {
membership.find { case (_member, _) => _member.CharId == charId } match { membership.find { case (_member, _) => _member.CharId == charId } match {
case Some(_) if squad.Leader.CharId != charId => case Some(_) if squad.Leader.CharId != charId =>
memberToSquad.remove(charId) memberToSquad.remove(charId)
subs.MonitorSquadDetails.subtractOne(charId)
features.Switchboard ! SquadSwitchboard.Leave(charId) features.Switchboard ! SquadSwitchboard.Leave(charId)
true true
case _ => case _ =>

11
src/main/scala/net/psforever/services/teamwork/SquadSwitchboard.scala
View file

@ -171,7 +171,7 @@ class SquadSwitchboard(
//update for leader //update for leader
features.InitialAssociation = false features.InitialAssociation = false
subscriptions.Publish(leaderId, SquadResponse.IdentifyAsSquadLeader(squad.GUID)) subscriptions.Publish(leaderId, SquadResponse.IdentifyAsSquadLeader(squad.GUID))
subscriptions.Publish(leaderId, SquadResponse.CharacterKnowledge(charId, role.Name, role.Certifications, 40, 5, role.ZoneId)) subscriptions.Publish(leaderId, SquadResponse.CharacterKnowledge(charId, role.Name, role.Certifications, player.avatar.br.value, player.avatar.cr.value, role.ZoneId))
//everyone //everyone
subscriptions.InitSquadDetail(features) subscriptions.InitSquadDetail(features)
} else { } else {
@ -200,7 +200,7 @@ class SquadSwitchboard(
) )
subscriptions.Publish(toChannel, SquadResponse.Join(squad, List(position), "", self), Seq(charId)) subscriptions.Publish(toChannel, SquadResponse.Join(squad, List(position), "", self), Seq(charId))
//update for leader //update for leader
subscriptions.Publish(leaderId, SquadResponse.CharacterKnowledge(charId, role.Name, role.Certifications, 40, 5, role.ZoneId)) subscriptions.Publish(leaderId, SquadResponse.CharacterKnowledge(charId, role.Name, role.Certifications, player.avatar.br.value, player.avatar.cr.value, role.ZoneId))
subscriptions.SquadEvents.subscribe(sendTo, s"/$toChannel/Squad") subscriptions.SquadEvents.subscribe(sendTo, s"/$toChannel/Squad")
subscriptions.InitSquadDetail(squad.GUID, Seq(charId), squad) subscriptions.InitSquadDetail(squad.GUID, Seq(charId), squad)
} }
@ -729,6 +729,7 @@ class SquadSwitchboard(
_.CharId == promotedPlayer _.CharId == promotedPlayer
} }
.foreach { member => .foreach { member =>
//todo: get member br & cr to replace 40, 5
subscriptions.Publish(promotedPlayer, SquadResponse.CharacterKnowledge(member.CharId, member.Name, member.Certifications, 40, 5, member.ZoneId)) subscriptions.Publish(promotedPlayer, SquadResponse.CharacterKnowledge(member.CharId, member.Name, member.Certifications, 40, 5, member.ZoneId))
} }
//to old and to new squad leader //to old and to new squad leader
@ -904,18 +905,18 @@ class SquadSwitchboard(
if (leaderCharId != charId) { if (leaderCharId != charId) {
subscriptions.Publish( subscriptions.Publish(
leaderCharId, leaderCharId,
SquadResponse.CharacterKnowledge(charId, member.Name, certifications, 40, 5, zoneNumber) SquadResponse.CharacterKnowledge(charId, member.Name, certifications, player.avatar.br.value, player.avatar.cr.value, zoneNumber)
) )
} }
context.parent ! SquadServiceMessage(player, player.Zone, SquadAction.ReloadDecoration()) context.parent ! SquadServiceMessage(player, player.Zone, SquadAction.ReloadDecoration())
} else if (zoneBefore != zoneNumber && leaderCharId != charId) { } else if (zoneBefore != zoneNumber && leaderCharId != charId) {
subscriptions.Publish( subscriptions.Publish(
leaderCharId, leaderCharId,
SquadResponse.CharacterKnowledge(charId, member.Name, certifications, 40, 5, 0) SquadResponse.CharacterKnowledge(charId, member.Name, certifications, player.avatar.br.value, player.avatar.cr.value, 0)
) )
subscriptions.Publish( subscriptions.Publish(
leaderCharId, leaderCharId,
SquadResponse.CharacterKnowledge(charId, member.Name, certifications, 40, 5, zoneNumber) SquadResponse.CharacterKnowledge(charId, member.Name, certifications, player.avatar.br.value, player.avatar.cr.value, zoneNumber)
) )
} }
if (features.LocationFollowsSquadLead) { if (features.LocationFollowsSquadLead) {