From 2d4e4b9bfaa65da58bfbe3f54ca8b743a38a164a Mon Sep 17 00:00:00 2001
From: eri <eri@inventati.org>
Date: Sun, 21 Jul 2024 16:46:11 +0200
Subject: [PATCH] feat: final fixes

---
 src/enemy.rs            | 59 ++++++++++++++++++++++++++++++++++++++---
 src/player.rs           |  1 -
 src/tilemap.rs          | 10 +++----
 src/ui/menu/mappings.rs | 17 +++++++-----
 4 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/src/enemy.rs b/src/enemy.rs
index 34865c2..efa0b9f 100644
--- a/src/enemy.rs
+++ b/src/enemy.rs
@@ -1,10 +1,12 @@
+use std::f32::consts::PI;
+
 use bevy::prelude::*;
 #[cfg(feature = "persist")]
 pub use bevy_persistent::prelude::Persistent;
 use rand::Rng;
 
 use crate::{
-    assets::{SoundAssets, ATLAS_SIZE},
+    assets::{CoreAssets, SoundAssets, ATLAS_SIZE},
     data::{attack, max_battery, SaveData},
     misc::{dir_to_vec, Direction, MoveTo, MIN_TURN_TIMER},
     player::Player,
@@ -45,7 +47,7 @@ impl Plugin for EnemyPlugin {
                 Update,
                 (
                     on_damage.in_set(PlaySet::Events),
-                    enemy_flash.in_set(PlaySet::Animation),
+                    (damage_text, enemy_flash).in_set(PlaySet::Animation),
                 ),
             );
     }
@@ -105,6 +107,9 @@ struct EnemyTurn(Timer);
 #[derive(Component)]
 struct EnemyFlash(Timer);
 
+#[derive(Component)]
+struct DamageText(Timer, Vec2);
+
 // ······
 // Events
 // ······
@@ -123,6 +128,7 @@ fn on_damage(
     mut damage_reader: EventReader<DamageEvent>,
     mut save_data: ResMut<Persistent<SaveData>>,
     mut next_play_state: ResMut<NextState<PlayState>>,
+    assets: Res<CoreAssets>,
 ) {
     for DamageEvent(entity) in damage_reader.read() {
         cmd.entity(*entity)
@@ -142,7 +148,7 @@ fn on_damage(
                     .clamp(0, max_battery(save_data.battery_level));
             }
 
-            enemy.health -= match enemy.elem {
+            let value = match enemy.elem {
                 Element::Basic => match save_data.attack_selected {
                     Element::Basic => attack(save_data.attack_level),
                     Element::Fire => {
@@ -249,6 +255,29 @@ fn on_damage(
                     },
                 },
             };
+
+            let value = value.clamp(0., enemy.health);
+            enemy.health -= value;
+
+            cmd.spawn((
+                Text2dBundle {
+                    text: Text::from_section(
+                        if value > 0. { format!("{:.1}", value) } else { "X".into() },
+                        TextStyle {
+                            font: assets.font.clone(),
+                            font_size: 10.,
+                            color: enemy_color(&save_data.attack_selected).lighter(0.1),
+                        },
+                    ),
+                    transform: Transform::from_translation(tile_to_pos(enemy.pos).extend(15.)),
+                    ..default()
+                },
+                DamageText(
+                    Timer::from_seconds(0.3, TimerMode::Once),
+                    tile_to_pos(enemy.pos),
+                ),
+            ));
+
             if enemy.health <= 0. {
                 cmd.entity(*entity).despawn();
                 let mut rng = rand::thread_rng();
@@ -386,6 +415,30 @@ fn update_enemies(
     }
 }
 
+fn damage_text(
+    mut cmd: Commands,
+    mut text: Query<(
+        Entity,
+        &mut Transform,
+        &mut Text,
+        &mut DamageText,
+    )>,
+    time: Res<Time>,
+) {
+    for (entity, mut trans, mut text, mut flash) in text.iter_mut() {
+        let timer = flash.0.tick(time.delta());
+        if timer.just_finished() {
+            cmd.entity(entity).despawn();
+        }
+        let t = timer.fraction();
+        text.sections[0].style.color.set_alpha(1. - t);
+        let mut pos = flash.1;
+        pos.x += (t * PI * 2.).sin() * 5.;
+        pos.y += t * 50.;
+        trans.translation = pos.extend(15.);
+    }
+}
+
 // ·······
 // Helpers
 // ·······
diff --git a/src/player.rs b/src/player.rs
index 2915863..5f4fefa 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -91,7 +91,6 @@ fn init(mut cmd: Commands, sprite_assets: Res<SpriteAssets>) {
     ));
 }
 
-// TODO: Turn based movement
 fn move_player(
     mut cmd: Commands,
     mut player: Query<(Entity, &mut Player)>,
diff --git a/src/tilemap.rs b/src/tilemap.rs
index 835681c..f092f4c 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::{enemy_color, get_enemy, Element},
+    enemy::{enemy_color, get_enemy},
     misc::{dir_to_vec, Direction},
     player::{Status, StatusEvent},
     GameState, PlayState, SCALE,
@@ -261,13 +261,9 @@ fn generate_level(
                     }
                     let offset = offset.perp();
                     let left = TileData::pos(pos + offset);
-                    if !tiles.contains_key(&left) {
-                        tiles.insert(left, Tile::Wall);
-                    }
+                    tiles.entry(left).or_insert(Tile::Wall);
                     let right = TileData::pos(pos - offset);
-                    if !tiles.contains_key(&right) {
-                        tiles.insert(right, Tile::Wall);
-                    }
+                    tiles.entry(right).or_insert(Tile::Wall);
                 }
             }
         }
diff --git a/src/ui/menu/mappings.rs b/src/ui/menu/mappings.rs
index bd8f816..45985e0 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, UiOptionRowWidget, UiTextWidget},
-        UiRootContainer, UI_GAP,
+        UiRootContainer,
     },
     SCALE,
 };
@@ -110,12 +110,15 @@ fn row_mapping(map: &dyn Reflect, row: &mut UiBuilder<Entity>, asset_server: &As
     for prompt in prompts {
         // Dynamic loading to avoid having all icons in memory
         row.option_button(|button| {
-            button.spawn(ImageBundle {
-                image: UiImage::new(asset_server.load(&prompt)).with_color(Color::srgb(0.812, 0.776, 0.722)),
-                ..default()
-            }).style()
-            .height(Val::Px(16. * SCALE))
-            .width(Val::Px(16. * SCALE));
+            button
+                .spawn(ImageBundle {
+                    image: UiImage::new(asset_server.load(&prompt))
+                        .with_color(Color::srgb(0.812, 0.776, 0.722)),
+                    ..default()
+                })
+                .style()
+                .height(Val::Px(16. * SCALE))
+                .width(Val::Px(16. * SCALE));
         })
         .insert(BorderRadius::all(Val::Px(16.)))
         .insert(BorderColor::from(Srgba::NONE))