From 8bc773baa2a279ef01e94a2f528a76e845dbd564 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.de>
Date: Wed, 21 Feb 2024 17:11:47 +0100
Subject: [PATCH] Fix cooking equipment burning after content was thrown out,
 adjusted times for burning things

---
 overcooked_simulator/counters.py                   |  1 +
 overcooked_simulator/game_content/item_info.yaml   | 14 +++++++-------
 .../aatest_layouts/godot_test_layout.layout        |  9 +++++++++
 .../layouts/aatest_layouts/test1.layout            |  1 +
 .../layouts/aatest_layouts/test2.layout            |  9 +++++++++
 .../layouts/aatest_layouts/test3.layout            |  4 ++++
 .../layouts/aatest_layouts/test4.layout            |  3 +++
 .../game_content/layouts/basic.layout              |  6 +++---
 8 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 overcooked_simulator/game_content/layouts/aatest_layouts/godot_test_layout.layout
 create mode 100644 overcooked_simulator/game_content/layouts/aatest_layouts/test1.layout
 create mode 100644 overcooked_simulator/game_content/layouts/aatest_layouts/test2.layout
 create mode 100644 overcooked_simulator/game_content/layouts/aatest_layouts/test3.layout
 create mode 100644 overcooked_simulator/game_content/layouts/aatest_layouts/test4.layout

diff --git a/overcooked_simulator/counters.py b/overcooked_simulator/counters.py
index 40779e5c..2ae8b3f7 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 1266f61e..4e70e897 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 00000000..06db451a
--- /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 00000000..8ccd0a11
--- /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 00000000..8cfae98a
--- /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 00000000..8847c681
--- /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 00000000..09d7551f
--- /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 5238c21f..f3d0c2ec 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
-- 
GitLab