Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Microwave UI + solids implemented.

Browse Source
This commit is contained in:
FL-OZ
2020-05-03 01:34:00 -05:00
parent dba0949c5b
commit 0f61c2fadf
8 changed files with 186 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Kitchen/RecipeManager.cs
View File

@@ -33,12 +33,12 @@ namespace Content.Shared.Kitchen
return 0;
}
if (x._ingReagents.Count < y._ingReagents.Count)
if (x.IngredientsReagents.Count < y.IngredientsReagents.Count)
{
return 1;
}
if (x._ingReagents.Count > y._ingReagents.Count)
if (x.IngredientsReagents.Count > y.IngredientsReagents.Count)
{
return -1;
}

18
Content.Shared/Kitchen/SharedMicrowaveComponent.cs
View File

@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Shared.Kitchen
@@ -32,14 +33,25 @@ namespace Content.Shared.Kitchen
{
}
}
[Serializable, NetSerializable]
public class MicrowaveEjectSolidIndexedMessage : BoundUserInterfaceMessage
{
public int index;
public MicrowaveEjectSolidIndexedMessage(int i)
{
index = i;
}
}
}
[NetSerializable, Serializable]
public class MicrowaveUserInterfaceState : BoundUserInterfaceState
public class MicrowaveUpdateUserInterfaceState : BoundUserInterfaceState
{
public readonly List<Solution.ReagentQuantity> ReagentsReagents;
public readonly Dictionary<string, int> ContainedSolids;
public MicrowaveUserInterfaceState(List<Solution.ReagentQuantity> reagents, Dictionary<string,int> solids)
public readonly List<EntityUid> ContainedSolids;
public MicrowaveUpdateUserInterfaceState(List<Solution.ReagentQuantity> reagents, List<EntityUid> solids)
{
ReagentsReagents = reagents;
ContainedSolids = solids;

29
Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs
View File

@@ -18,16 +18,17 @@ namespace Content.Shared.Prototypes.Kitchen
public class FoodRecipePrototype : IPrototype, IIndexedPrototype
{
public string _id;
public string _name => Loc.GetString(Name);
private string Name;
public string _result;
public IReadOnlyDictionary<string, int> _ingReagents => IngredientsReagents;
public IReadOnlyDictionary<string, int> _ingSolids => IngredientsSolids;
private string _id;
public string Name => Loc.GetString(Name);
private string _name;
public string Result;
public int CookTime;
public IReadOnlyDictionary<string, int> IngredientsReagents => _ingsReagents;
public IReadOnlyDictionary<string, int> IngredientsSolids => _ingsSolids;
private Dictionary<string, int> _ingsReagents;
private Dictionary<string, int> _ingsSolids;
private Dictionary<string, int> IngredientsReagents;
private Dictionary<string, int> IngredientsSolids;
public int _cookTime;
public string ID => _id;
@@ -36,11 +37,11 @@ namespace Content.Shared.Prototypes.Kitchen
var serializer = YamlObjectSerializer.NewReader(mapping);
serializer.DataField(ref _id, "id", string.Empty);
serializer.DataField(ref Name, "name", string.Empty);
serializer.DataField(ref _result, "result", string.Empty);
serializer.DataField(ref IngredientsReagents, "reagents", new Dictionary<string, int>());
serializer.DataField(ref IngredientsSolids, "solids", new Dictionary<string, int>());
serializer.DataField(ref _cookTime, "time", 5);
serializer.DataField(ref _name, "name", string.Empty);
serializer.DataField(ref Result, "result", string.Empty);
serializer.DataField(ref _ingsReagents, "reagents", new Dictionary<string, int>());
serializer.DataField(ref _ingsSolids, "solids", new Dictionary<string, int>());
serializer.DataField(ref CookTime, "time", 5);
}
}