PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-14 16:04:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

automated turret damage was getting skipped because resolved attackers were hyper-focused on small turret automation and forgot about facility turrets (#1230)

Browse source
This commit is contained in:
Fate-JH 2024-08-22 23:35:55 -04:00 • committed by GitHub
parent 9708bf9beb
commit d219f903e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/main/scala/net/psforever/actors/session/normal/WeaponAndProjectileLogic.scala
View file

@ -17,6 +17,7 @@ import net.psforever.objects.serverobject.doors.InteriorDoorPassage
import net.psforever.objects.{AmmoBox, BoomerDeployable, BoomerTrigger, ConstructionItem, Deployables, DummyExplodingEntity, GlobalDefinitions, OwnableByPlayer, PlanetSideGameObject, Player, SpecialEmp, Tool, Tools, Vehicle} import net.psforever.objects.{AmmoBox, BoomerDeployable, BoomerTrigger, ConstructionItem, Deployables, DummyExplodingEntity, GlobalDefinitions, OwnableByPlayer, PlanetSideGameObject, Player, SpecialEmp, Tool, Tools, Vehicle}
import net.psforever.objects.serverobject.interior.Sidedness import net.psforever.objects.serverobject.interior.Sidedness
import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.serverobject.mount.Mountable
import net.psforever.objects.serverobject.structures.Amenity
import net.psforever.objects.serverobject.turret.{FacilityTurret, VanuSentry} import net.psforever.objects.serverobject.turret.{FacilityTurret, VanuSentry}
import net.psforever.objects.serverobject.turret.auto.{AutomatedTurret, AutomatedTurretBehavior} import net.psforever.objects.serverobject.turret.auto.{AutomatedTurret, AutomatedTurretBehavior}
import net.psforever.objects.sourcing.{PlayerSource, SourceEntry} import net.psforever.objects.sourcing.{PlayerSource, SourceEntry}
@ -545,7 +546,7 @@ class WeaponAndProjectileLogic(val ops: WeaponAndProjectileOperations, implicit
turret.Actor ! AutomatedTurretBehavior.ConfirmShot(target) turret.Actor ! AutomatedTurretBehavior.ConfirmShot(target)
Some(target) Some(target)
case turret: AutomatedTurret with OwnableByPlayer => case turret: AutomatedTurret =>
turret.Actor ! AutomatedTurretBehavior.ConfirmShot(target) turret.Actor ! AutomatedTurretBehavior.ConfirmShot(target)
HandleAIDamage(target, CompileAutomatedTurretDamageData(turret, projectileTypeId)) HandleAIDamage(target, CompileAutomatedTurretDamageData(turret, projectileTypeId))
Some(target) Some(target)
@ -558,7 +559,7 @@ class WeaponAndProjectileLogic(val ops: WeaponAndProjectileOperations, implicit
case target: PlanetSideServerObject with FactionAffinity with Vitality => case target: PlanetSideServerObject with FactionAffinity with Vitality =>
sessionLogic.validObject(attackerGuid, decorator = "AIDamage/Attacker") sessionLogic.validObject(attackerGuid, decorator = "AIDamage/Attacker")
.collect { .collect {
case turret: AutomatedTurret with OwnableByPlayer if turret.Target.nonEmpty => case turret: AutomatedTurret if turret.Target.nonEmpty =>
//the turret must be shooting at something (else) first //the turret must be shooting at something (else) first
HandleAIDamage(target, CompileAutomatedTurretDamageData(turret, projectileTypeId)) HandleAIDamage(target, CompileAutomatedTurretDamageData(turret, projectileTypeId))
} }
@ -1268,16 +1269,50 @@ class WeaponAndProjectileLogic(val ops: WeaponAndProjectileOperations, implicit
} }
private def CompileAutomatedTurretDamageData( private def CompileAutomatedTurretDamageData(
turret: AutomatedTurret with OwnableByPlayer, turret: AutomatedTurret,
projectileTypeId: Long
): Option[(AutomatedTurret, Tool, SourceEntry, ProjectileDefinition)] = {
turret match {
case tOwner: OwnableByPlayer =>
CompileAutomatedTurretDamageData(
turret,
CompileAutomatedTurretOwnableBlame(tOwner),
projectileTypeId
)
case tAmenity: Amenity =>
CompileAutomatedTurretDamageData(
turret,
CompileAutomatedTurretAmenityBlame(tAmenity),
projectileTypeId
)
case _ =>
None
}
}
private def CompileAutomatedTurretOwnableBlame(turret: AutomatedTurret with OwnableByPlayer): SourceEntry = {
Deployables.AssignBlameTo(continent, turret.OwnerName, SourceEntry(turret))
}
private def CompileAutomatedTurretAmenityBlame(turret: AutomatedTurret with Amenity): SourceEntry = {
turret
.Seats
.values
.flatMap(_.occupant)
.collectFirst(SourceEntry(_))
.getOrElse(SourceEntry(turret.Owner))
}
private def CompileAutomatedTurretDamageData(
turret: AutomatedTurret,
blame: SourceEntry,
projectileTypeId: Long projectileTypeId: Long
): Option[(AutomatedTurret, Tool, SourceEntry, ProjectileDefinition)] = { ): Option[(AutomatedTurret, Tool, SourceEntry, ProjectileDefinition)] = {
turret.Weapons turret.Weapons
.values .values
.flatMap { _.Equipment } .flatMap { _.Equipment }
.collect { .collect {
case weapon: Tool => case weapon: Tool => (turret, weapon, blame, weapon.Projectile)
val source = Deployables.AssignBlameTo(continent, turret.OwnerName, SourceEntry(turret))
(turret, weapon, source, weapon.Projectile)
} }
.find { case (_, _, _, p) => p.ObjectId == projectileTypeId } .find { case (_, _, _, p) => p.ObjectId == projectileTypeId }
} }