Merge branch 'new-frontiers-14:master' into EMP_2

new-frontiers-14 · Aug 6, 2023 · fedfaa5 · fedfaa5
2 parents 5381c01 + ce6bf1b
commit fedfaa5
Show file tree

Hide file tree

Showing 37 changed files with 20,878 additions and 118 deletions.
diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -109,6 +109,7 @@ private void OnStartup(RoundStartingEvent ev)
         var depotMap = "/Maps/cargodepot.yml";
         var tinnia = "/Maps/tinnia.yml";
         var lpbravo = "/Maps/lpbravo.yml";
+        var arena = "/Maps/arena.yml";
         var depotColor = new Color(55, 200, 55);
         var tinniaColor = new Color(55, 55, 200);
         var lpbravoColor = new Color(200, 55, 55);
@@ -127,7 +128,7 @@ private void OnStartup(RoundStartingEvent ev)
         ;
         if (_map.TryLoad(mapId, tinnia, out var depotUid2s, new MapLoadOptions
             {
-                Offset = _random.NextVector2(975f, 1375f)
+                Offset = _random.NextVector2(1275f, 1975f)
             }))
         {
             var meta = EnsureComp<MetaDataComponent>(depotUid2s[0]);
@@ -136,7 +137,7 @@ private void OnStartup(RoundStartingEvent ev)
         }
 
         ;
-        depotOffset = _random.NextVector2(2300f, 3400f);
+        depotOffset = _random.NextVector2(2600f, 3750f);
         if (_map.TryLoad(mapId, depotMap, out var depotUid3s, new MapLoadOptions
             {
                 Offset = depotOffset
@@ -150,7 +151,7 @@ private void OnStartup(RoundStartingEvent ev)
         ;
         if (_map.TryLoad(mapId, lpbravo, out var depotUid4s, new MapLoadOptions
             {
-                Offset = _random.NextVector2(1400f, 3000f)
+                Offset = _random.NextVector2(1950f, 3500f)
             }))
         {
             var meta = EnsureComp<MetaDataComponent>(depotUid4s[0]);
@@ -159,14 +160,25 @@ private void OnStartup(RoundStartingEvent ev)
             _shuttle.AddIFFFlag(depotUid4s[0], IFFFlags.HideLabel);
         }
 
+        ;
+        if (_map.TryLoad(mapId, arena, out var depotUid5s, new MapLoadOptions
+            {
+                Offset = _random.NextVector2(1500f, 3000f)
+            }))
+        {
+            var meta = EnsureComp<MetaDataComponent>(depotUid5s[0]);
+            meta.EntityName = "The Pit";
+            _shuttle.SetIFFColor(depotUid5s[0], tinniaColor);
+        }
+
         ;
         var dungenTypes = _prototypeManager.EnumeratePrototypes<DungeonConfigPrototype>();
 
         foreach (var dunGen in dungenTypes)
         {
 
             var seed = _random.Next();
-            var offset = _random.NextVector2(2100f, 4500f);
+            var offset = _random.NextVector2(2750f, 4400f);
             if (!_map.TryLoad(mapId, "/Maps/spaceplatform.yml", out var grids, new MapLoadOptions
                 {
                     Offset = offset
@@ -189,7 +201,7 @@ private void OnStartup(RoundStartingEvent ev)
         {
 
             var seed = _random.Next();
-            var offset = _random.NextVector2(2300f, 6500f);
+            var offset = _random.NextVector2(3800f, 8500f);
             if (!_map.TryLoad(mapId, "/Maps/spaceplatform.yml", out var grids, new MapLoadOptions
                 {
                     Offset = offset

diff --git a/Resources/Maps/Shuttles/anchor.yml b/Resources/Maps/Shuttles/anchor.yml
@@ -4982,7 +4982,7 @@ entities:
     - pos: -0.5,-0.5
       parent: 1
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 717
     components:
@@ -11292,7 +11292,7 @@ entities:
     - pos: 10.5,-27.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 1716
     components:

diff --git a/Resources/Maps/Shuttles/barge.yml b/Resources/Maps/Shuttles/barge.yml
@@ -2689,7 +2689,7 @@ entities:
     - pos: -4.5,6.5
       parent: 70
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 311
     components:
@@ -4904,7 +4904,7 @@ entities:
     - pos: -4.5,4.5
       parent: 70
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 599
     components:

diff --git a/Resources/Maps/Shuttles/cleric.yml b/Resources/Maps/Shuttles/cleric.yml
@@ -624,7 +624,7 @@ entities:
     - pos: 6.5,1.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 81
     components:

diff --git a/Resources/Maps/Shuttles/condor.yml b/Resources/Maps/Shuttles/condor.yml
@@ -3071,7 +3071,7 @@ entities:
     - pos: 0.5,4.5
       parent: 281
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 617
     components:
@@ -6527,7 +6527,7 @@ entities:
     - pos: 9.5,12.5
       parent: 281
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 861
     components:

diff --git a/Resources/Maps/Shuttles/construct.yml b/Resources/Maps/Shuttles/construct.yml
@@ -498,7 +498,7 @@ entities:
       pos: 0.5,1.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 62
     components:

diff --git a/Resources/Maps/Shuttles/courserx.yml b/Resources/Maps/Shuttles/courserx.yml
@@ -2171,7 +2171,7 @@ entities:
     - pos: 3.5,12.5
       parent: 1
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 310
     components:
@@ -4839,7 +4839,7 @@ entities:
       pos: -4.5,-13.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 737
     components:

diff --git a/Resources/Maps/Shuttles/dartx.yml b/Resources/Maps/Shuttles/dartx.yml
@@ -3020,7 +3020,7 @@ entities:
     - pos: -5.5,2.5
       parent: 1
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 242
     components:
@@ -6623,7 +6623,7 @@ entities:
       pos: 5.5,-15.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 758
     components:

diff --git a/Resources/Maps/Shuttles/empress.yml b/Resources/Maps/Shuttles/empress.yml
@@ -4445,7 +4445,7 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 1345
     components:
@@ -10409,7 +10409,7 @@ entities:
       pos: -0.5,-24.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 864
     components:

diff --git a/Resources/Maps/Shuttles/enforcer.yml b/Resources/Maps/Shuttles/enforcer.yml
@@ -688,7 +688,7 @@ entities:
       pos: -2.5,-2.5
       parent: 17
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 105
     components:
@@ -1533,7 +1533,7 @@ entities:
     - pos: -0.5,1.5
       parent: 17
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 201
     components:

diff --git a/Resources/Maps/Shuttles/esquire.yml b/Resources/Maps/Shuttles/esquire.yml
@@ -1881,7 +1881,7 @@ entities:
     - pos: -1.5,-1.5
       parent: 1
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 265
     components:
@@ -4459,7 +4459,7 @@ entities:
       pos: -2.5,-5.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 438
     components:

diff --git a/Resources/Maps/Shuttles/fighter.yml b/Resources/Maps/Shuttles/fighter.yml
@@ -569,7 +569,7 @@ entities:
       pos: 2.5,7.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 72
     components:

diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml
@@ -1424,7 +1424,7 @@ entities:
     - pos: -2.5,7.5
       parent: 1
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 186
     components:
@@ -3295,7 +3295,7 @@ entities:
     - pos: 9.5,8.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 494
     components:

diff --git a/Resources/Maps/Shuttles/honker.yml b/Resources/Maps/Shuttles/honker.yml
@@ -1322,7 +1322,7 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 260
     components:
@@ -2292,7 +2292,7 @@ entities:
           occludes: True
           ent: null
       type: ContainerContainer
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 209
     components:

diff --git a/Resources/Maps/Shuttles/interceptor.yml b/Resources/Maps/Shuttles/interceptor.yml
@@ -812,7 +812,7 @@ entities:
       pos: -0.5,-3.5
       parent: 117
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 105
     components:
@@ -1846,7 +1846,7 @@ entities:
     - pos: -1.5,1.5
       parent: 117
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 226
     components:

diff --git a/Resources/Maps/Shuttles/mail.yml b/Resources/Maps/Shuttles/mail.yml
@@ -439,7 +439,7 @@ entities:
     - pos: 0.5,3.5
       parent: 103
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 53
     components:
@@ -824,7 +824,7 @@ entities:
       pos: -0.5,-3.5
       parent: 103
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 94
     components:

diff --git a/Resources/Maps/Shuttles/marauder.yml b/Resources/Maps/Shuttles/marauder.yml
@@ -4135,7 +4135,7 @@ entities:
     - pos: -5.5,6.5
       parent: 1
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 622
     components:
@@ -10449,7 +10449,7 @@ entities:
       pos: -6.5,6.5
       parent: 1
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 1516
     components:

diff --git a/Resources/Maps/Shuttles/prospector.yml b/Resources/Maps/Shuttles/prospector.yml
@@ -956,7 +956,7 @@ entities:
     - pos: -1.5,-3.5
       parent: 201
       type: Transform
-- proto: FaxMachineBase
+- proto: FaxMachineShip
   entities:
   - uid: 161
     components:
@@ -1819,7 +1819,7 @@ entities:
       pos: -1.5,-3.5
       parent: 201
       type: Transform
-- proto: WarpPoint
+- proto: WarpPointShip
   entities:
   - uid: 199
     components: