PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-04-28 07:45:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

correcting the inheritance of turrets (FacilityTurret and TurretDeployable) by untangling their definition structures; damage and jammering code for ComplexDeployable objects moved onto that object's control actor; setting up SimpleDeployable objects for jammering status; correcting an oversight with FacilityTurret jammering

Browse source
This commit is contained in:
FateJH 2019-12-21 09:08:06 -05:00
parent a568e52590
commit fee001596f
22 changed files with 378 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/test/scala/objects/FacilityTurretTest.scala
View file

@ -19,7 +19,7 @@ import scala.concurrent.duration._
class FacilityTurretTest extends Specification {
"FacilityTurretTest" should {
"define" in {
val obj = new TurretDefinition(480)
val obj = new FacilityTurretDefinition(480)
obj.Weapons mustEqual mutable.HashMap.empty[TurretUpgrade.Value, ToolDefinition]
obj.ReserveAmmunition mustEqual false
obj.FactionLocked mustEqual true
@ -152,7 +152,7 @@ class FacilityTurretControl3Test extends ActorTest {
class FacilityTurretControl4Test extends ActorTest {
val player = Player(Avatar("", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
val objDef = new TurretDefinition(480)
val objDef = new FacilityTurretDefinition(480)
objDef.FactionLocked = false
val obj = FacilityTurret(objDef)
obj.GUID = PlanetSideGUID(1)