juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cooking simulator 3: Pies (#1540)

Browse Source 
* enum -> prototype

* move sprites

* more dirt sprites

* some food data stucking fixing

* pumpkin fix

* pie move sprites

* refactor components

* pie refactor

* remove outdated proto

* new pie types

* Update SliceableFoodSystem.cs

* Refactor food cooking system and add fat flavor

Added 'Fat' to the flavor profile. Refactored food cooking logic to use CreateFoodData and UpdateFoodDataVisuals instead of CookFood and ApplyFoodVisuals. Introduced RenameCooker property to CP14FoodCookerComponent to control entity renaming during cooking. Improved separation of food data creation and visual updates.

* Update migration.yml

* Refactor food visual and sliceable logic in cooking system

Moved sliceable food logic from OnCookFinished to UpdateFoodDataVisuals for better encapsulation. Made UpdateFoodDataVisuals overridable and updated its usage in random food initialization. Added Rename field to CP14RandomFoodDataComponent and cleaned up unused BecomeSliceable field in CP14FoodCookerComponent. Updated pie_pan.yml to add SliceableFood and a new random food entity.

* Update pie_pan.yml

* fill levels
This commit is contained in:
Red
2025-07-20 15:45:59 +03:00
committed by GitHub
parent 6b98c91f73
commit 8721f736e1
79 changed files with 581 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared._CP14.Cooking;
using Content.Shared.Chemistry.Components;
using Content.Shared.Database;
using Content.Shared.DoAfter;

1
Content.Shared/Nutrition/Components/FlavorProfileComponent.cs
View File

@@ -20,5 +20,6 @@ public sealed partial class FlavorProfileComponent : Component
"Nutriment",
"Vitamin",
"Protein",
"Fat", //CP14
};
}

15
Content.Shared/_CP14/Cooking/CP14SharedCookingSystem.DoAfter.cs
View File

@@ -4,10 +4,10 @@
*/
using Content.Shared._CP14.Cooking.Components;
using Content.Shared._CP14.Cooking.Prototypes;
using Content.Shared.DoAfter;
using Content.Shared.Temperature;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
using Robust.Shared.Timing;
@@ -55,10 +55,14 @@ public abstract partial class CP14SharedCookingSystem
if (args.Cancelled || args.Handled)
return;
if (!TryComp<CP14FoodHolderComponent>(ent, out var holder))
return;
if (!_proto.TryIndex(args.Recipe, out var indexedRecipe))
return;
CookFood(ent, indexedRecipe);
CreateFoodData(ent, indexedRecipe);
UpdateFoodDataVisuals((ent, holder), ent.Comp.RenameCooker);
args.Handled = true;
}
@@ -117,7 +121,10 @@ public abstract partial class CP14SharedCookingSystem
if (!_container.TryGetContainer(ent, ent.Comp.ContainerId, out var container))
return;
if (container.ContainedEntities.Count <= 0 && !ent.Comp.HoldFood)
if (!TryComp<CP14FoodHolderComponent>(ent, out var holder))
return;
if (container.ContainedEntities.Count <= 0 && holder.FoodData is null)
{
StopCooking(ent);
return;
@@ -128,7 +135,7 @@ public abstract partial class CP14SharedCookingSystem
ent.Comp.LastHeatingTime = _timing.CurTime;
DirtyField(ent.Owner,ent.Comp, nameof(CP14FoodCookerComponent.LastHeatingTime));
if (!_doAfter.IsRunning(ent.Comp.DoAfterId) && !ent.Comp.HoldFood)
if (!_doAfter.IsRunning(ent.Comp.DoAfterId) && holder.FoodData is null)
{
var recipe = GetRecipe(ent);
if (recipe is not null)

19
Content.Shared/_CP14/Cooking/CP14SharedCookingSystem.Transfer.cs
View File

@@ -14,25 +14,25 @@ public abstract partial class CP14SharedCookingSystem
private void InitTransfer()
{
SubscribeLocalEvent<CP14FoodHolderComponent, AfterInteractEvent>(OnAfterInteract);
SubscribeLocalEvent<CP14FoodCookerComponent, AfterInteractEvent>(OnInteractUsing);
SubscribeLocalEvent<CP14FoodHolderComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<CP14FoodCookerComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
}
private void OnAfterInteract(Entity<CP14FoodHolderComponent> ent, ref AfterInteractEvent args)
private void OnInteractUsing(Entity<CP14FoodHolderComponent> target, ref InteractUsingEvent args)
{
if (!TryComp<CP14FoodCookerComponent>(args.Target, out var cooker))
if (!TryComp<CP14FoodHolderComponent>(args.Used, out var used))
return;
MoveFoodToHolder(ent, (args.Target.Value, cooker));
TryTransferFood(target, (args.Used, used));
}
private void OnInteractUsing(Entity<CP14FoodCookerComponent> ent, ref AfterInteractEvent args)
private void OnAfterInteract(Entity<CP14FoodHolderComponent> ent, ref AfterInteractEvent args)
{
if (!TryComp<CP14FoodHolderComponent>(args.Target, out var holder))
if (!TryComp<CP14FoodHolderComponent>(args.Target, out var target))
return;
MoveFoodToHolder((args.Target.Value, holder), ent);
TryTransferFood(ent, (args.Target.Value, target));
}
private void OnInsertAttempt(Entity<CP14FoodCookerComponent> ent, ref ContainerIsInsertingAttemptEvent args)
@@ -40,7 +40,10 @@ public abstract partial class CP14SharedCookingSystem
if (args.Cancelled)
return;
if (ent.Comp.HoldFood)
if (!TryComp<CP14FoodHolderComponent>(ent, out var holder))
return;
if (holder.FoodData is not null)
{
_popup.PopupEntity(Loc.GetString("cp14-cooking-popup-not-empty", ("name", MetaData(ent).EntityName)), ent);
args.Cancel();

160
Content.Shared/_CP14/Cooking/CP14SharedCookingSystem.cs
View File

@@ -6,6 +6,7 @@
using System.Linq;
using System.Numerics;
using Content.Shared._CP14.Cooking.Components;
using Content.Shared._CP14.Cooking.Prototypes;
using Content.Shared.Audio;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
@@ -16,7 +17,6 @@ using Content.Shared.Fluids;
using Content.Shared.Nutrition.Components;
using Content.Shared.Popups;
using Content.Shared.Tag;
using Content.Shared.Throwing;
using Robust.Shared.Containers;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
@@ -26,17 +26,17 @@ namespace Content.Shared._CP14.Cooking;
public abstract partial class CP14SharedCookingSystem : EntitySystem
{
[Dependency] protected readonly IPrototypeManager _proto = default!;
[Dependency] protected readonly SharedContainerSystem _container = default!;
[Dependency] protected readonly IRobustRandom _random = default!;
[Dependency] protected readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] protected readonly SharedSolutionContainerSystem _solution = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly SharedPuddleSystem _puddle = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
[Dependency] protected readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
/// <summary>
/// When overcooking food, we will replace the reagents inside with this reagent.
@@ -61,7 +61,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
CacheAndOrderRecipes();
SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
SubscribeLocalEvent<CP14FoodVisualsComponent, ExaminedEvent>(OnExaminedEvent);
SubscribeLocalEvent<CP14FoodHolderComponent, ExaminedEvent>(OnExaminedEvent);
}
public override void Update(float frameTime)
@@ -85,7 +85,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
CacheAndOrderRecipes();
}
private void OnExaminedEvent(Entity<CP14FoodVisualsComponent> ent, ref ExaminedEvent args)
private void OnExaminedEvent(Entity<CP14FoodHolderComponent> ent, ref ExaminedEvent args)
{
if (ent.Comp.FoodData?.Name is null)
return;
@@ -107,31 +107,32 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
/// <summary>
/// Transfer food data from cooker to holder
/// </summary>
private void MoveFoodToHolder(Entity<CP14FoodHolderComponent> holder, Entity<CP14FoodCookerComponent> cooker)
protected virtual bool TryTransferFood(Entity<CP14FoodHolderComponent> target,
Entity<CP14FoodHolderComponent> source)
{
if (holder.Comp.HoldFood || !cooker.Comp.HoldFood)
return;
if (!source.Comp.CanGiveFood || !target.Comp.CanAcceptFood)
return false;
if (holder.Comp.FoodType != cooker.Comp.FoodType)
return;
if (target.Comp.FoodType != source.Comp.FoodType)
return false;
if (!TryComp<FoodComponent>(holder, out var holderFoodComp))
return;
if (source.Comp.FoodData is null)
return false;
if (!TryComp<CP14FoodVisualsComponent>(cooker, out var cookerFoodVisuals) || cookerFoodVisuals.FoodData is null)
return;
if (!TryComp<FoodComponent>(target, out var holderFoodComp))
return false;
if (!_solution.TryGetSolution(cooker.Owner, cooker.Comp.SolutionId, out var cookerSoln, out var cookerSolution))
return;
if (!_solution.TryGetSolution(source.Owner, source.Comp.SolutionId, out var cookerSoln, out var cookerSolution))
return false;
//Solutions
if (_solution.TryGetSolution(holder.Owner, holderFoodComp.Solution, out var holderSoln, out var solution))
if (_solution.TryGetSolution(target.Owner, holderFoodComp.Solution, out var holderSoln, out var solution))
{
if (solution.Volume > 0)
{
_popup.PopupEntity(Loc.GetString("cp14-cooking-popup-not-empty", ("name", MetaData(holder).EntityName)),
holder);
return;
_popup.PopupEntity(Loc.GetString("cp14-cooking-popup-not-empty", ("name", MetaData(target).EntityName)),
target);
return false;
}
_solution.TryTransferSolution(holderSoln.Value, cookerSolution, solution.MaxVolume);
@@ -139,63 +140,77 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
//Trash
//If we have a lot of trash, we put 1 random trash in each plate. If it's a last plate (out of solution in cooker), we put all the remaining trash in it.
if (cookerFoodVisuals.FoodData.Trash.Count > 0)
if (source.Comp.FoodData?.Trash.Count > 0)
{
if (cookerSolution.Volume <= 0)
{
holderFoodComp.Trash.AddRange(cookerFoodVisuals.FoodData.Trash);
holderFoodComp.Trash.AddRange(source.Comp.FoodData.Trash);
}
else
{
if (_net.IsServer)
{
var newTrash = _random.Pick(cookerFoodVisuals.FoodData.Trash);
cookerFoodVisuals.FoodData.Trash.Remove(newTrash);
var newTrash = _random.Pick(source.Comp.FoodData.Trash);
source.Comp.FoodData.Trash.Remove(newTrash);
holderFoodComp.Trash.Add(newTrash);
}
}
}
if (source.Comp.FoodData is not null)
UpdateFoodDataVisuals(target, source.Comp.FoodData);
Dirty(target);
Dirty(source);
_solution.UpdateChemicals(cookerSoln.Value);
return true;
}
private void UpdateFoodDataVisuals(
Entity<CP14FoodHolderComponent> ent,
bool rename = true)
{
var data = ent.Comp.FoodData;
if (data is null)
return;
UpdateFoodDataVisuals(ent, data, rename);
}
protected virtual void UpdateFoodDataVisuals(
Entity<CP14FoodHolderComponent> ent,
CP14FoodData data,
bool rename = true)
{
//Name and Description
if (cookerFoodVisuals.FoodData.Name is not null)
_metaData.SetEntityName(holder, Loc.GetString(cookerFoodVisuals.FoodData.Name));
if (cookerFoodVisuals.FoodData.Desc is not null)
_metaData.SetEntityDescription(holder, Loc.GetString(cookerFoodVisuals.FoodData.Desc));
if (rename)
{
if (data.Name is not null)
_metaData.SetEntityName(ent, Loc.GetString(data.Name));
if (data.Desc is not null)
_metaData.SetEntityDescription(ent, Loc.GetString(data.Desc));
}
//Flavors
EnsureComp<FlavorProfileComponent>(holder, out var flavorComp);
foreach (var flavor in cookerFoodVisuals.FoodData.Flavors)
EnsureComp<FlavorProfileComponent>(ent, out var flavorComp);
foreach (var flavor in data.Flavors)
{
flavorComp.Flavors.Add(flavor);
}
//Visuals
var holderFoodVisuals = EnsureComp<CP14FoodVisualsComponent>(holder);
holderFoodVisuals.FoodData = new CP14FoodData(cookerFoodVisuals.FoodData);
//Visual random
foreach (var layer in holderFoodVisuals.FoodData.Visuals)
ent.Comp.FoodData = new CP14FoodData(data);
foreach (var layer in data.Visuals)
{
if (_random.Prob(0.5f))
layer.Scale = new Vector2(-1, 1);
}
//Clear cooker data
if (cookerSolution.Volume <= 0)
{
cookerFoodVisuals.FoodData = null;
cooker.Comp.HoldFood = false;
}
holder.Comp.HoldFood = true;
Dirty(holder, holderFoodVisuals);
Dirty(cooker, cookerFoodVisuals);
Dirty(holder);
Dirty(cooker);
_solution.UpdateChemicals(cookerSoln.Value);
//Sliceable
// > on server overrided side
}
public CP14CookingRecipePrototype? GetRecipe(Entity<CP14FoodCookerComponent> ent)
@@ -218,7 +233,9 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
return GetRecipe(ent.Comp.FoodType, solution, allTags);
}
public CP14CookingRecipePrototype? GetRecipe(CP14FoodType foodType, Solution? solution, List<ProtoId<TagPrototype>> allTags)
public CP14CookingRecipePrototype? GetRecipe(ProtoId<CP14FoodTypePrototype> foodType,
Solution? solution,
List<ProtoId<TagPrototype>> allTags)
{
if (OrderedRecipes.Count == 0)
{
@@ -252,7 +269,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
return selectedRecipe;
}
protected void CookFood(Entity<CP14FoodCookerComponent> ent, CP14CookingRecipePrototype recipe)
protected void CreateFoodData(Entity<CP14FoodCookerComponent> ent, CP14CookingRecipePrototype recipe)
{
if (!_solution.TryGetSolution(ent.Owner, ent.Comp.SolutionId, out var soln, out var solution))
return;
@@ -260,18 +277,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
if (!_container.TryGetContainer(ent, ent.Comp.ContainerId, out var container))
return;
var newData = new CP14FoodData
{
Visuals = new List<PrototypeLayerData>(recipe.FoodData.Visuals),
Trash = new List<EntProtoId>(recipe.FoodData.Trash),
Flavors = new HashSet<LocId>(recipe.FoodData.Flavors),
Name = recipe.FoodData.Name,
Desc = recipe.FoodData.Desc,
CurrentRecipe = recipe
};
newData.Name = recipe.FoodData.Name;
newData.Desc = recipe.FoodData.Desc;
var newData = new CP14FoodData(recipe.FoodData);
//Process entities
foreach (var contained in container.ContainedEntities)
@@ -307,36 +313,36 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
if (solution.Volume <= 0)
return;
var foodVisuals = EnsureComp<CP14FoodVisualsComponent>(ent.Owner);
foodVisuals.FoodData = newData;
ent.Comp.HoldFood = true;
if (TryComp<CP14FoodHolderComponent>(ent.Owner, out var holder))
{
holder.FoodData = newData;
Dirty(ent.Owner, holder);
}
Dirty(ent);
Dirty(ent, foodVisuals);
}
protected void BurntFood(Entity<CP14FoodCookerComponent> ent)
{
if (!TryComp<CP14FoodVisualsComponent>(ent, out var foodVisuals) || foodVisuals.FoodData is null)
if (!TryComp<CP14FoodHolderComponent>(ent, out var holder) || holder.FoodData is null)
return;
if (!_solution.TryGetSolution(ent.Owner, ent.Comp.SolutionId, out var soln, out var solution))
return;
//Brown visual
foreach (var visuals in foodVisuals.FoodData.Visuals)
foreach (var visuals in holder.FoodData.Visuals)
{
visuals.Color = Color.FromHex("#212121");
}
foodVisuals.FoodData.Name = Loc.GetString("cp14-meal-recipe-burned-trash-name");
foodVisuals.FoodData.Desc = Loc.GetString("cp14-meal-recipe-burned-trash-desc");
holder.FoodData.Name = Loc.GetString("cp14-meal-recipe-burned-trash-name");
holder.FoodData.Desc = Loc.GetString("cp14-meal-recipe-burned-trash-desc");
var replacedVolume = solution.Volume / 2;
solution.SplitSolution(replacedVolume);
solution.AddReagent(_burntFoodReagent, replacedVolume / 2);
DirtyField(ent.Owner, foodVisuals, nameof(CP14FoodVisualsComponent.FoodData));
DirtyField(ent.Owner, holder, nameof(CP14FoodHolderComponent.FoodData));
}
}

24
Content.Shared/_CP14/Cooking/Components/CP14FoodCookerComponent.cs
View File

@@ -3,6 +3,7 @@
* https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
*/
using Content.Shared._CP14.Cooking.Prototypes;
using Content.Shared.DoAfter;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
@@ -10,14 +11,14 @@ using Robust.Shared.Serialization;
namespace Content.Shared._CP14.Cooking.Components;
/// <summary>
/// Prepares food from ingredients and places it in the FoodHolderComponent
/// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), Access(typeof(CP14SharedCookingSystem))]
public sealed partial class CP14FoodCookerComponent : Component
{
[DataField]
public bool HoldFood = false;
[DataField(required: true)]
public CP14FoodType FoodType;
public ProtoId<CP14FoodTypePrototype> FoodType;
[DataField]
public string ContainerId;
@@ -50,6 +51,9 @@ public sealed partial class CP14FoodCookerComponent : Component
[DataField]
public float BurntAdditionalSpawnProb = 0.2f;
[DataField]
public bool RenameCooker = false;
}
[Serializable]
@@ -64,6 +68,8 @@ public sealed partial class CP14FoodData
Visuals = new List<PrototypeLayerData>(data.Visuals);
Trash = new List<EntProtoId>(data.Trash);
Flavors = new HashSet<LocId>(data.Flavors);
SliceProto = data.SliceProto;
SliceCount = data.SliceCount;
}
[DataField]
@@ -83,12 +89,12 @@ public sealed partial class CP14FoodData
[DataField]
public HashSet<LocId> Flavors = new();
}
public enum CP14FoodType
{
Meal,
Soup,
[DataField]
public EntProtoId? SliceProto;
[DataField]
public ushort SliceCount = 5;
}
[Serializable, NetSerializable]

35
Content.Shared/_CP14/Cooking/Components/CP14FoodHolderComponent.cs
View File

@@ -3,20 +3,47 @@
* https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
*/
using Content.Shared._CP14.Cooking.Prototypes;
using Robust.Shared.GameStates;
using Robust.Shared.Utility;
using Robust.Shared.Prototypes;
namespace Content.Shared._CP14.Cooking.Components;
[RegisterComponent, NetworkedComponent, Access(typeof(CP14SharedCookingSystem))]
/// <summary>
/// Food of the specified type can be transferred to this entity.
/// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), Access(typeof(CP14SharedCookingSystem))]
public sealed partial class CP14FoodHolderComponent : Component
{
/// <summary>
/// What food is currently stored here?
/// </summary>
[DataField, AutoNetworkedField]
public CP14FoodData? FoodData;
[DataField]
public bool HoldFood = false;
public bool CanAcceptFood = false;
[DataField]
public bool CanGiveFood = false;
[DataField(required: true)]
public CP14FoodType FoodType;
public ProtoId<CP14FoodTypePrototype> FoodType;
[DataField]
public string? SolutionId;
[DataField]
public int MaxDisplacementFillLevels = 8;
[DataField]
public string? DisplacementRsiPath;
/// <summary>
/// target layer, where new layers will be added. This allows you to control the order of generative layers and static layers.
/// </summary>
[DataField]
public string TargetLayerMap = "cp14_foodLayers";
public HashSet<string> RevealedLayers = new();
}

36
Content.Shared/_CP14/Cooking/Components/CP14FoodVisualsComponent.cs
View File

@@ -1,36 +0,0 @@
/*
* This file is sublicensed under MIT License
* https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
*/
using Robust.Shared.GameStates;
using Robust.Shared.Utility;
namespace Content.Shared._CP14.Cooking.Components;
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true, true), Access(typeof(CP14SharedCookingSystem))]
public sealed partial class CP14FoodVisualsComponent : Component
{
/// <summary>
/// What food is currently stored here?
/// </summary>
[DataField, AutoNetworkedField]
public CP14FoodData? FoodData;
[DataField]
public int MaxDisplacementFillLevels = 8;
[DataField]
public string? DisplacementRsiPath = null;
[DataField]
public string? SolutionId;
/// <summary>
/// target layer, where new layers will be added. This allows you to control the order of generative layers and static layers.
/// </summary>
[DataField]
public string TargetLayerMap = "cp14_foodLayers";
public HashSet<string> RevealedLayers = new();
}

6
Content.Shared/_CP14/Cooking/CP14CookingRecipePrototype.cs → Content.Shared/_CP14/Cooking/Prototypes/CP14CookingRecipePrototype.cs
View File

@@ -7,7 +7,7 @@ using Content.Shared._CP14.Cooking.Components;
using Robust.Shared.Audio;
using Robust.Shared.Prototypes;
namespace Content.Shared._CP14.Cooking;
namespace Content.Shared._CP14.Cooking.Prototypes;
[Prototype("CP14CookingRecipe")]
public sealed class CP14CookingRecipePrototype : IPrototype
@@ -28,8 +28,8 @@ public sealed class CP14CookingRecipePrototype : IPrototype
[DataField]
public CP14FoodData FoodData = new();
[DataField]
public CP14FoodType FoodType = CP14FoodType.Meal;
[DataField(required: true)]
public ProtoId<CP14FoodTypePrototype> FoodType;
[DataField]
public TimeSpan CookingTime = TimeSpan.FromSeconds(20f);

15
Content.Shared/_CP14/Cooking/Prototypes/CP14FoodTypePrototype.cs Normal file
View File

@@ -0,0 +1,15 @@
/*
* This file is sublicensed under MIT License
* https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
*/
using Robust.Shared.Prototypes;
namespace Content.Shared._CP14.Cooking.Prototypes;
[Prototype("CP14FoodType")]
public sealed class CP14FoodTypePrototype : IPrototype
{
[IdDataField]
public string ID { get; private set; } = default!;
}

2
Content.Shared/_CP14/Cooking/Requirements/TagBlocked.cs
View File

@@ -30,6 +30,6 @@ public sealed partial class TagBlocked : CP14CookingCraftRequirement
public override float GetComplexity()
{
return 1;
return Tags.Count * -1;
}
}

18
Content.Shared/_CP14/Workbench/Requirements/FoodResource.cs
View File

@@ -6,8 +6,10 @@
using System.Linq;
using Content.Shared._CP14.Cooking;
using Content.Shared._CP14.Cooking.Components;
using Content.Shared._CP14.Cooking.Prototypes;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Content.Shared.Nutrition.Components;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
@@ -28,16 +30,16 @@ public sealed partial class FoodResource : CP14WorkbenchCraftRequirement
var solutionSys = entManager.System<SharedSolutionContainerSystem>();
foreach (var ent in placedEntities)
{
if (!entManager.TryGetComponent<CP14FoodVisualsComponent>(ent, out var foodVisuals))
if (!entManager.TryGetComponent<CP14FoodHolderComponent>(ent, out var foodHolder))
continue;
if (entManager.HasComponent<CP14FoodHolderComponent>(ent))
if (!entManager.HasComponent<FoodComponent>(ent))
continue;
if (foodVisuals.FoodData?.CurrentRecipe != Recipe)
if (foodHolder.FoodData?.CurrentRecipe != Recipe)
continue;
if (!solutionSys.TryGetSolution(ent, foodVisuals.SolutionId, out _, out var solution))
if (!solutionSys.TryGetSolution(ent, foodHolder.SolutionId, out _, out var solution))
continue;
if (solution.Volume < Count)
@@ -57,16 +59,16 @@ public sealed partial class FoodResource : CP14WorkbenchCraftRequirement
foreach (var ent in placedEntities)
{
if (!entManager.TryGetComponent<CP14FoodVisualsComponent>(ent, out var foodVisuals))
if (!entManager.TryGetComponent<CP14FoodHolderComponent>(ent, out var foodHolder))
continue;
if (entManager.HasComponent<CP14FoodHolderComponent>(ent))
if (!entManager.HasComponent<FoodComponent>(ent))
continue;
if (foodVisuals.FoodData?.CurrentRecipe != Recipe)
if (foodHolder.FoodData?.CurrentRecipe != Recipe)
continue;
if (!solutionSys.TryGetSolution(ent, foodVisuals.SolutionId, out _, out var solution))
if (!solutionSys.TryGetSolution(ent, foodHolder.SolutionId, out _, out var solution))
continue;
if (solution.Volume < Count)