Skip to content
Snippets Groups Projects
  1. Feb 01, 2024
  2. Jan 31, 2024
    • Florian Schröder's avatar
      Update counter orientation and comment out dispensers · 53fb1e1f
      Florian Schröder authored
      Improved how the orientation of counters is determined in the overcooked_environment; counters will now orient themselves in the correct direction based on their neighbors. Additionally, all dispensers have been commented out in the GUI 2D visualization configuration for cleaning up the visuals. These changes improve both the functionality and visual aspect of the simulator.
      53fb1e1f
  3. Jan 30, 2024
  4. Jan 29, 2024
  5. Jan 28, 2024
    • Florian Schröder's avatar
      Update command line instructions for game server and GUI · 610e930e
      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.
      610e930e
    • Florian Schröder's avatar
      Update command instructions and enhance error handling · 239e7093
      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.
      239e7093
    • Florian Schröder's avatar
      Add manager ID argument to Overcooked simulator · 8d82c086
      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.
      8d82c086
  6. Jan 27, 2024
    • Florian Schröder's avatar
      Add penalty for trashing items in Overcooked simulator · b600b39e
      Florian Schröder authored
      This update introduces a penalty computation for items that the player puts into the trash in the Overcooked simulator. A new function has been added onto the Order class to calculate this penalty, and the Trashcan class has been updated to use this new function whenever an item is dropped off. This change helps to further emulate real gameplay mechanics.
      b600b39e
    • Florian Schröder's avatar
      Refactor 2D visualization and GUI components · fe277e48
      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.
      fe277e48
    • Florian Schröder's avatar
      Refactor counter setup and update various classes · d9ddc417
      Florian Schröder authored
      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.
      d9ddc417
  7. Jan 26, 2024
    • Florian Schröder's avatar
      Update test_start.py · 8e8075b4
      Florian Schröder authored
      8e8075b4
    • Florian Schröder's avatar
      Update test_start.py · 993908e6
      Florian Schröder authored
      993908e6
    • Florian Schröder's avatar
      Refactor progress counter handling in overcooked simulator · 0a75551a
      Florian Schröder authored
      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.
      0a75551a
    • Florian Schröder's avatar
      Remove unnecessary print statements · 4cf989f6
      Florian Schröder authored
      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.
      4cf989f6
    • Florian Schröder's avatar
      Improve documentation in overcooked_environment and counter_factory modules · 97d33243
      Florian Schröder authored
      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.
      97d33243
    • Florian Schröder's avatar
      Refactor simulator environment and add counter factory · 3606ecfd
      Florian Schröder authored
      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.
      3606ecfd
    • Florian Schröder's avatar
      Merge branch... · eff27363
      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
      eff27363
    • Florian Schröder's avatar
      Refactor equipment transition filters and update drawing.py · 05c413f0
      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.
      05c413f0
    • Florian Schröder's avatar
      Merge remote-tracking branch 'origin/main' into... · ef9fbc7a
      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
      ef9fbc7a
    • Florian Schröder's avatar
      Merge branch... · e005a7ad
      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
      e005a7ad
    • Florian Schröder's avatar
      Update item name in visualization config · a51a9f61
      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.
      a51a9f61
    • Florian Schröder's avatar
      Add CookingCounter progress and raise exception for undefined counter types · 8ede781a
      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.
      8ede781a
Loading