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

Apple Tart Task #54

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6b95b08
added hot dog, bun, grill, and condiment assets, added new predicates…
tragicoverture Oct 30, 2024
f465e91
added condiment action and predicates, fixed draw condiments issue, a…
tragicoverture Oct 30, 2024
b912a80
updated hot dog and tileset assets
tragicoverture Oct 31, 2024
a27f00d
updated hot dog assets, updated preconditions for adding condiments
tragicoverture Nov 1, 2024
af2d852
updated goal predicates for problem file
tragicoverture Nov 1, 2024
7a99638
added new assets for salmon filet, turkey, salt, and oven, added new …
tragicoverture Nov 2, 2024
d6bce6a
updated stove asset to include oven indicator, updated oven asset to …
tragicoverture Nov 8, 2024
ed2f4e9
updated condiment predicates and actions for salmon
tragicoverture Nov 9, 2024
5218cb1
added new predicates and actions for fried shrimp functionality, adde…
tragicoverture Nov 14, 2024
23bfba0
added table under batter station
tragicoverture Nov 15, 2024
939716d
added croissant functionality, updated oven asset to be new station, …
tragicoverture Nov 20, 2024
0551390
made pan a container instead of an item
lsuyean Nov 8, 2024
c478f09
Resolve merge conflicts and integrate stacking implementation
Nov 23, 2024
e5118af
added assets for sushi
Nov 23, 2024
55ca028
created new actions for adding items to seaweed and rolling sushi, wi…
Nov 23, 2024
0962622
added assets for sushi (excluding uncooked rice)
YottaYocta Nov 23, 2024
b8a86b9
rewrote sushi in order to have new asset (bundle) and reimplemented a…
Dec 7, 2024
f8eff5b
added barebones bundle functionality to putting together tart and coo…
Dec 7, 2024
495499f
added barebones pizza implementation
Dec 7, 2024
78a5049
added assets for butter chicken, predicates for adding tomato sauce
Dec 20, 2024
8477702
Merge branch 'butter-chicken' into pizza
Dec 20, 2024
8304f83
added tomato sauce condiment (placeholder) and predicates for assembl…
Dec 20, 2024
58d34de
added baking apple tart options
Dec 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
Binary file added assets/.DS_Store
Binary file not shown.
Binary file added assets/appleslices.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/appletart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/appletartdough.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/baked_croissant.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/bakedappletart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/bakedpizza.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/batter_station.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/battered_shrimp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blendedapple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/bun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/butterchicken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cheesetri.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cookedblendedapple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cookedrice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/croissant.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cucumber.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cutchicken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cutcucumber.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cutpepperoni.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/cutsalmon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/dough.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/doughwithsauce.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/doughwithsauceandcheese.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/doughwithsaucecheeseandpepperoni.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fried_shrimp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/friedbutterchicken.png
Binary file added assets/gratedcheese.png
Binary file added assets/grill.png
Binary file added assets/grilledhotdog.png
Binary file added assets/grilledsalmon.png
Binary file added assets/grilledsaltedsalmon.png
Binary file added assets/hotdog.png
Binary file added assets/ketchup_hotdog.png
Binary file added assets/ketchup_mustard_hotdog.png
Binary file added assets/ketchupbottle.png
Binary file added assets/kneadedpizzadough.png
Binary file added assets/mustard_hotdog.png
Binary file added assets/mustardbottle.png
Binary file added assets/oven.png
Binary file added assets/oven_on.png
Binary file added assets/pepperonistick.png
Binary file added assets/rice.png
Binary file added assets/roastedturkey.png
Binary file added assets/rollingpin.png
Binary file added assets/salmon.png
Binary file added assets/salt.png
Binary file added assets/seasonedchicken.png
Binary file added assets/seaweed.png
Binary file added assets/shrimp.png
Binary file added assets/sushi.png
Binary file modified assets/tileset/tileset_counter/tileset_counter.png
Binary file modified assets/tileset/tileset_table/tileset_table.png
Binary file added assets/toastedbun.png
Binary file added assets/tomatosauce.png
Binary file added assets/triangle.png
Binary file added assets/turkey.png
Binary file added assets/wholechicken.png
171 changes: 99 additions & 72 deletions backend/state.py

Large diffs are not rendered by default.

261 changes: 257 additions & 4 deletions domain/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,42 +22,182 @@
}
},
{
"name": "pick-up-container",
"name": "pick-up-bundle",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "place-container",
"name": "place-bundle",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "stack",
"name": "stack-on-bottom-item",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "unstack",
"name": "pick-up-condiment",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "place-condiment",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "pick-up-condiment",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "place-condiment",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "stack-onto-container-stack",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "unstack-from-bottom-item",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "stack-onto-station-stack",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "unstack-from-station-stack",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "stack_on_container",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "unstack_from_container",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "stack-onto-container-stack",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "unstack-from-container-stack",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
}
],
"keyboard_actions": [
{
"name": "put-in-oven",
"input_instructions": {
"key": "p",
"at": "s1"
}
},
{
"name": "put-in-oven-bundle",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "take-out-item",
"input_instructions": {
"key": "p",
"at": "s1"
}
},
{
"name": "batter",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "cook",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "cook-on-oven",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "grill",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "toast",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "roast",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "bake",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "cut",
"input_instructions": {
Expand Down Expand Up @@ -86,6 +226,13 @@
"at": "s1"
}
},
{
"name": "boil-water-on-oven",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-to",
"input_instructions": {
Expand All @@ -106,6 +253,112 @@
"key": "space",
"at": null
}
},
{
"name": "roll",
"input_instructions": {
"key": "r",
"at": "s1"
}
},
{
"name": "add-to-bundle",
"input_instructions": {
"key": "r",
"at": "s1"
}
},
{
"name": "cook-bundle",
"input_instructions": {
"key": "r",
"at": "s1"
}
},
{
"name": "add-ketchup",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-mustard",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-salt",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-tomatosauce",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "roll-triangle",
"input_instructions": {
"key": "t",
"at": "s1"
}
},
{
"name": "shape",
"input_instructions": {
"key": "m",
"at": "s1"
}
},
{
"name": "add-sauce",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-cheese",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-pepperoni",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "bake-pizza",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-apple",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "bake-apple-tart",
"input_instructions": {
"key": "e",
"at": "s1"
}
}

]
}
Loading