diff --git a/overcooked_simulator/counters.py b/overcooked_simulator/counters.py index 40779e5cb228c993a65b5264f684225ea1ff78bc..2ae8b3f7f2fc320dc6563fb8c8563a3b1da4d4dd 100644 --- a/overcooked_simulator/counters.py +++ b/overcooked_simulator/counters.py @@ -616,6 +616,7 @@ class Trashcan(Counter): item.content_list ) item.reset_content() + item.reset() return item else: penalty = self.order_and_score.apply_penalty_for_using_trash(item) diff --git a/overcooked_simulator/game_content/item_info.yaml b/overcooked_simulator/game_content/item_info.yaml index 1266f61ebd611cd5c2a9097b1be9dd7eff65b7f7..4e70e8977d8c25c723148cd313d40ee946e2bad7 100644 --- a/overcooked_simulator/game_content/item_info.yaml +++ b/overcooked_simulator/game_content/item_info.yaml @@ -181,45 +181,45 @@ Pizza: BurntCookedPatty: type: Waste - seconds: 5.0 + seconds: 10.0 needs: [ CookedPatty ] equipment: Pan BurntChips: type: Waste - seconds: 5.0 + seconds: 10.0 needs: [ Chips ] equipment: Basket BurntFriedFish: type: Waste - seconds: 5.0 + seconds: 10.0 needs: [ FriedFish ] equipment: Basket BurntTomatoSoup: type: Waste needs: [ TomatoSoup ] - seconds: 6.0 + seconds: 10.0 equipment: Pot BurntOnionSoup: type: Waste needs: [ OnionSoup ] - seconds: 6.0 + seconds: 10.0 equipment: Pot BurntPizza: type: Waste needs: [ Pizza ] - seconds: 7.0 + seconds: 10.0 equipment: Peel # -------------------------------------------------------------------------------- Fire: type: Effect - seconds: 5.0 + seconds: 10.0 needs: [ BurntCookedPatty, BurntChips, BurntFriedFish, BurntTomatoSoup, BurntOnionSoup, BurntPizza ] manager: FireManager effect_type: Unusable diff --git a/overcooked_simulator/game_content/layouts/aatest_layouts/godot_test_layout.layout b/overcooked_simulator/game_content/layouts/aatest_layouts/godot_test_layout.layout new file mode 100644 index 0000000000000000000000000000000000000000..06db451a2f644732cc693835a9a5aaee6a38d612 --- /dev/null +++ b/overcooked_simulator/game_content/layouts/aatest_layouts/godot_test_layout.layout @@ -0,0 +1,9 @@ +########## +#________# +#________# +#________# +#________# +#________# +#________# +#________# +#########P diff --git a/overcooked_simulator/game_content/layouts/aatest_layouts/test1.layout b/overcooked_simulator/game_content/layouts/aatest_layouts/test1.layout new file mode 100644 index 0000000000000000000000000000000000000000..8ccd0a1152692fd1c9a0a911b0bb677bab98cb95 --- /dev/null +++ b/overcooked_simulator/game_content/layouts/aatest_layouts/test1.layout @@ -0,0 +1 @@ +____A___P \ No newline at end of file diff --git a/overcooked_simulator/game_content/layouts/aatest_layouts/test2.layout b/overcooked_simulator/game_content/layouts/aatest_layouts/test2.layout new file mode 100644 index 0000000000000000000000000000000000000000..8cfae98af3e7748e2df2dcdaae2ffffbe8c4a074 --- /dev/null +++ b/overcooked_simulator/game_content/layouts/aatest_layouts/test2.layout @@ -0,0 +1,9 @@ +_ +_ +_ +A +_ +_ +_ +_ +P \ No newline at end of file diff --git a/overcooked_simulator/game_content/layouts/aatest_layouts/test3.layout b/overcooked_simulator/game_content/layouts/aatest_layouts/test3.layout new file mode 100644 index 0000000000000000000000000000000000000000..8847c681b18500df23abe068dac76fb4dfbdd6d2 --- /dev/null +++ b/overcooked_simulator/game_content/layouts/aatest_layouts/test3.layout @@ -0,0 +1,4 @@ +___ +_A_ +___ +__P \ No newline at end of file diff --git a/overcooked_simulator/game_content/layouts/aatest_layouts/test4.layout b/overcooked_simulator/game_content/layouts/aatest_layouts/test4.layout new file mode 100644 index 0000000000000000000000000000000000000000..09d7551fa64358eb61a97d4c562617dca82b9655 --- /dev/null +++ b/overcooked_simulator/game_content/layouts/aatest_layouts/test4.layout @@ -0,0 +1,3 @@ +____ +_A__ +___P \ No newline at end of file diff --git a/overcooked_simulator/game_content/layouts/basic.layout b/overcooked_simulator/game_content/layouts/basic.layout index 5238c21f86c487ed90ff8efc6a373c6213d1f6c9..f3d0c2ec5af7857c4af42841d154a677fd31b21b 100644 --- a/overcooked_simulator/game_content/layouts/basic.layout +++ b/overcooked_simulator/game_content/layouts/basic.layout @@ -4,6 +4,6 @@ $__________I #__A_____A_D C__________E -C__________G -#__________# -#P#S+#X##S+# \ No newline at end of file +#__________G +C__________# +##PS+#X##S+# \ No newline at end of file