diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs index 0d60be4d78..0cb4524cb4 100644 --- a/Content.IntegrationTests/Tests/CargoTest.cs +++ b/Content.IntegrationTests/Tests/CargoTest.cs @@ -38,12 +38,11 @@ public sealed class CargoTest var ent = entManager.SpawnEntity(proto.Product, new MapCoordinates(Vector2.Zero, mapId)); var price = pricing.GetPrice(ent); - Assert.That(price, Is.LessThan(proto.PointCost), $"Found arbitrage on {proto.ID} cargo product! Cost is {proto.PointCost} but sell is {price}!"); + Assert.That(price, Is.AtMost(proto.PointCost), $"Found arbitrage on {proto.ID} cargo product! Cost is {proto.PointCost} but sell is {price}!"); entManager.DeleteEntity(ent); } - }); - + mapManager.DeleteMap(mapId); }); diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 9491a41cf3..7a8d3eca87 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -4,7 +4,7 @@ sprite: Objects/Consumable/Food/Baked/pizza.rsi state: margherita product: CrateFoodPizza - cost: 550 + cost: 450 category: Food group: market @@ -47,7 +47,7 @@ cost: 750 category: Food group: market - + - type: cargoProduct id: FoodCrateKvassTank icon: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 50806574be..a079ec1a01 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -164,6 +164,8 @@ - type: StorageVisualizer state_open: box-open state_closed: box + - type: StaticPrice + price: 0 - type: entity name: pizza box diff --git a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml index 445aae35e1..dfff087e22 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml @@ -9,4 +9,6 @@ layers: - state: icon - type: Item - size: 1001 \ No newline at end of file + size: 1001 + - type: StaticPrice + price: 0 diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml index c7406c35f1..ee6d680485 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml @@ -51,6 +51,8 @@ tags: - Plastic - Trash + - type: StaticPrice + price: 0 - type: entity parent: UtensilBase @@ -110,3 +112,5 @@ types: - Knife breakChance: 0.20 + - type: StaticPrice + price: 0