Add solution pouring / click-transfer (#574)
* Add click-based solution transfer For example, clicking on a beaker with a soda can to transfer the soda to the beaker. Works on plain solution containers like beakers and also on open drink containers like soda cans as long as they have the `PourIn` and `PourOut` solution capabilities. If no `SolutionComponent` is added to a drink entity, the `DrinkComponent` will give the entity one. This PR extends that behavior slightly by also giving these default `SolutionComponent`'s the proper capabilities for pouring in/out. * Improve fix for poured drinks not immediately disappearing Instead of making `DrinkComponent.Use` public this splits out the code important to both users and made that function public, leaving `Use` private. * Shorten solution transfer popup * Make code review changes - Move pouring code from SolutionComponent to new PourableComponent. Added PourableComponent to client ignore list and added to existing container prototypes. - Added EmptyVolume property to shared SolutionComponent for convenience. - Removed DrinkComponent fix from pouring AttackBy code. Instead DrinkComponent subscribes to the SolutionChanged action and updates its self when necessary. - Fixed pouring being able to add more than a containers max volume and sometimes deleting reagents. - Added message for when a container is full. * More code review changes - Remove IAttackBy ComponentReference attribute in PourableComponent - Remove _transferAmount from shared SolutionComponent. Left over var from previous commit not being used anymore.
This commit is contained in:
@@ -125,15 +125,23 @@ namespace Content.Shared.Chemistry
|
||||
}
|
||||
}
|
||||
|
||||
public void RemoveSolution(int quantity)
|
||||
/// <summary>
|
||||
/// Remove the specified quantity from this solution.
|
||||
/// </summary>
|
||||
/// <param name="quantity">The quantity of this solution to remove</param>
|
||||
/// <param name="removedSolution">Out arg. The removed solution. Useful for adding removed solution
|
||||
/// into other solutions. For example, when pouring from one container to another.</param>
|
||||
public void RemoveSolution(int quantity, out Solution removedSolution)
|
||||
{
|
||||
if(quantity <=0)
|
||||
removedSolution = new Solution();
|
||||
if(quantity <= 0)
|
||||
return;
|
||||
|
||||
var ratio = (float)(TotalVolume - quantity) / TotalVolume;
|
||||
|
||||
if (ratio <= 0)
|
||||
{
|
||||
removedSolution = this.Clone(); //Todo: Check if clone necessary
|
||||
RemoveAllSolution();
|
||||
return;
|
||||
}
|
||||
@@ -148,6 +156,7 @@ namespace Content.Shared.Chemistry
|
||||
var newQuantity = (int)Math.Floor(oldQuantity * ratio);
|
||||
|
||||
_contents[i] = new ReagentQuantity(reagent.ReagentId, newQuantity);
|
||||
removedSolution.AddReagent(reagent.ReagentId, oldQuantity - newQuantity);
|
||||
}
|
||||
|
||||
TotalVolume = (int)Math.Floor(TotalVolume * ratio);
|
||||
|
||||
Reference in New Issue
Block a user