diff --git a/cooperative_cuisine/configs/layouts/study_layouts/1-4-bottleneck.layout b/cooperative_cuisine/configs/layouts/study_layouts/1-4-bottleneck.layout index a66163dadb89139302f67d35e1cea1fc1c3a53a9..e16be9c1eeefaa4a689aa78672ce445dcfb96219 100644 --- a/cooperative_cuisine/configs/layouts/study_layouts/1-4-bottleneck.layout +++ b/cooperative_cuisine/configs/layouts/study_layouts/1-4-bottleneck.layout @@ -5,8 +5,8 @@ B___________# L____###____$ #____#=#____$ #____#=#____P -X____#=#____# -=QQ#U===#@@@= +X____#=#____@ +=QQ#U===#@@#= ; seconds=240 ; plates={c:0, d:0} diff --git a/cooperative_cuisine/configs/layouts/study_layouts/1-5-circle.layout b/cooperative_cuisine/configs/layouts/study_layouts/1-5-circle.layout index 995c7634b47696c65e5330cb94c9c7c326aa09c3..c586628b37cd12f2ca97862763c2cfc516f40a24 100644 --- a/cooperative_cuisine/configs/layouts/study_layouts/1-5-circle.layout +++ b/cooperative_cuisine/configs/layouts/study_layouts/1-5-circle.layout @@ -1,12 +1,12 @@ -====P$$#==== -=T#N____##|= -#_A________X -#_###S+###_# -#_#======#_# -#_#======#_# -#_####@@##_# -#________A_# -=#C#C###U#U= +====P#$$#==== +=T#N_____##|= +#_A_________X +#_###S+####_# +#_#=======#_# +#_#=======#_# +#_#####@@##_# +#_________A_# +=#C#C####U#U= ; seconds=240 ; plates={c:0, d:0} diff --git a/cooperative_cuisine/configs/layouts/study_layouts/5-open-space.layout b/cooperative_cuisine/configs/layouts/study_layouts/5-open-space.layout new file mode 100644 index 0000000000000000000000000000000000000000..dfc9f59ea547a3c577c5f78de74f975570006544 --- /dev/null +++ b/cooperative_cuisine/configs/layouts/study_layouts/5-open-space.layout @@ -0,0 +1,14 @@ +##TGED##F#F## ++___________X +S___________| +#___________$ +I___________$ +K___________P +#___________# +###C#C##O#O## + +; seconds=240 +; plates={c:0, d:0} +; dirty_plates=true +; link: https://overcooked.fandom.com/wiki/1-6_(Overcooked!) +; raising platforms based on earthquakes \ No newline at end of file diff --git a/cooperative_cuisine/configs/layouts/zztest_layouts/screenshot_tutorial.layout b/cooperative_cuisine/configs/layouts/zztest_layouts/screenshot_tutorial.layout new file mode 100644 index 0000000000000000000000000000000000000000..aeca0151c18ed089f5f8ad0ed583923516a7a612 --- /dev/null +++ b/cooperative_cuisine/configs/layouts/zztest_layouts/screenshot_tutorial.layout @@ -0,0 +1,11 @@ +PULTI##### +__________ +___=___=_ +___#___#__ +___#___#__ +___#___#__ +___=___=__ +__________ +##C##$#S+ +__________ +__________ diff --git a/cooperative_cuisine/configs/study/study_config.yaml b/cooperative_cuisine/configs/study/study_config.yaml index 13849e1ac5f84a1b2da29b7d7c423d7094ee421b..6d44dfed1bb71e09592e2fed5837b2541d2987f9 100644 --- a/cooperative_cuisine/configs/study/study_config.yaml +++ b/cooperative_cuisine/configs/study/study_config.yaml @@ -2,14 +2,13 @@ levels: - config_path: CONFIGS_DIR/environment_config.yaml layout_path: LAYOUTS_DIR/study_layouts/1-1-far-apart.layout - # layout_path: LAYOUTS_DIR/zztest_layouts/screenshot_tutorial.layout item_info_path: CONFIGS_DIR/item_info.yaml name: "Level 1" seed: 12345 config_overwrite: game: time_limit_seconds: 300 - validate_recipes: true + validate_recipes: false plates: clean_plates: 0 dirty_plates: 0 @@ -55,7 +54,7 @@ levels: game: time_limit_seconds: 300 plates: - clean_plates: 1 + clean_plates: 0 dirty_plates: 0 return_dirty: true orders: @@ -186,6 +185,56 @@ levels: Chips: 10 BurgerWithChips: 60 + - config_path: CONFIGS_DIR/environment_config.yaml + layout_path: LAYOUTS_DIR/study_layouts/5-open-space.layout + item_info_path: CONFIGS_DIR/item_info.yaml + name: "Level 5" + seed: 12345 + config_overwrite: + game: + time_limit_seconds: 300 + plates: + clean_plates: 0 + dirty_plates: 0 + return_dirty: true + orders: + serving_not_ordered_meals: false + meals: + all: false + list: + - Pizza + - FishAndChips + - Chips + - FriedFish + order_gen_kwargs: + order_duration_random_func: + kwargs: + a: 50 + b: 60 + sample_on_dur_random_func: + func: uniform + kwargs: + a: 22 + b: 24 + hook_callbacks: + orders: + hooks: [ completed_order ] + callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks '' + callback_class_kwargs: + time_dependence_func: !!python/name:cooperative_cuisine.scores.stepped_score '' + time_dependence_kwargs: + score_ratios: [ 0.5, 1, 1 ] + steps: [ 0, 0.25, 0.66 ] + round_decimals: 0 + static_score: 20 + score_on_specific_kwarg: meal_name + score_map: + Burger: 40 + Salad: 20 + Chips: 10 + BurgerWithChips: 60 + + num_players: 1 num_bots: 0