begin FOURTH time lmao

This commit is contained in:
Tao Tien 2026-02-10 01:29:22 -08:00
parent 6f3d27a6f6
commit 5497872aff
3 changed files with 47 additions and 30 deletions

View file

@ -219,10 +219,8 @@ fn view_hand(
tiles: Query<(&Tile, Entity)>,
hand_ent: Single<Entity, With<Hand>>,
) {
trace!("view_hand");
// trace!("view_hand");
if let Some(view) = stdb.db().view_player_hand().iter().next() {
debug!("view_hand: {view:?}");
let mut view = view.tiles.iter().map(Tile::from).collect::<Vec<_>>();
let tiles = tiles

View file

@ -26,6 +26,32 @@ pub enum TuiSet {
Render,
}
mod states {
use bevy::prelude::*;
use tui_logger::TuiWidgetState;
#[derive(Resource)]
pub(crate) struct ConsoleWidget {
pub(crate) state: TuiWidgetState,
pub(crate) open: bool,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, States, Default)]
pub(crate) enum TuiState {
#[default]
MainMenu,
InGame,
}
// #[derive(SubStates, Default, Clone, Copy, PartialEq, Eq, Hash, Debug)]
// #[source(TuiState = TuiState::MainMenu)]
// pub(crate) enum ZenState {
// #[default]
// Menu,
// Zen,
// }
}
impl Plugin for TuiPlugin {
fn build(&self, app: &mut App) {
app.add_plugins((
@ -60,7 +86,7 @@ impl Plugin for TuiPlugin {
.add_systems(
Update,
(
render::render_hands.run_if(in_state(GameState::Play)),
(render::render_hands, render::render_arg_check).run_if(in_state(GameState::Play)),
render::render,
)
.chain()
@ -95,29 +121,3 @@ fn discard_tile(
writer.write(GameMessage::Discarded(message.0));
}
}
mod states {
use bevy::prelude::*;
use tui_logger::TuiWidgetState;
#[derive(Resource)]
pub(crate) struct ConsoleWidget {
pub(crate) state: TuiWidgetState,
pub(crate) open: bool,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, States, Default)]
pub(crate) enum TuiState {
#[default]
MainMenu,
InGame,
}
// #[derive(SubStates, Default, Clone, Copy, PartialEq, Eq, Hash, Debug)]
// #[source(TuiState = TuiState::MainMenu)]
// pub(crate) enum ZenState {
// #[default]
// Menu,
// Zen,
// }
}

View file

@ -95,6 +95,23 @@ pub(crate) fn render(
Ok(())
}
pub(crate) fn render_arg_check(
mut commands: Commands,
mut tui: ResMut<RatatuiContext>,
hovered: Query<Entity, With<Hovered>>,
layouts: Res<HandLayouts>,
tiles: Query<&jong_types::Tile>,
// main_player: Single<(&Player, Entity, &Wind), With<MainPlayer>>,
curr_player: Single<Entity, With<CurrentPlayer>>,
players: Query<(&Player, Entity, &Children)>,
hands: Query<(&Children, Entity), (With<Hand>, Without<Player>)>,
// drawn_tile: Single<Entity, With<Drawn>>,
) {
trace!("arg!");
}
#[allow(clippy::too_many_arguments, clippy::type_complexity)]
pub(crate) fn render_hands(
mut commands: Commands,
@ -110,6 +127,8 @@ pub(crate) fn render_hands(
hands: Query<(&Children, Entity), (With<Hand>, Without<Player>)>,
drawn_tile: Single<Entity, With<Drawn>>,
) -> Result {
trace!("render_hands");
let mut frame = tui.get_frame();
debug_blocks(*layouts, &mut frame);