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

Tempura Croissant Task #46

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Tempura Croissant Task #46

wants to merge 13 commits into from

Conversation

tragicoverture
Copy link

Overview

In this pr, I integrated frying tempura and baking croissants into Robotouille by implementing new items, actions, and assets into the game.

Changes Made

Changes for implementing new features into Robotouille

  • Added new assets
  • Edited asset config json to update new and current assets
  • Edited input.json to include new actions
  • Edited robotouille config json to include new predicates and actions
  • Updated builder.py, object_enums.py with new objects

Changes for new objects

  • Updated builder.py, object_enums.py with new oven asset

Test Coverage

Manual testing using new test files

Related PRs or Issues

New updated oven asset will be reflected in "Salmon Turkey Task" pr soon.

Screenshots

fried tempura!
Screen.Recording.2024-11-20.at.18.49.27.mov
baked croissant!
Screen.Recording.2024-11-20.at.18.50.50.mov

… and actions into robotouille json, added corresponding gameplay instructions, added new objects into appropriate enums class, cannot draw condiment and condiment logic work in progress
…dded condiment problem jsons, need to add proper assets that correspond to hot dog with added condiments
…predicates and actions into robotouille json, updated input json to include new actions, added new objects into objects_enums.py
…be under with stove asset in config json, created new actions to put in oven and take out items from oven, updated canvas.py to account for multiple assets aside from default asset for stations
…d new input instructions, added new assets for shrimp and batter station
…added new problem environments for dough and croissant.
Copy link
Contributor

@lsuyean lsuyean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job on this PR! I tested out the environments and they look good. Left some comments regarding the roll-triangle and shape actions. Do let me know if you have any questions.

"param_types": ["item"]
},
{
"name": "has_condiments",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this predicate for?

{
"predicate": "atop",
"params": ["i2", "i1"],
"is_true": true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a precondition that the item is clear, and also check if the item atop the dough is a rolling pin (so that we cannot put a random item on it and roll it), and maybe also check that the station is a table, so that we cant roll the item on a sink for example

"sfx": [
{
"type": "conditional",
"param": "i1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite understand this sfx. Why is one of the immediate fx making isshaped true? It's already in the fx of the action, so it will already be set to true regardless of the conditions. Also, is the condition item_on necessary? since the action is not delayed, these effects should be immediate, so there will not be a case where item_on is not true

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants