Chem entity nerf (#11037)

This commit is contained in:
Kara
2022-09-05 18:43:04 -07:00
committed by GitHub
parent 9b67574225
commit 63b147e111
5 changed files with 9 additions and 1 deletions

View File

@@ -37,7 +37,7 @@ namespace Content.Client.Chemistry.UI
private static bool IsSpinValid(int n) private static bool IsSpinValid(int n)
{ {
return n is > 0 and <= 25; return n is > 0 and <= MaxEntitySpawns;
} }
/// <summary> /// <summary>

View File

@@ -281,6 +281,9 @@ namespace Content.Server.Chemistry.Components
var handSys = _sysMan.GetEntitySystem<SharedHandsSystem>(); var handSys = _sysMan.GetEntitySystem<SharedHandsSystem>();
var solSys = _sysMan.GetEntitySystem<SolutionContainerSystem>(); var solSys = _sysMan.GetEntitySystem<SolutionContainerSystem>();
pillAmount = Math.Clamp(pillAmount, 0, MaxEntitySpawns);
bottleAmount = Math.Clamp(bottleAmount, 0, MaxEntitySpawns);
if (action == UiAction.CreateBottles) if (action == UiAction.CreateBottles)
{ {
var individualVolume = BufferSolution.TotalVolume / FixedPoint2.New(bottleAmount); var individualVolume = BufferSolution.TotalVolume / FixedPoint2.New(bottleAmount);

View File

@@ -12,6 +12,7 @@ namespace Content.Shared.Chemistry.Components
[Virtual] [Virtual]
public class SharedChemMasterComponent : Component public class SharedChemMasterComponent : Component
{ {
public const int MaxEntitySpawns = 10;
public static string BeakerSlotId = "ChemMaster-beaker"; public static string BeakerSlotId = "ChemMaster-beaker";
[DataField("beakerSlot")] [DataField("beakerSlot")]

View File

@@ -42,6 +42,8 @@
solution: drink solution: drink
- type: TrashOnEmpty - type: TrashOnEmpty
solution: drink solution: drink
- type: StaticPrice
price: 0
- type: entity - type: entity
name: bottle name: bottle

View File

@@ -268,6 +268,8 @@
- type: DeleteOnTrigger - type: DeleteOnTrigger
- type: Extractable - type: Extractable
grindableSolutionName: food grindableSolutionName: food
- type: StaticPrice
price: 0
- type: entity - type: entity
name: pill canister name: pill canister