Show unit task queue and mark in side panel

Add `get_tasks` to the `Unit` trait and implement it for `MinerUnit`,
`Units` enum and `Option<Units>`.  Use the new method in `base_text` to
display a “Tasks Queue” line.

Refactor task assignment in `BoardState` to a chained call.

Update the skirmish view and `SidePanelWidget` to pass a flag indicating
whether the displayed unit is the currently marked one, and highlight
the
unit name accordingly.
This commit is contained in:
2026-05-17 11:00:06 +02:00
parent a7d8823bf2
commit e4728aab5d
6 changed files with 41 additions and 5 deletions
+3 -2
View File
@@ -220,9 +220,10 @@ impl BoardState {
let (row, col) = self.marked_cells.selected_unit.get_coords(); let (row, col) = self.marked_cells.selected_unit.get_coords();
let task: Tasks = Tasks::Digging(DiggingTask::new(self.marked_cells.marked_cells.clone())); let task: Tasks = Tasks::Digging(DiggingTask::new(self.marked_cells.marked_cells.clone()));
let unit: &mut Option<Units> = self.get_mut_cell(row, col).get_mut_option_unit();
unit.set_task(task); self.get_mut_cell(row, col)
.get_mut_option_unit()
.set_task(task);
self.marked_cells.selected_unit = None; self.marked_cells.selected_unit = None;
self.marked_cells.marked_cells.clear(); self.marked_cells.marked_cells.clear();
@@ -57,6 +57,10 @@ impl Unit for MinerUnit {
self.coords self.coords
} }
fn get_tasks(&self) -> String {
format!("{:?}", self.tasks)
}
fn set_task(&mut self, task: Tasks) { fn set_task(&mut self, task: Tasks) {
self.tasks.push_back(task); self.tasks.push_back(task);
} }
@@ -25,6 +25,8 @@ pub trait Unit {
fn get_coords(&self) -> (usize, usize); fn get_coords(&self) -> (usize, usize);
fn get_tasks(&self) -> String;
fn set_task(&mut self, task: Tasks); fn set_task(&mut self, task: Tasks);
fn base_text(&self) -> Vec<Line<'_>> { fn base_text(&self) -> Vec<Line<'_>> {
@@ -34,6 +36,7 @@ pub trait Unit {
let hp_percent: u16 = hp * 100 / max_hp; let hp_percent: u16 = hp * 100 / max_hp;
let can_dig: bool = self.get_can_dig(); let can_dig: bool = self.get_can_dig();
let digging_power: f32 = self.get_digging_power(); let digging_power: f32 = self.get_digging_power();
let tasks: String = self.get_tasks();
let mut lines: Vec<Line<'_>> = Vec::from([ let mut lines: Vec<Line<'_>> = Vec::from([
Line::from_iter(["Owner: ".gray(), owner]), Line::from_iter(["Owner: ".gray(), owner]),
@@ -46,6 +49,7 @@ pub trait Unit {
hp_percent.green(), hp_percent.green(),
"% )".gray(), "% )".gray(),
]), ]),
Line::from_iter(["Tasks Queue: ".gray(), tasks.green()]),
]); ]);
if can_dig { if can_dig {
@@ -58,6 +58,10 @@ impl Unit for Units {
self.u().get_coords() self.u().get_coords()
} }
fn get_tasks(&self) -> String {
self.u().get_tasks()
}
fn set_task(&mut self, task: Tasks) { fn set_task(&mut self, task: Tasks) {
self.u_mut().set_task(task); self.u_mut().set_task(task);
} }
@@ -100,6 +104,10 @@ impl Unit for Option<Units> {
self.as_ref().map_or((0, 0), |u| u.get_coords()) self.as_ref().map_or((0, 0), |u| u.get_coords())
} }
fn get_tasks(&self) -> String {
self.as_ref().map_or("".to_string(), |u| u.get_tasks())
}
fn set_task(&mut self, task: Tasks) { fn set_task(&mut self, task: Tasks) {
self.as_mut().map_or((), |u| u.set_task(task)) self.as_mut().map_or((), |u| u.set_task(task))
} }
+7 -1
View File
@@ -132,11 +132,17 @@ pub fn skirmish_view(app: &App, area: Rect, buf: &mut Buffer) {
if states.skirmish.side_panel { if states.skirmish.side_panel {
let row: usize = board.get_focused_cell().get_row(); let row: usize = board.get_focused_cell().get_row();
let col: usize = board.get_focused_cell().get_col(); let col: usize = board.get_focused_cell().get_col();
let mut is_unit_marked: bool = false;
if let Some((first_row, first_col)) = board.marked_cells.marked_cells.get(0) {
is_unit_marked = first_row == &row && first_col == &col;
}
SidePanelWidget::new( SidePanelWidget::new(
(row, col), (row, col),
&board.get_ref_cell(row, col).get_structure(), &board.get_ref_cell(row, col).get_structure(),
&board.get_ref_cell(row, col).get_option_unit(), &board.get_ref_cell(row, col).get_ref_option_unit(),
is_unit_marked,
) )
.render(side_panel_area, buf); .render(side_panel_area, buf);
} }
+15 -2
View File
@@ -17,14 +17,21 @@ pub struct SidePanelWidget<'a> {
coords: (usize, usize), coords: (usize, usize),
structure: &'a Structures, structure: &'a Structures,
unit: &'a Option<Units>, unit: &'a Option<Units>,
is_unit_marked: bool,
} }
impl<'a> SidePanelWidget<'a> { impl<'a> SidePanelWidget<'a> {
pub fn new(coords: (usize, usize), structure: &'a Structures, unit: &'a Option<Units>) -> Self { pub fn new(
coords: (usize, usize),
structure: &'a Structures,
unit: &'a Option<Units>,
is_unit_marked: bool,
) -> Self {
Self { Self {
coords, coords,
structure, structure,
unit, unit,
is_unit_marked,
} }
} }
@@ -86,9 +93,15 @@ impl Widget for SidePanelWidget<'_> {
.render(structure_area, buf); .render(structure_area, buf);
if self.unit.is_unit() { if self.unit.is_unit() {
let mut unit_name: String = self.unit.get_name().to_string();
if self.is_unit_marked {
unit_name = format!("> {} <", unit_name);
}
Paragraph::new(self.unit.text()) Paragraph::new(self.unit.text())
.alignment(Alignment::Left) .alignment(Alignment::Left)
.block(self.get_inner_block(self.unit.get_name().to_string(), Color::Green)) .block(self.get_inner_block(unit_name, Color::Green))
.render(unit_area, buf); .render(unit_area, buf);
} }
} }