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

Add (not working) basis for allowing solids (entities) in recipes.

Browse Source
This commit is contained in:
FL-OZ
2020-05-02 01:29:20 -05:00
parent dd19466578
commit dba0949c5b
9 changed files with 132 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
View File

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using Content.Client.GameObjects.Components.Mobs;
using Content.Shared.Kitchen;
using Robust.Shared.GameObjects.Components.UserInterface;
@@ -29,7 +30,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
base.UpdateState(state);
if (!(state is MicrowaveUserInterfaceState cstate))
return;
_menu.RefreshReagents(cstate.ContainedReagents);
_menu.RefreshContents(cstate.ReagentsReagents, cstate.ContainedSolids);
}

18
Content.Client/GameObjects/Components/Kitchen/MicrowaveMenu.cs
View File

@@ -2,8 +2,10 @@
using Content.Shared.Chemistry;
using Content.Shared.GameObjects;
using Content.Shared.Kitchen;
using Robust.Client.ResourceManagement;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
@@ -37,7 +39,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
};
var ejectButton = new Button()
{
Label = { Text = Loc.GetString("EJECT CONTENTS")}
Label = { Text = Loc.GetString("EJECT REAGENTS")}
};
var scrollContainer = new ScrollContainer()
{
@@ -71,7 +73,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
}
public void RefreshReagents(List<Solution.ReagentQuantity> reagents)
public void RefreshContents(List<Solution.ReagentQuantity> reagents, Dictionary<string,int> solids)
{
InnerScrollContainer.RemoveAllChildren();
foreach (var item in reagents)
@@ -84,6 +86,18 @@ namespace Content.Client.GameObjects.Components.Kitchen
Text = $"{item.Quantity} {proto.Name}"
});
}
foreach (var item in solids)
{
IoCManager.Resolve<IPrototypeManager>().TryIndex(item.Key, out EntityPrototype proto);
var solidLabel = new Button()
{
Text = $"{item.Value} {proto.Name}"
};
InnerScrollContainer.AddChild(solidLabel);
}
}
protected override void Dispose(bool disposing)