* resolved merge of multi-PR-merge master branch supporting gating branch

* making adjustments to the distinctions between building map id and building GUID, where necessary, to assist with the loading process

* custom spawn tube definitions for the sanctuary VT_building's
This commit is contained in:
Fate-JH 2019-04-08 08:05:15 -04:00 committed by GitHub
parent 7fcbf7bf41
commit c38c619a23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 2348 additions and 948 deletions

View file

@ -104,7 +104,7 @@ class BuildingTest extends Specification {
class WarpGateTest extends Specification {
"WarpGate" should {
"construct" in {
val bldg = WarpGate(0, 10, Zone.Nowhere)
val bldg = WarpGate(0, 10, Zone.Nowhere, GlobalDefinitions.warpgate)
bldg.MapId mustEqual 10
bldg.Actor mustEqual ActorRef.noSender
bldg.Amenities mustEqual Nil