Implement damage UI, damage and stale moves. (#45)
CI / build-and-test (push) Successful in 1m30s

Reviewed-on: #45
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
This commit was merged in pull request #45.
This commit is contained in:
2026-09-19 15:40:44 +00:00
committed by EIREXE
parent 7269a1cb49
commit 804e5e37e0
11 changed files with 178 additions and 60 deletions
+57
View File
@@ -0,0 +1,57 @@
use bevy::prelude::*;
use crate::{
fighter::manifest::{FighterManifest, FighterManifestRegistry}, match_loading::{PendingMatch}, ui::{errors::UIErrors, fighter_info::FighterInfoUI},
};
#[derive(Component, FromTemplate)]
pub struct BattleUI {
}
pub fn spawn_battle_ui(mut commands: Commands, request: Res<PendingMatch>, fighter_registry: Res<FighterManifestRegistry>, manifests: Res<Assets<FighterManifest>>) -> Result {
let mut fighter_uis = vec![];
for player in &request.players {
let manifest = fighter_registry.get(player.fighter).ok_or_else(|| UIErrors::FighterManifestHandleNotFound(player.fighter))?;
let manifest = manifests.get(manifest).ok_or_else(|| UIErrors::FighterManifestNotFound(player.fighter))?;
fighter_uis.push(FighterInfoUI::build(manifest, player));
}
let scene = bsn! {
BattleUI {
}
Node {
width: percent(100),
height: percent(100),
flex_direction: FlexDirection::Column,
align_items: AlignItems::Center,
justify_content: JustifyContent::End,
}
Children [
(
#FighterInfos
Node {
width: percent(100),
flex_direction: FlexDirection::Row,
align_items: AlignItems::End,
justify_content: JustifyContent::SpaceEvenly,
}
Children [
{fighter_uis}
]
)
]
};
commands.spawn_scene(scene);
Ok(())
}
pub fn cleanup_battle_ui(mut commands: Commands, battle_ui: Query<Entity, With<BattleUI>>) {
for entity in battle_ui {
commands.entity(entity).despawn();
}
}
+14
View File
@@ -0,0 +1,14 @@
use bevy::{scene::SpawnSceneError};
use crate::{fighter::FighterId};
#[derive(thiserror::Error, Debug)]
pub enum UIErrors {
#[error("Scene spawn failed: {0:?}")]
SceneSpawnFailed(#[from] SpawnSceneError),
#[error("Fighter manifest handle not found for fighter id {0:?}")]
FighterManifestHandleNotFound(FighterId),
#[error("Fighter manifest not found for fighter id {0:?}")]
FighterManifestNotFound(FighterId),
}
+57
View File
@@ -0,0 +1,57 @@
use bevy::prelude::*;
use crate::{fighter::{attack::FighterDamage, manifest::{FighterManifest}}, match_loading::MatchPlayer, player::Player};
#[derive(Component, FromTemplate)]
pub struct FighterInfoUI {
percentage_text: Entity,
_name_text: Entity,
player_handle: usize,
visible_damage: FighterDamage,
}
impl FighterInfoUI {
pub fn build(_manifest: &FighterManifest, match_player: &MatchPlayer) -> impl Scene {
let fighter_name = "El grande padre";
bsn! {
FighterInfoUI {
percentage_text: #PercentageText,
_name_text: #NameText,
player_handle: {match_player.handle}
}
Node {
flex_direction: FlexDirection::Column,
align_items: AlignItems::Center,
justify_content: JustifyContent::Center,
}
Children [
(
#PercentageText
Text("0.00%")
TextFont {
font_size: px(crate::menus::style::H2_SIZE),
}
),
(
#NameText
Text({fighter_name})
)
]
}
}
}
pub fn update_fighter_info_damage(fighters: Query<(&Player, &FighterDamage)>, ui_elements: Query<&mut FighterInfoUI>, mut commands: Commands) {
for mut ui_element in ui_elements {
let Some((_, damage)) = fighters.iter().find(|(player, _)| {
player.handle == ui_element.player_handle
}) else {
continue;
};
if *damage != ui_element.visible_damage {
commands.entity(ui_element.percentage_text).insert(Text(format!("{}%", damage)));
ui_element.visible_damage = damage.clone();
}
}
}
+18
View File
@@ -0,0 +1,18 @@
use bevy::prelude::*;
use crate::AppState;
pub mod battle_ui;
pub mod errors;
pub mod fighter_info;
#[derive(Default)]
pub struct InGameUIPlugin;
impl Plugin for InGameUIPlugin {
fn build(&self, app: &mut App) {
app.add_systems(OnEnter(AppState::InMatch), battle_ui::spawn_battle_ui)
.add_systems(OnExit(AppState::InMatch), battle_ui::cleanup_battle_ui)
.add_systems(PostUpdate, fighter_info::update_fighter_info_damage);
}
}