From f505fc36a05aca89eef429da78e3a192a8b36265 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 30 May 2024 22:57:10 +0300 Subject: [PATCH] Make more liquids evaporate (#1407) * Liquids * Update SharedPuddleSystem.Evaporation.cs * Update SharedPuddleSystem.Evaporation.cs * Update Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> --- .../Tests/Fluids/FluidSpillTest.cs | 2 +- .../Fluids/SharedPuddleSystem.Evaporation.cs | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs index 6e88d6928e6..be3cb08f181 100644 --- a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs @@ -73,7 +73,7 @@ await server.WaitPost(() => await server.WaitAssertion(() => { var grid = entityManager.GetComponent(gridId); - var solution = new Solution("Blood", FixedPoint2.New(100)); + var solution = new Solution("Wine", FixedPoint2.New(100)); // Frontier - Blood to wine so test pass var tileRef = grid.GetTileRef(puddleOrigin); #pragma warning disable NUnit2045 // Interdependent tests Assert.That(puddleSystem.TrySpillAt(tileRef, solution, out _), Is.True); diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs index 023d024a05b..0ae9ccb3ead 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs @@ -8,7 +8,18 @@ public abstract partial class SharedPuddleSystem [ValidatePrototypeId] private const string Water = "Water"; - public static readonly string[] EvaporationReagents = [Water]; + private const string FluorosulfuricAcid = "FluorosulfuricAcid"; // Frontier + private const string Vomit = "Vomit"; // Frontier + private const string InsectBlood = "InsectBlood"; // Frontier + private const string AmmoniaBlood = "AmmoniaBlood"; // Frontier + private const string ZombieBlood = "ZombieBlood"; // Frontier + private const string Blood = "Blood"; // Frontier + private const string Slime = "Slime"; // Frontier + private const string CopperBlood = "CopperBlood"; // Frontier + private const string Sap = "Sap"; // Frontier + private const string JuiceTomato = "JuiceTomato"; // Frontier + + public static readonly string[] EvaporationReagents = [Water, Vomit, InsectBlood, AmmoniaBlood, ZombieBlood, Blood, Slime, CopperBlood, FluorosulfuricAcid, Sap, JuiceTomato]; // Frontier public bool CanFullyEvaporate(Solution solution) {