Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Make more liquids evaporate (new-frontiers-14#1407)
Browse files Browse the repository at this point in the history
* Liquids

* Update SharedPuddleSystem.Evaporation.cs

* Update SharedPuddleSystem.Evaporation.cs

* Update Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs

Co-authored-by: whatston3 <[email protected]>

---------

Co-authored-by: whatston3 <[email protected]>
  • Loading branch information
dvir001 and whatston3 authored May 30, 2024
1 parent 6ba653a commit f505fc3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ await server.WaitPost(() =>
await server.WaitAssertion(() =>
{
var grid = entityManager.GetComponent<MapGridComponent>(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);
Expand Down
13 changes: 12 additions & 1 deletion Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,18 @@ public abstract partial class SharedPuddleSystem
[ValidatePrototypeId<ReagentPrototype>]
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)
{
Expand Down

0 comments on commit f505fc3

Please sign in to comment.