Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate microwave recipes into multiple machines (electric range, assembler, medical assembler) #1935

Merged

Conversation

whatston3
Copy link
Contributor

@whatston3 whatston3 commented Sep 3, 2024

About the PR

Adds an oven. At the time of writing, it's just a combination electric grill and microwave. Haven't changed any of the microwave noises or UI, so it's a bit janky. Also, interaction is a litle odd - both the placeable surface and the microwave handle interaction events. Maybe the oven door should be lockable/unlockable? There's also no components in the oven definition at the moment, so it's slow. The power draw with the range on max is also 4 kW, wew.

I think it'd be reasonable to split apart microwave recipes into different cookable machines (this would allow for something like a dedicated medical "microwave" to handle the recipe for sutures/burn pads and whatever other advanced topicals might be coming down the pipe.

Why / Balance

Better kitchen mechanics? Mechanics drive RP, more immersive to bake bread in an oven than in a microwave.

How to test

Media

of.in.the.cold.food.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: The Food-O-Mat and electric range are now available to assemble and bake food. A medical assembler has been added for aloe cream and topical recipes.
  • add: A tier 2 civilian research now unlocks the fryer, Food-O-Mat and range, and another unlocks the medical assembler.
  • tweak: Many microwave recipes now use the range and Food-O-Mat. Refer to the Food Recipes Guidebook page for details.
  • remove: The medical techfab recipes for advanced topicals have been removed.

Copy link
Contributor

github-actions bot commented Sep 3, 2024

RSI Diff Bot; head commit b2cc74a merging into 92768f1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Structures/Machines/assembler.rsi

State Old New Status
assembler-blinky-unlit Added
assembler-broken-unlit Added
assembler-invisible Added
assembler-on-unlit Added
assembler-running-unlit Added
assembler-scan-unlit Added
assembler Added

Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi

State Old New Status
icon Added
mediwave-base Added
mediwave-off-unlit Added
mediwave-on-unlit Added

Resources/Textures/_NF/Structures/Machines/oven.rsi

State Old New Status
composite_off Added
composite_on Added
cooking_unlit Added
off_no_door Added
oven_door Added
range_high Added
range_low Added
range_medium Added
unlit Added

Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi

State Old New Status
composite_off Added
composite_on Added
cooking_unlit Added
off_no_door Added
oven_door Added
range_high Added
range_low Added
range_medium Added
unlit Added

Edit: diff updated after b2cc74a

@dvir001
Copy link
Contributor

dvir001 commented Sep 3, 2024

Is the /suicide command next it works?

@whatston3
Copy link
Contributor Author

Is the /suicide command next it works?

Unsure, but probably. It's a draft for a reason, it still needs some time in the oven. :^)

@Everturning
Copy link

I made a point here that ovens should be able to take a lot of recipes away from microwaves so that we can change the guidelines for ships (like allowing donk pockets and microwaves in ships for example)
https://discord.com/channels/1123826877245694004/1278101708873928778/1278101708873928778]

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Sep 7, 2024
Copy link
Contributor

github-actions bot commented Sep 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Changes: Shaders and removed Merge Conflict This PR has conflicts that prevent merging labels Sep 7, 2024
@GreaseMonk
Copy link
Contributor

I agree with this. If we add new machines they should have unique recipes. I like more cooking machines because it can show a difference between a budget kitchen and a well outfitted kitchen.

They can definitely share recipes , but there should be a reason to use the oven rather than a microwave.
Using the same UI as a microwave also feels very cheap to me, perhaps you can alter it in some way to make it more unique ?

@dvir001
Copy link
Contributor

dvir001 commented Sep 8, 2024

I agree with this. If we add new machines they should have unique recipes. I like more cooking machines because it can show a difference between a budget kitchen and a well outfitted kitchen.

They can definitely share recipes , but there should be a reason to use the oven rather than a microwave. Using the same UI as a microwave also feels very cheap to me, perhaps you can alter it in some way to make it more unique ?

I think just adding the machine as a new PR should be a good start.

Were still not at a point to remake cooking without putting code into in-game cooking book to support a new cooking system.

@whatston3
Copy link
Contributor Author

I've separated out the microwave recipes into different categories (Oven, Microwave, Assembler [largely for salads and sushi and the like], and Medical Assembler). There are now a few different entities that selectively make these recipes. As a proof of concept, I think this is sufficient and fit for purpose.

Assets for each of the entities can probably use some work (sounds, graphics), UI needs changes (assemblers in particular should probably just be a one-button UI saying "ASSEMBLE") and the YAML as-is probably largely redundant.

I'd like to invite discussion, particularly about which recipes belong where, what machines are missing, and what particular machines are missing or extraneous.

@whatston3 whatston3 changed the title Oven Separate microwave recipes into multiple machines (electric range, assembler, medical assembler) Sep 22, 2024
@dustylens
Copy link
Contributor

dustylens commented Sep 25, 2024

This has come such a long ways, I'm really excited to see this in game! So much of the discussion in Frontier has been wrapped up in the culinary side of things and it's fantastic to see some structure emerge to differentiate how that plays out.

Outside of the fact that I am really excited for the medical assembler, which I think is going to open the door for a lot of Frontier specific tools without cluttering or confusing cooking recipes, differentiating oven recipes and assembler recipes is going to be great.

No more microwaving sushi and yes to actually baking things that need to be baked. Not to mention opening the door to finally getting brewing up and running.

Differentiating the recipes is going to be a bit weird at first. But I think that the logic behind them connects really well with RL counterparts. You do not bake the salad, you assemble the salad.

As a mechanical question rather than dumping praise: What is a good way to assist in differentiating the recipes that currently exist? What is the criteria behind assigning traditional microwave recipes? Will all microwave recipes work in ovens, but not all oven recipes work in microwaves?

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Sep 27, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Oct 2, 2024
@dvir001
Copy link
Contributor

dvir001 commented Oct 5, 2024

What is still missing? since this PR fucks with many maps I will like to have it merged soon as possible.

@whatston3
Copy link
Contributor Author

What is still missing? since this PR fucks with many maps I will like to have it merged soon as possible.

Medical assembler isn't mapped anywhere.
No techs or recipes for electric range, assembler, or medical assembler boards, no sources of complete machines.
Still haven't pulled the minimal "get this onto ships and recipe guidebook page" into here.

@github-actions github-actions bot added Map-Shuttle Map - Shuttle Map-POI Map - POI and removed YML labels Oct 5, 2024
@whatston3 whatston3 marked this pull request as ready for review October 7, 2024 19:01
@dvir001 dvir001 merged commit 2479231 into new-frontiers-14:master Oct 12, 2024
18 checks passed
FrontierATC added a commit that referenced this pull request Oct 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants