From e570d3fb2f64fe04d2b625339848a44b491286ed Mon Sep 17 00:00:00 2001
From: eri <eri@inventati.org>
Date: Sun, 21 Jul 2024 16:10:16 +0200
Subject: [PATCH] feat: enemy flash

---
 src/enemy.rs            | 55 +++++++++++++++++++++++++++++++++++------
 src/tilemap.rs          | 43 +++++++++++++++++---------------
 src/ui/menu/mappings.rs |  5 ++--
 src/ui/widgets.rs       |  2 +-
 4 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/src/enemy.rs b/src/enemy.rs
index d0c54f4..34865c2 100644
--- a/src/enemy.rs
+++ b/src/enemy.rs
@@ -19,12 +19,12 @@ const WEIGHTS: [[u32; 7]; 12] = [
     [5, 40, 30, 5, 00, 20, 0],
     [00, 20, 45, 25, 00, 9, 1],
     [00, 10, 20, 50, 10, 9, 1],
-    [00, 00, 5, 55, 20, 19, 1],
-    [00, 00, 00, 60, 15, 19, 1],
-    [00, 00, 00, 40, 35, 24, 1],
-    [00, 00, 00, 20, 50, 29, 1],
-    [00, 00, 00, 10, 70, 19, 1],
-    [00, 00, 00, 5, 85, 9, 1],
+    [00, 00, 5, 55, 20, 19, 0],
+    [00, 00, 00, 60, 15, 19, 0],
+    [00, 00, 00, 40, 35, 24, 0],
+    [00, 00, 00, 20, 50, 29, 0],
+    [00, 00, 00, 10, 70, 19, 0],
+    [00, 00, 00, 5, 85, 9, 0],
 ];
 
 // ······
@@ -43,7 +43,10 @@ impl Plugin for EnemyPlugin {
             )
             .add_systems(
                 Update,
-                on_damage.in_set(PlaySet::Events),
+                (
+                    on_damage.in_set(PlaySet::Events),
+                    enemy_flash.in_set(PlaySet::Animation),
+                ),
             );
     }
 }
@@ -99,6 +102,9 @@ pub struct Enemy {
 #[derive(Component)]
 struct EnemyTurn(Timer);
 
+#[derive(Component)]
+struct EnemyFlash(Timer);
+
 // ······
 // Events
 // ······
@@ -119,6 +125,12 @@ fn on_damage(
     mut next_play_state: ResMut<NextState<PlayState>>,
 ) {
     for DamageEvent(entity) in damage_reader.read() {
+        cmd.entity(*entity)
+            .try_insert(EnemyFlash(Timer::from_seconds(
+                0.15,
+                TimerMode::Once,
+            )));
+
         if let Ok(mut enemy) = enemies.get_mut(*entity) {
             if let EnemyType::EndGame = enemy.typ {
                 next_play_state.set(PlayState::GameWon);
@@ -285,6 +297,26 @@ fn enemy_turn(mut cmd: Commands) {
     )));
 }
 
+fn enemy_flash(
+    mut cmd: Commands,
+    mut enemies: Query<(
+        Entity,
+        &Enemy,
+        &mut Sprite,
+        &mut EnemyFlash,
+    )>,
+    time: Res<Time>,
+) {
+    for (entity, enemy, mut sprite, mut flash) in enemies.iter_mut() {
+        let timer = flash.0.tick(time.delta());
+        if timer.just_finished() {
+            cmd.entity(entity).remove::<EnemyFlash>();
+        }
+        let n = (timer.fraction() * 5.) as u32;
+        sprite.color = if n % 2 == 0 { Color::WHITE } else { enemy_color(&enemy.elem) };
+    }
+}
+
 fn update_enemies(
     mut cmd: Commands,
     mut timer: Query<(Entity, &mut EnemyTurn)>,
@@ -440,3 +472,12 @@ fn enemy_elem() -> Element {
         _ => Element::Basic,
     }
 }
+
+pub fn enemy_color(elem: &Element) -> Color {
+    match elem {
+        Element::Basic => Color::srgb(0.812, 0.776, 0.722),
+        Element::Fire => Color::srgb(0.902, 0.282, 0.18),
+        Element::Water => Color::srgb(0.235, 0.675, 0.843),
+        Element::Grass => Color::srgb(0.22, 0.851, 0.451),
+    }
+}
diff --git a/src/tilemap.rs b/src/tilemap.rs
index b2366d4..835681c 100644
--- a/src/tilemap.rs
+++ b/src/tilemap.rs
@@ -10,7 +10,7 @@ use rand::{seq::SliceRandom, Rng};
 use crate::{
     assets::{SpriteAssets, ATLAS_SIZE},
     data::{max_battery, max_range, Persistent, SaveData},
-    enemy::{get_enemy, Element},
+    enemy::{enemy_color, get_enemy, Element},
     misc::{dir_to_vec, Direction},
     player::{Status, StatusEvent},
     GameState, PlayState, SCALE,
@@ -245,7 +245,8 @@ fn generate_level(
                 let center_a = a * ROOM_SEP.as_ivec2() + ROOM_SEP.as_ivec2() / 2;
                 let mut first_wall = false;
                 for pos in 0..sep {
-                    let tile = TileData::pos(center_a + pos as i32 * offset);
+                    let pos = center_a + pos as i32 * offset;
+                    let tile = TileData::pos(pos);
                     // Find the first wall and start laying paths
                     if !first_wall {
                         if let Some(Tile::Wall) = tiles.get(&tile) {
@@ -258,30 +259,37 @@ fn generate_level(
                     else if let Some(Tile::Wall) = tiles.insert(tile, Tile::Path) {
                         break;
                     }
+                    let offset = offset.perp();
+                    let left = TileData::pos(pos + offset);
+                    if !tiles.contains_key(&left) {
+                        tiles.insert(left, Tile::Wall);
+                    }
+                    let right = TileData::pos(pos - offset);
+                    if !tiles.contains_key(&right) {
+                        tiles.insert(right, Tile::Wall);
+                    }
                 }
             }
         }
         aux.remove(&a);
     }
 
-    // Insert ladder down or final key
-    // This iterator is supposed to be random
-    if level < 9 {
-        for (_, tile) in tiles.iter_mut() {
-            if !matches!(tile, Tile::Ground) {
-                continue;
-            }
-            *tile = Tile::LadderDown;
-            break;
-        }
-    }
-
     // Insert ladder up
     tiles.insert(
         TileData::pos(ROOM_SEP.as_ivec2() / 2),
         Tile::LadderUp,
     );
 
+    // Insert ladder down or final key
+    // This iterator is supposed to be random
+    for (_, tile) in tiles.iter_mut() {
+        if !matches!(tile, Tile::Ground) {
+            continue;
+        }
+        *tile = if level < 9 { Tile::LadderDown } else { Tile::Enemy };
+        break;
+    }
+
     // Create actual tiles
     let mut unique = false;
     tiles
@@ -353,12 +361,7 @@ fn create_tile(
                     .with_scale(Vec3::splat(SCALE)),
                 texture: sprite_assets.one_bit.clone(),
                 sprite: Sprite {
-                    color: match enemy.elem {
-                        Element::Basic => Color::srgb(0.812, 0.776, 0.722),
-                        Element::Fire => Color::srgb(0.902, 0.282, 0.18),
-                        Element::Water => Color::srgb(0.235, 0.675, 0.843),
-                        Element::Grass => Color::srgb(0.22, 0.851, 0.451),
-                    },
+                    color: enemy_color(&enemy.elem),
                     ..default()
                 },
                 ..default()
diff --git a/src/ui/menu/mappings.rs b/src/ui/menu/mappings.rs
index e6f856c..3d3ef64 100644
--- a/src/ui/menu/mappings.rs
+++ b/src/ui/menu/mappings.rs
@@ -16,7 +16,7 @@ use crate::{
     ui::{
         menu::{navigation::FocusableHoverFill, MenuButton, MenuState},
         widgets::{UiButtonWidget, UiImageWidget, UiOptionRowWidget, UiTextWidget},
-        UiRootContainer, UI_GAP,
+        UiRootContainer,
     },
 };
 
@@ -41,8 +41,7 @@ pub(super) fn open(
                 .style()
                 .width(Val::Percent(100.))
                 .align_items(AlignItems::Center)
-                .justify_content(JustifyContent::Center)
-                .row_gap(UI_GAP);
+                .justify_content(JustifyContent::Center);
 
             column.title("Mappings".into(), assets.font.clone());
 
diff --git a/src/ui/widgets.rs b/src/ui/widgets.rs
index 8a96b8a..d2efa72 100644
--- a/src/ui/widgets.rs
+++ b/src/ui/widgets.rs
@@ -178,7 +178,7 @@ impl UiOptionRowWidget for UiBuilder<'_, Entity> {
                     ..default()
                 },
                 background_color: BUTTON_COLOR.into(),
-                border_radius: BorderRadius::MAX,
+                // border_radius: BorderRadius::MAX,
                 ..default()
             },
             spawn_children,