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

Metamorphosis - FoodSequence 3 #31012

Merged

Conversation

TheShuEd
Copy link
Member

@TheShuEd TheShuEd commented Aug 14, 2024

About the PR

specific recipes in a FoodSequence can turn a food into a separate special entity. The same result can be obtained in different ways. Different ways affect the final food solution, its flavors, and the garbage that remains after it is eaten.

for example, Cheeseburger recipe:

- type: metamorphRecipe
  id: FoodBurgerCheese
  key: burger
  result: FoodBurgerCheese
  rules:
  - !type:SequenceLength
    range:
      min: 3
      max: 4
  - !type:LastElementHasTags
    tags:
    - Bun
  - !type:IngredientsWithTags
    tags:
    - Cooked
    - Meat
    count:
      min: 1
      max: 2
  - !type:IngredientsWithTags
    tags:
    - Cheese
    count:
      min: 1
      max: 2
2024-08-18_23-54-04.mp4

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

all FoodSequenceElement components edited again
transfomed from

- type: FoodSequenceElement
    sprite:
      sprite: Objects/Consumable/Food/xxx.rsi
      state: xxx
    entries:
      burger:
        name: food-sequence-content-xxx
      taco: 
        name: food-sequence-content-xxx

to

- type: FoodSequenceElement
    entries:
      Taco: xxx
      Burger: xxx

with new Dictionary <ProtoId<Tag>, ProtoId<FoodSequenceElementPrototype>>
new FoodSequenceElementPrototype required:

- type: foodSequenceElement
  id: Berries
  name: food-sequence-content-berries
  sprites:
  - sprite: Objects/Specific/Hydroponics/berries.rsi
    state: produce
  tags:
  - Fruit

Changelog
🆑

  • add: Returned Taco microwave recipes (people were sad)
  • add: added an alternative method of crafting some burgers, through the correct assembly sequence of modular food.
  • tweak: severely cut back on the number of items you can put on burgers, tacos, or kebabs. This had poor design, and things need to be separately resprited by adding them on modular food.

@beck-thompson
Copy link
Contributor

Finally no evil microwave for burgers! 🥳

@Moomoobeef
Copy link
Contributor

your work on burgers is making me want to add soups/stews...
perhaps when I get back home (still on vacation rn)

@KashRas2

This comment was marked as off-topic.

@github-actions github-actions bot added the Changes: Sprites Changes: Might require knowledge of spriting or visual design. label Aug 18, 2024
Copy link
Contributor

github-actions bot commented Aug 18, 2024

RSI Diff Bot; head commit 39285a1 merging into 894d498
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Species/Human/organs.rsi

State Old New Status
brain Modified

Resources/Textures/Objects/Consumable/Food/skewer.rsi

State Old New Status
skewer-tomato Modified
skewer-watermelon Added

Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi

State Old New Status
slice Modified

Resources/Textures/Objects/Consumable/Food/taco.rsi

State Old New Status
tacoshell_back Removed
tacoshell_forward Removed
beeftaco Added
beeftacosupreme Added
chickentaco Added
chickentacosupreme Added
fishtaco Added
rattaco Added

Resources/Textures/Objects/Consumable/Food/burger.rsi

State Old New Status
screwed Added

Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi

State Old New Status
cheese Added

Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi

State Old New Status
cheese Added
rat Added
tacoshell_back Added
tacoshell_forward Added

Edit: diff updated after 39285a1

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 18, 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 S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 18, 2024
@slarticodefast
Copy link
Member

Oh, I just merged snails, which contain more food sequence elements that need to be adjusted. Sorry. #30765

@EmoGarbage404
Copy link
Contributor

Did you pray today
Did you pray today

@EmoGarbage404 EmoGarbage404 merged commit 230ea9b into space-wizards:master Sep 8, 2024
14 checks passed
@mirrorcult
Copy link
Contributor

the promised land

@TheShuEd
Copy link
Member Author

TheShuEd commented Sep 8, 2024

:0

Erisfiregamer1 pushed a commit to The-Arcadis-Team/arc-station-14 that referenced this pull request Jan 9, 2025
* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
Erisfiregamer1 pushed a commit to The-Arcadis-Team/arc-station-14 that referenced this pull request Jan 9, 2025
* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Needs Review Status: Requires additional reviews before being fully accepted S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants