# Conflicts:
#	overcooked_simulator/game_server.py

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.

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.

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.

The `overcooked_environment.py` file has been significantly refactored to streamline handling of counter setup. Post counter setup responsibilities have been shifted to the `CounterFactory` class. A utility function, `get_closest`, has been introduced in `utils.py` to determine the closest counter and is used in multiple classes. Minor updates are also made across several other classes for optimization and clarity. The 'other' score in `environment_config.yaml` has been changed from 0 to 20.

The commit refines the way the 'progress' method is called on counters in the overcooked simulator. Utilizing Python's introspection functions, the update identifies the relevant counter classes dynamically on setup, and stores them. Simplified calls to these relevant counters are then performed during steps in the simulation. Additionally, the code now checks the superclass with the built-in 'issubclass' function to create counters.

The print statements that are outputting the kitchen height in the overcooked_environment.py file, the command line arguments in the __main__.py file, and a redundant check in the counter_factory.py file have been removed. This is in an effort to declutter the console output and streamline the code.

The code changes include addition of in-line comments and docstrings, which clarify the purpose and functionality of various elements in the overcooked_environment and counter_factory modules. Several new comments explain the use of certain variables and functions, and additional explanations are offered for existing sections. This is part of an ongoing effort to improve the maintainability and readability of the codebase.

This commit simplifies the overcooked environment by refactoring the way counters are created and managed. A new CounterFactory class is introduced, offloading logic from the environment class. In addition, the symbol to character mapping and other environment-related configurations are moved to a separate YAML file. The .gitignore file is also updated to ignore the 'playground' directory. Making these changes enhances code maintainability and readability.

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

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.

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

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

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.

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.

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

Resolve "api"

Closes #57

See merge request scs/cocosy/overcooked-simulator!26

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.

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.

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.

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.

# 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

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.

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.

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.