tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite recipe prototype.

Browse Source 
Fix comparer in microwavecomponent.
This commit is contained in:
FL-OZ
2020-04-27 00:27:25 -05:00
parent 7e4d4bb1d4
commit 24842418c3
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs
View File

@@ -67,11 +67,16 @@ namespace Content.Server.GameObjects.Components.Kitchen
return 0;
}
if(x.Ingredients.Count < y.Ingredients.Count)
if (x.Ingredients.Count < y.Ingredients.Count)
{
return 1;
}
if (x.Ingredients.Count > y.Ingredients.Count)
{
return -1;
}
return 0;
}
}
@@ -109,7 +114,9 @@ namespace Content.Server.GameObjects.Components.Kitchen
{
var outputFromRecipe = r.OutPutPrototype;
_entityManager.SpawnEntity(outputFromRecipe, Owner.Transform.GridPosition);
return;
}
}
}
@@ -119,13 +126,14 @@ namespace Content.Server.GameObjects.Components.Kitchen
{
var ingName = ingredient.Key.ToString();
var ingQuantity = ingredient.Value;
if (!_contents.ContainsReagent(ingName, out var amt) && amt != ingQuantity) return false;
_contents.TryRemoveReagent(ingName, ReagentUnit.New(ingQuantity));
//This doesnt work.
if (_contents.ContainsReagent(ingName, out var amt) && amt >= ingQuantity)
{
_contents.TryRemoveReagent(ingName, ReagentUnit.New(ingQuantity));
return true;
}
}
return true;
return false;
}