PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-04-26 22:35:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

using three Terminals known to the continent home3

Browse source
This commit is contained in:
FateJH 2017-09-21 12:24:28 -04:00
parent 0c7c4dc58f
commit 981acadae5
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/src/main/scala/net/psforever/objects/continent/IntergalacticCluster.scala
View file

@ -25,9 +25,9 @@ class IntergalacticCluster(continents : List[Zone]) extends Actor {
case IntergalacticCluster.RequestZoneInitialization(tplayer) =>
continents.foreach(zone => {
sender ! Zone.ZoneInitialization(zone.ZoneInitialization())
sender ! Zone.ClientInitialization(zone.ClientInitialization())
})
sender ! IntergalacticCluster.ZoneInitializationComplete(tplayer)
sender ! IntergalacticCluster.ClientInitializationComplete(tplayer)
case _ => ;
}
@ -55,5 +55,5 @@ object IntergalacticCluster {
final case class RequestZoneInitialization(tplayer : Player)
final case class ZoneInitializationComplete(tplayer : Player)
final case class ClientInitializationComplete(tplayer : Player)
}

19
common/src/main/scala/net/psforever/objects/continent/Zone.scala
View file

@ -2,7 +2,7 @@
package net.psforever.objects.continent
import akka.actor.{ActorContext, ActorRef, Props}
import net.psforever.objects.Player
import net.psforever.objects.{PlanetSideGameObject, Player}
import net.psforever.objects.entity.IdentifiableEntity
import net.psforever.objects.equipment.Equipment
import net.psforever.objects.guid.NumberPoolHub
@ -25,12 +25,12 @@ class Zone(id : String, zoneNumber : Int, map : String) {
if(actor == ActorRef.noSender) {
actor = context.actorOf(Props(classOf[ZoneActor], this), s"$id-actor")
val pool = guid.AddPool("pool", (200 to 400).toList)
val pool = guid.AddPool("pool", (200 to 1000).toList)
val poolActor = context.actorOf(Props(classOf[NumberPoolActor], pool), name = s"$ZoneId-poolActor")
pool.Selector = new RandomSelector
accessor = context.actorOf(Props(classOf[NumberPoolAccessorActor], guid, pool, poolActor), s"$ZoneId-accessor")
startupUtilities.foreach({case ((obj, uid)) => accessor ! Register(obj, uid, actor)})
startupUtilities.foreach({case ((obj, uid)) => accessor ! Register(obj, uid, actor) })
}
actor
}
@ -52,7 +52,12 @@ class Zone(id : String, zoneNumber : Int, map : String) {
accessor
}
def GUID(object_guid : PlanetSideGUID) : Option[IdentifiableEntity] = guid(object_guid.guid)
def GUID(object_guid : PlanetSideGUID) : Option[PlanetSideGameObject] = guid(object_guid.guid) match {
case Some(obj) =>
Some(obj.asInstanceOf[PlanetSideGameObject]) //potential casting error
case None =>
None
}
def EquipmentOnGround : ListBuffer[Equipment] = equipmentOnGround
@ -60,11 +65,11 @@ class Zone(id : String, zoneNumber : Int, map : String) {
startupUtilities = startupUtilities :+ (obj, id)
}
def ZoneInitialization() : List[GamePacket] = {
def ClientInitialization() : List[GamePacket] = {
List.empty[GamePacket]
}
def ZoneConfiguration() : List[GamePacket] = {
def ClientConfiguration() : List[GamePacket] = {
List.empty[GamePacket]
}
}
@ -79,7 +84,7 @@ object Zone {
final case class ItemFromGround(player : Player, item : Equipment)
final case class ZoneInitialization(list : List[GamePacket])
final case class ClientInitialization(list : List[GamePacket])
def apply(zoneId : String, zoneNumber : Int, map : String) : Zone = {
new Zone(zoneId, zoneNumber, map)