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

original squad leader did not have health or armor properly scaled to the field; squad vehicle stats no longer override individual squad member stats in ui (#479)

Browse source
This commit is contained in:
Fate-JH 2020-05-30 12:03:25 -04:00 • committed by GitHub
parent 4da6f9d618
commit 765816a4d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/scala/services/teamwork/SquadService.scala
View file

@ -2230,8 +2230,8 @@ class SquadService extends Actor {
val leadPosition = squad.Membership(0) val leadPosition = squad.Membership(0)
leadPosition.Name = name leadPosition.Name = name
leadPosition.CharId = player.CharId leadPosition.CharId = player.CharId
leadPosition.Health = player.Health leadPosition.Health = StatConverter.Health(player.Health, player.MaxHealth, min=1, max=64)
leadPosition.Armor = player.Armor leadPosition.Armor = StatConverter.Health(player.Armor, player.MaxArmor, min=1, max=64)
leadPosition.Position = player.Position leadPosition.Position = player.Position
leadPosition.ZoneId = 1 leadPosition.ZoneId = 1
squadFeatures += squad.GUID -> new SquadFeatures(squad).Start squadFeatures += squad.GUID -> new SquadFeatures(squad).Start

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

@ -11269,14 +11269,7 @@ class WorldSessionActor extends Actor
squadService ! SquadServiceMessage( squadService ! SquadServiceMessage(
player, player,
continent, continent,
continent.GUID(player.VehicleSeated) match { SquadServiceAction.Update(player.CharId, player.Health, player.MaxHealth, player.Armor, player.MaxArmor, player.Position, continent.Number)
case Some(vehicle : Vehicle) =>
SquadServiceAction.Update(player.CharId, vehicle.Health, vehicle.MaxHealth, vehicle.Shields, vehicle.MaxShields, vehicle.Position, continent.Number)
case Some(obj : PlanetSideGameObject with WeaponTurret) =>
SquadServiceAction.Update(player.CharId, obj.Health, obj.MaxHealth, 0, 0, obj.Position, continent.Number)
case _ =>
SquadServiceAction.Update(player.CharId, player.Health, player.MaxHealth, player.Armor, player.MaxArmor, player.Position, continent.Number)
}
) )
} }