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

Solution refactor (#4407)

Browse Source 
* Rename SolutionContainerCaps -> Capability

* Move IExamine event to Chemistry System.

* ECS the ISolutionChange into SolutionChangeEvent

* Unify SolutionContainer into a single shared component

* Replace ISolutionInteraction with SolutionContainerComponent

* Move all methods from SolutionContainer to ChemistrySystem

* Refactor EntitySystem calls to Dependencies

* Refactor SolutionContainer to SolutionManager

* Fix yamls

* Fix test fails

* Fix post merge issues

* Fix various issues with SolutionManager

* More fixes

* Fix more components

* Fix events not being directed

* Fixes for Hypospray

* Separate removal and iteration on Metabolism

* Fix creampie problems

* Address some of sloth's issues

* Refactors for Systems

* Refactored solution location

* Fix tests

* Address more sloth issues

* Fix dependency

* Fix merge conflicts

* Add xmldocs for Capabilities components

* Remove HasSolution/TryGetDefaultSolution and Add/Remove Drainable/Refillable

* Replace Grindable/Juiceable with Extractable

* Refactor field names

* Fix Drainable

* Fix some issues with spillable and injector

* Fix issues with Grinder

* Fix Beaker having duplicate solutions

* Fix foaming

* Address some MGS issues

* Fix Uid issues

* Fix errors in solution Tranfer

* Fixed some extra values constant values

* Cola is drinkable now
This commit is contained in:
Ygg01
2021-09-06 15:49:44 +02:00
committed by GitHub
parent b8911d58ac
commit c209e3f29b
166 changed files with 4268 additions and 3278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs
View File

@@ -1,6 +1,8 @@
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.Chemistry.Components;
using Content.Server.Nutrition.Components;
using Content.Shared.Chemistry.EntitySystems;
using Robust.Shared.GameObjects;
namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink
{
@@ -10,14 +12,16 @@ namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || target.Deleted || !target.TryGetComponent(out SolutionContainerComponent? drink))
if (target == null
|| target.Deleted
|| !EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(target, DrinkComponent.DefaultSolutionName, out var drink))
{
return 0.0f;
}
var nutritionValue = 0;
foreach (var reagent in drink.ReagentList)
foreach (var reagent in drink.Contents)
{
// TODO
nutritionValue += (reagent.Quantity * 30).Int();

9
Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs
View File

@@ -1,6 +1,8 @@
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.Chemistry.Components;
using Content.Server.Nutrition.Components;
using Content.Shared.Chemistry.EntitySystems;
using Robust.Shared.GameObjects;
namespace Content.Server.AI.Utility.Considerations.Nutrition.Food
{
@@ -10,14 +12,15 @@ namespace Content.Server.AI.Utility.Considerations.Nutrition.Food
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || target.Deleted || !target.TryGetComponent(out SolutionContainerComponent? food))
if (target == null || target.Deleted ||
!EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(target, FoodComponent.SolutionName, out var food))
{
return 0.0f;
}
var nutritionValue = 0;
foreach (var reagent in food.ReagentList)
foreach (var reagent in food.Contents)
{
// TODO
nutritionValue += (reagent.Quantity * 30).Int();