- Jan 29, 2024
-
-
Fabian Heinrich authored
-
Florian Schröder authored
Refactored the way layout file paths are stored and accessed within the Overcooked simulator GUI. Now, layout file paths are stored in a dictionary which allows for more efficient and flexible usage when setting up the environment. The drop-down menu now initializes with 'basic.layout' as the default option, if it exists, otherwise a random layout is chosen.
-
Fabian Heinrich authored
-
Florian Schröder authored
-
Florian Schröder authored
The commit incorporates the state changes for the 'reset_button' in different scenarios in the overcooked_gui.py file. The reset button is now configured to either show or hide during particular instances of the game, enhancing the user interaction by providing clearer game state transitions.
-
- Jan 28, 2024
-
-
Florian Schröder authored
The instructions for starting the Overcooked game server and GUI have been updated. They now include manager_ids as extra arguments, which are necessary for proper setup. This changelog is reflected in the __init__.py file of the overcooked_simulator directory.
-
Florian Schröder authored
The README.md file has been updated with revised instructions on initiating game server and GUI, specifically the inclusion of manager_ids as arguments. The argument type for manager_ids in utils.py is also altered from list to string. Exception handling in overcooked_gui.py has been improved to explicitly throw a value error when encountering forbidden requests.
-
Florian Schröder authored
An optional argument for the list of manager IDs was added across the Overcooked simulator. These IDs are now used for authorization purposes when creating environments. Unauthorized attempts now return HTTP error 403. This helps enhance security and control over environment management in the simulation.
-
- Jan 27, 2024
-
-
Florian Schröder authored
This commit provides a significant overhaul of various aspects within the overcooked_simulator's 2D visualization and GUI components. The changes include adjusting the game window and grid size, simplifying the drawing methods by removing redundancy, and enhancing the theme configuration for the GUI. This makes the code cleaner and easier to maintain, besides improving the visual style of the GUI.
-
- Jan 26, 2024
-
-
Florian Schröder authored
Merge branch '66-replace-transitions-values-from-dict-just-to-the-iteminfo-because-it-already-stores-all-the-info' into 'main' Resolve "replace transitions values from dict just to the iteminfo because it already stores all the info" Closes #66 See merge request scs/cocosy/overcooked-simulator!32
-
Florian Schröder authored
Refactored the transition filter code in overcooked_environment.py by replacing redundant code with a call to `filter_item_info` method. The changes lead to easier maintenance and increased code readability. Also, in gui_2d_vis/drawing.py, array conversion was added to 'pos' to ensure operations involving 'pos' and 'd' won't raise errors.
-
Florian Schröder authored
Merge remote-tracking branch 'origin/main' into 66-replace-transitions-values-from-dict-just-to-the-iteminfo-because-it-already-stores-all-the-info # Conflicts: # overcooked_simulator/counters.py # overcooked_simulator/game_items.py # overcooked_simulator/overcooked_environment.py # tests/test_start.py
-
Florian Schröder authored
Merge branch '64-item-and-meal-extension-fish-and-chips-pizza-general-class-for-cooking-counter-stove-deep-fryer' into 'main' Resolve "Item and Meal extension fish and chips, pizza; general class for cooking counter -> stove, deep fryer, oven on class" Closes #64 See merge request scs/cocosy/overcooked-simulator!30
-
Florian Schröder authored
In the 2D visualization config file, the name of the "ChoppedMeat" item has been corrected. It is now appropriately referred to as "RawPatty" to better match the actual item and its corresponding image.
-
Florian Schröder authored
The CookingCounter is now included in the list of counters for which we calculate progress. Additionally, if a counter type is not defined in the configuration, a ValueError will be raised. Unnecessary imports were also removed from 'overcooked_gui.py', and a 'to_dict' method was added in 'counters.py'. Fixing errors from merge.
-
Florian Schröder authored
Merge remote-tracking branch 'origin/main' into 64-item-and-meal-extension-fish-and-chips-pizza-general-class-for-cooking-counter-stove-deep-fryer # Conflicts: # overcooked_simulator/gui_2d_vis/overcooked_gui.py # overcooked_simulator/overcooked_environment.py
-
Florian Schröder authored
Resolve "api" Closes #57 See merge request scs/cocosy/overcooked-simulator!26
-
Florian Schröder authored
The Overcooked Simulator has been updated to allow dynamic URLs and ports. This change includes modifications to the README file, and refactoring of main.py, utils.py and overcooked_gui.py to allow these variables to be passed in at runtime. This modification enhances the flexibility of the simulator when integrating with different systems or environments.
-
Florian Schröder authored
This commit removes a temporal lock previously used for the GUI. This leads to refinement and adjustments to the usage of datetime and timedelta in the simulator environment. In the tests, the Simulator class is replaced with directly creating an Environment instance and testing the desired features. Additions include comments for future TODOs relating to further enhancements and checks.
-
Fabian Heinrich authored
-
Fabian Heinrich authored
-
Fabian Heinrich authored
-
Fabian Heinrich authored
-
Florian Schröder authored
The logging setup has been moved from the now-deleted main.py to utils.py. In this refactor, the files main.py and simulation_runner.py were removed as they were no longer needed. Unnecessary print statements in overcooked_gui.py and the import of setup_logging in game_server.py were also removed.
-
Florian Schröder authored
Renamed `move_dist` attribute to `player_speed_units_per_seconds` in player configuration. Also implemented `__post_init__` method in Action class to handle conversion from str to Enum type. Added a utility function `custom_asdict_factory` to handle Enum serialization for actions. Various code updates are made to accommodate these changes. Fixes merge bugs.
-
Fabian Heinrich authored
-
Fabian Heinrich authored
-
Florian Schröder authored
# Conflicts: # overcooked_simulator/counters.py # overcooked_simulator/game_items.py # overcooked_simulator/gui_2d_vis/overcooked_gui.py # overcooked_simulator/order.py # overcooked_simulator/overcooked_environment.py # overcooked_simulator/player.py # overcooked_simulator/simulation_runner.py
-
Fabian Heinrich authored
-
Fabian Heinrich authored
-
Fabian Heinrich authored
-
Florian Schröder authored
A new command line interface has been added to Overcooked Simulator, which starts up the overcooked game engine server and a PyGame 2D Visualization window each in their own process. This is done using argparse for handling command line arguments. Furthermore, some minor changes have been introduced in the game server and GUI scripts to better handle processes and accept host and port arguments.
-
Fabian Heinrich authored
-
Fabian Heinrich authored
-
Florian Schröder authored
Removed the unused 'get_state_simple_json' method, added missing docstrings providing detailed explanations for functions in 'overcooked_simulator/game_server.py' and 'overcooked_simulator/simulation_runner.py'. Implemented a type hinting dictionary in 'overcooked_simulator/server_results.py'. These changes are aimed at improving code readability and maintenance.
-
Fabian Heinrich authored
-
- Jan 25, 2024
-
-
Florian Schröder authored
The player id type is updated from 'int | str' to 'str' across different files to maintain code uniformity and avoid type-related errors. Removed the global constants (USE_PLAYER_COOK_SPRITES, SHOW_INTERACTION_RANGE, SHOW_COUNTER_CENTERS) from gui files for better code structure. Moreover, function annotations are improved by providing more specific types which helps in understanding the codebase. The diff adds additional details in the form of questions or short descriptions in the comments as well.
-
Florian Schröder authored
The screen parameter for the draw_orders function has been changed from game_screen to main_window. This should ensure the orders will appear in the main application window instead of a separate game-specific screen, enhancing user interaction and visibility.
-
Florian Schröder authored
The update introduces a new function `get_json_state()` in overcooked_environment.py that exports the current game state in JSON format. Changes were made to player.py, counters.py, and game_items.py to include an additional `to_dict()` function which represents their current status as a dictionary. This commit also includes minor naming changes, such as renaming `beginning_time` to `start_time`.
-
Fabian Heinrich authored
-