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

Pancake Task #48

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 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
ecbf87e
initial functionality for pancakes up until cooking the pancake
tragicoverture Nov 30, 2024
598daee
initial functionality for pancakes up until cooking the pancake
tragicoverture Nov 30, 2024
ed09798
renamed condiments class to packages
tragicoverture Dec 7, 2024
de469e6
added butter functionality to pancake
tragicoverture Dec 11, 2024
80200cc
added rendering fixes for creation objects and meals
tragicoverture Dec 12, 2024
4045cbe
Revert "added rendering fixes for creation objects and meals"
tragicoverture Dec 13, 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 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/batter.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/blender_active.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/blender_full.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/butter.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/cooked_pancake.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/cooked_pancake_in_pan.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/cooked_pancake_with_butter.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/cutbutter.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/egg.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/eggcarton.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/flourbag.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/fryingpan.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/grill.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/grilledhotdog.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/grilledsalmon.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/grilledsaltedsalmon.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/hotdog.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/ketchup_hotdog.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/ketchup_mustard_hotdog.png
Binary file added assets/ketchupbottle.png
Binary file added assets/milk_flour.png
Binary file added assets/milk_whole.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/pancake.png
Binary file added assets/pancake_in_pan.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/shrimp.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/triangle.png
Binary file added assets/turkey.png
1 change: 0 additions & 1 deletion backend/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,5 @@ def step(self, actions, clock):

if self.movement.mode == Mode.TRAVERSE:
self.current_player = self.next_player()

return self, False

161 changes: 161 additions & 0 deletions domain/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@
"click_on": "s1"
}
},
{
"name": "pick-up-package",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "place-package",
"input_instructions": {
"button": "left",
"click_on": "s1"
}
},
{
"name": "stack",
"input_instructions": {
Expand All @@ -51,13 +65,69 @@
}
],
"keyboard_actions": [
{
"name": "put-in-oven",
"input_instructions": {
"key": "p",
"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 All @@ -79,33 +149,124 @@
"at": "s1"
}
},
{
"name": "create-pancakebatter",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "boil-water",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "blend",
"input_instructions": {
"key": "b",
"at": "s1"
}
},
{
"name": "boil-water-on-oven",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-to",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "add-content",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "take-out-pancake",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "take-out-egg",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "fill-bowl",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "fill-pan",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "pan-cook",
"input_instructions": {
"key": "e",
"at": "s1"
}
},
{
"name": "wait",
"input_instructions": {
"key": "space",
"at": null
}
},
{
"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": "roll-triangle",
"input_instructions": {
"key": "t",
"at": "s1"
}
},
{
"name": "shape",
"input_instructions": {
"key": "m",
"at": "s1"
}
}
]
}
Loading