Fix all ignored recipes in material arbitrage (#41134)

* lights

* drink glasses

* vial chem bottle

* plates n stuff

* boards

* airtank

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index dcb47fb81cca1c43eea4875f64504a6d36e09646..3c6c372b75e682811eefaae8d39a06cf58eb68d3 100644 (file)
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -28,20 +28,10 @@ namespace Content.IntegrationTests.Tests;
 [TestFixture]
 public sealed class MaterialArbitrageTest
 {
-    // These recipes are currently broken and need fixing. You should not be adding to these sets.
-    private readonly HashSet<string> _destructionArbitrageIgnore =
-    [
-        "BaseChemistryEmptyVial", "DrinkShotGlass", "SodiumLightTube", "DrinkGlassCoupeShaped",
-        "LedLightBulb", "ExteriorLightTube", "LightTube", "DrinkGlass", "DimLightBulb", "LightBulb", "LedLightTube",
-        "ChemistryEmptyBottle01", "WarmLightBulb",
-    ];
-
-    private readonly HashSet<string> _compositionArbitrageIgnore =
-    [
-        "FoodPlateSmall", "AirTank", "FoodPlateTin", "FoodPlateMuffinTin", "WeaponCapacitorRechargerCircuitboard",
-        "WeaponCapacitorRechargerCircuitboard", "BorgChargerCircuitboard", "BorgChargerCircuitboard", "FoodPlate",
-        "CellRechargerCircuitboard", "CellRechargerCircuitboard",
-    ];
+    // These sets are for selectively excluding recipes from arbitrage.
+    // You should NOT be adding to these. They exist here for downstreams and potential future issues.
+    private readonly HashSet<string> _destructionArbitrageIgnore = [];
+    private readonly HashSet<string> _compositionArbitrageIgnore = [];
 
     [Test]
     public async Task NoMaterialArbitrage()

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
index 55d22e3980b47e4dc2d0917a7cddbfc43742c401..36dff3a8d61fcaf513a745c4255fd9c7b402dafb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -57,7 +57,7 @@
     - Trash
   - type: PhysicalComposition
     materialComposition:
-      Glass: 60
+      Glass: 50
   - type: SpaceGarbage
 
 - type: entity
@@ -117,7 +117,7 @@
         acts: [ "Destruction" ]
   - type: PhysicalComposition
     materialComposition:
-      Glass: 30
+      Glass: 25
 
 - type: entity
   parent: FoodPlateTrash
@@ -196,7 +196,7 @@
     - Trash
   - type: PhysicalComposition
     materialComposition:
-      Steel: 60
+      Steel: 50
   - type: SpaceGarbage
 
 # Muffin Tin
@@ -220,5 +220,5 @@
     - Trash
   - type: PhysicalComposition
     materialComposition:
-      Steel: 30
+      Steel: 25
   - type: SpaceGarbage

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 0697506855d10b966086332e1c60fe58ff635f50..22205bf60df2f17f3ab4163c5f4c9e5b5e3c28a1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -663,8 +663,8 @@
         Cable: 5
     - type: PhysicalComposition
       materialComposition:
-        Steel: 30
-        Plastic: 30
+        Steel: 25
+        Plastic: 25
     - type: StaticPrice
       price: 15
 
@@ -706,8 +706,8 @@
         Cable: 5
     - type: PhysicalComposition
       materialComposition:
-        Steel: 30
-        Plastic: 30
+        Steel: 25
+        Plastic: 25
     - type: StaticPrice
       price: 15
 
@@ -727,8 +727,8 @@
         CableMV: 5
     - type: PhysicalComposition
       materialComposition:
-        Steel: 30
-        Plastic: 30
+        Steel: 25
+        Plastic: 25
     - type: StaticPrice
       price: 15
 

diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index 0b3b8352e550e32a55749e4461b23051f2091d87..edcb0491bfae203c897e67ddb8f837f5fd5e8d1e 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -77,7 +77,7 @@
   result: ChemistryEmptyBottle01
   completetime: 2
   materials:
-    Glass: 50
+    Glass: 100
 
 - type: latheRecipe
   id: Vape
@@ -95,7 +95,7 @@
   result: BaseChemistryEmptyVial
   completetime: 2
   materials:
-    Glass: 50
+    Glass: 100
     Wood: 20
 
 - type: latheRecipe

diff --git a/Resources/Prototypes/Recipes/Lathes/cooking.yml b/Resources/Prototypes/Recipes/Lathes/cooking.yml
index 333279a8201528e4b013b771173bb563923977eb..e3081437c42f32d5c68369a3c847a68832543c5f 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/cooking.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml
@@ -19,7 +19,7 @@
   id: BaseGlasswareRecipe
   completetime: 0.8
   materials:
-    Glass: 100
+    Glass: 200
 
 - type: latheRecipe
   parent: BaseGlasswareRecipe

diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index f683b07ef805f40f88783d34bd81e199daae1b8b..ec29a654d68f9fae448add0b42936cc7822e5d8b 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -8,7 +8,7 @@
   completetime: 2
   materials:
     Steel: 50
-    Glass: 50
+    Glass: 200
 
 # Recipes
 
@@ -120,7 +120,7 @@
   result: AirTank
   completetime: 4
   materials:
-    Steel: 300
+    Steel: 400
 
 - type: latheRecipe
   id: DoubleEmergencyOxygenTank