Skip to content
Snippets Groups Projects
  1. Jan 27, 2024
    • 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
  2. 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
    • Florian Schröder's avatar
      Merge remote-tracking branch 'origin/main' into... · 21a60763
      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
      21a60763
    • Florian Schröder's avatar
      Merge branch '57-api' into 'main' · 07c61851
      Florian Schröder authored
      Resolve "api"
      
      Closes #57
      
      See merge request scs/cocosy/overcooked-simulator!26
      07c61851
    • Florian Schröder's avatar
      Update Overcooked Simulator with dynamic URLs and ports · dd723f17
      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.
      dd723f17
    • Florian Schröder's avatar
      Refactor overcooked simulator and tests, remove GUI lock · 28f70141
      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.
      28f70141
    • Fabian Heinrich's avatar
    • Fabian Heinrich's avatar
      Pizza wood and correct soup placement · e934c152
      Fabian Heinrich authored
      e934c152
    • Fabian Heinrich's avatar
      Fixed: Remaining time as int · abc5715c
      Fabian Heinrich authored
      abc5715c
    • Fabian Heinrich's avatar
      Added raw fries png · 85ce1770
      Fabian Heinrich authored
      85ce1770
    • Florian Schröder's avatar
      Refactor logging setup and remove obsolete files · f4db8bd5
      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.
      f4db8bd5
    • Florian Schröder's avatar
      Update player speed attribute and handle Enum serialization · dc8d7e4f
      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.
      dc8d7e4f
    • Fabian Heinrich's avatar
      Fixed offsets · fedc0ff0
      Fabian Heinrich authored
      fedc0ff0
    • Fabian Heinrich's avatar
      Deepfryer basket · 85b24bab
      Fabian Heinrich authored
      85b24bab
    • Florian Schröder's avatar
      Merge remote-tracking branch 'origin/main' into 57-api · 4f4c2c15
      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
      4f4c2c15
    • Fabian Heinrich's avatar
      Updated sink · 7c557573
      Fabian Heinrich authored
      7c557573
    • Fabian Heinrich's avatar
      Wrong color · 5696776b
      Fabian Heinrich authored
      5696776b
    • Fabian Heinrich's avatar
      Bell for serving window · fae74c11
      Fabian Heinrich authored
      fae74c11
    • Florian Schröder's avatar
      Add command line interface to Overcooked Simulator · 01b18acd
      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.
      01b18acd
    • Fabian Heinrich's avatar
      Fishandchips · 4630e22a
      Fabian Heinrich authored
      4630e22a
    • Fabian Heinrich's avatar
      Pizza base, pizza, pizza dough · a4c5aedf
      Fabian Heinrich authored
      a4c5aedf
    • Florian Schröder's avatar
      Refactor and add detailed docstrings to Overcooked game server · d754c525
      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.
      d754c525
    • Fabian Heinrich's avatar
  3. Jan 25, 2024
    • Florian Schröder's avatar
      Refactor player id type and remove global constants in UI · 47edb3ea
      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.
      47edb3ea
    • Florian Schröder's avatar
      Switch screen for drawing orders in GUI · 3403d046
      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.
      3403d046
    • Florian Schröder's avatar
      Update Overcooked simulator to support state export in JSON format · df234b9c
      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`.
      df234b9c
    • Fabian Heinrich's avatar
      e22ce756
    • Florian Schröder's avatar
      Remove unnecessary lock in order enumeration · df38f03c
      Florian Schröder authored
      The lock in the enumeration of orders in the Overcooked simulator's 2D visualization was extra and thus, it was removed. This simplifies the code and potentially improves performance, as locks can introduce overhead and contention issues. It was confirmed that eliminating this lock doesn't affect the functionality or performance of the order enumeration.
      df38f03c
    • Florian Schröder's avatar
Loading