multiple test fixes (RMC-14#5597)

Skarletto · Feb 16, 2025 · 28c1f06 · 28c1f06
1 parent 4637ec0
commit 28c1f06
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 22 deletions.
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -14,6 +14,7 @@ namespace Content.IntegrationTests.Tests
 {
     [TestFixture]
     [TestOf(typeof(EntityUid))]
+    [NonParallelizable] // RMC14: We have some many entities that this causes a OOM.
     public sealed class EntityTest
     {
         private static readonly ProtoId<EntityCategoryPrototype> SpawnerCategory = "Spawner";

diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -148,6 +148,7 @@ public abstract partial class InteractionTest
     tags:
     - CanPilot
   - type: UserInterface
+  - type: Sprite
 ";
 
     [SetUp]

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -17,7 +17,6 @@
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
-using Content.Shared.Station.Components;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
@@ -68,7 +67,7 @@ public sealed class PostMapInitTest
             "Plasma",
             "Elkridge",
             "RMCDev",
-            // "Savannah",
+            "Savannah",
             "Almayer",
             "RMCAdminFax",
         };

diff --git a/Content.Server/_RMC14/Rules/CMDistressSignalRuleComponent.cs b/Content.Server/_RMC14/Rules/CMDistressSignalRuleComponent.cs
@@ -141,5 +141,5 @@ public sealed partial class CMDistressSignalRuleComponent : Component
     public TimeSpan RoundEndCheckDelay = TimeSpan.FromMinutes(1);
 
     [DataField]
-    public ResPath Thunderdome = new("Maps/_RMC14/thunderdome.yml");
+    public ResPath Thunderdome = new("/Maps/_RMC14/thunderdome.yml");
 }
diff --git a/Content.Shared/_RMC14/Communications/CommunicationsTowerSpawnerComponent.cs b/Content.Shared/_RMC14/Communications/CommunicationsTowerSpawnerComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared._RMC14.Communications;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, EntityCategory("Spawner")]
 [Access(typeof(CommunicationsTowerSystem))]
 public sealed partial class CommunicationsTowerSpawnerComponent : Component
 {

diff --git a/Content.Shared/_RMC14/Intel/IntelSpawnerComponent.cs b/Content.Shared/_RMC14/Intel/IntelSpawnerComponent.cs
@@ -1,8 +1,9 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared._RMC14.Intel;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, EntityCategory("Spawner")]
 [Access(typeof(IntelSystem))]
 public sealed partial class IntelSpawnerComponent : Component
 {

diff --git a/Content.Shared/_RMC14/OrbitalCannon/OrbitalCannonExplosion.cs b/Content.Shared/_RMC14/OrbitalCannon/OrbitalCannonExplosion.cs
@@ -7,7 +7,7 @@ namespace Content.Shared._RMC14.OrbitalCannon;
 [DataRecord]
 [Serializable, NetSerializable]
 public readonly record struct OrbitalCannonExplosion(
-    ProtoId<ExplosionPrototype> Type,
+    ProtoId<ExplosionPrototype>? Type,
     float Total,
     float Slope,
     float Max,

diff --git a/Content.Shared/_RMC14/OrbitalCannon/OrbitalCannonExplosionComponent.cs b/Content.Shared/_RMC14/OrbitalCannon/OrbitalCannonExplosionComponent.cs
@@ -1,8 +1,9 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared._RMC14.OrbitalCannon;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, EntityCategory("Spawner")]
 [Access(typeof(OrbitalCannonSystem))]
 public sealed partial class OrbitalCannonExplosionComponent : Component
 {

diff --git a/Content.Shared/_RMC14/OrbitalCannon/OrbitalCannonSystem.cs b/Content.Shared/_RMC14/OrbitalCannon/OrbitalCannonSystem.cs
@@ -585,10 +585,10 @@ public override void Update(float frameTime)
                 explosion.Current++;
                 Dirty(uid, explosion);
 
-                if (step.Type != default)
+                if (step.Type is { } type)
                 {
                     var coordinates = _transform.GetMapCoordinates(uid);
-                    _rmcExplosion.QueueExplosion(coordinates, step.Type, step.Total, step.Slope, step.Max, uid);
+                    _rmcExplosion.QueueExplosion(coordinates, type, step.Total, step.Slope, step.Max, uid);
                 }
 
                 if (step.Fire is { } fire && step.FireRange > 0)

diff --git a/Resources/ConfigPresets/RMC14/rmc.toml b/Resources/ConfigPresets/RMC14/rmc.toml
@@ -59,8 +59,6 @@ tags = "lang:en,region:am_n_e,rp:med"
 
 [ic]
 flavor_text = true
-role_time = 0
-kill_crit = false
 
 [infolinks]
 #appeal = "https://appeal.rouny-ss14.com"

diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Attachments/stock_attachments.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Attachments/stock_attachments.yml
@@ -323,6 +323,8 @@
     tags:
     - RMCAttachmentStock
     - RMCAttachmentM54CStockSolidMarksman
+  - type: ItemCamouflage # TODO RMC14
+    camouflageVariations: null
 
 - type: entity
   parent: RMCStockAttachmentCollapsibleBase

diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml
@@ -68,6 +68,7 @@
       state: all
 
 - type: entity
+  abstract: true
   parent: CMBaseWeaponRifleNoDualWieldPenalty
   id: CMBaseWeaponRifle
   components:

diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/rmc_intel.yml b/Resources/Prototypes/_RMC14/Entities/Objects/rmc_intel.yml
@@ -1,4 +1,5 @@
 - type: entity
+  abstract: true
   parent: BaseItem
   id: RMCIntelBase
   name: intel item

diff --git a/Resources/Prototypes/_RMC14/Entities/Structures/orbital_cannon.yml b/Resources/Prototypes/_RMC14/Entities/Structures/orbital_cannon.yml
@@ -123,6 +123,8 @@
   - type: Sprite
     sprite: _RMC14/Structures/almayer_props.rsi
     state: ob_warhead_3
+  - type: OrbitalCannonWarhead
+    explosion: RMCOrbitalCannonExplosionCluster
 
 - type: entity
   id: RMCOrbitalCannonWarheadSpawner
@@ -188,6 +190,18 @@
   - type: WarpPoint
     location: 1 orbital bombardment
 
+- type: entity
+  parent: MarkerBase
+  id: RMCOrbitalCannonExplosionCluster
+  name: cluster OB explosion
+  suffix: FIRES AN OB!!!
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: OrbitalCannonExplosion # TODO: RMC14
+  - type: WarpPoint
+    location: 1 orbital bombardment
+
 - type: entity
   id: RMCOrbitalCannonComputer
   name: orbital cannon console

diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/auxiliary_support_officer.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/auxiliary_support_officer.yml
@@ -85,8 +85,12 @@
   components:
   - type: SpawnPoint
     job_id: CMAuxiliarySupportOfficer
-  - type: Sprite
-    state: x
+  - type: Sprite # TODO: Replace with landmark sprite
+    layers:
+    - sprite: Markers/jobs.rsi
+      state: green
+    - sprite: _RMC14/Markers/cm_jobs.rsi
+      state: auxiliary_support_officer
 
 - type: entity
   parent: CMGuidebookRole

diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Other/Provost/provost_team_leader.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Other/Provost/provost_team_leader.yml
@@ -5,7 +5,7 @@
   description: rmc-job-description-provost-team-leader
   playTimeTracker: CMJobProvostTeamLeader
   ranks:
-    RMCRankProvostTeamLeader: []
+    RMCRankProvostProvostTeamLeader: []
   startingGear: RMCGearProvostTeamLeader
   icon: RMCJobIconProvostTeamLeader
   joinNotifyCrew: false

diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/doctor.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/doctor.yml
@@ -19,8 +19,9 @@
   components:
   - type: SpawnPoint
     job_id: CMSurvivor
-  - type: Sprite
+  - type: Sprite # TODO: Replace with landmark sprite
     layers:
     - sprite: Markers/jobs.rsi
       state: green
-    - state: survivor
+    - sprite: _RMC14/Markers/cm_jobs.rsi
+      state: survivor
diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/engineer.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/engineer.yml
@@ -18,8 +18,9 @@
   components:
   - type: SpawnPoint
     job_id: CMSurvivor
-  - type: Sprite
+  - type: Sprite # TODO: Replace with landmark sprite
     layers:
     - sprite: Markers/jobs.rsi
       state: green
-    - state: survivor
+    - sprite: _RMC14/Markers/cm_jobs.rsi
+      state: survivor
diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/security.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/security.yml
@@ -17,8 +17,9 @@
   components:
   - type: SpawnPoint
     job_id: CMSurvivor
-  - type: Sprite
+  - type: Sprite # TODO: Replace with landmark sprite
     layers:
     - sprite: Markers/jobs.rsi
       state: green
-    - state: survivor
+    - sprite: _RMC14/Markers/cm_jobs.rsi
+      state: survivor
diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/survivor.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Survivor/survivor.yml
@@ -58,7 +58,7 @@
   components:
   - type: SpawnPoint
     job_id: CMSurvivor
-  - type: Sprite
+  - type: Sprite # TODO: Replace with landmark sprite
     layers:
     - sprite: Markers/jobs.rsi
       state: green

diff --git a/Resources/Prototypes/_RMC14/Roles/Ranks/UNMC/provost.yml b/Resources/Prototypes/_RMC14/Roles/Ranks/UNMC/provost.yml
@@ -60,4 +60,3 @@
   name: Staff Sergeant
   prefix: SSgt.
   paygrade: E6
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,6 +148,7 @@ public abstract partial class InteractionTest @@
         tags:
         - CanPilot
       - type: UserInterface
+      - type: Sprite
     ";
         [SetUp]
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,3 @@
		name: Staff Sergeant
		prefix: SSgt.
		paygrade: E6