From 7bcce16ac2c1bcf6d0df5cff8a6101ec0f521821 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Wed, 8 Jan 2025 05:49:40 +0000
Subject: [PATCH] fix bounty arbitrage test (#2651)

* fix bounty arbitrage test

* fishie

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.IntegrationTests/Tests/CargoTest.cs             | 1 +
 Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs | 6 ++++++
 Resources/Prototypes/Catalog/Bounties/bounties.yml      | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 06c5fd2b0a2..bc97614fa38 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -73,6 +73,7 @@ public async Task NoCargoBountyArbitrageTest()
         var cargo = entManager.System<CargoSystem>();
 
         var bounties = protoManager.EnumeratePrototypes<CargoBountyPrototype>().ToList();
+        bounties.RemoveAll(bounty => bounty.SkipArbitrage); // DeltaV
 
         await server.WaitAssertion(() =>
         {
diff --git a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
index b40b03672ef..e56a0f3fe3b 100644
--- a/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
+++ b/Content.Shared/Cargo/Prototypes/CargoBountyPrototype.cs
@@ -39,6 +39,12 @@ public sealed partial class CargoBountyPrototype : IPrototype
     /// </summary>
     [DataField]
     public string IdPrefix = "NT";
+
+    /// <summary>
+    /// DeltaV: Skips this bounty for the cargo bounty arbitrage test.
+    /// </summary>
+    [DataField]
+    public bool SkipArbitrage;
 }
 
 [DataDefinition, Serializable, NetSerializable]
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 1aae778d5b2..6cd13bf0d8d 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -25,6 +25,7 @@
   id: BountyBrain
   reward: 12500
   description: bounty-description-brain
+  skipArbitrage: true # DeltaV - arena mob crate has mobs with brain
   entries:
   - name: bounty-item-brain
     amount: 1
@@ -74,6 +75,7 @@
   reward: 12500
   description: bounty-description-carp
   idPrefix: CC
+  skipArbitrage: true # DeltaV - arena mob crate has mobs with brain
   entries:
   - name: bounty-item-carp
     amount: 1