Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities #28225

blueDev2 · 2024-05-23T15:37:07Z

About the PR

Microwave recipes now treat stacked entities by their stacktype id instead of entity prototype id.

Why / Balance

This fixes an issue with making medicated sutures and regenerative mesh using brutepacks and ointments from a medical techfab.
Medical techfabs make "Brutepack1" and "Ointment1" entities and stacking them makes them retain their entityid, but the recipe used "Brutepack" and "Ointment" entities, so it was impossible to use brute packs and ointments from techfabs to create advanced medicine.

Technical details

Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities

Media

video1811032388.mp4

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Any microwave recipe that uses a stacked entity must now instead use the entity of the base stack entity, usually the base stack entity name does not have a number appended to the end of it.
Also when a stacked entity is used, each
Stackable entity prototypes can be found at Resources\Prototypes\Entities\Objects\Materials or whatever equivalent for the specific fork

As an example, here is the changes to the recipe for Regen Mesh

type: microwaveMealRecipe
id: RecipeRegenerativeMesh
name: regenerative mesh recipe
result: RegenerativeMesh
time: 10
solids:
FoodAloe: 1
Ointment: 1 -> Ointment: 10
MaterialCloth1: 1
reagents:
Sigynate: 20
Dermaline: 20

Changelog

🆑 blueDev2

fix: Fixed microwave recipes that use stacked materials

…ble entities AND fix appropriate YMLs

AJCM-git

Fix linter, only had a glance at the code but it seems like it's a bit longer than necessary? try see if there's a way to shorten it or you are checking things unnecessarily (also use proxy methods like Del() instead of direct EntityManager calls)

blueDev2 · 2024-05-31T14:03:13Z

Just to make sure, you want me to change to linter so it doesn't fail when doing this right? Cause I checked the errors and while they are correct since stackid is not entityid, the point of this PR is to make the recipes entity-agonistic.

AJCM-git

Okay, had a bit more time to think about this and i'm pretty sure what you actually need to do here is not touching the recipes at all, but instead when you check for stack component, if it has it then you index the prototype and do solidID = prototype.Spawn; and thats all you need (i think)

blueDev2 · 2024-05-31T20:16:58Z

I don't think I understand what you mean by "index the prototype". I cannot find any field called "Spawn" at the moment.

blueDev2 · 2024-05-31T20:22:04Z

Oh wait, the stack prototype?

blueDev2 · 2024-05-31T20:30:32Z

Ok I see what you mean now, but couldn't that easily introduce confusion since, for example, a recipe that requires "SheetGlass1: 10" and a recipe that requires "SheetGlass10: 10" would both just require 10 steel? Or would it be a rule to only use the SheetGlass1 variant?

AJCM-git · 2024-05-31T20:43:40Z

Ok I see what you mean now, but couldn't that easily introduce confusion since, for example, a recipe that requires "SheetGlass1: 10" and a recipe that requires "SheetGlass10: 10" would both just require 10 steel? Or would it be a rule to only use the SheetGlass1 variant?

Yeah the amount in the recipe takes absolute priority so people should just use the base variant with just 1 in the stack, microwaves are absolutely atrocious code anyways so i would prioritize fixing the bug.

Yet another option that is cleaner but more annoying is making the base Brutepack and Ointment have 1 (thus replacing their variants with 1 and making the techfab print these) in the stack by default and add and Ointment30 prototypes as replacements for current references to brutepacks and ointments (its a bulk replace so it prob wouldnt be that bad)

blueDev2 · 2024-05-31T20:45:38Z

Ok I see what you mean now, but couldn't that easily introduce confusion since, for example, a recipe that requires "SheetGlass1: 10" and a recipe that requires "SheetGlass10: 10" would both just require 10 steel? Or would it be a rule to only use the SheetGlass1 variant?

Yeah the amount in the recipe takes absolute priority so people should just use the base variant with just 1 in the stack, microwaves are absolutely atrocious code anyways so i would prioritize fixing the bug.

Yet another option that is cleaner but more annoying is making the base Brutepack and Ointment have 1 (thus replacing their variants with 1 and making the techfab print these) in the stack by default and add and Ointment30 prototypes as replacements for current references to brutepacks and ointments (its a bulk replace so it prob wouldnt be that bad)

You meant Ointment10 right? They only stack to 10.

Resources/Prototypes/Recipes/Cooking/medical_recipes.yml

Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs

AJCM-git · 2024-06-04T14:43:43Z

Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs

                    {
-                        var metaData = MetaData(item);
-                        if (metaData.EntityPrototype == null)
+                        string? itemID = null;
+
+                        // If an entity has a stack component, use the stacktype instead of prototype id
+                        if (TryComp<StackComponent>(item, out var stackComp))
+                        {
+                            itemID = _prototype.Index<StackPrototype>(stackComp.StackTypeId).Spawn;
+                        }
+                        else
+                        {
+                            var metaData = MetaData(item);
+                            if (metaData.EntityPrototype == null)
+                            {
+                                continue;
+                            }
+                            itemID = metaData.EntityPrototype.ID;
+                        }
+
+                        if (itemID != recipeSolid.Key)
                        {
                            continue;
                        }

-                        if (metaData.EntityPrototype.ID == recipeSolid.Key)
+                        if (stackComp is not null)
+                        {
+                            if (stackComp.Count == 1)
+                            {
+                                _container.Remove(item, component.Storage);
+                            }
+                            _stack.Use(item, 1, stackComp);
+                            break;
+                        }
+                        else
                        {
                            _container.Remove(item, component.Storage);
-                            EntityManager.DeleteEntity(item);
+                            Del(item);
                            break;
                        }


now, the last thing that irks me about this, couldnt you just merge this into a single if else and just repeat the itemID != recipeSolid.Key check?

It would work but I think the current structure makes more sense:
First we check the entity and get an ID
Then check if that id is the one we are currently looking for, if not, iterate to the next entity
Then remove the entity or decrement the stack component count

An outer loop is counting down the amount of solids needed to be removed, so every iteration of this loop will only remove 1 entity or decrement the stack by 1.

eh, its just a shorter version of basically the same thing but i wont block this over that

Microwave recipes now uses stacktypeid instead of entityid for stacka…

80beba0

…ble entities AND fix appropriate YMLs

AJCM-git requested changes May 31, 2024

View reviewed changes

AJCM-git added the S: Awaiting Changes Status: Changes are required before another review can happen label May 31, 2024

Microwave Recipe Code Cleanup

af3120a

AJCM-git requested changes May 31, 2024

View reviewed changes

blueDev2 added 2 commits May 31, 2024 21:29

Changed recipes ymls

dbea35f

Rechanged microwave system again

f71bc1e

blueDev2 requested a review from AJCM-git June 1, 2024 01:40

github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Jun 1, 2024

AJCM-git requested changes Jun 3, 2024

View reviewed changes

Resources/Prototypes/Recipes/Cooking/medical_recipes.yml Show resolved Hide resolved

Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs Show resolved Hide resolved

AJCM-git added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Jun 3, 2024

AJCM-git reviewed Jun 4, 2024

View reviewed changes

AJCM-git approved these changes Jun 4, 2024

View reviewed changes

AJCM-git removed the S: Awaiting Changes Status: Changes are required before another review can happen label Jun 4, 2024

AJCM-git merged commit 0e93d13 into space-wizards:master Jun 4, 2024
12 checks passed

blueDev2 deleted the Microwave-Stacks-Fix branch June 4, 2024 21:22

thebadman4662 mentioned this pull request Jun 6, 2024

Suture/mesh recipes require 1000% bruisepacks/ointments #28667

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities #28225

Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities #28225

blueDev2 commented May 23, 2024 •

edited

Loading

AJCM-git left a comment

blueDev2 commented May 31, 2024 •

edited

Loading

AJCM-git left a comment

blueDev2 commented May 31, 2024

blueDev2 commented May 31, 2024

blueDev2 commented May 31, 2024

AJCM-git commented May 31, 2024 •

edited

Loading

blueDev2 commented May 31, 2024

AJCM-git Jun 4, 2024

blueDev2 Jun 4, 2024

AJCM-git Jun 4, 2024

Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities #28225

Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities #28225

Conversation

blueDev2 commented May 23, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Breaking changes

AJCM-git left a comment

Choose a reason for hiding this comment

blueDev2 commented May 31, 2024 • edited Loading

AJCM-git left a comment

Choose a reason for hiding this comment

blueDev2 commented May 31, 2024

blueDev2 commented May 31, 2024

blueDev2 commented May 31, 2024

AJCM-git commented May 31, 2024 • edited Loading

blueDev2 commented May 31, 2024

AJCM-git Jun 4, 2024

Choose a reason for hiding this comment

blueDev2 Jun 4, 2024

Choose a reason for hiding this comment

AJCM-git Jun 4, 2024

Choose a reason for hiding this comment

blueDev2 commented May 23, 2024 •

edited

Loading

blueDev2 commented May 31, 2024 •

edited

Loading

AJCM-git commented May 31, 2024 •

edited

Loading