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

how painbox doors work; moved constant chat system subscriptions; swapped around medical terminal coordinates on home3

Browse source
This commit is contained in:
FateJH 2020-01-03 20:24:44 -05:00
parent d2ef5a76a4
commit 837e9cb2ff
4 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

34
common/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala
View file

@ -11,19 +11,31 @@ import scala.concurrent.duration._
import scala.concurrent.ExecutionContext.Implicits.global
class PainboxControl(painbox: Painbox) extends Actor {
//private[this] val log = org.log4s.getLogger(s"Painbox")
private var painboxTick: Cancellable = DefaultCancellable.obj
private var nearestDoor : Door = null
private[this] val log = org.log4s.getLogger(s"Painbox")
var painboxTick: Cancellable = DefaultCancellable.obj
var nearestDoor : Option[Door] = None
def receive : Receive = {
case "startup" =>
painbox.Owner match {
case obj : Building =>
nearestDoor = obj.Amenities
.collect { case door : Door => door }
.minBy(door => Vector3.DistanceSquared(painbox.Position, door.Position))
context.become(Stopped)
case _ => ;
if(painbox.Definition.HasNearestDoorDependency) {
(painbox.Owner match {
case obj : Building =>
obj.Amenities
.collect { case door : Door => door }
.sortBy(door => Vector3.DistanceSquared(painbox.Position, door.Position))
.headOption
case _ =>
None
}) match {
case door @ Some(_) =>
nearestDoor = door
context.become(Stopped)
case _ =>
log.error(s"object #${painbox.GUID.guid} can not find a door that it needed")
}
}
else {
context.become(Stopped)
}
case _ => ;
@ -42,7 +54,7 @@ class PainboxControl(painbox: Painbox) extends Actor {
val guid = painbox.GUID
val owner = painbox.Owner.asInstanceOf[Building]
val faction = owner.Faction
if(faction != PlanetSideEmpire.NEUTRAL && (!painbox.Definition.HasNearestDoorDependency || (painbox.Definition.HasNearestDoorDependency && nearestDoor.Open.nonEmpty))) {
if(faction != PlanetSideEmpire.NEUTRAL && (nearestDoor match { case Some(door) => door.Open.nonEmpty; case _ => true })) {
val events = owner.Zone.AvatarEvents
val damage = painbox.Definition.Damage
val radius = painbox.Definition.Radius * painbox.Definition.Radius

6
common/src/main/scala/net/psforever/objects/zones/SphereOfInfluenceActor.scala
View file

@ -68,6 +68,12 @@ object SOI {
/** Stop sorting players into sois */
final case class Stop()
/**
* Recursively populate each facility's sphere of influence with players.
* @param buildings an iterator of buildings and the radius of its sphere of influence
* @param players a list of players to allocate;
* the list gets shorter as each building is allocated
*/
@tailrec
def Populate(buildings : Iterator[(Building, Int)], players : List[Player]) : Unit = {
if(players.nonEmpty && buildings.hasNext) {