diff --git a/overcooked_simulator/game_content/item_info_debug.yaml b/overcooked_simulator/game_content/item_info_debug.yaml index 15d3b606480a232ffce7de3ef1ba61c930686cf4..fd871d1d5685df542317bf772b67f3a3fd8ed7d8 100644 --- a/overcooked_simulator/game_content/item_info_debug.yaml +++ b/overcooked_simulator/game_content/item_info_debug.yaml @@ -188,7 +188,7 @@ BurntCookedPatty: BurntChips: type: Waste - seconds: 5.0 + seconds: 1.0 needs: [ Chips ] equipment: Basket @@ -220,7 +220,7 @@ BurntPizza: Fire: type: Effect - seconds: 10.0 + seconds: 1.0 needs: [ BurntCookedPatty, BurntChips, BurntFriedFish, BurntTomatoSoup, BurntOnionSoup, BurntPizza ] manager: FireManager effect_type: Unusable diff --git a/overcooked_simulator/gui_2d_vis/drawing.py b/overcooked_simulator/gui_2d_vis/drawing.py index 7515b212dd0c45b0e6c84d0228c86cea6df53ebd..76f311179b192a742ae2535f1e51079a03edc5b1 100644 --- a/overcooked_simulator/gui_2d_vis/drawing.py +++ b/overcooked_simulator/gui_2d_vis/drawing.py @@ -65,6 +65,9 @@ class Visualizer: self.player_colors = [] self.config = config + self.fire_state = 0 + self.fire_time_steps = 8 + def create_player_colors(self, n) -> None: hue_values = np.linspace(0, 1, n + 1) @@ -332,6 +335,12 @@ class Visualizer: item_key += "Plate" if item_key.startswith("Burnt"): item_key = item_key.replace("Burnt", "") + + if item_key == "Fire": + item_key = ( + f"{item_key}{int(self.fire_state/self.fire_time_steps)+1}" + ) + self.draw_thing( pos=pos, parts=self.config[item_key]["parts"], @@ -472,6 +481,8 @@ class Visualizer: Args: state: The game state returned by the environment. """ + global FIRE_STATE + for counter in counters: self.draw_counter(screen, counter, grid_size) @@ -499,6 +510,8 @@ class Visualizer: 3, ) + FIRE_STATE = (self.fire_state + 1) % (3 * self.fire_time_steps) + def draw_orders( self, screen, state, grid_size, width, height, screen_margin, config ): diff --git a/overcooked_simulator/gui_2d_vis/images/fire2.png b/overcooked_simulator/gui_2d_vis/images/fire2.png new file mode 100644 index 0000000000000000000000000000000000000000..1f28ad6e87d7e5985a1dbf9d72d13643a7936b00 Binary files /dev/null and b/overcooked_simulator/gui_2d_vis/images/fire2.png differ diff --git a/overcooked_simulator/gui_2d_vis/images/fire3.png b/overcooked_simulator/gui_2d_vis/images/fire3.png new file mode 100644 index 0000000000000000000000000000000000000000..65b883b7d5663f7c8f99032c9939e3f4479e03f0 Binary files /dev/null and b/overcooked_simulator/gui_2d_vis/images/fire3.png differ diff --git a/overcooked_simulator/gui_2d_vis/visualization.yaml b/overcooked_simulator/gui_2d_vis/visualization.yaml index 44e6e56b0d46b77ceac7b2441d099ffb7c4220c6..06fe3d1e5278f1f58f7ca74d90d4c00fd67cdd83 100644 --- a/overcooked_simulator/gui_2d_vis/visualization.yaml +++ b/overcooked_simulator/gui_2d_vis/visualization.yaml @@ -140,6 +140,25 @@ Fire: path: images/fire.png size: 1 +Fire1: + parts: + - type: image + path: images/fire.png + size: 1.0 + +Fire2: + parts: + - type: image + path: images/fire2.png + size: 1.0 + +Fire3: + parts: + - type: image + path: images/fire3.png + size: 1.0 + + # Items Tomato: parts: