From ec8ada33889f1c7d7d44556d0a1efe037a7156a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=81da?= Date: Thu, 30 Oct 2025 19:09:44 -0500 Subject: [PATCH] Fix all ignored recipes in material arbitrage (#41134) * lights * drink glasses * vial chem bottle * plates n stuff * boards * airtank --------- Co-authored-by: iaada --- .../Tests/MaterialArbitrageTest.cs | 18 ++++-------------- .../Consumable/Food/Containers/plate.yml | 8 ++++---- .../Circuitboards/Machine/production.yml | 12 ++++++------ .../Prototypes/Recipes/Lathes/chemistry.yml | 4 ++-- .../Prototypes/Recipes/Lathes/cooking.yml | 2 +- Resources/Prototypes/Recipes/Lathes/misc.yml | 4 ++-- 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs index dcb47fb81c..3c6c372b75 100644 --- 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 _destructionArbitrageIgnore = - [ - "BaseChemistryEmptyVial", "DrinkShotGlass", "SodiumLightTube", "DrinkGlassCoupeShaped", - "LedLightBulb", "ExteriorLightTube", "LightTube", "DrinkGlass", "DimLightBulb", "LightBulb", "LedLightTube", - "ChemistryEmptyBottle01", "WarmLightBulb", - ]; - - private readonly HashSet _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 _destructionArbitrageIgnore = []; + private readonly HashSet _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 55d22e3980..36dff3a8d6 100644 --- 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 0697506855..22205bf60d 100644 --- 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 0b3b8352e5..edcb0491bf 100644 --- 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 333279a820..e3081437c4 100644 --- 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 f683b07ef8..ec29a654d6 100644 --- 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